summaryrefslogtreecommitdiffstats
path: root/lcm
diff options
context:
space:
mode:
Diffstat (limited to 'lcm')
-rw-r--r--lcm/lcm/nf/vnfs/const.py268
-rw-r--r--lcm/lcm/nf/vnfs/tests/test_vnf_create.py442
-rw-r--r--lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py2
3 files changed, 278 insertions, 434 deletions
diff --git a/lcm/lcm/nf/vnfs/const.py b/lcm/lcm/nf/vnfs/const.py
index bde2a7f9..f197294a 100644
--- a/lcm/lcm/nf/vnfs/const.py
+++ b/lcm/lcm/nf/vnfs/const.py
@@ -18,6 +18,274 @@ VNF_STATUS = enum(NULL='null', INSTANTIATING="instantiating", INACTIVE='inactive
FAILED="failed", TERMINATING="terminating", SCALING="scaling", OPERATING="operating",
UPDATING="updating", HEALING="healing")
+vnfd_rawdata = {
+ "rawData": {
+ "instance": {
+ "metadata": {
+ "designer": "sdno",
+ "name": "underlayervpn",
+ "csarVersion": "1.0",
+ "csarType": "SSAR",
+ "csarProvider": "huawei",
+ "version": "1.0",
+ "type": "SSAR",
+ "id": "ns_underlayervpn_1_0"
+ },
+ "nodes": [
+ {
+ "id": "ac2_fdhrbk3dvan8hl5wifm9lp1e9",
+ "type_name": "tosca.nodes.sdn.l3ac",
+ "template_name": "ac2",
+ "properties": {
+ "ip": {
+ "type_name": "string"
+ },
+ "route": {
+ "type_name": "string"
+ },
+ "port": {
+ "type_name": "string"
+ },
+ "svlan": {
+ "type_name": "string"
+ }
+ },
+ "interfaces": [
+ {
+ "name": "Standard",
+ "type_name": "tosca.interfaces.node.lifecycle.Standard"
+ }
+ ],
+ "capabilities": [
+ {
+ "name": "feature",
+ "type_name": "tosca.capabilities.Node"
+ },
+ {
+ "name": "ac",
+ "type_name": "tosca.capabilities.sdn.ac"
+ }
+ ],
+ "relationships": [
+ {
+ "target_node_id": "pe2_go3vo1ctxr1vlbl0ij8stbtj6",
+ "target_capability_name": "feature"
+ },
+ {
+ "target_node_id": "ac2_fdhrbk3dvan8hl5wifm9lp1e9",
+ "target_capability_name": "feature"
+ }
+ ]
+ },
+ {
+ "id": "ac1_jqows1ai0j0cmwk9jdvuknt97",
+ "type_name": "tosca.nodes.sdn.l3ac",
+ "template_name": "ac1",
+ "properties": {
+ "ip": {
+ "type_name": "string"
+ },
+ "route": {
+ "type_name": "string"
+ },
+ "port": {
+ "type_name": "string"
+ },
+ "svlan": {
+ "type_name": "string"
+ }
+ },
+ "interfaces": [
+ {
+ "name": "Standard",
+ "type_name": "tosca.interfaces.node.lifecycle.Standard"
+ }
+ ],
+ "capabilities": [
+ {
+ "name": "feature",
+ "type_name": "tosca.capabilities.Node"
+ },
+ {
+ "name": "ac",
+ "type_name": "tosca.capabilities.sdn.ac"
+ }
+ ],
+ "relationships": [
+ {
+ "target_node_id": "pe1_e58ekps6m45g6w9egs9lue2j7",
+ "target_capability_name": "feature"
+ },
+ {
+ "target_node_id": "ac2_fdhrbk3dvan8hl5wifm9lp1e9",
+ "target_capability_name": "feature"
+ }
+ ]
+ },
+ {
+ "id": "vpn_ie0xim076f7cje67fvrrq9tg1",
+ "type_name": "tosca.nodes.sdn.underlayVPN",
+ "template_name": "vpn",
+ "properties": {
+ "serviceType": {
+ "type_name": "string"
+ },
+ "description": {
+ "type_name": "string"
+ },
+ "name": {
+ "type_name": "string"
+ },
+ "topology": {
+ "type_name": "string"
+ }
+ },
+ "interfaces": [
+ {
+ "name": "Standard",
+ "type_name": "tosca.interfaces.node.lifecycle.Standard"
+ }
+ ],
+ "capabilities": [
+ {
+ "name": "feature",
+ "type_name": "tosca.capabilities.Node"
+ }
+ ],
+ "relationships": [
+ {
+ "target_node_id": "ac1_jqows1ai0j0cmwk9jdvuknt97",
+ "target_capability_name": "feature"
+ },
+ {
+ "target_node_id": "ac2_fdhrbk3dvan8hl5wifm9lp1e9",
+ "target_capability_name": "feature"
+ }
+ ]
+ },
+ {
+ "id": "pe1_e58ekps6m45g6w9egs9lue2j7",
+ "type_name": "tosca.nodes.sdn.l3pe",
+ "template_name": "pe1",
+ "properties": {
+ "id": {
+ "type_name": "string"
+ }
+ },
+ "interfaces": [
+ {
+ "name": "Standard",
+ "type_name": "tosca.interfaces.node.lifecycle.Standard"
+ }
+ ],
+ "capabilities": [
+ {
+ "name": "feature",
+ "type_name": "tosca.capabilities.Node"
+ },
+ {
+ "name": "pe",
+ "type_name": "tosca.capabilities.sdn.pe"
+ }
+ ]
+ },
+ {
+ "id": "pe2_go3vo1ctxr1vlbl0ij8stbtj6",
+ "type_name": "tosca.nodes.sdn.l3pe",
+ "template_name": "pe2",
+ "properties": {
+ "id": {
+ "type_name": "string"
+ }
+ },
+ "interfaces": [
+ {
+ "name": "Standard",
+ "type_name": "tosca.interfaces.node.lifecycle.Standard"
+ }
+ ],
+ "capabilities": [
+ {
+ "name": "feature",
+ "type_name": "tosca.capabilities.Node"
+ },
+ {
+ "name": "pe",
+ "type_name": "tosca.capabilities.sdn.pe"
+ }
+ ]
+ }
+ ],
+ "substitution": {
+ "node_type_name": "tosca.nodes.sdn.ext.NS.ns_underlayervpn"
+ },
+ "inputs": {
+ "ac2_ip": {
+ "type_name": "string",
+ "description": "ac2_ipofunderlayvpn"
+ },
+ "ac2_route": {
+ "type_name": "string",
+ "description": "ac2_routeofunderlayvpn"
+ },
+ "serviceType": {
+ "type_name": "string",
+ "description": "serviceTypeofunderlayvpn"
+ },
+ "description": {
+ "type_name": "string",
+ "description": "descriptionofunderlayvpn"
+ },
+ "pe2_id": {
+ "type_name": "string",
+ "description": "pe2_idofunderlayvpn"
+ },
+ "ac1_route": {
+ "type_name": "string",
+ "description": "ac1_routeofunderlayvpn"
+ },
+ "ac1_svlan": {
+ "type_name": "integer",
+ "description": "ac1_svlanofunderlayvpn"
+ },
+ "name": {
+ "type_name": "string",
+ "description": "Nameofunderlayervpn"
+ },
+ "ac1_ip": {
+ "type_name": "string",
+ "description": "ac1_ipofunderlayvpn"
+ },
+ "ac2_port": {
+ "type_name": "string",
+ "description": "ac2_portofunderlayvpn"
+ },
+ "pe1_id": {
+ "type_name": "string",
+ "description": "pe1_idofunderlayvpn"
+ },
+ "technology": {
+ "type_name": "string",
+ "description": "technologyofunderlayvpn"
+ },
+ "ac1_port": {
+ "type_name": "string",
+ "description": "ac1_portofunderlayvpn"
+ },
+ "ac2_svlan": {
+ "type_name": "integer",
+ "description": "ac2_svlanofunderlayvpn"
+ },
+ "topology": {
+ "type_name": "string",
+ "description": "topologyofunderlayvpn"
+ }
+ }
+ }
+ }
+}
+
+
vnfd_model_dict = {
'local_storages': [],
'vdus': [
diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
index a35dcaa8..a8df7b37 100644
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
@@ -18,6 +18,7 @@ import mock
from django.test import TestCase, Client
from rest_framework import status
+from lcm.nf.vnfs.const import vnfd_rawdata
from lcm.nf.vnfs.vnf_create.inst_vnf import InstVnf
from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel, NetworkInstModel, \
SubNetworkInstModel, PortInstModel
@@ -61,7 +62,7 @@ class TestNFInstantiate(TestCase):
@mock.patch.object(restcall, 'call_req')
def test_create_vnf_identifier(self, mock_call_req):
r1 = [0, json.JSONEncoder().encode({'package_id':'222', 'csar_id':'2222'}), '200'] # get csar_id from nslcm by vnfd_id
- r2 = [0, json.JSONEncoder().encode(vnfd_raw_data), '200'] # get rawdata from catalog by csar_id
+ r2 = [0, json.JSONEncoder().encode(vnfd_rawdata), '200'] # get rawdata from catalog by csar_id
mock_call_req.side_effect = [r1, r2]
data = {
"vnfdId": "111",
@@ -106,7 +107,7 @@ class TestNFInstantiate(TestCase):
version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED',
nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time())
r1 = [0, json.JSONEncoder().encode({'package_id':'222', 'csar_id':'2222'}), '200'] # get csar_id from nslcm by vnfd_id
- r2 = [1, json.JSONEncoder().encode(vnfd_raw_data), '200'] # get rawdata from catalog by csar_id
+ r2 = [1, json.JSONEncoder().encode(vnfd_rawdata), '200'] # get rawdata from catalog by csar_id
mock_call_req.side_effect = [r1, r2]
self.nf_inst_id = '1111'
self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
@@ -121,7 +122,7 @@ class TestNFInstantiate(TestCase):
version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED',
nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time())
r1 = [0, json.JSONEncoder().encode({'package_id': '222', 'csar_id': '2222'}), '200'] # get csar_id from nslcm by vnfd_id
- r2 = [0, json.JSONEncoder().encode(vnfd_raw_data), '200'] # get rawdata from catalog by csar_id
+ r2 = [0, json.JSONEncoder().encode(vnfd_rawdata), '200'] # get rawdata from catalog by csar_id
r3 = [1, json.JSONEncoder().encode({"vim":
{
"vimid": '1',
@@ -136,6 +137,11 @@ class TestNFInstantiate(TestCase):
InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
self.assert_job_result(self.job_id, 255, "Nf instancing apply grant exception")
+
+
+
+
+
# @mock.patch.object(restcall, 'call_req')
# def test_instantiate_vnf_when_(self, mock_call_req):
# NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222',
@@ -245,433 +251,3 @@ inst_req_data = {
"localizationLanguage": "en_US",
"additionalParams": {}
}
-
-vnfd_model_dict = {
- 'local_storages': [],
- 'vdus': [
- {
- 'volumn_storages': [],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'2'},
- 'local_storages': [],
- 'vdu_id': u'vdu_omm.001',
- 'image_file': u'opencos_sss_omm_img_release_20150723-1-disk1',
- 'dependencies': [],
- 'vls': [],
- 'cps': [],
- 'properties': {
- 'key_vdu': '',
- 'support_scaling': False,
- 'vdu_type': '',
- 'name': '',
- 'storage_policy': '',
- 'location_info': {
- 'vimId': '',
- 'availability_zone': '',
- 'region': '',
- 'dc': '',
- 'host': '',
- 'tenant': ''},
- 'inject_data_list': [],
- 'watchdog': {
- 'action': '',
- 'enabledelay': ''},
- 'local_affinity_antiaffinity_rule': {},
- 'template_id': u'omm.001',
- 'manual_scale_select_vim': False},
- 'description': u'singleommvm'},
- {
- 'volumn_storages': [],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'4'},
- 'local_storages': [],
- 'vdu_id': u'vdu_1',
- 'image_file': u'sss',
- 'dependencies': [],
- 'vls': [],
- 'cps': [],
- 'properties': {
- 'key_vdu': '',
- 'support_scaling': False,
- 'vdu_type': '',
- 'name': '',
- 'storage_policy': '',
- 'location_info': {
- 'vimId': '',
- 'availability_zone': '',
- 'region': '',
- 'dc': '',
- 'host': '',
- 'tenant': ''},
- 'inject_data_list': [],
- 'watchdog': {
- 'action': '',
- 'enabledelay': ''},
- 'local_affinity_antiaffinity_rule': {},
- 'template_id': u'1',
- 'manual_scale_select_vim': False},
- 'description': u'ompvm'},
- {
- 'volumn_storages': [],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'14'},
- 'local_storages': [],
- 'vdu_id': u'vdu_2',
- 'image_file': u'sss',
- 'dependencies': [],
- 'vls': [],
- 'cps': [],
- 'properties': {
- 'key_vdu': '',
- 'support_scaling': False,
- 'vdu_type': '',
- 'name': '',
- 'storage_policy': '',
- 'location_info': {
- 'vimId': '',
- 'availability_zone': '',
- 'region': '',
- 'dc': '',
- 'host': '',
- 'tenant': ''},
- 'inject_data_list': [],
- 'watchdog': {
- 'action': '',
- 'enabledelay': ''},
- 'local_affinity_antiaffinity_rule': {},
- 'template_id': u'2',
- 'manual_scale_select_vim': False},
- 'description': u'ompvm'},
- {
- 'volumn_storages': [],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'14'},
- 'local_storages': [],
- 'vdu_id': u'vdu_3',
- 'image_file': u'sss',
- 'dependencies': [],
- 'vls': [],
- 'cps': [],
- 'properties': {
- 'key_vdu': '',
- 'support_scaling': False,
- 'vdu_type': '',
- 'name': '',
- 'storage_policy': '',
- 'location_info': {
- 'vimId': '',
- 'availability_zone': '',
- 'region': '',
- 'dc': '',
- 'host': '',
- 'tenant': ''},
- 'inject_data_list': [],
- 'watchdog': {
- 'action': '',
- 'enabledelay': ''},
- 'local_affinity_antiaffinity_rule': {},
- 'template_id': u'3',
- 'manual_scale_select_vim': False},
- 'description': u'ompvm'},
- {
- 'volumn_storages': [],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'4'},
- 'local_storages': [],
- 'vdu_id': u'vdu_10',
- 'image_file': u'sss',
- 'dependencies': [],
- 'vls': [],
- 'cps': [],
- 'properties': {
- 'key_vdu': '',
- 'support_scaling': False,
- 'vdu_type': '',
- 'name': '',
- 'storage_policy': '',
- 'location_info': {
- 'vimId': '',
- 'availability_zone': '',
- 'region': '',
- 'dc': '',
- 'host': '',
- 'tenant': ''},
- 'inject_data_list': [],
- 'watchdog': {
- 'action': '',
- 'enabledelay': ''},
- 'local_affinity_antiaffinity_rule': {},
- 'template_id': u'10',
- 'manual_scale_select_vim': False},
- 'description': u'ppvm'},
- {
- 'volumn_storages': [],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'14'},
- 'local_storages': [],
- 'vdu_id': u'vdu_11',
- 'image_file': u'sss',
- 'dependencies': [],
- 'vls': [],
- 'cps': [],
- 'properties': {
- 'key_vdu': '',
- 'support_scaling': False,
- 'vdu_type': '',
- 'name': '',
- 'storage_policy': '',
- 'location_info': {
- 'vimId': '',
- 'availability_zone': '',
- 'region': '',
- 'dc': '',
- 'host': '',
- 'tenant': ''},
- 'inject_data_list': [],
- 'watchdog': {
- 'action': '',
- 'enabledelay': ''},
- 'local_affinity_antiaffinity_rule': {},
- 'template_id': u'11',
- 'manual_scale_select_vim': False},
- 'description': u'ppvm'},
- {
- 'volumn_storages': [],
- 'nfv_compute': {
- 'mem_size': '',
- 'num_cpus': u'14'},
- 'local_storages': [],
- 'vdu_id': u'vdu_12',
- 'image_file': u'sss',
- 'dependencies': [],
- 'vls': [],
- 'cps': [],
- 'properties': {
- 'key_vdu': '',
- 'support_scaling': False,
- 'vdu_type': '',
- 'name': '',
- 'storage_policy': '',
- 'location_info': {
- 'vimId': '',
- 'availability_zone': '',
- 'region': '',
- 'dc': '',
- 'host': '',
- 'tenant': ''},
- 'inject_data_list': [],
- 'watchdog': {
- 'action': '',
- 'enabledelay': ''},
- 'local_affinity_antiaffinity_rule': {},
- 'template_id': u'12',
- 'manual_scale_select_vim': False},
- 'description': u'ppvm'}],
- 'volumn_storages': [],
- 'policies': {
- 'scaling': {
- 'targets': {},
- 'policy_id': u'policy_scale_sss-vnf-template',
- 'properties': {
- 'policy_file': '*-vnfd.zip/*-vnf-policy.xml'},
- 'description': ''}},
- 'image_files': [
- {
- 'description': '',
- 'properties': {
- 'name': u'opencos_sss_omm_img_release_20150723-1-disk1.vmdk',
- 'checksum': '',
- 'disk_format': u'VMDK',
- 'file_url': u'./zte-cn-sss-main-image/OMM/opencos_sss_omm_img_release_20150723-1-disk1.vmdk',
- 'container_type': 'vm',
- 'version': '',
- 'hypervisor_type': 'kvm'},
- 'image_file_id': u'opencos_sss_omm_img_release_20150723-1-disk1'},
- {
- 'description': '',
- 'properties': {
- 'name': u'sss.vmdk',
- 'checksum': '',
- 'disk_format': u'VMDK',
- 'file_url': u'./zte-cn-sss-main-image/NE/sss.vmdk',
- 'container_type': 'vm',
- 'version': '',
- 'hypervisor_type': 'kvm'},
- 'image_file_id': u'sss'}],
- 'vls': [],
- 'cps': [],
- 'metadata': {
- 'vendor': u'zte',
- 'is_shared': False,
- 'description': '',
- 'domain_type': u'CN',
- 'version': u'v4.14.10',
- 'vmnumber_overquota_alarm': False,
- 'cross_dc': False,
- 'vnf_type': u'SSS',
- 'vnfd_version': u'V00000001',
- 'id': u'sss-vnf-template',
- 'name': u'sss-vnf-template'},
- "flavourId": "flavour_1",
- "instantiationLevelId": "instantiationLevel_1",
- "extVirtualLinks": [
- {
- "vlInstanceId": "1",
- "vim": {
- "vimInfoId": "1",
- "vimId": "1",
- "interfaceInfo": {
- "vimType": "vim",
- "apiVersion": "v2",
- "protocolType": "http"
- },
- "accessInfo": {
- "tenant": "tenant_vCPE",
- "username": "vCPE",
- "password": "vCPE_321"
- },
- "interfaceEndpoint": "http://10.43.21.105:80/"
- },
- "resourceId": "1246",
- "extCps": [
- {
- "cpdId": "11",
- "addresses": [
- {
- "addressType": "MAC",
- "l2AddressData": "00:f3:43:20:a2:a3"
- },
- {
- "addressType": "IP",
- "l3AddressData": {
- "iPAddressType": "IPv4",
- "iPAddress": "192.168.104.2"
- }
- }
- ],
- "numDynamicAddresses": 0
- }
- ]
- }
- ],
- "localizationLanguage": "en_US",
- "additionalParams": {}
-}
-
-vnfd_raw_data = {
- "rawData": {
- "instance": {
- "metadata": {
- "is_shared": False,
- "plugin_info": "vbrasplugin_1.0",
- "vendor": "zte",
- "request_reclassification": False,
- "name": "vbras",
- "version": 1,
- "vnf_type": "vbras",
- "cross_dc": False,
- "vnfd_version": "1.0.0",
- "id": "zte_vbras_1.0",
- "nsh_aware": True
- },
- "nodes": [
- {
- "id": "aaa_dnet_cp_0xu2j5sbigxc8h1ega3if0ld1",
- "type_name": "tosca.nodes.nfv.ext.zte.CP",
- "template_name": "aaa_dnet_cp",
- "properties": {
- "bandwidth": {
- "type_name": "integer",
- "value": 0
- },
- "direction": {
- "type_name": "string",
- "value": "bidirectional"
- },
- "vnic_type": {
- "type_name": "string",
- "value": "normal"
- },
- "sfc_encapsulation": {
- "type_name": "string",
- "value": "mac"
- },
- "order": {
- "type_name": "integer",
- "value": 2
- }
- },
- "relationships": [
- {
- "name": "guest_os",
- "source_requirement_index": 0,
- "target_node_id": "AAA_image_d8aseebr120nbm7bo1ohkj194",
- "target_capability_name": "feature"
- }
- ]
- },
- {
- "id": "LB_Image_oj5l2ay8l2g6vcq6fsswzduha",
- "type_name": "tosca.nodes.nfv.ext.ImageFile",
- "template_name": "LB_Image",
- "properties": {
- "disk_format": {
- "type_name": "string",
- "value": "qcow2"
- },
- "file_url": {
- "type_name": "string",
- "value": "/SoftwareImages/image-lb"
- },
- "name": {
- "type_name": "string",
- "value": "image-lb"
- }
- }
- }
- ]
- },
- "model": {
- "metadata": {
- "is_shared": False,
- "plugin_info": "vbrasplugin_1.0",
- "vendor": "zte",
- "request_reclassification": False,
- "name": "vbras",
- "version": 1,
- "vnf_type": "vbras",
- "cross_dc": False,
- "vnfd_version": "1.0.0",
- "id": "zte_vbras_1.0",
- "nsh_aware": True
- },
- "node_templates": [
- {
- "name": "aaa_dnet_cp",
- "type_name": "tosca.nodes.nfv.ext.zte.CP",
- "default_instances": 1,
- "min_instances": 0,
- "properties": {
- "bandwidth": {
- "type_name": "integer",
- "value": 0
- }
- },
- "requirement_templates": [
- {
- "name": "virtualbinding",
- "target_node_template_name": "AAA",
- "target_capability_name": "virtualbinding"
- }
- ]
- }
- ]
- }
- }
-}
diff --git a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
index d429c6de..cc963f7e 100644
--- a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
+++ b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
@@ -125,7 +125,7 @@ class InstVnf(Thread):
self.vnfd_info = toscautil.convert_vnfd_model(raw_data["rawData"]) # convert to inner json
self.vnfd_info = json.JSONDecoder().decode(self.vnfd_info)
- self.vnfd_info = vnfd_model_dict
+ # self.vnfd_info = vnfd_model_dict # just for test
self.checkParameterExist()
# update NfInstModel