From 0f4cb066c2fd0b8b611cc54eb94f47489ff10fe9 Mon Sep 17 00:00:00 2001 From: "ying.yunlong" Date: Mon, 5 Feb 2018 18:18:09 +0800 Subject: Add vfc-ztevnfmdriver swagger requirement Change-Id: I8303deaff8f97072a72c4e235381d8c0b973b793 Issue-ID: VFC-736 Signed-off-by: ying.yunlong --- zte/vmanager/driver/interfaces/tests.py | 1223 ++++++++++++------------------- zte/vmanager/driver/interfaces/urls.py | 3 +- zte/vmanager/requirements.txt | 9 +- 3 files changed, 478 insertions(+), 757 deletions(-) (limited to 'zte/vmanager') diff --git a/zte/vmanager/driver/interfaces/tests.py b/zte/vmanager/driver/interfaces/tests.py index d46f9a73..da414847 100644 --- a/zte/vmanager/driver/interfaces/tests.py +++ b/zte/vmanager/driver/interfaces/tests.py @@ -148,10 +148,14 @@ class InterfacesTest(TestCase): } } - response = self.client.post("/api/ztevnfmdriver/v1/ztevnfmid/vnfs", - data=json.dumps(req_data), content_type="application/json") - self.assertEqual(str(status.HTTP_200_OK), response.status_code) - expect_resp_data = {"jobId": "NF-CREATE-8-b384535c-9f45-11e6-8749-fa163e91c2f9", "vnfInstanceId": "8"} + response = self.client.post( + "/api/ztevnfmdriver/v1/ztevnfmid/vnfs", + data=json.dumps(req_data), + content_type="application/json") + self.assertEqual(status.HTTP_200_OK, response.status_code) + expect_resp_data = { + "jobId": "NF-CREATE-8-b384535c-9f45-11e6-8749-fa163e91c2f9", + "vnfInstanceId": "8"} self.assertEqual(expect_resp_data, response.data) @mock.patch.object(restcall, 'call_req') @@ -170,12 +174,14 @@ class InterfacesTest(TestCase): "password": "admin", "createTime": "2016-07-06 15:33:18"}), "200"] - r2 = [0, json.JSONEncoder().encode({"vnfInstanceId": "1", "jobId": "1"}), "200"] + r2 = [0, json.JSONEncoder().encode( + {"vnfInstanceId": "1", "jobId": "1"}), "200"] mock_call_req.side_effect = [r1, r2] - response = self.client.post("/api/ztevnfmdriver/v1/ztevnfmid/vnfs/vbras_innstance_id/terminate") + response = self.client.post( + "/api/ztevnfmdriver/v1/ztevnfmid/vnfs/vbras_innstance_id/terminate") - self.assertEqual(str(status.HTTP_200_OK), response.status_code) + self.assertEqual(status.HTTP_200_OK, response.status_code) expect_resp_data = {"jobId": "1", "vnfInstanceId": "1"} self.assertEqual(expect_resp_data, response.data) @@ -198,9 +204,10 @@ class InterfacesTest(TestCase): r2 = [0, json.JSONEncoder().encode({"vnfinstancestatus": "1"}), "200"] mock_call_req.side_effect = [r1, r2] - response = self.client.get("/api/ztevnfmdriver/v1/ztevnfmid/vnfs/vbras_innstance_id") + response = self.client.get( + "/api/ztevnfmdriver/v1/ztevnfmid/vnfs/vbras_innstance_id") - self.assertEqual(str(status.HTTP_200_OK), response.status_code) + self.assertEqual(status.HTTP_200_OK, response.status_code) expect_resp_data = {"vnfInfo": {"vnfStatus": "1"}} self.assertEqual(expect_resp_data, response.data) @@ -230,26 +237,22 @@ class InterfacesTest(TestCase): "progress": 255, "errorcode": "", "responseid": 20, - "statusdescription": "'JsonParser' object has no attribute 'parser_info'" - } - ], + "statusdescription": "'JsonParser' object has no attribute 'parser_info'"}], "responseid": 21, "errorcode": "", "progress": 40, - "statusdescription": "Create nf apply resource failed" - }, - "jobid": "NF-CREATE-11-ec6c2f2a-9f48-11e6-9405-fa163e91c2f9" - } + "statusdescription": "Create nf apply resource failed"}, + "jobid": "NF-CREATE-11-ec6c2f2a-9f48-11e6-9405-fa163e91c2f9"} r1 = [0, json.JSONEncoder().encode(vnfm_info), '200'] r2 = [0, json.JSONEncoder().encode(resp_body), '200'] mock_call_req.side_effect = [r1, r2] - response = self.client.get("/api/ztevnfmdriver/v1/{vnfmid}/jobs/{jobid}?responseId={responseId}".format( - vnfmid=vnfm_info["vnfmId"], - jobid=resp_body["jobid"], - responseId=resp_body["responsedescriptor"]["responseid"]) - ) + response = self.client.get( + "/api/ztevnfmdriver/v1/{vnfmid}/jobs/{jobid}?responseId={responseId}".format( + vnfmid=vnfm_info["vnfmId"], + jobid=resp_body["jobid"], + responseId=resp_body["responsedescriptor"]["responseid"])) - self.assertEqual(str(status.HTTP_200_OK), response.status_code) + self.assertEqual(status.HTTP_200_OK, response.status_code) expect_resp_data = resp_body self.assertDictEqual(expect_resp_data, response.data) @@ -289,10 +292,12 @@ class InterfacesTest(TestCase): } mock_call_req.return_value = ret - response = self.client.put("/api/ztevnfmdriver/v1/resource/grant", - data=json.dumps(req_data), content_type='application/json') + response = self.client.put( + "/api/ztevnfmdriver/v1/resource/grant", + data=json.dumps(req_data), + content_type='application/json') - self.assertEqual(str(status.HTTP_201_CREATED), response.status_code) + self.assertEqual(status.HTTP_201_CREATED, response.status_code) expect_resp_data = { "vimid": "516cee95-e8ca-4d26-9268-38e343c2e31e", @@ -334,10 +339,12 @@ class InterfacesTest(TestCase): }), "200"] mock_call_req.side_effect = [r1] - response = self.client.post("/api/ztevnfmdriver/v1/vnfs/lifecyclechangesnotification", - data=json.dumps(notify_req_data), content_type='application/json') + response = self.client.post( + "/api/ztevnfmdriver/v1/vnfs/lifecyclechangesnotification", + data=json.dumps(notify_req_data), + content_type='application/json') - self.assertEqual(str(status.HTTP_200_OK), response.status_code) + self.assertEqual(status.HTTP_200_OK, response.status_code) expect_resp_data = None self.assertEqual(expect_resp_data, response.data) @@ -418,9 +425,11 @@ class InterfacesTest(TestCase): } } - response = self.client.post("/api/ztevnfmdriver/v1/100/vnfs/101/scale", - data=json.dumps(scale_vnf_data), content_type='application/json') - self.assertEqual(str(status.HTTP_202_ACCEPTED), response.status_code) + response = self.client.post( + "/api/ztevnfmdriver/v1/100/vnfs/101/scale", + data=json.dumps(scale_vnf_data), + content_type='application/json') + self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code) self.assertDictEqual(job_info, response.data) @mock.patch.object(restcall, 'call_req') @@ -464,730 +473,436 @@ class InterfacesTest(TestCase): 'isgrace': 'force' } - response = self.client.post("/api/ztevnfmdriver/v1/200/vnfs/201/heal", - data=json.dumps(heal_vnf_data), content_type='application/json') + response = self.client.post( + "/api/ztevnfmdriver/v1/200/vnfs/201/heal", + data=json.dumps(heal_vnf_data), + content_type='application/json') - self.assertEqual(str(status.HTTP_202_ACCEPTED), response.status_code) + self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code) self.assertDictEqual(job_info, response.data) -notify_req_data = { - "vnfinstanceid": "1", - "nfvoid": "3", - "extension": { - "openo_notification": { - "status": "finished", - "affectedService": [ - - ], - "affectedVnfc": [ - { - "changeType": "added", - "computeResource": { - "resourceId": "e8ccc55a-3ebb-4e46-8260-dc4a1646ef4f", - "tenant": "ZTE_ONAP_PRO", - "vimId": "vmware_vio", - "resourceName": "ZTE_xGW_39_CDB_1" - }, - "storageResource": [ - - ], - "vnfcInstanceId": "17502154-c5bf-11e7-904d-fa163eee1ffe", - "vduType": "CDB", - "vduId": "VDU_S_CDB_51" - }, - { - "changeType": "added", - "computeResource": { - "resourceId": "a9dd6a73-76ee-4d07-9554-08f14c17261f", - "tenant": "ZTE_ONAP_PRO", - "vimId": "vmware_vio", - "resourceName": "ZTE_xGW_39_SLB_1" - }, - "storageResource": [ - - ], - "vnfcInstanceId": "1750d540-c5bf-11e7-904d-fa163eee1ffe", - "vduType": "SLB", - "vduId": "VDU_M_SLB_42" - } - ], - "nfvoInstanceId": "3", - "affectedVirtualLink": [ - { - "changeType": "added", - "virtualLinkInstanceId": "1753b60c-c5bf-11e7-904d-fa163eee1ffe", - "networkResource": { - "resourceId": "c55e0788-3683-48a1-b88a-a0cb5e05bd44", - "tenant": None, - "vimId": "vmware_vio", - "resourceName": "ZTE_VGW_MGT_NET39" - }, - "virtualLinkDescId": "ZTE_VGW_MGT_NET39_virtualLink", - "tenant": "ZTE_ONAP_PRO", - "subnetworkResource": { - "resourceId": "33c8a03d-00c9-4c57-a348-26dae462b473", - "tenant": None, - "vimId": "vmware_vio", - "resourceName": "ZTE_VGW_MGT_NET39_s" - } - }, - { - "changeType": "added", - "virtualLinkInstanceId": "175472a4-c5bf-11e7-904d-fa163eee1ffe", - "networkResource": { - "resourceId": "2d22b6e4-340b-45a8-8757-5206aa056b92", - "tenant": None, - "vimId": "vmware_vio", - "resourceName": "ZTE_VGW_SERVICE_NET39" - }, - "virtualLinkDescId": "ZTE_VGW_SERVICE_NET39_virtualLink", - "tenant": "ZTE_ONAP_PRO", - "subnetworkResource": { - "resourceId": "2ea2acc0-a4ed-44f8-9d31-9cdc9e3ebe62", - "tenant": None, - "vimId": "vmware_vio", - "resourceName": "ZTE_VGW_SERVICE_NET39_s" - } - } - ], - "affectedVirtualStorage": [ - - ], - "jobId": "", - "affectedcapacity": { - "vcp": "72", - "vm": "9", - "localStorage": "0", - "sharedStorage": "288", - "vMemory": "233472", - "port": "27" - }, - "additionalParam": { - "vmList": [ - { - "vmName": "ZTE_xGW_39_CDB_1", - "vduId": "VDU_S_CDB_51" - }, - { - "vmName": "ZTE_xGW_39_CDB_2", - "vduId": "VDU_S_CDB_51" - }, - { - "vmName": "ZTE_xGW_39_SLB_1", - "vduId": "VDU_M_SLB_42" - }, - { - "vmName": "ZTE_xGW_39_SLB_2", - "vduId": "VDU_M_SLB_42" - }, - { - "vmName": "ZTE_xGW_39_GSU_1", - "vduId": "VDU_M_GSU_22" - }, - { - "vmName": "ZTE_xGW_39_GSU_2", - "vduId": "VDU_M_GSU_22" - }, - { - "vmName": "ZTE_xGW_39_MPU_1", - "vduId": "VDU_M_MPU_12" - }, - { - "vmName": "ZTE_xGW_39_PFU_1", - "vduId": "VDU_M_PFU_32" - }, - { - "vmName": "ZTE_xGW_39_PFU_2", - "vduId": "VDU_M_PFU_32" - } - ] - }, - "nfInstanceId": "1", - "affectedCp": [ - { - "changeType": "added", - "cPInstanceId": "175767d4-c5bf-11e7-904d-fa163eee1ffe", - "ownertype": 3, - "cpdId": "CP_NO_0_CDB_ZTE_VGW_MGT_NET39", - "portResource": { - "resourceId": "3296b6d8-ebca-4d33-98f4-68d1bc63a3d0", - "tenant": "ZTE_ONAP_PRO", - "vimId": "vmware_vio", - "resourceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_su1" - }, - "cpInstanceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_su1", - "ownerid": "17502154-c5bf-11e7-904d-fa163eee1ffe", - "virtualLinkInstanceId": "1753b60c-c5bf-11e7-904d-fa163eee1ffe" - }, - { - "changeType": "added", - "cPInstanceId": "1758181e-c5bf-11e7-904d-fa163eee1ffe", - "ownertype": 3, - "cpdId": "CP_NO_1_CDB_ZTE_VGW_SERVICE_NET39", - "portResource": { - "resourceId": "5e277a18-94de-469a-a336-2c01ab46387e", - "tenant": "ZTE_ONAP_PRO", - "vimId": "vmware_vio", - "resourceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_su2" - }, - "cpInstanceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_su2", - "ownerid": "17502154-c5bf-11e7-904d-fa163eee1ffe", - "virtualLinkInstanceId": "175472a4-c5bf-11e7-904d-fa163eee1ffe" - } - ], - "vnfdmodule": { - "volume_storages": [ - - ], - "inputs": { - - }, - "vdus": [ - { - "volume_storages": [ - - ], - "description": "CDB", - "vdu_id": "VDU_S_CDB_51", - "local_storages": [ - "local_disk_root_10GB", - "local_disk_ephemeral_14GB" - ], - "nfv_compute": { - "flavor_extra_specs": { - "hw:cpu_policy": "dedicated", - "hw:mem_page_size": "large", - "hw:numa_nodes": 1, - "hw:cpu_max_sockets": 1 - }, - "mem_size": 8192, - "num_cpus": 2 - }, - "artifacts": [ - - ], - "dependencies": [ - - ], - "vls": [ - "ZTE_VGW_MGT_NET39_virtualLink", - "ZTE_VGW_SERVICE_NET39_virtualLink" - ], - "image_file": "image_51", - "cps": [ - "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_su1", - "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_su2" - ], - "properties": { - "key_vd": True, - "support_scaling": True, - "vdu_type": "CDB", - "name": "ZTE_xGW_39_CDB_1", - "storage_policy": "Share_Service", - "inject_network_address": True, - "is_predefined": False, - "location_info": { - "vimid": "", - "availability_zone": "", - "vdc": "OG_OrganizationDC", - "host": "", - "tenant": "", - "vapp": "xgw" - }, - "use_shared_vm": False, - "inject_data_list": [ - - ], - "allow_scale_updown": True, - "action": "ADD", - "watchdog": { - - }, - "template_id": 51, - "manual_scale_select_vim": False, - "config_drive": True - } - }, - { - "volume_storages": [ - - ], - "description": "SLB", - "vdu_id": "VDU_M_SLB_42", - "local_storages": [ - "local_disk_root_10GB", - "local_disk_ephemeral_14GB" - ], - "nfv_compute": { - "flavor_extra_specs": { - "hw:cpu_policy": "dedicated", - "hw:mem_page_size": "large", - "hw:numa_nodes": 1, - "hw:cpu_max_sockets": 1 - }, - "mem_size": 24576, - "num_cpus": 8 - }, - "artifacts": [ - - ], - "dependencies": [ - - ], - "vls": [ - "ZTE_VGW_MGT_NET39_virtualLink", - "ZTE_VGW_SERVICE_NET39_virtualLink", - "ZTE_NET39_virtualLink", - "ZTE_VGW_GTP_NET39_virtualLink" - ], - "image_file": "image_51", - "cps": [ - "CP_ZTE_xGW_39_SLB_1_ZTE_VGW_MGT_NET39_su1", - "CP_ZTE_xGW_39_SLB_1_ZTE_VGW_SERVICE_NET39_su2", - "CP_ZTE_xGW_39_SLB_1_zte-net-subnet393", - "CP_ZTE_xGW_39_SLB_1_ZTE_VGW_GTP_NET39_su4" - ], - "properties": { - "key_vd": True, - "support_scaling": False, - "vdu_type": "SLB", - "name": "ZTE_xGW_39_SLB_1", - "storage_policy": "Share_Service", - "inject_network_address": True, - "is_predefined": False, - "location_info": { - "vimid": "", - "availability_zone": "", - "vdc": "OG_OrganizationDC", - "host": "", - "tenant": "", - "vapp": "xgw" - }, - "use_shared_vm": False, - "inject_data_list": [ - - ], - "allow_scale_updown": True, - "action": "ADD", - "watchdog": { - - }, - "template_id": 42, - "manual_scale_select_vim": False, - "config_drive": True - } - } - ], - "vcloud": [ - - ], - "extvirtuallink": "", - "server_groups": [ - - ], - "image_files": [ - { - "properties": { - "vendor": "zte", - "name": "ZXUN_xGW_CGSL_QCOW2_OP_V6.17.10.B17.ova", - "image_extra_specs": { - - }, - "disk_format": "vmdk", - "file_url": "SoftwareImages/ZXUN-xGW-CGSL-QCOW2-V6.17.10.B17-image.tar.gz", - "container_type": "bare", - "version": "V6.17.10.B17.ova" - }, - "image_file_id": "image_51", - "description": "xgw image file" - } - ], - "routers": [ - - ], - "local_storages": [ - { - "local_storage_id": "local_disk_ephemeral_38GB", - "description": "local_disk_ephemeral_38GB", - "properties": { - "disk_type": "ephemeral", - "size": 38 - } - }, - { - "local_storage_id": "local_disk_root_10GB", - "description": "local_disk_root_10GB", - "properties": { - "disk_type": "root", - "size": 10 - } - }, - { - "local_storage_id": "local_disk_ephemeral_14GB", - "description": "local_disk_ephemeral_14GB", - "properties": { - "disk_type": "ephemeral", - "size": 14 - } - } - ], - "vnf_flavours": [ - - ], - "vnf_exposed": { - "external_cps": [ - { - "key_name": "ZTE_NET39_virtualLink", - "cpd_id": "CP_NO_3_PFU_ZTE_NET39" - }, - { - "key_name": "ZTE_NET39_virtualLink1", - "cpd_id": "CP_NO_2_PFU_ZTE_NET39" - }, - { - "key_name": "ZTE_VGW_GTP_NET39_virtualLink", - "cpd_id": "CP_NO_3_SLB_ZTE_VGW_GTP_NET39" - }, - { - "key_name": "ZTE_NET39_virtualLink2", - "cpd_id": "CP_NO_2_SLB_ZTE_NET39" - }, - { - "key_name": "provider-zte_virtualLink", - "cpd_id": "CP_NO_2_MPU_provider-zte" - } - ], - "forward_cps": [ - { - "key_name": "ZTE_VGW_GTP_NET39_forwarder", - "cpd_id": "CP_NO_3_SLB_ZTE_VGW_GTP_NET39" - }, - { - "key_name": "ZTE_NET39_forwarder1", - "cpd_id": "CP_NO_2_PFU_ZTE_NET39" - }, - { - "key_name": "ZTE_NET39_forwarder2", - "cpd_id": "CP_NO_3_PFU_ZTE_NET39" - }, - { - "key_name": "provider-zte_forwarder", - "cpd_id": "CP_NO_2_MPU_provider-zte" - }, - { - "key_name": "ZTE_NET39_forwarder", - "cpd_id": "CP_NO_2_SLB_ZTE_NET39" - } - ] - }, - "reserved_total": { - "portnum": 27, - "vcpunum": 72, - "memorysize": 233472, - "shdsize": 288, - "isreserve": 0, - "vmnum": 9 - }, - "policies": [ - { - "scaling": [ - { - "description": "zte vgw vnf policy", - "policy_id": "Policy_1", - "targets": [ - "VDU_S_CDB_51", - "VDU_M_CDB_52", - "VDU_M_SLB_42", - "VDU_M_GSU_22", - "VDU_M_MPU_12", - "VDU_L_MPU_13", - "VDU_M_PFU_32", - "VDU_L_PFU_33" - ], - "properties": { - "policy_file": "Policies/zte-vcn-vnf-policy.xml" - } - } - ], - "healing": [ - - ] - } - ], - "plugins": [ - - ], - "services": [ - - ], - "vcenter": [ - - ], - "cps": [ - { - "vl_id": "ZTE_VGW_MGT_NET39_virtualLink", - "description": "ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_s", - "vdu_id": "VDU_S_CDB_51", - "properties": { - "service_port_created": False, - "name": "ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_s", - "allowed_address_pairs": [ - - ], - "bandwidth": 0, - "is_virtual": False, - "guest_os_mt": 1400, - "vnic_type": "normal", - "floating_ip_address": { - - }, - "mac_address": "", - "port_security_enabled": False, - "ip_address": "192.168.39.247", - "order": 1, - "security_groups": [ - - ], - "bond": "none" - }, - "cp_id": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_su1", - "cpd_id": "CP_NO_0_CDB_ZTE_VGW_MGT_NET39" - }, - { - "vl_id": "ZTE_VGW_SERVICE_NET39_virtualLink", - "description": "ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_s", - "vdu_id": "VDU_S_CDB_51", - "properties": { - "service_port_created": False, - "name": "ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_s", - "allowed_address_pairs": [ - - ], - "bandwidth": 0, - "is_virtual": False, - "guest_os_mt": 1400, - "vnic_type": "normal", - "floating_ip_address": { - - }, - "mac_address": "", - "port_security_enabled": False, - "ip_address": "192.168.40.247", - "order": 2, - "security_groups": [ - - ], - "bond": "none" - }, - "cp_id": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_su2", - "cpd_id": "CP_NO_1_CDB_ZTE_VGW_SERVICE_NET39" - } - ], - "vls": [ - { - "route_external": False, - "route_id": "", - "vl_id": "ZTE_VGW_MGT_NET39_virtualLink", - "description": "ZTE_VGW_MGT_NET39_s", - "properties": { - "gateway_ip": "", - "vendor": "ZTE", - "name": "ZTE_VGW_MGT_NET39_s", - "location_info": { - "vdc": "OG_OrganizationDC", - "vimid": 1, - "tenant": "", - "vapp": "xgw" - }, - "start_ip": "", - "segmentation_id": "142", - "dns_nameservers": [ - - ], - "vds_name": "", - "mt": 1400, - "is_predefined": True, - "ip_version": 4, - "netmask": "255.255.255.0", - "end_ip": "", - "host_routes": [ - - ], - "vlan_transparent": False, - "physical_network": "physnet1", - "cidr": "192.168.39.0/24", - "dhcp_enabled": False, - "network_name": "ZTE_VGW_MGT_NET39", - "network_type": "vlan" - } - }, - { - "route_external": False, - "route_id": "", - "vl_id": "ZTE_VGW_SERVICE_NET39_virtualLink", - "description": "ZTE_VGW_SERVICE_NET39_s", - "properties": { - "gateway_ip": "", - "vendor": "ZTE", - "name": "ZTE_VGW_SERVICE_NET39_s", - "location_info": { - "vdc": "OG_OrganizationDC", - "vimid": 1, - "tenant": "", - "vapp": "xgw" - }, - "start_ip": "", - "segmentation_id": "128", - "dns_nameservers": [ - - ], - "vds_name": "", - "mt": 1400, - "is_predefined": True, - "ip_version": 4, - "netmask": "255.255.255.0", - "end_ip": "", - "host_routes": [ - - ], - "vlan_transparent": False, - "physical_network": "physnet1", - "cidr": "192.168.40.0/24", - "dhcp_enabled": False, - "network_name": "ZTE_VGW_SERVICE_NET39", - "network_type": "vlan" - } - } - ], - "element_groups": [ - - ], - "metadata": { - "plugin_info": "cn_plugin_3.0", - "vendor": "ZTE", - "is_shared": False, - "adjust_vnf_capacity": True, - "paas_project": "", - "description": "VMware", - "vnf_extend_type": "driver", - "domain_type": "CN", - "resview": "dync", - "script_info": "", - "service_category": "EPC", - "version": "ZTE", - "vnf_type": "SAE-GW", - "cross_dc": False, - "vmnumber_overquota_alarm": True, - "vnfd_version": "V00000001", - "id": "NFAR-ZTE-40-ZTE", - "name": 40 - } - }, - "operation": "instantiate", - "vnfmInstanceId": "31f8934e-c785-4fa5-9205-c5f374ada982" - } - }, - "vimid": "vmware_vio", - "timestamp": "20171110105828", - "affectedcp": [ - { - "changeType": "added", - "cPInstanceId": "175767d4-c5bf-11e7-904d-fa163eee1ffe", - "ownertype": 3, - "cpdId": "CP_NO_0_CDB_ZTE_VGW_MGT_NET39", - "portResource": { - "resourceId": "3296b6d8-ebca-4d33-98f4-68d1bc63a3d0", - "tenant": "ZTE_ONAP_PRO", - "vimId": "vmware_vio", - "resourceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_su1" - }, - "cpInstanceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_su1", - "ownerid": "17502154-c5bf-11e7-904d-fa163eee1ffe", - "virtualLinkInstanceId": "1753b60c-c5bf-11e7-904d-fa163eee1ffe" - }, - { - "changeType": "added", - "cPInstanceId": "1758181e-c5bf-11e7-904d-fa163eee1ffe", - "ownertype": 3, - "cpdId": "CP_NO_1_CDB_ZTE_VGW_SERVICE_NET39", - "portResource": { - "resourceId": "5e277a18-94de-469a-a336-2c01ab46387e", - "tenant": "ZTE_ONAP_PRO", - "vimId": "vmware_vio", - "resourceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_su2" - }, - "cpInstanceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_su2", - "ownerid": "17502154-c5bf-11e7-904d-fa163eee1ffe", - "virtualLinkInstanceId": "175472a4-c5bf-11e7-904d-fa163eee1ffe" - } - ], - "vmlist": [ - { - "VMNumber": 1, - "vdutype": "CDB", - "VMFlavor": "VDU_S_CDB_51", - "VMIDlist": [ - { - "VMID": "e8ccc55a-3ebb-4e46-8260-dc4a1646ef4f", - "VMName": "ZTE_xGW_39_CDB_1", - "vimid": "vmware_vio", - "tenant": "ZTE_ONAP_PRO" - } - ] - }, - { - "VMNumber": 1, - "vdutype": "SLB", - "VMFlavor": "VDU_M_SLB_42", - "VMIDlist": [ - { - "VMID": "a9dd6a73-76ee-4d07-9554-08f14c17261f", - "VMName": "ZTE_xGW_39_SLB_1", - "vimid": "vmware_vio", - "tenant": "ZTE_ONAP_PRO" - } - ] - } - ], - "EventType": 1, - "vnfmid": "31f8934e-c785-4fa5-9205-c5f374ada982", - "affectedvirtuallink ": [ - { - "changeType": "added", - "virtualLinkInstanceId": "1753b60c-c5bf-11e7-904d-fa163eee1ffe", - "networkResource": { - "resourceId": "c55e0788-3683-48a1-b88a-a0cb5e05bd44", - "tenant": None, - "vimId": "vmware_vio", - "resourceName": "ZTE_VGW_MGT_NET39" - }, - "virtualLinkDescId": "ZTE_VGW_MGT_NET39_virtualLink", - "tenant": "ZTE_ONAP_PRO", - "subnetworkResource": { - "resourceId": "33c8a03d-00c9-4c57-a348-26dae462b473", - "tenant": None, - "vimId": "vmware_vio", - "resourceName": "ZTE_VGW_MGT_NET39_s" - } - }, - { - "changeType": "added", - "virtualLinkInstanceId": "175472a4-c5bf-11e7-904d-fa163eee1ffe", - "networkResource": { - "resourceId": "2d22b6e4-340b-45a8-8757-5206aa056b92", - "tenant": None, - "vimId": "vmware_vio", - "resourceName": "ZTE_VGW_SERVICE_NET39" - }, - "virtualLinkDescId": "ZTE_VGW_SERVICE_NET39_virtualLink", - "tenant": "ZTE_ONAP_PRO", - "subnetworkResource": { - "resourceId": "2ea2acc0-a4ed-44f8-9d31-9cdc9e3ebe62", - "tenant": None, - "vimId": "vmware_vio", - "resourceName": "ZTE_VGW_SERVICE_NET39_s" - } - } - ] -} +notify_req_data = {"vnfinstanceid": "1", + "nfvoid": "3", + "extension": {"openo_notification": {"status": "finished", + "affectedService": [], + "affectedVnfc": [{"changeType": "added", + "computeResource": {"resourceId": "e8ccc55a-3ebb-4e46-8260-dc4a1646ef4f", + "tenant": "ZTE_ONAP_PRO", + "vimId": "vmware_vio", + "resourceName": "ZTE_xGW_39_CDB_1"}, + "storageResource": [], + "vnfcInstanceId": "17502154-c5bf-11e7-904d-fa163eee1ffe", + "vduType": "CDB", + "vduId": "VDU_S_CDB_51"}, + {"changeType": "added", + "computeResource": {"resourceId": "a9dd6a73-76ee-4d07-9554-08f14c17261f", + "tenant": "ZTE_ONAP_PRO", + "vimId": "vmware_vio", + "resourceName": "ZTE_xGW_39_SLB_1"}, + "storageResource": [], + "vnfcInstanceId": "1750d540-c5bf-11e7-904d-fa163eee1ffe", + "vduType": "SLB", + "vduId": "VDU_M_SLB_42"}], + "nfvoInstanceId": "3", + "affectedVirtualLink": [{"changeType": "added", + "virtualLinkInstanceId": "1753b60c-c5bf-11e7-904d-fa163eee1ffe", + "networkResource": {"resourceId": "c55e0788-3683-48a1-b88a-a0cb5e05bd44", + "tenant": None, + "vimId": "vmware_vio", + "resourceName": "ZTE_VGW_MGT_NET39"}, + "virtualLinkDescId": "ZTE_VGW_MGT_NET39_virtualLink", + "tenant": "ZTE_ONAP_PRO", + "subnetworkResource": {"resourceId": "33c8a03d-00c9-4c57-a348-26dae462b473", + "tenant": None, + "vimId": "vmware_vio", + "resourceName": "ZTE_VGW_MGT_NET39_s"}}, + {"changeType": "added", + "virtualLinkInstanceId": "175472a4-c5bf-11e7-904d-fa163eee1ffe", + "networkResource": {"resourceId": "2d22b6e4-340b-45a8-8757-5206aa056b92", + "tenant": None, + "vimId": "vmware_vio", + "resourceName": "ZTE_VGW_SERVICE_NET39"}, + "virtualLinkDescId": "ZTE_VGW_SERVICE_NET39_virtualLink", + "tenant": "ZTE_ONAP_PRO", + "subnetworkResource": {"resourceId": "2ea2acc0-a4ed-44f8-9d31-9cdc9e3ebe62", + "tenant": None, + "vimId": "vmware_vio", + "resourceName": "ZTE_VGW_SERVICE_NET39_s"}}], + "affectedVirtualStorage": [], + "jobId": "", + "affectedcapacity": {"vcp": "72", + "vm": "9", + "localStorage": "0", + "sharedStorage": "288", + "vMemory": "233472", + "port": "27"}, + "additionalParam": {"vmList": [{"vmName": "ZTE_xGW_39_CDB_1", + "vduId": "VDU_S_CDB_51"}, + {"vmName": "ZTE_xGW_39_CDB_2", + "vduId": "VDU_S_CDB_51"}, + {"vmName": "ZTE_xGW_39_SLB_1", + "vduId": "VDU_M_SLB_42"}, + {"vmName": "ZTE_xGW_39_SLB_2", + "vduId": "VDU_M_SLB_42"}, + {"vmName": "ZTE_xGW_39_GSU_1", + "vduId": "VDU_M_GSU_22"}, + {"vmName": "ZTE_xGW_39_GSU_2", + "vduId": "VDU_M_GSU_22"}, + {"vmName": "ZTE_xGW_39_MPU_1", + "vduId": "VDU_M_MPU_12"}, + {"vmName": "ZTE_xGW_39_PFU_1", + "vduId": "VDU_M_PFU_32"}, + {"vmName": "ZTE_xGW_39_PFU_2", + "vduId": "VDU_M_PFU_32"}]}, + "nfInstanceId": "1", + "affectedCp": [{"changeType": "added", + "cPInstanceId": "175767d4-c5bf-11e7-904d-fa163eee1ffe", + "ownertype": 3, + "cpdId": "CP_NO_0_CDB_ZTE_VGW_MGT_NET39", + "portResource": {"resourceId": "3296b6d8-ebca-4d33-98f4-68d1bc63a3d0", + "tenant": "ZTE_ONAP_PRO", + "vimId": "vmware_vio", + "resourceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_su1"}, + "cpInstanceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_su1", + "ownerid": "17502154-c5bf-11e7-904d-fa163eee1ffe", + "virtualLinkInstanceId": "1753b60c-c5bf-11e7-904d-fa163eee1ffe"}, + {"changeType": "added", + "cPInstanceId": "1758181e-c5bf-11e7-904d-fa163eee1ffe", + "ownertype": 3, + "cpdId": "CP_NO_1_CDB_ZTE_VGW_SERVICE_NET39", + "portResource": {"resourceId": "5e277a18-94de-469a-a336-2c01ab46387e", + "tenant": "ZTE_ONAP_PRO", + "vimId": "vmware_vio", + "resourceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_su2"}, + "cpInstanceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_su2", + "ownerid": "17502154-c5bf-11e7-904d-fa163eee1ffe", + "virtualLinkInstanceId": "175472a4-c5bf-11e7-904d-fa163eee1ffe"}], + "vnfdmodule": {"volume_storages": [], + "inputs": {}, + "vdus": [{"volume_storages": [], + "description": "CDB", + "vdu_id": "VDU_S_CDB_51", + "local_storages": ["local_disk_root_10GB", + "local_disk_ephemeral_14GB"], + "nfv_compute": {"flavor_extra_specs": {"hw:cpu_policy": "dedicated", + "hw:mem_page_size": "large", + "hw:numa_nodes": 1, + "hw:cpu_max_sockets": 1}, + "mem_size": 8192, + "num_cpus": 2}, + "artifacts": [], + "dependencies": [], + "vls": ["ZTE_VGW_MGT_NET39_virtualLink", + "ZTE_VGW_SERVICE_NET39_virtualLink"], + "image_file": "image_51", + "cps": ["CP_ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_su1", + "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_su2"], + "properties": {"key_vd": True, + "support_scaling": True, + "vdu_type": "CDB", + "name": "ZTE_xGW_39_CDB_1", + "storage_policy": "Share_Service", + "inject_network_address": True, + "is_predefined": False, + "location_info": {"vimid": "", + "availability_zone": "", + "vdc": "OG_OrganizationDC", + "host": "", + "tenant": "", + "vapp": "xgw"}, + "use_shared_vm": False, + "inject_data_list": [], + "allow_scale_updown": True, + "action": "ADD", + "watchdog": {}, + "template_id": 51, + "manual_scale_select_vim": False, + "config_drive": True}}, + {"volume_storages": [], + "description": "SLB", + "vdu_id": "VDU_M_SLB_42", + "local_storages": ["local_disk_root_10GB", + "local_disk_ephemeral_14GB"], + "nfv_compute": {"flavor_extra_specs": {"hw:cpu_policy": "dedicated", + "hw:mem_page_size": "large", + "hw:numa_nodes": 1, + "hw:cpu_max_sockets": 1}, + "mem_size": 24576, + "num_cpus": 8}, + "artifacts": [], + "dependencies": [], + "vls": ["ZTE_VGW_MGT_NET39_virtualLink", + "ZTE_VGW_SERVICE_NET39_virtualLink", + "ZTE_NET39_virtualLink", + "ZTE_VGW_GTP_NET39_virtualLink"], + "image_file": "image_51", + "cps": ["CP_ZTE_xGW_39_SLB_1_ZTE_VGW_MGT_NET39_su1", + "CP_ZTE_xGW_39_SLB_1_ZTE_VGW_SERVICE_NET39_su2", + "CP_ZTE_xGW_39_SLB_1_zte-net-subnet393", + "CP_ZTE_xGW_39_SLB_1_ZTE_VGW_GTP_NET39_su4"], + "properties": {"key_vd": True, + "support_scaling": False, + "vdu_type": "SLB", + "name": "ZTE_xGW_39_SLB_1", + "storage_policy": "Share_Service", + "inject_network_address": True, + "is_predefined": False, + "location_info": {"vimid": "", + "availability_zone": "", + "vdc": "OG_OrganizationDC", + "host": "", + "tenant": "", + "vapp": "xgw"}, + "use_shared_vm": False, + "inject_data_list": [], + "allow_scale_updown": True, + "action": "ADD", + "watchdog": {}, + "template_id": 42, + "manual_scale_select_vim": False, + "config_drive": True}}], + "vcloud": [], + "extvirtuallink": "", + "server_groups": [], + "image_files": [{"properties": {"vendor": "zte", + "name": "ZXUN_xGW_CGSL_QCOW2_OP_V6.17.10.B17.ova", + "image_extra_specs": {}, + "disk_format": "vmdk", + "file_url": "SoftwareImages/ZXUN-xGW-CGSL-QCOW2-V6.17.10.B17-image.tar.gz", + "container_type": "bare", + "version": "V6.17.10.B17.ova"}, + "image_file_id": "image_51", + "description": "xgw image file"}], + "routers": [], + "local_storages": [{"local_storage_id": "local_disk_ephemeral_38GB", + "description": "local_disk_ephemeral_38GB", + "properties": {"disk_type": "ephemeral", + "size": 38}}, + {"local_storage_id": "local_disk_root_10GB", + "description": "local_disk_root_10GB", + "properties": {"disk_type": "root", + "size": 10}}, + {"local_storage_id": "local_disk_ephemeral_14GB", + "description": "local_disk_ephemeral_14GB", + "properties": {"disk_type": "ephemeral", + "size": 14}}], + "vnf_flavours": [], + "vnf_exposed": {"external_cps": [{"key_name": "ZTE_NET39_virtualLink", + "cpd_id": "CP_NO_3_PFU_ZTE_NET39"}, + {"key_name": "ZTE_NET39_virtualLink1", + "cpd_id": "CP_NO_2_PFU_ZTE_NET39"}, + {"key_name": "ZTE_VGW_GTP_NET39_virtualLink", + "cpd_id": "CP_NO_3_SLB_ZTE_VGW_GTP_NET39"}, + {"key_name": "ZTE_NET39_virtualLink2", + "cpd_id": "CP_NO_2_SLB_ZTE_NET39"}, + {"key_name": "provider-zte_virtualLink", + "cpd_id": "CP_NO_2_MPU_provider-zte"}], + "forward_cps": [{"key_name": "ZTE_VGW_GTP_NET39_forwarder", + "cpd_id": "CP_NO_3_SLB_ZTE_VGW_GTP_NET39"}, + {"key_name": "ZTE_NET39_forwarder1", + "cpd_id": "CP_NO_2_PFU_ZTE_NET39"}, + {"key_name": "ZTE_NET39_forwarder2", + "cpd_id": "CP_NO_3_PFU_ZTE_NET39"}, + {"key_name": "provider-zte_forwarder", + "cpd_id": "CP_NO_2_MPU_provider-zte"}, + {"key_name": "ZTE_NET39_forwarder", + "cpd_id": "CP_NO_2_SLB_ZTE_NET39"}]}, + "reserved_total": {"portnum": 27, + "vcpunum": 72, + "memorysize": 233472, + "shdsize": 288, + "isreserve": 0, + "vmnum": 9}, + "policies": [{"scaling": [{"description": "zte vgw vnf policy", + "policy_id": "Policy_1", + "targets": ["VDU_S_CDB_51", + "VDU_M_CDB_52", + "VDU_M_SLB_42", + "VDU_M_GSU_22", + "VDU_M_MPU_12", + "VDU_L_MPU_13", + "VDU_M_PFU_32", + "VDU_L_PFU_33"], + "properties": {"policy_file": "Policies/zte-vcn-vnf-policy.xml"}}], + "healing": []}], + "plugins": [], + "services": [], + "vcenter": [], + "cps": [{"vl_id": "ZTE_VGW_MGT_NET39_virtualLink", + "description": "ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_s", + "vdu_id": "VDU_S_CDB_51", + "properties": {"service_port_created": False, + "name": "ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_s", + "allowed_address_pairs": [], + "bandwidth": 0, + "is_virtual": False, + "guest_os_mt": 1400, + "vnic_type": "normal", + "floating_ip_address": {}, + "mac_address": "", + "port_security_enabled": False, + "ip_address": "192.168.39.247", + "order": 1, + "security_groups": [], + "bond": "none"}, + "cp_id": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_su1", + "cpd_id": "CP_NO_0_CDB_ZTE_VGW_MGT_NET39"}, + {"vl_id": "ZTE_VGW_SERVICE_NET39_virtualLink", + "description": "ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_s", + "vdu_id": "VDU_S_CDB_51", + "properties": {"service_port_created": False, + "name": "ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_s", + "allowed_address_pairs": [], + "bandwidth": 0, + "is_virtual": False, + "guest_os_mt": 1400, + "vnic_type": "normal", + "floating_ip_address": {}, + "mac_address": "", + "port_security_enabled": False, + "ip_address": "192.168.40.247", + "order": 2, + "security_groups": [], + "bond": "none"}, + "cp_id": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_su2", + "cpd_id": "CP_NO_1_CDB_ZTE_VGW_SERVICE_NET39"}], + "vls": [{"route_external": False, + "route_id": "", + "vl_id": "ZTE_VGW_MGT_NET39_virtualLink", + "description": "ZTE_VGW_MGT_NET39_s", + "properties": {"gateway_ip": "", + "vendor": "ZTE", + "name": "ZTE_VGW_MGT_NET39_s", + "location_info": {"vdc": "OG_OrganizationDC", + "vimid": 1, + "tenant": "", + "vapp": "xgw"}, + "start_ip": "", + "segmentation_id": "142", + "dns_nameservers": [], + "vds_name": "", + "mt": 1400, + "is_predefined": True, + "ip_version": 4, + "netmask": "255.255.255.0", + "end_ip": "", + "host_routes": [], + "vlan_transparent": False, + "physical_network": "physnet1", + "cidr": "192.168.39.0/24", + "dhcp_enabled": False, + "network_name": "ZTE_VGW_MGT_NET39", + "network_type": "vlan"}}, + {"route_external": False, + "route_id": "", + "vl_id": "ZTE_VGW_SERVICE_NET39_virtualLink", + "description": "ZTE_VGW_SERVICE_NET39_s", + "properties": {"gateway_ip": "", + "vendor": "ZTE", + "name": "ZTE_VGW_SERVICE_NET39_s", + "location_info": {"vdc": "OG_OrganizationDC", + "vimid": 1, + "tenant": "", + "vapp": "xgw"}, + "start_ip": "", + "segmentation_id": "128", + "dns_nameservers": [], + "vds_name": "", + "mt": 1400, + "is_predefined": True, + "ip_version": 4, + "netmask": "255.255.255.0", + "end_ip": "", + "host_routes": [], + "vlan_transparent": False, + "physical_network": "physnet1", + "cidr": "192.168.40.0/24", + "dhcp_enabled": False, + "network_name": "ZTE_VGW_SERVICE_NET39", + "network_type": "vlan"}}], + "element_groups": [], + "metadata": {"plugin_info": "cn_plugin_3.0", + "vendor": "ZTE", + "is_shared": False, + "adjust_vnf_capacity": True, + "paas_project": "", + "description": "VMware", + "vnf_extend_type": "driver", + "domain_type": "CN", + "resview": "dync", + "script_info": "", + "service_category": "EPC", + "version": "ZTE", + "vnf_type": "SAE-GW", + "cross_dc": False, + "vmnumber_overquota_alarm": True, + "vnfd_version": "V00000001", + "id": "NFAR-ZTE-40-ZTE", + "name": 40}}, + "operation": "instantiate", + "vnfmInstanceId": "31f8934e-c785-4fa5-9205-c5f374ada982"}}, + "vimid": "vmware_vio", + "timestamp": "20171110105828", + "affectedcp": [{"changeType": "added", + "cPInstanceId": "175767d4-c5bf-11e7-904d-fa163eee1ffe", + "ownertype": 3, + "cpdId": "CP_NO_0_CDB_ZTE_VGW_MGT_NET39", + "portResource": {"resourceId": "3296b6d8-ebca-4d33-98f4-68d1bc63a3d0", + "tenant": "ZTE_ONAP_PRO", + "vimId": "vmware_vio", + "resourceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_su1"}, + "cpInstanceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_MGT_NET39_su1", + "ownerid": "17502154-c5bf-11e7-904d-fa163eee1ffe", + "virtualLinkInstanceId": "1753b60c-c5bf-11e7-904d-fa163eee1ffe"}, + {"changeType": "added", + "cPInstanceId": "1758181e-c5bf-11e7-904d-fa163eee1ffe", + "ownertype": 3, + "cpdId": "CP_NO_1_CDB_ZTE_VGW_SERVICE_NET39", + "portResource": {"resourceId": "5e277a18-94de-469a-a336-2c01ab46387e", + "tenant": "ZTE_ONAP_PRO", + "vimId": "vmware_vio", + "resourceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_su2"}, + "cpInstanceName": "CP_ZTE_xGW_39_CDB_1_ZTE_VGW_SERVICE_NET39_su2", + "ownerid": "17502154-c5bf-11e7-904d-fa163eee1ffe", + "virtualLinkInstanceId": "175472a4-c5bf-11e7-904d-fa163eee1ffe"}], + "vmlist": [{"VMNumber": 1, + "vdutype": "CDB", + "VMFlavor": "VDU_S_CDB_51", + "VMIDlist": [{"VMID": "e8ccc55a-3ebb-4e46-8260-dc4a1646ef4f", + "VMName": "ZTE_xGW_39_CDB_1", + "vimid": "vmware_vio", + "tenant": "ZTE_ONAP_PRO"}]}, + {"VMNumber": 1, + "vdutype": "SLB", + "VMFlavor": "VDU_M_SLB_42", + "VMIDlist": [{"VMID": "a9dd6a73-76ee-4d07-9554-08f14c17261f", + "VMName": "ZTE_xGW_39_SLB_1", + "vimid": "vmware_vio", + "tenant": "ZTE_ONAP_PRO"}]}], + "EventType": 1, + "vnfmid": "31f8934e-c785-4fa5-9205-c5f374ada982", + "affectedvirtuallink ": [{"changeType": "added", + "virtualLinkInstanceId": "1753b60c-c5bf-11e7-904d-fa163eee1ffe", + "networkResource": {"resourceId": "c55e0788-3683-48a1-b88a-a0cb5e05bd44", + "tenant": None, + "vimId": "vmware_vio", + "resourceName": "ZTE_VGW_MGT_NET39"}, + "virtualLinkDescId": "ZTE_VGW_MGT_NET39_virtualLink", + "tenant": "ZTE_ONAP_PRO", + "subnetworkResource": {"resourceId": "33c8a03d-00c9-4c57-a348-26dae462b473", + "tenant": None, + "vimId": "vmware_vio", + "resourceName": "ZTE_VGW_MGT_NET39_s"}}, + {"changeType": "added", + "virtualLinkInstanceId": "175472a4-c5bf-11e7-904d-fa163eee1ffe", + "networkResource": {"resourceId": "2d22b6e4-340b-45a8-8757-5206aa056b92", + "tenant": None, + "vimId": "vmware_vio", + "resourceName": "ZTE_VGW_SERVICE_NET39"}, + "virtualLinkDescId": "ZTE_VGW_SERVICE_NET39_virtualLink", + "tenant": "ZTE_ONAP_PRO", + "subnetworkResource": {"resourceId": "2ea2acc0-a4ed-44f8-9d31-9cdc9e3ebe62", + "tenant": None, + "vimId": "vmware_vio", + "resourceName": "ZTE_VGW_SERVICE_NET39_s"}}]} diff --git a/zte/vmanager/driver/interfaces/urls.py b/zte/vmanager/driver/interfaces/urls.py index fe70e460..745ff830 100644 --- a/zte/vmanager/driver/interfaces/urls.py +++ b/zte/vmanager/driver/interfaces/urls.py @@ -35,4 +35,5 @@ urlpatterns = [ views.scale, name='scale'), url(r'^api/(?P[0-9a-zA-Z\-\_]+)/v1/(?P[0-9a-zA-Z\-\_]+)/vnfs/(?P[0-9a-zA-Z\-\_]+)/heal$', views.heal, name='heal'), - url(r'^samples/$', views.samples, name='samples'), ] + url(r'^samples/$', views.samples, name='samples') +] diff --git a/zte/vmanager/requirements.txt b/zte/vmanager/requirements.txt index 49f0e42e..8b15738c 100644 --- a/zte/vmanager/requirements.txt +++ b/zte/vmanager/requirements.txt @@ -1,6 +1,6 @@ # rest framework -Django==1.9.6 -djangorestframework==3.3.3 +Django==1.11.9 +djangorestframework==3.7.7 # for call rest api httplib2==0.9.2 @@ -9,3 +9,8 @@ httplib2==0.9.2 coverage==4.2 mock==2.0.0 unittest_xml_reporting==1.12.0 + +# for auto swagger +drf-yasg>=1.2.2 +flex>=6.11.1 +swagger-spec-validator>=2.1.0 \ No newline at end of file -- cgit 1.2.3-korg