Merge lp:~vishvananda/nova/fix-floating-reboot into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

Fix issue where floating ips don't get recreated when a network host reboots.

[Dan Prince (dan-prince)]

This looks good. I suppose we could attempt to populate the host columns via a DB migration (by looking in the services table for a network host?). Kind of a polish thing but if a user had lots of floating IPs it could save a bit of time.

I think this is good though.

review: Approve

[Devin Carlen (devcamcar)]

lgtm

Vish, do you want to do anything with the migrations?

review: Approve

[Vish Ishaya (vishvananda)]

no, it would only be for people who are upgrading from d4, earlier than that the host wasn't set. I don't feel it is really necessary.

[Devin Carlen (devcamcar)]

Sounds good, will approve.

[Trey Morris (tr3buchet)]

gah i gotta pay closer attention.. So networks have hosts, and fixed_ips have networks, floating_ips are associated with fixed_ips. Couldn't we just get to the host a floating_ip is associated with.

floating_ip['fixed_ip']['network']['host']
or
if ha
floating_ip['fixed_ip']['instance']['host']

I'm confused.

[Vish Ishaya (vishvananda)]

Yes that was my first approach, but it required changing linked tables in the db as well, so I figured go for the smaller change for diablo bug fixing. I you feel like the other change is more accurate, feel free to prop it into essex, perhaps with a drop column host in floating ips.

Vish

 On Sep 16, 2011, at 3:32 PM, Trey Morris wrote:

> gah i gotta pay closer attention.. So networks have hosts, and fixed_ips have networks, floating_ips are associated with fixed_ips. Couldn't we just get to the host a floating_ip is associated with.
>
> floating_ip['fixed_ip']['network']['host']
> or
> if ha
> floating_ip['fixed_ip']['instance']['host']
>
> I'm confused.
> --
> https://code.launchpad.net/~vishvananda/nova/fix-floating-reboot/+merge/75279
> You are the owner of lp:~vishvananda/nova/fix-floating-reboot.

=== modified file 'nova/db/api.py'
--- nova/db/api.py	2011-09-08 20:49:03 +0000
+++ nova/db/api.py	2011-09-13 23:54:17 +0000
@@ -261,11 +261,13 @@
     return IMPL.floating_ip_disassociate(context, address)
 
 
-def floating_ip_fixed_ip_associate(context, floating_address, fixed_address):
+def floating_ip_fixed_ip_associate(context, floating_address,
+                                   fixed_address, host):
     """Associate an floating ip to a fixed_ip by address."""
     return IMPL.floating_ip_fixed_ip_associate(context,
                                                floating_address,
-                                               fixed_address)
+                                               fixed_address,
+                                               host)
 
 
 def floating_ip_get_all(context):
@@ -367,7 +369,7 @@
 
 def fixed_ip_get_all_by_instance_host(context, host):
     """Get all allocated fixed ips filtered by instance host."""
-    return IMPL.fixed_ip_get_all_instance_by_host(context, host)
+    return IMPL.fixed_ip_get_all_by_instance_host(context, host)
 
 
 def fixed_ip_get_by_address(context, address):

=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2011-09-12 19:43:15 +0000
+++ nova/db/sqlalchemy/api.py	2011-09-13 23:54:17 +0000
@@ -529,7 +529,8 @@
 
 
 @require_context
-def floating_ip_fixed_ip_associate(context, floating_address, fixed_address):
+def floating_ip_fixed_ip_associate(context, floating_address,
+                                   fixed_address, host):
     session = get_session()
     with session.begin():
         # TODO(devcamcar): How to ensure floating_id belongs to user?
@@ -540,6 +541,7 @@
                                                fixed_address,
                                                session=session)
         floating_ip_ref.fixed_ip = fixed_ip_ref
+        floating_ip_ref.host = host
         floating_ip_ref.save(session=session)
 
 
@@ -583,6 +585,7 @@
         else:
             fixed_ip_address = None
         floating_ip_ref.fixed_ip = None
+        floating_ip_ref.host = None
         floating_ip_ref.save(session=session)
     return fixed_ip_address
 

=== modified file 'nova/network/manager.py'
--- nova/network/manager.py	2011-09-12 02:11:43 +0000
+++ nova/network/manager.py	2011-09-13 23:54:17 +0000
@@ -289,7 +289,8 @@
 
         self.db.floating_ip_fixed_ip_associate(context,
                                                floating_address,
-                                               fixed_address)
+                                               fixed_address,
+                                               self.host)
         self.driver.bind_floating_ip(floating_address)
         self.driver.ensure_floating_forward(floating_address, fixed_address)
 

=== modified file 'nova/tests/db/fakes.py'
--- nova/tests/db/fakes.py	2011-07-19 21:25:16 +0000
+++ nova/tests/db/fakes.py	2011-09-13 23:54:17 +0000
@@ -125,10 +125,11 @@
             if ips[0]['fixed_ip']:
                 fixed_ip_address = ips[0]['fixed_ip']['address']
             ips[0]['fixed_ip'] = None
+            ips[0]['host'] = None
             return fixed_ip_address
 
     def fake_floating_ip_fixed_ip_associate(context, floating_address,
-                                            fixed_address):
+                                            fixed_address, host):
         float = filter(lambda i: i['address'] == floating_address,
                        floating_ips)
         fixed = filter(lambda i: i['address'] == fixed_address,
@@ -136,6 +137,7 @@
         if float and fixed:
             float[0]['fixed_ip'] = fixed[0]
             float[0]['fixed_ip_id'] = fixed[0]['id']
+            float[0]['host'] = host
 
     def fake_floating_ip_get_all_by_host(context, host):
         # TODO(jkoelker): Once we get the patches that remove host from