aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2019-06-21 12:49:28 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-06-21 12:49:28 +0000
commit285a7114e586b24d37ccbb60f32c1e3e8a199de9 (patch)
tree710090e1f8ba32fb06455c5fe731edc8ef0b904d
parentf1a30b6431ff32f498bee48d13e520a4e3d939b1 (diff)
parentc948a5443449382883a2544bebcc991cb1234bd3 (diff)
Merge "Remove quota about instances in shaker" into stable/hunter
-rw-r--r--functest/opnfv_tests/openstack/shaker/shaker.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py
index 1ee669ce3..fd31ea689 100644
--- a/functest/opnfv_tests/openstack/shaker/shaker.py
+++ b/functest/opnfv_tests/openstack/shaker/shaker.py
@@ -40,6 +40,7 @@ class Shaker(singlevm.SingleVm2):
ssh_connect_loops = 12
create_server_timeout = 300
shaker_timeout = '3600'
+ quota_instances = -1
def __init__(self, **kwargs):
super(Shaker, self).__init__(**kwargs)
@@ -82,6 +83,9 @@ class Shaker(singlevm.SingleVm2):
"heat_stack_owner", user=self.project.user.id,
project=self.project.project.id,
domain=self.project.domain.id)
+ self.orig_cloud.set_compute_quotas(
+ self.project.project.name,
+ instances=self.quota_instances)
scpc = scp.SCPClient(self.ssh.get_transport())
scpc.put('/home/opnfv/functest/conf/env_file', remote_path='~/')
if os.environ.get('OS_CACERT'):