summaryrefslogtreecommitdiff
path: root/openstackclient/compute/v2/server.py
diff options
context:
space:
mode:
authorStephen Finucane <sfinucan@redhat.com>2019-06-14 11:51:52 +0100
committerDean Troyer <dtroyer@gmail.com>2019-08-27 17:12:15 -0500
commit6419533f436c6c369e05662c6ced26ad0bc68240 (patch)
tree52c06195e2a9456b3d10d1ddbee451a7d0113298 /openstackclient/compute/v2/server.py
parentb9d63105566c84db11a976846844ad7b3a0b331e (diff)
downloadpython-openstackclient-6419533f436c6c369e05662c6ced26ad0bc68240.tar.gz
Bump hacking version
Pick up newer versions of this library. Thankfully no serious changes are needed. Change-Id: I69e523844529fc1c8aa0c1ce764182dbe29cfeb6 Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
Diffstat (limited to 'openstackclient/compute/v2/server.py')
-rw-r--r--openstackclient/compute/v2/server.py58
1 files changed, 29 insertions, 29 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 95c2f28a..5922dc50 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -79,37 +79,37 @@ def _format_servers_list_power_state(state):
def _get_ip_address(addresses, address_type, ip_address_family):
- # Old style addresses
- if address_type in addresses:
- for addy in addresses[address_type]:
+ # Old style addresses
+ if address_type in addresses:
+ for addy in addresses[address_type]:
+ if int(addy['version']) in ip_address_family:
+ return addy['addr']
+
+ # New style addresses
+ new_address_type = address_type
+ if address_type == 'public':
+ new_address_type = 'floating'
+ if address_type == 'private':
+ new_address_type = 'fixed'
+ for network in addresses:
+ for addy in addresses[network]:
+ # Case where it is list of strings
+ if isinstance(addy, six.string_types):
+ if new_address_type == 'fixed':
+ return addresses[network][0]
+ else:
+ return addresses[network][-1]
+ # Case where it is a dict
+ if 'OS-EXT-IPS:type' not in addy:
+ continue
+ if addy['OS-EXT-IPS:type'] == new_address_type:
if int(addy['version']) in ip_address_family:
return addy['addr']
-
- # New style addresses
- new_address_type = address_type
- if address_type == 'public':
- new_address_type = 'floating'
- if address_type == 'private':
- new_address_type = 'fixed'
- for network in addresses:
- for addy in addresses[network]:
- # Case where it is list of strings
- if isinstance(addy, six.string_types):
- if new_address_type == 'fixed':
- return addresses[network][0]
- else:
- return addresses[network][-1]
- # Case where it is a dict
- if 'OS-EXT-IPS:type' not in addy:
- continue
- if addy['OS-EXT-IPS:type'] == new_address_type:
- if int(addy['version']) in ip_address_family:
- return addy['addr']
- msg = _("ERROR: No %(type)s IP version %(family)s address found")
- raise exceptions.CommandError(
- msg % {"type": address_type,
- "family": ip_address_family}
- )
+ msg = _("ERROR: No %(type)s IP version %(family)s address found")
+ raise exceptions.CommandError(
+ msg % {"type": address_type,
+ "family": ip_address_family}
+ )
def _prefix_checked_value(prefix):