X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fbiz%2Fgrant_vnf.py;h=80ff035c9095181be39b7daa84017d7f47231eb1;hb=46ad7c172411214c5432ed93fda4271288077447;hp=92f22350cc5eb006a84116dfe0eada9bb8004dc5;hpb=49b87c030e4ae60b141268f9c2f89b8010acd050;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/biz/grant_vnf.py b/lcm/lcm/nf/biz/grant_vnf.py
index 92f22350..80ff035c 100644
--- a/lcm/lcm/nf/biz/grant_vnf.py
+++ b/lcm/lcm/nf/biz/grant_vnf.py
@@ -25,77 +25,63 @@ logger = logging.getLogger(__name__)
 
 def grant_resource(data, nf_inst_id, job_id, grant_type, vdus):
     logger.info("Grant resource begin")
-
     content_args = {
         'vnfInstanceId': nf_inst_id,
         'vnfLcmOpOccId': job_id,
-        'vnfdId': None,  # TODO
-        'flavourId': None,  # TODO
-        'operate': grant_type,
+        # '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
+        # 'instantiationLevelId': None,  # TODO
+        # 'addResources': [],
+        # 'tmpResources': [],
+        # 'updateResources': [],
+        # 'removeResources': [],
+        # 'placementConstraints': [],
+        # 'vimConstraints': [],
+        'additionalParams': {}
+        # '_links': None  # TODO
     }
 
     if grant_type == GRANT_TYPE.TERMINATE:
         res_index = 1
+        content_args['removeResources'] = []
         for vdu in vdus:
             res_def = {
                 'id': str(res_index),
                 'type': 'COMPUTE',
-                'vduId': None,
-                'resourceTemplateId': None,
+                # 'vduId': None,
+                # 'resourceTemplateId': None,
                 'resource': {
-                    'vimConnectionId': None,
-                    'resourceProviderId': None,
-                    'resourceid': vdu.resourceid,
-                    'vimLevelResourceType': None
+                    #  'vimConnectionId': None,
+                    #  'resourceProviderId': None,
+                    'resourceId': vdu.resourceid,
+                    #  'vimLevelResourceType': None
                 }
             }
             content_args['removeResources'].append(res_def)
             res_index += 1
-        content_args['additionalParams']['vimid'] = vdus[0].vimid
+        if vdus and vdus[0].vimid:
+            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 = {
                 'id': str(res_index),
                 'type': 'COMPUTE',
-                'vduId': None,
-                'resourceTemplateId': None,  # TODO: shall be present for the planned creation of new resources.
-                'resource': None
+                # 'vduId': vdu["vdu_id"],
+                'resourceTemplateId': vdu["vdu_id"]  # , None,
+                # 'resource': None
             }
             content_args['addResources'].append(res_def)
             res_index += 1
-        content_args['additionalParams']['vimid'] = vim_id
-    elif grant_type == GRANT_TYPE.HEAL_RESTART:
-        res_index = 1
-        res_def = {
-            'type': 'VDU',
-            'resDefId': str(res_index),
-            'resDesId': vdus[0].resourceid}
-        content_args['updateResources'].append(res_def)
-        content_args['additionalParams']['vimid'] = vdus[0].vimid
-    elif grant_type == GRANT_TYPE.HEAL_CREATE:
-        vim_id = vdus[0]["properties"]["location_info"]["vimid"]
-        res_index = 1
-        res_def = {
-            'type': 'VDU',
-            'resDefId': str(res_index),
-            'resDesId': ignore_case_get(vdus[0], "vdu_id")
-        }
-        content_args['addResources'].append(res_def)
-        content_args['additionalParams']['vimid'] = vim_id
+        if vim_id:
+            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),
@@ -105,16 +91,26 @@ def grant_resource(data, nf_inst_id, job_id, grant_type, vdus):
                 'resource': {
                     'vimConnectionId': None,
                     'resourceProviderId': None,
-                    'resourceid': vdu.resourceid,
+                    'resourceId': vdu.resourceid,
                     'vimLevelResourceType': None
                 }
             }
             content_args['updateResources'].append(res_def)
             res_index += 1
-        content_args['additionalParams']['vimid'] = vdus[0].vimid
+        if vdus and vdus[0].vimid:
+            content_args['additionalParams']['vimid'] = vdus[0].vimid
 
-    vnfInsts = NfInstModel.objects.filter(nfinstid=nf_inst_id)
-    content_args['additionalParams']['vnfmid'] = vnfInsts[0].vnfminstid
+    vnfInst_list = NfInstModel.objects.filter(nfinstid=nf_inst_id)
+    addition_paras = content_args['additionalParams']
+    for vnf in vnfInst_list:
+        if vnf.vnfminstid:
+            addition_paras['vnfmid'] = vnf.vnfminstid
+        if vnf.vimInfo and 'vimid' not in addition_paras:
+            vim_info = json.loads(vnf.vimInfo)
+            vimid = ""
+            for key in list(vim_info.keys()):
+                vimid = key
+            addition_paras['vimid'] = vimid
     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)