Fix vnf notify logic

[vfc/gvnfm/vnflcm.git] / lcm / lcm / pub / msapi / gvnfmdriver.py

diff --git a/lcm/lcm/pub/msapi/gvnfmdriver.py b/lcm/lcm/pub/msapi/gvnfmdriver.py
index c2519ea..41e04f8 100644 (file)
--- a/lcm/lcm/pub/msapi/gvnfmdriver.py
+++ b/lcm/lcm/pub/msapi/gvnfmdriver.py
@@ -101,15 +101,15 @@ def prepare_notification_data(nfinstid, jobid, changetype, operation):
                 'resourceProviderId': port.name,  # TODO: is resourceName mapped to resourceProviderId?
                 'vimLevelResourceType': 'port'
             },
-            'cpInstanceId': port.cpinstanceid  # TODO: port.cpinstanceid is not initiated when create port resource.
+            'cpInstanceId': port.portid  # TODO: port.cpinstanceid is not initiated when create port resource.
         })
     for network_id, ext_link_ports in ext_connectivity_map.items():
         networks = NetworkInstModel.objects.filter(networkid=network_id)
-        network = networks[0]
+        net_name = networks[0].name if networks else network_id
         network_resource = {
-            'vimConnectionId': network.vimid,
-            'resourceId': network.resourceid,
-            'resourceProviderId': network.name,  # TODO: is resourceName mapped to resourceProviderId?
+            'vimConnectionId': ext_link_ports[0]['resourceHandle']['vimConnectionId'],
+            'resourceId': network_id,
+            'resourceProviderId': net_name,  # TODO: is resourceName mapped to resourceProviderId?
             'vimLevelResourceType': 'network'
         }
         ext_connectivity.append({