diff --git a/watcher_tempest_plugin/tests/scenario/base.py b/watcher_tempest_plugin/tests/scenario/base.py index 3800b88..af7822c 100644 --- a/watcher_tempest_plugin/tests/scenario/base.py +++ b/watcher_tempest_plugin/tests/scenario/base.py @@ -165,8 +165,8 @@ class BaseInfraOptimScenarioTest(manager.ScenarioTest): **kwargs) return body - def _create_one_instance_per_host(self, metrics=dict()): - """Create 1 instance per compute node + def _create_one_instance_per_host_with_statistic(self, metrics=dict()): + """Create 1 instance per compute node and make instance statistic This goes up to the min_compute_nodes threshold so that things don't get crazy if you have 1000 compute nodes but set min to 3. diff --git a/watcher_tempest_plugin/tests/scenario/test_execute_actuator.py b/watcher_tempest_plugin/tests/scenario/test_execute_actuator.py index bf67d24..73bddae 100644 --- a/watcher_tempest_plugin/tests/scenario/test_execute_actuator.py +++ b/watcher_tempest_plugin/tests/scenario/test_execute_actuator.py @@ -82,7 +82,7 @@ class TestExecuteActionsViaActuator(base.BaseInfraOptimScenarioTest): return self.mgr.flavors_client.list_flavors()['flavors'] def _prerequisite_param_for_migrate_action(self): - created_instances = self._create_one_instance_per_host() + created_instances = self._create_one_instance_per_host_with_statistic() instance = created_instances[0] source_node = created_instances[0]["OS-EXT-SRV-ATTR:host"] destination_node = created_instances[-1]["OS-EXT-SRV-ATTR:host"] @@ -97,7 +97,7 @@ class TestExecuteActionsViaActuator(base.BaseInfraOptimScenarioTest): return parameters def _prerequisite_param_for_resize_action(self): - created_instances = self._create_one_instance_per_host() + created_instances = self._create_one_instance_per_host_with_statistic() instance = created_instances[0] current_flavor_id = instance['flavor']['id'] @@ -227,7 +227,7 @@ class TestExecuteActionsViaActuator(base.BaseInfraOptimScenarioTest): def test_execute_resize(self): self.addCleanup(self.rollback_compute_nodes_status) - created_instances = self._create_one_instance_per_host() + created_instances = self._create_one_instance_per_host_with_statistic() instance = created_instances[0] current_flavor_id = instance['flavor']['id'] @@ -245,7 +245,7 @@ class TestExecuteActionsViaActuator(base.BaseInfraOptimScenarioTest): def test_execute_migrate(self): self.addCleanup(self.rollback_compute_nodes_status) - created_instances = self._create_one_instance_per_host() + created_instances = self._create_one_instance_per_host_with_statistic() instance = created_instances[0] source_node = created_instances[0]["OS-EXT-SRV-ATTR:host"] destination_node = created_instances[-1]["OS-EXT-SRV-ATTR:host"] diff --git a/watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py b/watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py index 06d9e88..8d88502 100644 --- a/watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py +++ b/watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py @@ -66,7 +66,7 @@ class TestExecuteBasicStrategy(base.BaseInfraOptimScenarioTest): - get results and make sure it succeeded """ self.addCleanup(self.rollback_compute_nodes_status) - self._create_one_instance_per_host() + self._create_one_instance_per_host_with_statistic() self.make_host_statistic() _, goal = self.client.show_goal(self.GOAL_NAME) diff --git a/watcher_tempest_plugin/tests/scenario/test_execute_host_maintenance.py b/watcher_tempest_plugin/tests/scenario/test_execute_host_maintenance.py index c1d71f8..9291a82 100644 --- a/watcher_tempest_plugin/tests/scenario/test_execute_host_maintenance.py +++ b/watcher_tempest_plugin/tests/scenario/test_execute_host_maintenance.py @@ -60,7 +60,7 @@ class TestExecuteHostMaintenanceStrategy(base.BaseInfraOptimScenarioTest): def test_execute_host_maintenance(self): """Execute an action plan using the host_maintenance strategy""" self.addCleanup(self.rollback_compute_nodes_status) - instances = self._create_one_instance_per_host() + instances = self._create_one_instance_per_host_with_statistic() hostname = instances[0].get('OS-EXT-SRV-ATTR:hypervisor_hostname') audit_parameters = {"maintenance_node": hostname} diff --git a/watcher_tempest_plugin/tests/scenario/test_execute_vm_workload_consolidation.py b/watcher_tempest_plugin/tests/scenario/test_execute_vm_workload_consolidation.py index e532515..ed852c1 100644 --- a/watcher_tempest_plugin/tests/scenario/test_execute_vm_workload_consolidation.py +++ b/watcher_tempest_plugin/tests/scenario/test_execute_vm_workload_consolidation.py @@ -80,7 +80,7 @@ class TestExecuteVmWorkloadBalanceStrategy(base.BaseInfraOptimScenarioTest): 'archive_policy_name': 'low' } } - self._create_one_instance_per_host(metrics) + self._create_one_instance_per_host_with_statistic(metrics) _, goal = self.client.show_goal(self.GOAL_NAME) _, strategy = self.client.show_strategy("vm_workload_consolidation") diff --git a/watcher_tempest_plugin/tests/scenario/test_execute_workload_balancing.py b/watcher_tempest_plugin/tests/scenario/test_execute_workload_balancing.py index 5dc9af4..2b5ed95 100644 --- a/watcher_tempest_plugin/tests/scenario/test_execute_workload_balancing.py +++ b/watcher_tempest_plugin/tests/scenario/test_execute_workload_balancing.py @@ -61,7 +61,7 @@ class TestExecuteWorkloadBalancingStrategy(base.BaseInfraOptimScenarioTest): def test_execute_workload_stabilization(self): """Execute an action plan using the workload_stabilization strategy""" self.addCleanup(self.rollback_compute_nodes_status) - instances = self._create_one_instance_per_host() + instances = self._create_one_instance_per_host_with_statistic() self._pack_all_created_instances_on_one_host(instances) self.make_host_statistic()