From 925de8b965b6d2251786d3c88afb833ddc66db33 Mon Sep 17 00:00:00 2001 From: liusheng Date: Mon, 26 Dec 2016 10:37:03 +0800 Subject: [PATCH] Change 'port-type' to 'port_type' when pass the parameter to API The nimble api require 'port_type' when creating a server with port type specified, but currently the client pass a 'port-type' parameter. Change-Id: I4be883d41e5b8174f1870f2ed41f1d325a01537d Closes-Bug: #1652551 --- nimbleclient/osc/v1/server.py | 5 +++++ nimbleclient/tests/unit/osc/v1/test_server.py | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/nimbleclient/osc/v1/server.py b/nimbleclient/osc/v1/server.py index d7a130d..cb96877 100644 --- a/nimbleclient/osc/v1/server.py +++ b/nimbleclient/osc/v1/server.py @@ -86,6 +86,11 @@ class CreateServer(command.ShowOne): self.app.client_manager.image.images, parsed_args.image) + for nic in parsed_args.nic: + if 'port-type' in nic: + nic['port_type'] = nic['port-type'] + del nic['port-type'] + data = bc_client.server.create( name=parsed_args.name, image_uuid=image_data.id, diff --git a/nimbleclient/tests/unit/osc/v1/test_server.py b/nimbleclient/tests/unit/osc/v1/test_server.py index 1b2d060..8b12266 100644 --- a/nimbleclient/tests/unit/osc/v1/test_server.py +++ b/nimbleclient/tests/unit/osc/v1/test_server.py @@ -13,6 +13,7 @@ # under the License. # +import copy import mock import uuid @@ -74,10 +75,15 @@ class TestServerCreate(TestServer): ('name', name), ('flavor', flavor_id), ('image', image_id)] + called_networks = copy.deepcopy(networks) + for nic in called_networks: + if 'port-type' in nic: + nic['port_type'] = nic['port-type'] + del nic['port-type'] called_data = {'name': name, 'image_uuid': image_id, 'instance_type_uuid': flavor_id, - 'networks': networks} + 'networks': called_networks} for network in networks: network_id = network.get('uuid') port_type = network.get('port-type')