Merge lp:~tpatil/nova/bug839269 into lp:~hudson-openstack/nova/trunk

[Tushar Patil]

When vpn=true in allocate ip, it attempts to allocate the ip that is reserved in the network. Unfortunately fixed_ip_associate attempts to ignore reserved ips.
This fix allows to filter reserved ip address only when vpn=True.

When vpn=true in allocate ip, it attempts to allocate the ip that is reserved in the network. Unfortunately fixed_ip_associate attempts to ignore reserved ips.
This fix allows to filter reserved ip address only when vpn=True.

[Brian Waldon (bcwaldon)]

Looks good. Would you mind adding a docstring to fixed_ip_associate in sqlalchemy/api.py to explain that 'reserved' is the exact value that will be filtered on?

[lp:~tpatil/nova/bug839269]

1525. By Tushar Patil on 2011-09-08

Added docstring to explain usage of reserved keyword argument

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[William Wolf (throughnothing)]

lgtm

review: Approve

[Brian Waldon (bcwaldon)]

Thanks, Tushar.

review: Approve

[Dan Prince (dan-prince)]

Looks good.

review: Approve

=== modified file 'nova/db/api.py'
--- nova/db/api.py	2011-09-08 18:47:56 +0000
+++ nova/db/api.py	2011-09-08 20:51:25 +0000
@@ -324,13 +324,15 @@
 ####################
 
 
-def fixed_ip_associate(context, address, instance_id, network_id=None):
+def fixed_ip_associate(context, address, instance_id, network_id=None,
+                       reserved=False):
     """Associate fixed ip to instance.
 
     Raises if fixed ip is not available.
 
     """
-    return IMPL.fixed_ip_associate(context, address, instance_id, network_id)
+    return IMPL.fixed_ip_associate(context, address, instance_id, network_id,
+                                   reserved)
 
 
 def fixed_ip_associate_pool(context, network_id, instance_id=None, host=None):

=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2011-09-08 18:47:56 +0000
+++ nova/db/sqlalchemy/api.py	2011-09-08 20:51:25 +0000
@@ -669,14 +669,19 @@
 
 
 @require_admin_context
-def fixed_ip_associate(context, address, instance_id, network_id=None):
+def fixed_ip_associate(context, address, instance_id, network_id=None,
+                       reserved=False):
+    """Keyword arguments:
+    reserved -- should be a boolean value(True or False), exact value will be 
+    used to filter on the fixed ip address
+    """
     session = get_session()
     with session.begin():
         network_or_none = or_(models.FixedIp.network_id == network_id,
                               models.FixedIp.network_id == None)
         fixed_ip_ref = session.query(models.FixedIp).\
                                filter(network_or_none).\
-                               filter_by(reserved=False).\
+                               filter_by(reserved=reserved).\
                                filter_by(deleted=False).\
                                filter_by(address=address).\
                                with_lockmode('update').\

=== modified file 'nova/network/manager.py'
--- nova/network/manager.py	2011-09-08 07:43:11 +0000
+++ nova/network/manager.py	2011-09-08 20:51:25 +0000
@@ -1005,7 +1005,8 @@
             address = network['vpn_private_address']
             self.db.fixed_ip_associate(context,
                                        address,
-                                       instance_id)
+                                       instance_id,
+                                       reserved=True)
         else:
             address = kwargs.get('address', None)
             if address:

=== modified file 'nova/tests/test_network.py'
--- nova/tests/test_network.py	2011-09-01 20:09:23 +0000
+++ nova/tests/test_network.py	2011-09-08 20:51:25 +0000
@@ -269,7 +269,8 @@
 
         db.fixed_ip_associate(mox.IgnoreArg(),
                               mox.IgnoreArg(),
-                              mox.IgnoreArg()).AndReturn('192.168.0.1')
+                              mox.IgnoreArg(),
+                              reserved=True).AndReturn('192.168.0.1')
         db.fixed_ip_update(mox.IgnoreArg(),
                            mox.IgnoreArg(),
                            mox.IgnoreArg())