aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-09-19 13:20:01 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-09-19 13:21:44 +0200
commit48c819f97d53b558e7be02f7f0eb5b2f72cabcac (patch)
treed63c5c608773b6968e40fa8e0f0232477d621d96
parenta5d6f526c6b935cf1fc7f02a87e0e1118979edd8 (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>
-rw-r--r--functest/opnfv_tests/openstack/shaker/shaker.py4
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py4
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)