openstack/placement
Code Issues Proposed changes

Merge "Remove unused methods in nova utils"

Browse Source
This commit is contained in:
Jenkins
2015-01-26 14:38:56 +00:00
committed by Gerrit Code Review
parent 4d502ca120 fea6add4f0
commit 6753b83f26
1 changed files with 0 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
nova/utils.py
View File

@@ -322,60 +322,6 @@ def generate_password(length=None, symbolgroups=DEFAULT_PASSWORD_SYMBOLS):
return ''.join(password)
def get_my_ipv4_address():
"""Run ip route/addr commands to figure out the best ipv4
"""
LOCALHOST = '127.0.0.1'
try:
out = execute('ip', '-f', 'inet', '-o', 'route', 'show')
# Find the default route
regex_default = ('default\s*via\s*'
'(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})'
'\s*dev\s*(\w*)\s*')
default_routes = re.findall(regex_default, out[0])
if not default_routes:
return LOCALHOST
gateway, iface = default_routes[0]
# Find the right subnet for the gateway/interface for
# the default route
route = ('(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\/(\d{1,2})'
'\s*dev\s*(\w*)\s*')
for match in re.finditer(route, out[0]):
subnet = netaddr.IPNetwork(match.group(1) + "/" + match.group(2))
if (match.group(3) == iface and
netaddr.IPAddress(gateway) in subnet):
try:
return _get_ipv4_address_for_interface(iface)
except exception.NovaException:
pass
except Exception as ex:
LOG.error(_LE("Couldn't get IPv4 : %(ex)s"), {'ex': ex})
return LOCALHOST
def _get_ipv4_address_for_interface(iface):
"""Run ip addr show for an interface and grab its ipv4 addresses
"""
try:
out = execute('ip', '-f', 'inet', '-o', 'addr', 'show', iface)
regexp_address = re.compile('inet\s*'
'(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})')
address = [m.group(1) for m in regexp_address.finditer(out[0])
if m.group(1) != '127.0.0.1']
if address:
return address[0]
else:
msg = _('IPv4 address is not found.: %s') % out[0]
raise exception.NovaException(msg)
except Exception as ex:
msg = _("Couldn't get IPv4 of %(interface)s"
" : %(ex)s") % {'interface': iface, 'ex': ex}
LOG.error(msg)
raise exception.NovaException(msg)
def get_my_linklocal(interface):
try:
if_str = execute('ip', '-f', 'inet6', '-o', 'addr', 'show', interface)