From 15b2a3b85b157e4a032d1fbb68bd3d7a509ed765 Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Fri, 16 Sep 2011 14:07:41 -0500 Subject: moved floating ip db access and sanity checking from network api into network manager added floating ip get by fixed address added fixed_ip_get moved floating ip testing from osapi into the network tests where they belong Change-Id: I3ee53971206e37405a2adc2491412f7896e1af87 --- nova/compute/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index 7bf28d24e..6837c7ae4 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1521,8 +1521,8 @@ class API(base.Base): LOG.warning(_("multiple fixed_ips exist, using the first: %s"), fixed_ip_addrs[0]) self.network_api.associate_floating_ip(context, - floating_ip=address, - fixed_ip=fixed_ip_addrs[0]) + floating_address=address, + fixed_address=fixed_ip_addrs[0]) def get_instance_metadata(self, context, instance_id): """Get all metadata associated with an instance.""" -- cgit