aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFu Jinhua <fu.jinhua@zte.com.cn>2017-11-09 12:56:34 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-09 12:56:34 +0000
commit6ba4c7357c7f8032a8ec368443ab95533a02aaf5 (patch)
treedc50c29cdbc0df3e468998243c97893dca1f905d
parente0886b3e0d1e6433e9830c21e16cfde54e8d6734 (diff)
parent3a865cbd2f5dd1d9ca9e4715faf42c16ca65545d (diff)
Merge "Fix vfc-lcm heal func bug"
-rw-r--r--lcm/ns/vnfs/heal_vnfs.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lcm/ns/vnfs/heal_vnfs.py b/lcm/ns/vnfs/heal_vnfs.py
index 2ba7c8a9..5436f510 100644
--- a/lcm/ns/vnfs/heal_vnfs.py
+++ b/lcm/ns/vnfs/heal_vnfs.py
@@ -66,7 +66,7 @@ class NFHealService(threading.Thread):
logger.error('NF instance[id=%s] does not exist' % self.vnf_instance_id)
raise NSLCMException('NF instance[id=%s] does not exist' % self.vnf_instance_id)
logger.debug('vnfd_model = %s, vnf_instance_id = %s' % (nf_info[0].vnfd_model, self.vnf_instance_id))
- self.nf_model = json.loads(nf_info[0].vnfd_model)
+ self.nf_model = nf_info[0].vnfd_model
self.m_nf_inst_id = nf_info[0].mnfinstid
self.vnfm_inst_id = nf_info[0].vnfm_inst_id
self.nf_additional_params = ignore_case_get(self.data, 'additionalParams')
@@ -83,7 +83,7 @@ class NFHealService(threading.Thread):
vmid = ignore_case_get(actionvminfo, 'vmid')
vmname = ignore_case_get(actionvminfo, 'vmname')
- vduid = self.get_vudId(vmid, self.vnf_instance_id)
+ vduid = self.get_vudId(vmid)
self.nf_heal_params = {
"action": action,