diff --git a/shade/__init__.py b/shade/__init__.py
index 003350d06..3420e7e72 100644
--- a/shade/__init__.py
+++ b/shade/__init__.py
@@ -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:
diff --git a/shade/tests/unit/test_floating_ip_common.py b/shade/tests/unit/test_floating_ip_common.py
index 7c5e193dc..810916b82 100644
--- a/shade/tests/unit/test_floating_ip_common.py
+++ b/shade/tests/unit/test_floating_ip_common.py
@@ -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')