From 47a57b02912f23d6e7452341db8137b7ac594017 Mon Sep 17 00:00:00 2001 From: chenhb-zte Date: Mon, 9 May 2016 13:55:43 -0400 Subject: [PATCH] Fix bugs on booting a server from volume like "Change #312845" The arg of image must be None,when booting server from volume. Otherwise still boot server from image. Related function: boot_server_from_volume_and_delete, boot_server_from_volume_and_resize, boot_server_from_volume_and_live_migrate. Change-Id: I4338e08a7b3de9bde89265d7f4c342aaec6ab565 --- rally/plugins/openstack/scenarios/nova/servers.py | 6 +++--- tests/unit/plugins/openstack/scenarios/nova/test_servers.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rally/plugins/openstack/scenarios/nova/servers.py b/rally/plugins/openstack/scenarios/nova/servers.py index e590a75b..18a861d2 100644 --- a/rally/plugins/openstack/scenarios/nova/servers.py +++ b/rally/plugins/openstack/scenarios/nova/servers.py @@ -154,7 +154,7 @@ class NovaServers(utils.NovaScenario, """ volume = self._create_volume(volume_size, imageRef=image) block_device_mapping = {"vda": "%s:::1" % volume.id} - server = self._boot_server(image, flavor, + server = self._boot_server(None, flavor, block_device_mapping=block_device_mapping, **kwargs) self.sleep_between(min_sleep, max_sleep) @@ -531,7 +531,7 @@ class NovaServers(utils.NovaScenario, boot_server_kwargs["block_device_mapping"] = { "vda": "%s:::1" % volume.id} - server = self._boot_server(image, flavor, **boot_server_kwargs) + server = self._boot_server(None, flavor, **boot_server_kwargs) self.sleep_between(min_sleep, max_sleep) self._resize(server, to_flavor) @@ -678,7 +678,7 @@ class NovaServers(utils.NovaScenario, """ volume = self._create_volume(volume_size, imageRef=image) block_device_mapping = {"vda": "%s:::1" % volume.id} - server = self._boot_server(image, flavor, + server = self._boot_server(None, flavor, block_device_mapping=block_device_mapping, **kwargs) self.sleep_between(min_sleep, max_sleep) diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_servers.py b/tests/unit/plugins/openstack/scenarios/nova/test_servers.py index 5cbf72a4..8004429d 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_servers.py +++ b/tests/unit/plugins/openstack/scenarios/nova/test_servers.py @@ -356,7 +356,7 @@ class NovaServersTestCase(test.ScenarioTestCase): scenario._create_volume.assert_called_once_with(5, imageRef="img") scenario._boot_server.assert_called_once_with( - "img", 0, + None, 0, block_device_mapping={"vda": "volume_id:::1"}, fakearg="f") scenario.sleep_between.assert_called_once_with(10, 20) @@ -528,7 +528,7 @@ class NovaServersTestCase(test.ScenarioTestCase): scenario._create_volume.assert_called_once_with(10, imageRef="img") scenario._boot_server.assert_called_once_with( - "img", flavor, + None, flavor, block_device_mapping={"vda": "volume_id:::1"}) scenario.sleep_between.assert_called_once_with(10, 20) scenario._resize.assert_called_once_with(fake_server, to_flavor) @@ -593,7 +593,7 @@ class NovaServersTestCase(test.ScenarioTestCase): scenario._create_volume.assert_called_once_with(5, imageRef="img") scenario._boot_server.assert_called_once_with( - "img", 0, + None, 0, block_device_mapping={"vda": "volume_id:::1"}, fakearg="f")