openstack/rally-openstack
Code Issues Proposed changes

Change "%s:::1" to "%s:::0" in block_device_mapping

Browse Source 
If block_device_mapping = {"vda": "%s:::1" % volume.id},when user
want to delete server,it will delete both vm and volume.
If that,the time of nova.delete_server is not exactly,because it
spend some time to delete volume.

Change-Id: I200d8346fcd72dc18cfae7aa43b981ca5ade2194
This commit is contained in:
lianghao 2018-12-03 16:57:31 +08:00
parent c3d1f032c1
commit 0fa9179ccc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rally_openstack/scenarios/nova/servers.py
View File

@ -187,7 +187,7 @@ class BootServerFromVolumeAndDelete(utils.NovaScenario,
"""
volume = self.cinder.create_volume(volume_size, imageRef=image,
volume_type=volume_type)
block_device_mapping = {"vda": "%s:::1" % volume.id}
block_device_mapping = {"vda": "%s:::0" % volume.id}
server = self._boot_server(None, flavor,
block_device_mapping=block_device_mapping,
**kwargs)
@ -356,7 +356,7 @@ class BootServerFromVolume(utils.NovaScenario, cinder_utils.CinderBasic):
"""
volume = self.cinder.create_volume(volume_size, imageRef=image,
volume_type=volume_type)
block_device_mapping = {"vda": "%s:::1" % volume.id}
block_device_mapping = {"vda": "%s:::0" % volume.id}
self._boot_server(None, flavor, auto_assign_nic=auto_assign_nic,
block_device_mapping=block_device_mapping,
**kwargs)
@ -591,7 +591,7 @@ class BootServerFromVolumeAndResize(utils.NovaScenario,
volume = self.cinder.create_volume(volume_size, imageRef=image,
**create_volume_kwargs)
boot_server_kwargs["block_device_mapping"] = {
"vda": "%s:::1" % volume.id}
"vda": "%s:::0" % volume.id}
server = self._boot_server(None, flavor, **boot_server_kwargs)
self.sleep_between(min_sleep, max_sleep)
@ -766,7 +766,7 @@ class BootServerFromVolumeAndLiveMigrate(utils.NovaScenario,
"""
volume = self.cinder.create_volume(volume_size, imageRef=image,
volume_type=volume_type)
block_device_mapping = {"vda": "%s:::1" % volume.id}
block_device_mapping = {"vda": "%s:::0" % volume.id}
server = self._boot_server(None, flavor,
block_device_mapping=block_device_mapping,
**kwargs)

8
tests/unit/scenarios/nova/test_servers.py
View File

@ -364,7 +364,7 @@ class NovaServersTestCase(test.ScenarioTestCase):
volume_type=None)
scenario._boot_server.assert_called_once_with(
None, 0, auto_assign_nic=False,
block_device_mapping={"vda": "volume_id:::1"},
block_device_mapping={"vda": "volume_id:::0"},
fakearg="f")
@mock.patch("rally_openstack.services.storage.block.BlockStorage")
@ -387,7 +387,7 @@ class NovaServersTestCase(test.ScenarioTestCase):
volume_type=None)
scenario._boot_server.assert_called_once_with(
None, 0,
block_device_mapping={"vda": "volume_id:::1"},
block_device_mapping={"vda": "volume_id:::0"},
fakearg="f")
scenario.sleep_between.assert_called_once_with(10, 20)
scenario._delete_server.assert_called_once_with(fake_server,
@ -685,7 +685,7 @@ class NovaServersTestCase(test.ScenarioTestCase):
cinder.create_volume.assert_called_once_with(10, imageRef="img")
scenario._boot_server.assert_called_once_with(
None, flavor,
block_device_mapping={"vda": "volume_id:::1"})
block_device_mapping={"vda": "volume_id:::0"})
scenario.sleep_between.assert_called_once_with(10, 20)
scenario._resize.assert_called_once_with(fake_server, to_flavor)
@ -745,7 +745,7 @@ class NovaServersTestCase(test.ScenarioTestCase):
scenario._boot_server.assert_called_once_with(
None, 0,
block_device_mapping={"vda": "volume_id:::1"},
block_device_mapping={"vda": "volume_id:::0"},
fakearg="f")
scenario.sleep_between.assert_called_once_with(10, 20)