Merge patch from Vish to move creation of default security groups into the API layer. This is a temporary fix. We need to sort out for Austin+1 how to deal with things like this.

2 files changed, 11 insertions, 0 deletions

diff --git a/nova/db/api.py b/nova/db/api.py
index 602c3cf09..5e033b59d 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -604,6 +604,11 @@ def security_group_destroy(context, security_group_id):
     return IMPL.security_group_destroy(context, security_group_id)
 
 
+def security_group_destroy_all(context):
+    """Deletes a security group"""
+    return IMPL.security_group_destroy_all(context)
+
+
 ####################
 
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index d2847506e..07ea5d145 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -947,6 +947,12 @@ def security_group_destroy(_context, security_group_id):
                         'where group_id=:id',
                         {'id': security_group_id})
 
+def security_group_destroy_all(_context):
+    session = get_session()
+    with session.begin():
+        # TODO(vish): do we have to use sql here?
+        session.execute('update security_group set deleted=1')
+        session.execute('update security_group_rules set deleted=1')
 
 ###################