openstack
/
shade
Code Issues Proposed changes

Merge "Plumb wait and timout down to add_auto_ip"

This commit is contained in:
Jenkins 2015-10-02 17:15:46 +00:00 committed by Gerrit Code Review
parent bf50406139 0a06226863
commit b5965f8b6e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shade/__init__.py
View File

@ -2328,7 +2328,9 @@ class OpenStackCloud(object):
return self.get_floating_ip(id=f_ip['id'])
def add_ips_to_server(self, server, auto_ip=True, ips=None, ip_pool=None):
def add_ips_to_server(
self, server, auto_ip=True, ips=None, ip_pool=None,
wait=False, timeout=60):
if ip_pool:
self.add_ip_from_pool(server['id'], ip_pool)
elif ips:
@ -2336,7 +2338,7 @@ class OpenStackCloud(object):
elif auto_ip:
if self.get_server_public_ip(server):
return server
self.add_auto_ip(server)
self.add_auto_ip(server, wait=wait, timeout=timeout)
else:
return server

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

@ -104,4 +104,5 @@ class TestFloatingIP(base.TestCase):
self.client.add_ips_to_server(server_dict)
mock_add_auto_ip.assert_called_with(server_dict)
mock_add_auto_ip.assert_called_with(
server_dict, wait=False, timeout=60)