Update the nslcm code to update the resourceName

Change-Id: Ib93fdb8c1097793c8bc3f8b4c8461de5bac09c28
Issue-ID: VFC-1657
Signed-off-by: YuanHong Deng <dengyuanhong@chinamobile.com>

diff --git a/lcm/ns_vnfs/biz/handle_notification.py b/lcm/ns_vnfs/biz/handle_notification.py
index edcebbb..647878c 100644 (file)
--- a/lcm/ns_vnfs/biz/handle_notification.py
+++ b/lcm/ns_vnfs/biz/handle_notification.py
@@ -132,7 +132,7 @@ class HandleVnfLcmOocNotification(object):
                 if portResource:
                     vimId = ignore_case_get(portResource, 'vimConnectionId')
                     resourceId = ignore_case_get(portResource, 'resourceId')
-                    resourceName = ignore_case_get(portResource, 'resourceId')  # replaced with resouceId temporarily
+                    resourceName = ignore_case_get(portResource, 'resourceProviderId')
                     tenant = ignore_case_get(portResource, 'tenant')
                     ipAddress = ignore_case_get(portResource, 'ipAddress')
                     macAddress = ignore_case_get(portResource, 'macAddress')

diff --git a/lcm/ns_vnfs/tests/tests.py b/lcm/ns_vnfs/tests/tests.py
index c3d3008..5614c57 100644 (file)
--- a/lcm/ns_vnfs/tests/tests.py
+++ b/lcm/ns_vnfs/tests/tests.py
@@ -2271,6 +2271,7 @@ class TestVnfNotifyView(TestCase):
                                                           "resourceHandle": {
                                                               "vimConnectionId": "vim_connection_id",
                                                               "resourceId": "resource_id",
+                                                              "resourceProviderId": "resourceProviderId",
                                                               "tenant": "tenant",
                                                               "ipAddress": "ipAddress",
                                                               "macAddress": "macAddress",
@@ -2314,7 +2315,7 @@ class TestVnfNotifyView(TestCase):
                                           relatednetworkid="resource_id", vltype=0)
         self.assertIsInstance(vl_inst, VLInstModel)
         port_inst = PortInstModel.objects.get(networkid='networkId', subnetworkid='subnetId', vimid="vim_connection_id",
-                                              resourceid="resource_id", name="resource_id", instid="instId",
+                                              resourceid="resource_id", name="resourceProviderId", instid="instId",
                                               cpinstanceid="cp_instance_id", bandwidth='unknown',
                                               operationalstate='active', ipaddress="ipAddress", macaddress='macAddress',
                                               floatipaddress='unknown', serviceipaddress='unknown',
@@ -2413,6 +2414,7 @@ class TestVnfNotifyView(TestCase):
                                                           "resourceHandle": {
                                                               "vimConnectionId": "vim_connection_id",
                                                               "resourceId": "resource_id",
+                                                              "resourceProviderId": "resourceProviderId",
                                                               "tenant": "tenant",
                                                               "ipAddress": "ipAddress",
                                                               "macAddress": "macAddress",
@@ -2432,7 +2434,7 @@ class TestVnfNotifyView(TestCase):
                                           relatednetworkid="resource_id", vltype=0)
         self.assertIsInstance(vl_inst, VLInstModel)
         port_inst = PortInstModel.objects.get(networkid='networkId', subnetworkid='subnetId', vimid="vim_connection_id",
-                                              resourceid="resource_id", name="resource_id", instid="instId",
+                                              resourceid="resource_id", name="resourceProviderId", instid="instId",
                                               cpinstanceid="cp_instance_id", bandwidth='unknown',
                                               operationalstate='active', ipaddress="ipAddress", macaddress='macAddress',
                                               floatipaddress='unknown', serviceipaddress='unknown',