Floating ips auto assignment

3 files changed, 36 insertions, 0 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 68b163355..86273b6b4 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -73,6 +73,8 @@ flags.DEFINE_integer('live_migration_retry_count', 30,
 flags.DEFINE_integer("rescue_timeout", 0,
                      "Automatically unrescue an instance after N seconds."
                      " Set to 0 to disable.")
+flags.DEFINE_bool('auto_assign_floating_ip',False, 'Autoassigning floating'
+                                                   ' ip to VM')
 
 LOG = logging.getLogger('nova.compute.manager')
 
@@ -224,6 +226,16 @@ class ComputeManager(manager.SchedulerDependentManager):
             self.network_manager.setup_compute_network(context,
                                                        instance_id)
 
+            if FLAGS.auto_assign_floating_ip:
+                public_ip = rpc.call(context,
+                                FLAGS.network_topic,
+                                {"method": "allocate_floating_ip",
+                                "args": {"project_id": context.project_id}})
+                self.network_manager.associate_floating_ip(context,
+                                               instance_id=instance_id,
+                                               address=public_ip)
+
+
         # TODO(vish) check to make sure the availability zone matches
         self.db.instance_set_state(context,
                                    instance_id,
@@ -271,6 +283,15 @@ class ComputeManager(manager.SchedulerDependentManager):
                          network_topic,
                          {"method": "disassociate_floating_ip",
                           "args": {"floating_address": address}})
+                
+                if FLAGS.auto_assign_floating_ip:
+                    LOG.debug(_("Deallocating floating ip %s"),
+                                    floating_ip['address'], context=context)
+                    rpc.cast(context,
+                             FLAGS.network_topic,
+                             {"method": "deallocate_floating_ip",
+                              "args": {"floating_address":
+                                                floating_ip['address']}})
 
             address = fixed_ip['address']
             if address:
diff --git a/nova/db/api.py b/nova/db/api.py
index 63901e94d..859acc146 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -290,6 +290,9 @@ def floating_ip_update(context, address, values):
     """Update a floating ip by address or raise if it doesn't exist."""
     return IMPL.floating_ip_update(context, address, values)
 
+def floating_ip_set_auto_assigned(context, address):
+    """Set auto_assigned flag to floating ip"""
+    return IMPL.floating_ip_set_auto_assigned(context, address)
 
 ####################
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index e675022e9..28126a517 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -489,6 +489,7 @@ def floating_ip_deallocate(context, address):
                                                      address,
                                                      session=session)
         floating_ip_ref['project_id'] = None
+        floating_ip_ref['auto_assigned'] = False
         floating_ip_ref.save(session=session)
 
 
@@ -522,6 +523,17 @@ def floating_ip_disassociate(context, address):
     return fixed_ip_address
 
 
+@require_context
+def floating_ip_set_auto_assigned(context, address):
+    session = get_session()
+    with session.begin():
+        floating_ip_ref = floating_ip_get_by_address(context,
+                                                     address,
+                                                     session=session)
+        floating_ip_ref.auto_assigned = True
+        floating_ip_ref.save(session=session)
+
+
 @require_admin_context
 def floating_ip_get_all(context):
     session = get_session()