min_computes_nodes is also used as max values

Its max value is now 10 according to the default quota.

Change-Id: Ie7bfcb224e821c15d38d0cba1d9f080548613e79
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit f21f139f9d24d282310d0830a053169532e75596)

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index c6566ca..37da36b 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -580,7 +580,8 @@ class TempestCommon(singlevm.VmReady2):
         self.deployment_dir = self.get_verifier_deployment_dir(
             self.verifier_id, self.deployment_id)
 
-        compute_cnt = self.count_hypervisors()
+        compute_cnt = self.count_hypervisors() if self.count_hypervisors(
+            ) <= 10 else 10
         self.image_alt = self.publish_image_alt()
         self.flavor_alt = self.create_flavor_alt()
         LOGGER.debug("flavor: %s", self.flavor_alt)
@@ -659,20 +660,6 @@ class TempestCommon(singlevm.VmReady2):
         return super(TempestCommon, self).is_successful()
 
 
-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,
-            cores=self.quota_cores)
-        return super(TempestScenario, self).run(**kwargs)
-
-
 class TempestHorizon(TempestCommon):
     """Tempest Horizon testcase implementation class."""
 

diff --git a/setup.cfg b/setup.cfg
index 9121930..da7bb2f 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,7 +26,6 @@ xtesting.testcase =
     cinder_test = functest.opnfv_tests.openstack.cinder.cinder_test:CinderCheck
     odl = functest.opnfv_tests.sdn.odl.odl:ODLTests
     tempest_common = functest.opnfv_tests.openstack.tempest.tempest:TempestCommon
-    tempest_scenario = functest.opnfv_tests.openstack.tempest.tempest:TempestScenario
     tempest_horizon = functest.opnfv_tests.openstack.tempest.tempest:TempestHorizon
     tempest_heat = functest.opnfv_tests.openstack.tempest.tempest:TempestHeat
     rally_sanity = functest.opnfv_tests.openstack.rally.rally:RallySanity