diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2018-03-07 19:05:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-07 19:05:14 +0000 |
| commit | d5a2c20d8de2796b2d2e2143ddfb2ba839a0e999 (patch) | |
| tree | 4fa5ef47b8a22c37e080789160f7eff25ffa26b9 | |
| parent | 0c455af95a0f2258401b54cbca0d84732433fb24 (diff) | |
| parent | 1b76131a65f32ebcfc83fa9b4b53d681e6ab25e1 (diff) | |
Merge "NFVi Test stops after one hour even if configured context duration is longer"
| -rw-r--r-- | yardstick/network_services/vnf_generic/vnf/sample_vnf.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py index f16b4142d..ad78774f0 100644 --- a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py +++ b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py @@ -609,8 +609,10 @@ class ScenarioHelper(object): @property def timeout(self): - return self.options.get('timeout', DEFAULT_VNF_TIMEOUT) - + test_duration = self.scenario_cfg.get('runner', {}).get('duration', + self.options.get('timeout', DEFAULT_VNF_TIMEOUT)) + test_timeout = self.options.get('timeout', DEFAULT_VNF_TIMEOUT) + return test_duration if test_duration > test_timeout else test_timeout class SampleVNF(GenericVNF): """ Class providing file-like API for generic VNF implementation """ |