Add Heal Api in 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 fe3cb53..92f2235 100644 (file)
--- a/lcm/lcm/nf/biz/grant_vnf.py
+++ b/lcm/lcm/nf/biz/grant_vnf.py
@@ -25,49 +25,90 @@ logger = logging.getLogger(__name__)
 
 def grant_resource(data, nf_inst_id, job_id, grant_type, vdus):
     logger.info("Grant resource begin")
-    lifecycleOperration = grant_type
 
     content_args = {
         'vnfInstanceId': nf_inst_id,
-        'vnfDescriptorId': '',
-        'lifecycleOperation': lifecycleOperration,
         'vnfLcmOpOccId': job_id,
+        'vnfdId': None,  # TODO
+        'flavourId': None,  # TODO
+        'operate': grant_type,
+        'isAutomaticInvocation': True,  # TODO
+        'instantiationLevelId': None,  # TODO
         'addResources': [],
+        'tmpResources': [],
         'updateResources': [],
         'removeResources': [],
         'placementConstraints': [],
-        'additionalParams': {}
+        'vimConstraints': [],
+        'additionalParams': {},
+        '_links': None  # TODO
     }
 
-    if grant_type == "Terminate":
+    if grant_type == GRANT_TYPE.TERMINATE:
         res_index = 1
         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":
+    elif grant_type == GRANT_TYPE.INSTANTIATE:
         vim_id = ignore_case_get(ignore_case_get(data, "additionalParams"), "vimId")
         res_index = 1
         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': None,
+                'resourceTemplateId': None,  # TODO: shall be present for the planned creation of new resources.
+                '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
     elif grant_type == GRANT_TYPE.OPERATE:
         res_index = 1
         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['updateResources'].append(res_def)
             res_index += 1
         content_args['additionalParams']['vimid'] = vdus[0].vimid
@@ -76,4 +117,5 @@ def grant_resource(data, nf_inst_id, job_id, grant_type, vdus):
     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