diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-11-30 11:55:02 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-11-30 16:21:55 +0100 |
| commit | 29d58a38f38284cb9a2fa9b9da87682e9256dc5c (patch) | |
| tree | 3cb64ad38d523e9e6c2ea2f60abc41b0f1e8cc3f | |
| parent | 7d30d9b06faa49d400000c72916c49ca0a01ac06 (diff) | |
Adjust timeouts in Vnfs
When testcases fail, the jjobs is aborted and the result isn't
printed.
Change-Id: Ibda6268873303e631705c695a41c50980a3d29e5
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit abd9c1d00cb48a620317e50dd459cb0db2b5f0c5)
| -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 f9548eb2c..c98b1e2ef 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py @@ -323,7 +323,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'), @@ -440,7 +440,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 2cfc2a5d3..b02e9d8e5 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py @@ -479,7 +479,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"): @@ -491,7 +491,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 6192cc547..541c78611 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py @@ -463,7 +463,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"): @@ -474,7 +474,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) |