x
/
python-moganclient
Code Issues Proposed changes

Merge "Correct the network parameter when creating server"

This commit is contained in:
Jenkins 2017-09-08 06:25:22 +00:00 committed by Gerrit Code Review
parent 4c2ef55250 ec673bcec7
commit 5e2278fbd9
2 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
moganclient/osc/v1/server.py
View File

@ -105,10 +105,9 @@ class CreateServer(command.ShowOne):
)
parser.add_argument(
"--nic",
metavar="net-id=NETWORK[,port-type=PORT_TYPE]",
metavar="<net-id=NETWORK, port-id=PORT>",
required=True,
required_keys=['net-id'],
optional_keys=['port-type'],
optional_keys=['net-id', 'port-id'],
action=parseractions.MultiKeyValueAction,
help=_("Create a NIC on the server. "
"Specify option multiple times to create multiple NICs."),
@ -181,12 +180,12 @@ class CreateServer(command.ShowOne):
parsed_args.image)
for nic in parsed_args.nic:
if 'port-type' in nic:
nic['port_type'] = nic['port-type']
del nic['port-type']
if 'net-id' in nic:
nic['net_id'] = nic['net-id']
del nic['net-id']
if 'port-id' in nic:
nic['port_id'] = nic['port-id']
del nic['port-id']
files = {}
for f in parsed_args.file:
@ -658,7 +657,7 @@ class ShowServerNetworkInfo(command.Lister):
)
data = bc_client.server.get_server_nics(server.uuid)
columns = ('network_id', 'port_id', 'mac_address', 'fixed_ips',
'floating_ip', 'port_type')
'floating_ip')
formatters = {'fixed_ips': lambda s: json.dumps(s, indent=4)}
return (columns,
(utils.get_item_properties(

44
moganclient/tests/unit/osc/v1/test_server.py
View File

@ -81,12 +81,12 @@ class TestServerCreate(TestServer):
('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']
if 'net-id' in nic:
nic['net_id'] = nic['net-id']
del nic['net-id']
if 'port-id' in nic:
nic['port_id'] = nic['port-id']
del nic['port-id']
called_data = {'server': {'name': name,
'image_uuid': image_id,
'flavor_uuid': flavor_id,
@ -94,17 +94,12 @@ class TestServerCreate(TestServer):
'min_count': 1,
'max_count': 1}}
for network in networks:
network_id = network.get('net-id')
port_type = network.get('port-type')
if port_type:
arglist.extend(
['--nic',
'net-id=' + network_id + ',port-type=' + port_type])
verifylist.append(
('nic', [{'net-id': network_id, 'port-type': port_type}]))
else:
arglist.extend(['--nic', 'net-id=' + network_id])
verifylist.append(('nic', [{'net-id': network_id}]))
if 'net-id' in network:
arglist.extend(['--nic', 'net-id=' + network['net-id']])
verifylist.append(('nic', [{'net-id': network['net-id']}]))
elif 'port-id' in network:
arglist.extend(['--nic', 'port-id=' + network['port-id']])
verifylist.append(('nic', [{'port-id': network['port-id']}]))
if description:
arglist.extend(['--description', description])
verifylist.append(('description', description))
@ -187,17 +182,6 @@ class TestServerCreate(TestServer):
name, flavor_id, image_id,
networks, availability_zone=fake_az)
def test_server_create_with_port_type(self, mock_create, mock_find):
name = 'server1'
flavor_id = 'flavor-id-' + uuidutils.generate_uuid(dashed=False)
image_id = 'image-id-' + uuidutils.generate_uuid(dashed=False)
networks = [{'net-id': 'net-id-' + uuidutils.generate_uuid(
dashed=False),
'port-type': 'normal'}]
self._test_create_fake_server(mock_create, mock_find,
name, flavor_id, image_id,
networks)
def test_server_create_with_metadata(self, mock_create, mock_find):
name = 'server1'
flavor_id = 'flavor-id-' + uuidutils.generate_uuid(dashed=False)
@ -209,6 +193,16 @@ class TestServerCreate(TestServer):
name, flavor_id, image_id,
networks, properties=properties)
def test_server_create_with_port_specified(self, mock_create, mock_find):
name = 'server1'
flavor_id = 'flavor-id-' + uuidutils.generate_uuid(dashed=False)
image_id = 'image-id-' + uuidutils.generate_uuid(dashed=False)
networks = [{'port-id': 'port-id-' + uuidutils.generate_uuid(
dashed=False)}]
self._test_create_fake_server(mock_create, mock_find,
name, flavor_id, image_id,
networks)
@mock.patch.object(utils, 'find_resource')
@mock.patch.object(server_mgr.ServerManager, '_update')