diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-01 13:59:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-01 13:59:58 +0000 |
| commit | 3636685ede1e841ddfed73a1dfb90851f0003980 (patch) | |
| tree | 77f09d03277f5488de0cfab1319a532a2c9b7168 | |
| parent | 0afb131893a09c5340d3508579a1e9ea6d768537 (diff) | |
| parent | 3424bc6d6238dcfac9d4ff05df6258e52b75b479 (diff) | |
| download | python-novaclient-3636685ede1e841ddfed73a1dfb90851f0003980.tar.gz | |
Merge "Always send volume_id when booting with legacy bdm" into stable/liberty2.30.1
| -rw-r--r-- | novaclient/base.py | 4 | ||||
| -rw-r--r-- | novaclient/tests/functional/test_servers.py | 23 |
2 files changed, 23 insertions, 4 deletions
diff --git a/novaclient/base.py b/novaclient/base.py index a07bd249..2222501d 100644 --- a/novaclient/base.py +++ b/novaclient/base.py @@ -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 diff --git a/novaclient/tests/functional/test_servers.py b/novaclient/tests/functional/test_servers.py index 75be3f47..6c7cf449 100644 --- a/novaclient/tests/functional/test_servers.py +++ b/novaclient/tests/functional/test_servers.py @@ -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. |