summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorying.yunlong <ying.yunlong@zte.com.cn>2017-11-13 19:47:51 +0800
committerying.yunlong <ying.yunlong@zte.com.cn>2017-11-13 19:47:51 +0800
commitc794226f618330350de1aaecfe6dedd458e07865 (patch)
tree069b4903d172faacd51a71387075b4c6d07e6202
parent66e8f0b03e23b28ddefb2d678666ab5f4a813eb3 (diff)
Fix vfc-nslcm heal bug
Change-Id: Ie22ad5b67a64f91de655899f3739d42feb4c615e Issue-ID: VFC-589 Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
-rw-r--r--lcm/ns/vnfs/const.py2
-rw-r--r--lcm/ns/vnfs/create_vnfs.py2
-rw-r--r--lcm/ns/vnfs/heal_vnfs.py3
3 files changed, 4 insertions, 3 deletions
diff --git a/lcm/ns/vnfs/const.py b/lcm/ns/vnfs/const.py
index 3775f9cf..bc0047f3 100644
--- a/lcm/ns/vnfs/const.py
+++ b/lcm/ns/vnfs/const.py
@@ -19,6 +19,6 @@ INST_TYPE = enum(VNF=0, VNFM=1)
INST_TYPE_NAME = enum(VNF='VNF', VNFM='VNFM')
PACKAGE_TYPE = enum(VNFD='VNFD', NSD='NSD')
-NFVO_VNF_INST_TIMEOUT_SECOND = 1800
+NFVO_VNF_INST_TIMEOUT_SECOND = 3000
DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'
diff --git a/lcm/ns/vnfs/create_vnfs.py b/lcm/ns/vnfs/create_vnfs.py
index 58b02f55..9315ef92 100644
--- a/lcm/ns/vnfs/create_vnfs.py
+++ b/lcm/ns/vnfs/create_vnfs.py
@@ -238,7 +238,7 @@ class CreateVnfs(Thread):
timeout=NFVO_VNF_INST_TIMEOUT_SECOND)
if ret != JOB_MODEL_STATUS.FINISHED:
- logger.error('VNF instantiation failed on VNFM side.')
+ logger.error('VNF instantiation failed on VNFM side. ret=[%s]', ret)
raise NSLCMException('VNF instantiation failed on VNFM side.')
def write_vnf_creation_info(self):
diff --git a/lcm/ns/vnfs/heal_vnfs.py b/lcm/ns/vnfs/heal_vnfs.py
index 439daa65..dd40fe10 100644
--- a/lcm/ns/vnfs/heal_vnfs.py
+++ b/lcm/ns/vnfs/heal_vnfs.py
@@ -77,7 +77,8 @@ class NFHealService(threading.Thread):
action = ignore_case_get(self.nf_additional_params, 'action')
if action == "restartvm":
- action = "vmReset"
+ # action = "vmReset"
+ action = "vmStart"
actionvminfo = ignore_case_get(self.nf_additional_params, 'actionvminfo')
vmid = ignore_case_get(actionvminfo, 'vmid')