diff options
| author | Jens Rosenboom <j.rosenboom@x-ion.de> | 2017-03-29 14:17:49 +0000 |
|---|---|---|
| committer | Jens Rosenboom <j.rosenboom@x-ion.de> | 2017-04-03 11:26:35 +0000 |
| commit | 61cde9c8e85182073b53e3736f8568f2a6d1453c (patch) | |
| tree | 438dff3e6c962d5440991e416ba96d0f5b5f80a6 /openstackclient | |
| parent | ca06a09d4d900f6196eeefb1cbfcef462c12b39c (diff) | |
| download | python-openstackclient-61cde9c8e85182073b53e3736f8568f2a6d1453c.tar.gz | |
Fix block-device-mapping when volume_size is empty
The Nova API responds with an validation error when a bdm is submitted
containing an empty volume_size. So instead omit that attribute when it
is empty.
Change-Id: Iba905fca8c440a03e828c20922f3b813bba3fa3a
Closes-Bug: 1677236
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/unit/compute/v2/test_server.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 1fe5bb0d..3ae75167 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -544,7 +544,7 @@ class CreateServer(command.ShowOne): else: mapping['source_type'] = 'volume' mapping['destination_type'] = 'volume' - if len(dev_map) > 2: + if len(dev_map) > 2 and dev_map[2]: mapping['volume_size'] = dev_map[2] if len(dev_map) > 3: mapping['delete_on_termination'] = dev_map[3] diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py index 7691ef59..a0716e4c 100644 --- a/openstackclient/tests/unit/compute/v2/test_server.py +++ b/openstackclient/tests/unit/compute/v2/test_server.py @@ -817,8 +817,7 @@ class TestServerCreate(TestServer): 'uuid': real_volume_mapping.split(':', 1)[0], 'destination_type': 'volume', 'source_type': 'volume', - 'delete_on_termination': '0', - 'volume_size': '' + 'delete_on_termination': '0' }], nics=[], scheduler_hints={}, |