diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-05 23:24:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-05 23:24:18 +0000 |
| commit | 0cafffa4b24c1c8b1ccc3a49fd52fcd23385805c (patch) | |
| tree | 2a597454065f9ecd70ee7daebf10015424b71744 /openstackclient | |
| parent | 27037a43db7d801d9a03662d3f273d39e491bb7a (diff) | |
| parent | dd1ca68f56b0a3631ca4bb682c0c0ae8cc4215ae (diff) | |
| download | python-openstackclient-0cafffa4b24c1c8b1ccc3a49fd52fcd23385805c.tar.gz | |
Merge "Trivial: Import network.common as network_common in server.py"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index adab29c9..67da63b1 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -37,7 +37,7 @@ from openstackclient.common import parseractions from openstackclient.common import utils from openstackclient.i18n import _ # noqa from openstackclient.identity import common as identity_common -from openstackclient.network import common +from openstackclient.network import common as network_common def _format_servers_list_networks(networks): @@ -476,15 +476,19 @@ class CreateServer(show.ShowOne): if neutron_enabled: network_client = self.app.client_manager.network if nic_info["net-id"]: - nic_info["net-id"] = common.find(network_client, - 'network', - 'networks', - nic_info["net-id"]) + nic_info["net-id"] = network_common.find( + network_client, + 'network', + 'networks', + nic_info["net-id"] + ) if nic_info["port-id"]: - nic_info["port-id"] = common.find(network_client, - 'port', - 'ports', - nic_info["port-id"]) + nic_info["port-id"] = network_common.find( + network_client, + 'port', + 'ports', + nic_info["port-id"] + ) else: if nic_info["net-id"]: nic_info["net-id"] = utils.find_resource( |