openstack
/
rally
Code Issues Proposed changes

Stopping server is redundant before cold-migrating server 

In function boot_and_migrate_server, _stop_server is redundant because
cold-migrating server already contains stopping server and
cold-migrating server.

Change-Id: I18047668b02848e6b71ea9abbae575a45c5435a6
Closes-Bug: #1594730
This commit is contained in:
Lv Fumei 2016-06-21 16:58:49 +08:00
parent 9061e03bd8
commit 945fc053a2
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rally/plugins/openstack/scenarios/nova/servers.py
View File

@ -758,7 +758,7 @@ class NovaServers(utils.NovaScenario,
"""Migrate a server.
This scenario launches a VM on a compute node available in
the availability zone and stops the VM, and then migrates the VM
the availability zone, and then migrates the VM
to another compute node on the same availability zone.
:param image: image to be used to boot an instance
@ -766,15 +766,14 @@ class NovaServers(utils.NovaScenario,
:param kwargs: Optional additional arguments for server creation
"""
server = self._boot_server(image, flavor, **kwargs)
self._stop_server(server)
self._migrate(server)
# NOTE(wtakase): This is required because cold migration and resize
# share same code path.
confirm = kwargs.get("confirm", True)
if confirm:
self._resize_confirm(server, status="SHUTOFF")
self._resize_confirm(server, status="ACTIVE")
else:
self._resize_revert(server, status="SHUTOFF")
self._resize_revert(server, status="ACTIVE")
self._delete_server(server)
@types.convert(from_image={"type": "glance_image"},

7
tests/unit/plugins/openstack/scenarios/nova/test_servers.py
View File

@ -653,7 +653,6 @@ class NovaServersTestCase(test.ScenarioTestCase):
scenario = servers.NovaServers(self.context)
scenario.generate_random_name = mock.MagicMock(return_value="name")
scenario._boot_server = mock.MagicMock(return_value=fake_server)
scenario._stop_server = mock.MagicMock()
scenario._migrate = mock.MagicMock()
scenario._resize_confirm = mock.MagicMock()
scenario._resize_revert = mock.MagicMock()
@ -667,16 +666,14 @@ class NovaServersTestCase(test.ScenarioTestCase):
fakearg="fakearg",
confirm=confirm)
scenario._stop_server.assert_called_once_with(fake_server)
scenario._migrate.assert_called_once_with(fake_server)
if confirm:
scenario._resize_confirm.assert_called_once_with(fake_server,
status="SHUTOFF")
status="ACTIVE")
else:
scenario._resize_revert.assert_called_once_with(fake_server,
status="SHUTOFF")
status="ACTIVE")
scenario._delete_server.assert_called_once_with(fake_server)