fix grant parameter error

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / biz / grant_vnf.py

diff --git a/lcm/lcm/nf/biz/grant_vnf.py b/lcm/lcm/nf/biz/grant_vnf.py
index 268e8e4..dd22c06 100644 (file)
--- a/lcm/lcm/nf/biz/grant_vnf.py
+++ b/lcm/lcm/nf/biz/grant_vnf.py
@@ -18,53 +18,97 @@ import logging
 from lcm.pub.database.models import NfInstModel
 from lcm.pub.msapi.gvnfmdriver import apply_grant_to_nfvo
 from lcm.pub.utils.values import ignore_case_get
+from lcm.nf.const import GRANT_TYPE
 
 logger = logging.getLogger(__name__)
 
 
 def grant_resource(data, nf_inst_id, job_id, grant_type, vdus):
     logger.info("Grant resource begin")
-    if grant_type == "Terminate":
-        lifecycleOperration = "Terminate"
-    elif grant_type == "instantiate":
-        lifecycleOperration = "Instantiate"
 
     content_args = {
         'vnfInstanceId': nf_inst_id,
-        'vnfDescriptorId': '',
-        'lifecycleOperation': lifecycleOperration,
         'vnfLcmOpOccId': job_id,
-        'addResources': [],
-        'removeResources': [],
-        'placementConstraint': [],
-        'additionalParam': {}
+        # 'vnfdId': None,  # TODO
+        # 'flavourId': "default",  # TODO
+        'operation': grant_type,
+        'isAutomaticInvocation': True,  # TODO
+        # 'instantiationLevelId': None,  # TODO
+        # 'addResources': [],
+        # 'tmpResources': [],
+        # 'updateResources': [],
+        # 'removeResources': [],
+        # 'placementConstraints': [],
+        # 'vimConstraints': [],
+        # 'additionalParams': {}
+        # '_links': None  # TODO
     }
 
-    if grant_type == "Terminate":
+    if grant_type == GRANT_TYPE.TERMINATE:
         res_index = 1
+        content_args['removeResources'] = []
         for vdu in vdus:
             res_def = {
-                'type': 'VDU',
-                'resDefId': str(res_index),
-                'resDesId': vdu.resouceid}
+                'id': str(res_index),
+                'type': 'COMPUTE',
+                'vduId': None,
+                'resourceTemplateId': None,
+                'resource': {
+                    'vimConnectionId': None,
+                    'resourceProviderId': None,
+                    'resourceid': vdu.resourceid,
+                    'vimLevelResourceType': None
+                }
+            }
             content_args['removeResources'].append(res_def)
             res_index += 1
-        content_args['additionalParam']['vimid'] = vdus[0].vimid
-    elif grant_type == "Instantiate":
+        if vdus[0].vimid:
+            content_args['additionalParams'] = {}
+            content_args['additionalParams']['vimid'] = vdus[0].vimid
+    elif grant_type == GRANT_TYPE.INSTANTIATE:
         vim_id = ignore_case_get(ignore_case_get(data, "additionalParams"), "vimId")
         res_index = 1
+        content_args['addResources'] = []
         for vdu in vdus:
             res_def = {
-                'type': 'VDU',
-                'resDefId': str(res_index),
-                'resDesId': ignore_case_get(vdu, "vdu_id")
+                'id': str(res_index),
+                'type': 'COMPUTE',
+                # 'vduId': vdu["vdu_id"],
+                'resourceTemplateId': vdu["vdu_id"]  # , None,
+                # 'resource': None
             }
             content_args['addResources'].append(res_def)
             res_index += 1
-        content_args['additionalParam']['vimid'] = vim_id
+        if vim_id:
+            content_args['additionalParams'] = {}
+            content_args['additionalParams']['vimid'] = vim_id
+    elif grant_type == GRANT_TYPE.OPERATE:
+        res_index = 1
+        content_args['updateResources'] = []
+        for vdu in vdus:
+            res_def = {
+                'id': str(res_index),
+                'type': 'COMPUTE',
+                'vduId': None,
+                'resourceTemplateId': None,
+                'resource': {
+                    'vimConnectionId': None,
+                    'resourceProviderId': None,
+                    'resourceid': vdu.resourceid,
+                    'vimLevelResourceType': None
+                }
+            }
+            content_args['updateResources'].append(res_def)
+            res_index += 1
+        if vdus[0].vimid:
+            content_args['additionalParams'] = {}
+            content_args['additionalParams']['vimid'] = vdus[0].vimid
 
     vnfInsts = NfInstModel.objects.filter(nfinstid=nf_inst_id)
-    content_args['additionalParam']['vnfmid'] = vnfInsts[0].vnfminstid
+    if vnfInsts[0].vnfminstid:
+        content_args['additionalParams'] = {}
+        content_args['additionalParams']['vnfmid'] = vnfInsts[0].vnfminstid
     logger.info('Grant request data=%s' % content_args)
     apply_result = apply_grant_to_nfvo(json.dumps(content_args))
+    logger.info("apply_result: %s" % apply_result)
     return apply_result