diff options
author | Jose Lausuch <jalausuch@suse.com> | 2017-11-30 14:31:11 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-11-30 14:31:11 +0000 |
commit | 462b1f77176092d2ea075f32bf60d06920c87240 (patch) | |
tree | 7761360c8568619bc12312cd9dd03ed869391a4b | |
parent | 4047bc91468525ca4f46c63d74dbe9fc9521e49f (diff) | |
parent | abd9c1d00cb48a620317e50dd459cb0db2b5f0c5 (diff) |
Merge "Adjust timeouts in Vnfs"
-rw-r--r-- | functest/opnfv_tests/vnf/ims/cloudify_ims.py | 4 | ||||
-rw-r--r-- | functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py | 4 | ||||
-rw-r--r-- | functest/opnfv_tests/vnf/ims/orchestra_openims.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py index 2fdad3c35..b8a815c28 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py @@ -325,7 +325,7 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase): _get_deployment_environment_creation_execution( cfy_client, descriptor.get('name')), self.__logger, - timeout=600) + timeout=300) self.__logger.info("Start the VNF Instance deployment") execution = cfy_client.executions.start(descriptor.get('name'), @@ -442,7 +442,7 @@ def get_config(parameter, file_path): return value -def wait_for_execution(client, execution, logger, timeout=2400, ): +def wait_for_execution(client, execution, logger, timeout=1500, ): """Wait for a workflow execution on Cloudify Manager.""" # if execution already ended - return without waiting if execution.status in Execution.END_STATES: diff --git a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py index c6e96e1d0..4593a1b8b 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py @@ -478,7 +478,7 @@ class ClearwaterImsVnf(vnf.VnfOnBoarding): self.logger.info("Waiting for Open Baton NFVO to be up and running...") timeout = 0 - while timeout < 45: + while timeout < 20: if servertest( self.mano['details']['fip'].ip, "8080"): @@ -490,7 +490,7 @@ class ClearwaterImsVnf(vnf.VnfOnBoarding): time.sleep(60) timeout += 1 - if timeout >= 45: + if timeout >= 20: duration = time.time() - start_time self.details["orchestrator"].update( status='FAIL', duration=duration) diff --git a/functest/opnfv_tests/vnf/ims/orchestra_openims.py b/functest/opnfv_tests/vnf/ims/orchestra_openims.py index f4c140e53..fcb65e734 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py @@ -461,7 +461,7 @@ class OpenImsVnf(vnf.VnfOnBoarding): self.logger.info("Waiting for Open Baton NFVO to be up and running...") timeout = 0 - while timeout < 45: + while timeout < 20: if servertest( self.mano['details']['fip'].ip, "8080"): @@ -472,7 +472,7 @@ class OpenImsVnf(vnf.VnfOnBoarding): time.sleep(60) timeout += 1 - if timeout >= 45: + if timeout >= 20: duration = time.time() - start_time self.details["orchestrator"].update( status='FAIL', duration=duration) |