openstack/shade
Code Issues Proposed changes

Plumb fixed_address through add_ips_to_server

Browse Source 
Specifying a fixed_address if you know it is somethig that the lower
level functions understand, but was left out of the argument list
for add_ips_to_server. Plumb it through.

Change-Id: Iba3456f0f45e5b0230c752a50fc3d3b29e8ade54
This commit is contained in:
Monty Taylor 2015-11-09 10:36:31 -05:00
parent 4528609e85
commit a71db08bc7
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
shade/openstackcloud.py
View File

@ -3024,7 +3024,9 @@ class OpenStackCloud(object):
server=server, floating_ip=f_ip, fixed_address=fixed_address,
wait=wait, timeout=timeout)
def add_ip_list(self, server, ips, wait=False, timeout=60):
def add_ip_list(
self, server, ips, wait=False, timeout=60,
fixed_address=None):
"""Attach a list of IPs to a server.
:param server: a server object
@ -3033,6 +3035,8 @@ class OpenStackCloud(object):
to the server in Nova. Defaults to False.
:param timeout: (optional) Seconds to wait, defaults to 60.
See the ``wait`` parameter.
:param fixed_address: (optional) Fixed address of the server to
attach the IP to
:returns: The updated server dict
@ -3045,7 +3049,8 @@ class OpenStackCloud(object):
f_ip = self.get_floating_ip(
id=None, filters={'floating_ip_address': ip})
return self._attach_ip_to_server(
server=server, floating_ip=f_ip, wait=wait, timeout=timeout)
server=server, floating_ip=f_ip, wait=wait, timeout=timeout,
fixed_address=fixed_address)
def add_auto_ip(self, server, wait=False, timeout=60, reuse=True):
"""Add a floating IP to a server.
@ -3090,12 +3095,15 @@ class OpenStackCloud(object):
def add_ips_to_server(
self, server, auto_ip=True, ips=None, ip_pool=None,
wait=False, timeout=60, reuse=True):
wait=False, timeout=60, reuse=True, fixed_address=None):
if ip_pool:
server = self._add_ip_from_pool(
server, ip_pool, reuse=reuse, wait=wait, timeout=timeout)
server, ip_pool, reuse=reuse, wait=wait, timeout=timeout,
fixed_address=fixed_address)
elif ips:
server = self.add_ip_list(server, ips, wait=wait, timeout=timeout)
server = self.add_ip_list(
server, ips, wait=wait, timeout=timeout,
fixed_address=fixed_address)
elif auto_ip:
if not self.get_server_public_ip(server):
server = self._add_auto_ip(

5
shade/tests/unit/test_floating_ip_common.py
View File

@ -76,7 +76,8 @@ class TestFloatingIP(base.TestCase):
self.client.add_ips_to_server(server_dict, ip_pool=pool)
mock_add_ip_from_pool.assert_called_with(
server_dict, pool, reuse=True, wait=False, timeout=60)
server_dict, pool, reuse=True, wait=False, timeout=60,
fixed_address=None)
@patch.object(OpenStackCloud, 'nova_client')
@patch.object(OpenStackCloud, 'add_ip_list')
@ -92,7 +93,7 @@ class TestFloatingIP(base.TestCase):
self.client.add_ips_to_server(server_dict, ips=ips)
mock_add_ip_list.assert_called_with(
server_dict, ips, wait=False, timeout=60)
server_dict, ips, wait=False, timeout=60, fixed_address=None)
@patch.object(OpenStackCloud, 'nova_client')
@patch.object(OpenStackCloud, '_add_auto_ip')