Align grant request with SOL003.

[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 5446fa3..763b197 100644 (file)
--- a/lcm/lcm/pub/msapi/gvnfmdriver.py
+++ b/lcm/lcm/pub/msapi/gvnfmdriver.py
@@ -59,8 +59,8 @@ def prepare_notification_data(nfinstid, jobid, changetype):
             vm = VmInstModel.objects.filter(vmid=vnfc.vmid)
             if vm:
                 vm_resource = {
-                    'vimId': vm[0].vimConnectionId,
-                    'resourceId': vm[0].resouceid,
+                    'vimId': vm[0].vimid,
+                    'resourceId': vm[0].resourceid,
                     'resourceProviderId': vm[0].vmname,  # TODO: is resourceName mapped to resourceProviderId?
                     'vimLevelResourceType': 'vm'
                 }
@@ -75,7 +75,7 @@ def prepare_notification_data(nfinstid, jobid, changetype):
     for network in networks:
         network_resource = {
             'vimConnectionId': network.vimid,
-            'resourceId': network.resouceid,
+            'resourceId': network.resourceid,
             'resourceProviderId': network.name,  # TODO: is resourceName mapped to resourceProviderId?
             'vimLevelResourceType': 'network'
         }
@@ -92,11 +92,11 @@ def prepare_notification_data(nfinstid, jobid, changetype):
             'id': port.portid,  # TODO: port.portid or port.nodeid?
             'resourceHandle': {
                 'vimConnectionId': port.vimid,
-                'resourceId': port.resouceid,
+                'resourceId': port.resourceid,
                 'resourceProviderId': port.name,  # TODO: is resourceName mapped to resourceProviderId?
                 'vimLevelResourceType': 'port'
             },
-            'cpInstanceId': port.cpinstanceid
+            'cpInstanceId': port.cpinstanceid  # TODO: port.cpinstanceid is not initiated when create port resource.
         }),
     affected_vss = []
     vss = StorageInstModel.objects.filter(instid=nfinstid)
@@ -107,7 +107,7 @@ def prepare_notification_data(nfinstid, jobid, changetype):
             'changeType': changetype,
             'storageResource': {
                 'vimConnectionId': vs.vimid,
-                'resourceId': vs.resouceid,
+                'resourceId': vs.resourceid,
                 'resourceProviderId': vs.name,  # TODO: is resourceName mapped to resourceProviderId?
                 'vimLevelResourceType': 'volume'
             }