diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-27 03:06:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-27 03:06:50 +0000 |
| commit | 7b609ebd55b1ff38be4763b5122b4a48a05ef931 (patch) | |
| tree | 6ca427d085704772379112b9e68868ca605539df /openstackclient | |
| parent | 19a7081aa0dd7303e908969d65879ce13ef3cc27 (diff) | |
| parent | bffc98e4e526ffb9878a12db9a0d8b87cf73d082 (diff) | |
| download | python-openstackclient-7b609ebd55b1ff38be4763b5122b4a48a05ef931.tar.gz | |
Merge "Fix server create with nova-net"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 5 | ||||
| -rw-r--r-- | openstackclient/tests/functional/compute/v2/test_server.py | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 8b4a3721..60dc605c 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -655,10 +655,9 @@ class CreateServer(command.ShowOne): nic_info["port-id"] = port.id else: if nic_info["net-id"]: - nic_info["net-id"] = utils.find_resource( - compute_client.networks, + nic_info["net-id"] = compute_client.api.network_find( nic_info["net-id"] - ).id + )['id'] if nic_info["port-id"]: msg = _("can't create server with port specified " "since network endpoint not enabled") diff --git a/openstackclient/tests/functional/compute/v2/test_server.py b/openstackclient/tests/functional/compute/v2/test_server.py index dd257e9a..76255c69 100644 --- a/openstackclient/tests/functional/compute/v2/test_server.py +++ b/openstackclient/tests/functional/compute/v2/test_server.py @@ -207,12 +207,20 @@ class ServerTests(common.ComputeTestCase): 'floating ip create -f json ' + 'public' )) - floating_ip = cmd_output['floating_ip_address'] + + # Look for Neutron value first, then nova-net + floating_ip = cmd_output.get( + 'floating_ip_address', + cmd_output.get( + 'ip', + None, + ), + ) self.assertNotEqual('', cmd_output['id']) self.assertNotEqual('', floating_ip) self.addCleanup( self.openstack, - 'floating ip delete ' + cmd_output['id'] + 'floating ip delete ' + str(cmd_output['id']) ) raw_output = self.openstack( |