diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-09-19 13:20:01 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-09-19 13:23:26 +0200 |
| commit | 46fa9c0f6cb4616651d774134ebfeecf4672217f (patch) | |
| tree | 2b83229e0bacdd377c8089c849e3a770343c09b3 | |
| parent | 725453995986d033dd854e62dd650958999dc209 (diff) | |
Remove any cores quota in tempest_scenario and shaker
Both can reach the default limit if lots of computes available.
Co-Authored-By: Vincent Huet <vincent.huet@orange.com>
Change-Id: Ifd8a1080a08f55bf4b0efe1858e79fa4aff75895
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 48c819f97d53b558e7be02f7f0eb5b2f72cabcac)
| -rw-r--r-- | functest/opnfv_tests/openstack/shaker/shaker.py | 4 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py index 03aeccafc..46a44c775 100644 --- a/functest/opnfv_tests/openstack/shaker/shaker.py +++ b/functest/opnfv_tests/openstack/shaker/shaker.py @@ -41,6 +41,7 @@ class Shaker(singlevm.SingleVm2): create_server_timeout = 300 shaker_timeout = '3600' quota_instances = -1 + quota_cores = -1 def __init__(self, **kwargs): super(Shaker, self).__init__(**kwargs) @@ -85,7 +86,8 @@ class Shaker(singlevm.SingleVm2): domain=self.project.domain.id) self.orig_cloud.set_compute_quotas( self.project.project.name, - instances=self.quota_instances) + instances=self.quota_instances, + cores=self.quota_cores) scpc = scp.SCPClient(self.ssh.get_transport()) scpc.put('/home/opnfv/functest/conf/env_file', remote_path='~/') if os.environ.get('OS_CACERT'): diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index faf2ab5ca..a6ec568a0 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -644,9 +644,11 @@ class TempestScenario(TempestCommon): """Tempest scenario testcase implementation class.""" quota_instances = -1 + quota_cores = -1 def run(self, **kwargs): self.orig_cloud.set_compute_quotas( self.project.project.name, - instances=self.quota_instances) + instances=self.quota_instances, + cores=self.quota_cores) return super(TempestScenario, self).run(**kwargs) |