openstack
/
watcher-tempest-plugin
Code Issues Proposed changes

Modify method name 

Make the method "_create_one_instance_per_host" clear

Change-Id: I4b637dff733de62fd706274a5022f4359058e574
This commit is contained in:
chenke 2019-02-27 14:34:07 +08:00
parent 7552c51df8
commit bb2a7ab78f
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
watcher_tempest_plugin/tests/scenario/base.py
View File

@ -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.

8
watcher_tempest_plugin/tests/scenario/test_execute_actuator.py
View File

@ -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"]

2
watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py
View File

@ -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)

2
watcher_tempest_plugin/tests/scenario/test_execute_host_maintenance.py
View File

@ -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}

2
watcher_tempest_plugin/tests/scenario/test_execute_vm_workload_consolidation.py
View File

@ -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")

2
watcher_tempest_plugin/tests/scenario/test_execute_workload_balancing.py
View File

@ -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()