summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-12-05 12:59:43 +0000
committerGerrit Code Review <review@openstack.org>2022-12-05 12:59:43 +0000
commit5b42583cb194f6ca64c88d22d359babd49c20311 (patch)
tree362626eb03d7fdfdd631a2bcfd60a47b65267b05 /openstackclient
parent747811fad58aa636ca92834a88fc0424bc42d87e (diff)
parente7bc68735f5010f0712b640e204c6ceb05fa3759 (diff)
downloadpython-openstackclient-5b42583cb194f6ca64c88d22d359babd49c20311.tar.gz
Merge "tests: Add test for multiple blocks devices"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/tests/unit/compute/v2/test_server.py54
1 files changed, 35 insertions, 19 deletions
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index 45aff6a3..bd7ea27c 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -1460,6 +1460,7 @@ class TestServerCreate(TestServer):
self.flavors_mock.get.return_value = self.flavor
self.volume = volume_fakes.create_one_volume()
+ self.volume_alt = volume_fakes.create_one_volume()
self.volumes_mock.get.return_value = self.volume
self.snapshot = volume_fakes.create_one_snapshot()
@@ -2578,11 +2579,13 @@ class TestServerCreate(TestServer):
'key_name': None,
'availability_zone': None,
'admin_pass': None,
- 'block_device_mapping_v2': [{
- 'uuid': self.volume.id,
- 'source_type': 'volume',
- 'destination_type': 'volume',
- }],
+ 'block_device_mapping_v2': [
+ {
+ 'uuid': self.volume.id,
+ 'source_type': 'volume',
+ 'destination_type': 'volume',
+ },
+ ],
'nics': [],
'scheduler_hints': {},
'config_drive': None,
@@ -2609,11 +2612,13 @@ class TestServerCreate(TestServer):
f'volume_type=foo,boot_index=1,delete_on_termination=true,'
f'tag=foo'
)
+ block_device_alt = f'uuid={self.volume_alt.id},source_type=volume'
arglist = [
'--image', 'image1',
'--flavor', self.flavor.id,
'--block-device', block_device,
+ '--block-device', block_device_alt,
self.new_server.name,
]
verifylist = [
@@ -2634,6 +2639,10 @@ class TestServerCreate(TestServer):
'delete_on_termination': 'true',
'tag': 'foo',
},
+ {
+ 'uuid': self.volume_alt.id,
+ 'source_type': 'volume',
+ },
]),
('server_name', self.new_server.name),
]
@@ -2654,20 +2663,27 @@ class TestServerCreate(TestServer):
'key_name': None,
'availability_zone': None,
'admin_pass': None,
- 'block_device_mapping_v2': [{
- 'uuid': self.volume.id,
- 'source_type': 'volume',
- 'destination_type': 'volume',
- 'disk_bus': 'ide',
- 'device_name': 'sdb',
- 'volume_size': '64',
- 'guest_format': 'ext4',
- 'boot_index': 1,
- 'device_type': 'disk',
- 'delete_on_termination': True,
- 'tag': 'foo',
- 'volume_type': 'foo',
- }],
+ 'block_device_mapping_v2': [
+ {
+ 'uuid': self.volume.id,
+ 'source_type': 'volume',
+ 'destination_type': 'volume',
+ 'disk_bus': 'ide',
+ 'device_name': 'sdb',
+ 'volume_size': '64',
+ 'guest_format': 'ext4',
+ 'boot_index': 1,
+ 'device_type': 'disk',
+ 'delete_on_termination': True,
+ 'tag': 'foo',
+ 'volume_type': 'foo',
+ },
+ {
+ 'uuid': self.volume_alt.id,
+ 'source_type': 'volume',
+ 'destination_type': 'volume',
+ },
+ ],
'nics': 'auto',
'scheduler_hints': {},
'config_drive': None,