openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Always send volume_id when booting with legacy bdm" into stable/liberty

This commit is contained in:
Jenkins 2015-10-01 13:59:58 +00:00 committed by Gerrit Code Review
parent 0afb131893 3424bc6d62
commit 3636685ede
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
novaclient/base.py
View File

@ -289,7 +289,9 @@ class BootingManagerWithFind(ManagerWithFind):
mapping_parts = mapping.split(':')
source_id = mapping_parts[0]
if len(mapping_parts) > 1:
if len(mapping_parts) == 1:
bdm_dict['volume_id'] = source_id
elif len(mapping_parts) > 1:
source_type = mapping_parts[1]
if source_type.startswith('snap'):
bdm_dict['snapshot_id'] = source_id

23
novaclient/tests/functional/test_servers.py
View File

@ -20,7 +20,9 @@ class TestServersBootNovaClient(base.ClientTestBase):
"""Servers boot functional tests.
"""
def test_boot_server_with_legacy_bdm(self):
COMPUTE_API_VERSION = "2.1"
def _boot_server_with_legacy_bdm(self, bdm_params=()):
volume_size = 1
volume_name = str(uuid.uuid4())
volume = self.client.volumes.create(size=volume_size,
@ -28,17 +30,32 @@ class TestServersBootNovaClient(base.ClientTestBase):
imageRef=self.image.id)
self.wait_for_volume_status(volume, "available")
bdm_params = ':'.join(bdm_params)
if bdm_params:
bdm_params = ''.join((':', bdm_params))
server_info = self.nova("boot", params=(
"%(name)s --flavor %(flavor)s --poll "
"--block-device-mapping vda=%(volume_id)s:::1" % {
"--block-device-mapping vda=%(volume_id)s%(bdm_params)s" % {
"name": str(uuid.uuid4()), "flavor":
self.flavor.id,
"volume_id": volume.id}))
"volume_id": volume.id,
"bdm_params": bdm_params}))
server_id = self._get_value_from_the_table(server_info, "id")
self.client.servers.delete(server_id)
self.wait_for_resource_delete(server_id, self.client.servers)
def test_boot_server_with_legacy_bdm(self):
# bdm v1 format
# <id>:<type>:<size(GB)>:<delete-on-terminate>
# params = (type, size, delete-on-terminate)
params = ('', '', '1')
self._boot_server_with_legacy_bdm(bdm_params=params)
def test_boot_server_with_legacy_bdm_volume_id_only(self):
self._boot_server_with_legacy_bdm()
class TestServersListNovaClient(base.ClientTestBase):
"""Servers list functional tests.