Ease debugging Shaker

[functest.git] / functest / opnfv_tests / openstack / shaker / shaker.py

diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py
index 03aecca..d7f97c1 100644 (file)
--- a/functest/opnfv_tests/openstack/shaker/shaker.py
+++ b/functest/opnfv_tests/openstack/shaker/shaker.py
@@ -41,13 +41,14 @@ 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)
         self.role = None
 
     def check_requirements(self):
-        if len(self.orig_cloud.list_hypervisors()) < 2:
+        if self.count_active_hypervisors() < 2:
             self.__logger.warning("Shaker requires at least 2 hypervisors")
             self.is_skipped = True
             self.project.clean()
@@ -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'):
@@ -103,7 +105,7 @@ class Shaker(singlevm.SingleVm2):
             'export OS_PASSWORD="{}" && '
             '{}'
             'env && '
-            'timeout {} shaker --image-name {} --flavor-name {} '
+            'timeout {} shaker --debug --image-name {} --flavor-name {} '
             '--server-endpoint {}:9000 --external-net {} --dns-nameservers {} '
             '--scenario openstack/full_l2,'
             'openstack/full_l3_east_west,'