Merge "Floating ip attachment needed ip instead of id."

openstack · Feb 28, 2012 · b85d1aa · b85d1aa
2 parents 399ff43 + 0e58aea
commit b85d1aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/horizon/horizon/api/nova.py b/horizon/horizon/api/nova.py
@@ -346,7 +346,7 @@ def server_add_floating_ip(request, server, floating_ip):
     """
     server = novaclient(request).servers.get(server)
     fip = novaclient(request).floating_ips.get(floating_ip)
-    return novaclient(request).servers.add_floating_ip(server.id, fip.id)
+    return novaclient(request).servers.add_floating_ip(server.id, fip.ip)
 
 
 def server_remove_floating_ip(request, server, floating_ip):
@@ -355,7 +355,7 @@ def server_remove_floating_ip(request, server, floating_ip):
     """
     fip = novaclient(request).floating_ips.get(floating_ip)
     server = novaclient(request).servers.get(fip.instance_id)
-    return novaclient(request).servers.remove_floating_ip(server.id, fip.id)
+    return novaclient(request).servers.remove_floating_ip(server.id, fip.ip)
 
 
 def tenant_quota_get(request, tenant_id):

diff --git a/horizon/horizon/tests/api_tests/nova_tests.py b/horizon/horizon/tests/api_tests/nova_tests.py
@@ -130,7 +130,7 @@ def test_server_remove_floating_ip(self):
         novaclient.floating_ips = self.mox.CreateMockAnything()
         novaclient.servers.get(server.id).AndReturn(server)
         novaclient.floating_ips.get(floating_ip.id).AndReturn(floating_ip)
-        novaclient.servers.remove_floating_ip(server.id, floating_ip.id) \
+        novaclient.servers.remove_floating_ip(server.id, floating_ip.ip) \
                           .AndReturn(server)
         self.mox.ReplayAll()
 
@@ -148,7 +148,7 @@ def test_server_add_floating_ip(self):
         novaclient.servers = self.mox.CreateMockAnything()
         novaclient.servers.get(server.id).AndReturn(server)
         novaclient.floating_ips.get(floating_ip.id).AndReturn(floating_ip)
-        novaclient.servers.add_floating_ip(server.id, floating_ip.id) \
+        novaclient.servers.add_floating_ip(server.id, floating_ip.ip) \
                           .AndReturn(server)
         self.mox.ReplayAll()