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=1997e0c052872f3ce1b1cae2c3abcd17f9f4a1e3;hpb=0ce55f5401f26c0acb975b718e638f0c650a93eb;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/biz/grant_vnf.py b/lcm/lcm/nf/biz/grant_vnf.py
index 1997e0c0..80ff035c 100644
--- a/lcm/lcm/nf/biz/grant_vnf.py
+++ b/lcm/lcm/nf/biz/grant_vnf.py
@@ -18,53 +18,100 @@ 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': [],
-        'placementConstraints': [],
+        # '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['additionalParams']['vimid'] = vdus[0].vimid
-    elif grant_type == "Instantiate":
+        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 = {
-                '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['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),
+                '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 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)
     return apply_result