summaryrefslogtreecommitdiffstats
path: root/lcm/lcm/pub/vimapi/adaptor.py
diff options
context:
space:
mode:
authorfujinhua <fu.jinhua@zte.com.cn>2018-11-22 09:20:21 +0800
committerfujinhua <fu.jinhua@zte.com.cn>2018-11-22 10:11:02 +0800
commitb2c15bc4a66f804d462e213a7cd16aa5abe24931 (patch)
tree7486697bff95dba41c4d45726473e13ceb2d06ce /lcm/lcm/pub/vimapi/adaptor.py
parent1cbfeb8366d32855c1d4daf4e7371bb4081f89de (diff)
Fix vnf heal logic
Change-Id: I05edef058cceef70f250731bde114534eadbfe4d Issue-ID: VFC-1163 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
Diffstat (limited to 'lcm/lcm/pub/vimapi/adaptor.py')
-rw-r--r--lcm/lcm/pub/vimapi/adaptor.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py
index 3b959c45..bffdcbe6 100644
--- a/lcm/lcm/pub/vimapi/adaptor.py
+++ b/lcm/lcm/pub/vimapi/adaptor.py
@@ -88,6 +88,7 @@ def action_vm(action_type, server, vimId, tenantId):
else:
param["reboot"]["type"] = "HARD"
res_id = server["id"]
+ logger.debug("%s,%s,%s,%s", vimId, tenantId, res_id, param)
api.action_vm(vimId, tenantId, res_id, param)
@@ -116,15 +117,20 @@ def heal_vim_res(vdus, vnfd_info, do_notify, data, vim_cache, res_cache):
vimid = data["vimid"]
tenant = data["tenant"]
actionType = data["action"]
+ resid = ''
if actionType == HEAL_ACTION_TYPE.START:
+ resid = vdus[0]["vdu_id"]
create_vm(vim_cache, res_cache, vnfd_info, vdus[0], do_notify, RES_VM)
elif actionType == HEAL_ACTION_TYPE.RESTART:
+ resid = vdus[0].resourceid
+ logger.debug("Start restart vm(%s)", resid)
vm_info = api.get_vm(vimid, tenant, vdus[0].resourceid)
+ logger.debug("vminfo=%s", vm_info)
action_vm(ACTION_TYPE.REBOOT, vm_info, vimid, tenant)
except VimException as e:
- logger.error("Failed to Heal %s(%s)", RES_VM, vdus[0]["vdu_id"])
+ logger.error("Failed to Heal %s(%s)", RES_VM, resid)
logger.error("%s:%s", e.http_code, e.message)
- raise NFLCMException("Failed to Heal %s(%s)", RES_VM, vdus[0]["vdu_id"])
+ raise NFLCMException("Failed to Heal %s(%s)" % (RES_VM, resid))
def create_vim_res(data, do_notify, vim_cache={}, res_cache={}):