openstack
/
shade
Code Issues Proposed changes

Merge "Correctly pass the server ID to add_ip_from_pool"

This commit is contained in:
Jenkins 2015-07-28 14:48:18 +00:00 committed by Gerrit Code Review
parent 404675ef46 482d6ed822
commit fe5dcc7f89
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shade/__init__.py
View File

@ -2344,7 +2344,7 @@ class OpenStackCloud(object):
def add_ips_to_server(self, server, auto_ip=True, ips=None, ip_pool=None):
if ip_pool:
self.add_ip_from_pool(server, ip_pool)
self.add_ip_from_pool(server['id'], ip_pool)
elif ips:
self.add_ip_list(server, ips)
elif auto_ip:

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

@ -62,7 +62,7 @@ class TestFloatingIP(base.TestCase):
def test_add_ips_to_server_pool(
self, mock_add_ip_from_pool, mock_nova_client):
server = FakeServer(
id='server-id', name='test-server', status="ACTIVE", addresses={}
id='romeo', name='test-server', status="ACTIVE", addresses={}
)
server_dict = meta.obj_to_dict(server)
pool = 'nova'
@ -71,7 +71,7 @@ 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)
mock_add_ip_from_pool.assert_called_with('romeo', pool)
@patch.object(OpenStackCloud, 'nova_client')
@patch.object(OpenStackCloud, 'add_ip_list')