diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-03 19:49:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-03 19:49:42 +0000 |
| commit | e2cd971a03ed8b8bf518b995d32c49a85cae441d (patch) | |
| tree | 18b0c683601af22b8436a4600fe1db81cc37a64c /openstackclient | |
| parent | 6251d7d82a0c4be5c6e82d5db5d26e5d95cb4c96 (diff) | |
| parent | 61cde9c8e85182073b53e3736f8568f2a6d1453c (diff) | |
| download | python-openstackclient-e2cd971a03ed8b8bf518b995d32c49a85cae441d.tar.gz | |
Merge "Fix block-device-mapping when volume_size is empty"
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={}, |