Add operate api to GVNFM

[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..fe3cb53 100644 (file)
--- a/lcm/lcm/nf/biz/grant_vnf.py
+++ b/lcm/lcm/nf/biz/grant_vnf.py
@@ -18,16 +18,14 @@ 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"
+    lifecycleOperration = grant_type
 
     content_args = {
         'vnfInstanceId': nf_inst_id,
@@ -35,9 +33,10 @@ def grant_resource(data, nf_inst_id, job_id, grant_type, vdus):
         'lifecycleOperation': lifecycleOperration,
         'vnfLcmOpOccId': job_id,
         'addResources': [],
+        'updateResources': [],
         'removeResources': [],
-        'placementConstraint': [],
-        'additionalParam': {}
+        'placementConstraints': [],
+        'additionalParams': {}
     }
 
     if grant_type == "Terminate":
@@ -49,7 +48,7 @@ def grant_resource(data, nf_inst_id, job_id, grant_type, vdus):
                 'resDesId': vdu.resouceid}
             content_args['removeResources'].append(res_def)
             res_index += 1
-        content_args['additionalParam']['vimid'] = vdus[0].vimid
+        content_args['additionalParams']['vimid'] = vdus[0].vimid
     elif grant_type == "Instantiate":
         vim_id = ignore_case_get(ignore_case_get(data, "additionalParams"), "vimId")
         res_index = 1
@@ -61,10 +60,20 @@ def grant_resource(data, nf_inst_id, job_id, grant_type, vdus):
             }
             content_args['addResources'].append(res_def)
             res_index += 1
-        content_args['additionalParam']['vimid'] = vim_id
+        content_args['additionalParams']['vimid'] = vim_id
+    elif grant_type == GRANT_TYPE.OPERATE:
+        res_index = 1
+        for vdu in vdus:
+            res_def = {
+                'type': 'VDU',
+                'resDefId': str(res_index),
+                'resDesId': vdu.resouceid}
+            content_args['updateResources'].append(res_def)
+            res_index += 1
+        content_args['additionalParams']['vimid'] = vdus[0].vimid
 
     vnfInsts = NfInstModel.objects.filter(nfinstid=nf_inst_id)
-    content_args['additionalParam']['vnfmid'] = vnfInsts[0].vnfminstid
+    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))
     return apply_result