diff options
| author | David Rabel <rabel@b1-systems.de> | 2017-03-13 15:16:48 +0100 |
|---|---|---|
| committer | David Rabel <rabel@b1-systems.de> | 2017-04-07 16:36:18 +0200 |
| commit | 8549071363805a9eef815dd2429b6b860db11a2c (patch) | |
| tree | 64d33748a43f31851ec3b7c2756fd166314ac9f7 /openstackclient/tests/unit/compute | |
| parent | 4a19f6753b9e21b3089824d17943b39c211a616a (diff) | |
| download | python-openstackclient-8549071363805a9eef815dd2429b6b860db11a2c.tar.gz | |
Add --network and --port to server create
--nic option is quite unhandy. It is better to have
two seperate options --network and --port to add a
network to a new server.
Change-Id: I523abdc83ca2dd4c5dd3871f8f109c2bf57c2e02
Closes-Bug: #1612898
Diffstat (limited to 'openstackclient/tests/unit/compute')
| -rw-r--r-- | openstackclient/tests/unit/compute/v2/test_server.py | 44 |
1 files changed, 34 insertions, 10 deletions
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py index 249902bc..600b872e 100644 --- a/openstackclient/tests/unit/compute/v2/test_server.py +++ b/openstackclient/tests/unit/compute/v2/test_server.py @@ -384,14 +384,18 @@ class TestServerCreate(TestServer): arglist = [ '--image', 'image1', '--flavor', 'flavor1', - '--nic', 'net-id=net1', - '--nic', 'port-id=port1', + '--network', 'net1', + '--nic', 'net-id=net1,v4-fixed-ip=10.0.0.2', + '--port', 'port1', + '--network', 'net1', + '--nic', 'port-id=port2', self.new_server.name, ] verifylist = [ ('image', 'image1'), ('flavor', 'flavor1'), - ('nic', ['net-id=net1', 'port-id=port1']), + ('nic', ['net-id=net1', 'net-id=net1,v4-fixed-ip=10.0.0.2', + 'port-id=port1', 'net-id=net1', 'port-id=port2']), ('config_drive', False), ('server_name', self.new_server.name), ] @@ -411,20 +415,28 @@ class TestServerCreate(TestServer): network_client.find_port = find_port network_resource = mock.Mock() network_resource.id = 'net1_uuid' - port_resource = mock.Mock() - port_resource.id = 'port1_uuid' + port1_resource = mock.Mock() + port1_resource.id = 'port1_uuid' + port2_resource = mock.Mock() + port2_resource.id = 'port2_uuid' find_network.return_value = network_resource - find_port.return_value = port_resource + find_port.side_effect = (lambda port_id, ignore_missing: + {"port1": port1_resource, + "port2": port2_resource}[port_id]) # Mock sdk APIs. _network = mock.Mock() _network.id = 'net1_uuid' - _port = mock.Mock() - _port.id = 'port1_uuid' + _port1 = mock.Mock() + _port1.id = 'port1_uuid' + _port2 = mock.Mock() + _port2.id = 'port2_uuid' find_network = mock.Mock() find_port = mock.Mock() find_network.return_value = _network - find_port.return_value = _port + find_port.side_effect = (lambda port_id, ignore_missing: + {"port1": _port1, + "port2": _port2}[port_id]) self.app.client_manager.network.find_network = find_network self.app.client_manager.network.find_port = find_port @@ -449,10 +461,22 @@ class TestServerCreate(TestServer): 'v4-fixed-ip': '', 'v6-fixed-ip': '', 'port-id': ''}, + {'net-id': 'net1_uuid', + 'v4-fixed-ip': '10.0.0.2', + 'v6-fixed-ip': '', + 'port-id': ''}, + {'net-id': '', + 'v4-fixed-ip': '', + 'v6-fixed-ip': '', + 'port-id': 'port1_uuid'}, + {'net-id': 'net1_uuid', + 'v4-fixed-ip': '', + 'v6-fixed-ip': '', + 'port-id': ''}, {'net-id': '', 'v4-fixed-ip': '', 'v6-fixed-ip': '', - 'port-id': 'port1_uuid'}], + 'port-id': 'port2_uuid'}], scheduler_hints={}, config_drive=None, ) |