From ed3914eafa7d076fdcc03ee958f77528bcf20603 Mon Sep 17 00:00:00 2001
From: Todd Willey <todd@ansolabs.com>
Date: Sat, 11 Jun 2011 18:03:45 -0400
Subject: Add a method to delete provider firewall rules.

---
 nova/db/api.py            | 10 ++++++++++
 nova/db/sqlalchemy/api.py | 21 +++++++++++++++++++++
 2 files changed, 31 insertions(+)

(limited to 'nova/db')

diff --git a/nova/db/api.py b/nova/db/api.py
index 798b2881c..62368c438 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -1004,6 +1004,16 @@ def provider_fw_rule_get_all(context):
     return IMPL.provider_fw_rule_get_all(context)
 
 
+def provider_fw_rule_get_all_by_cidr(context, cidr):
+    """Get all provider-level firewall rules."""
+    return IMPL.provider_fw_rule_get_all_by_cidr(context)
+
+
+def provider_fw_rule_destroy(context, rule_id):
+    """Delete a provider firewall rule from the database."""
+    return IMPL.provider_fw_rule_destroy(context)
+
+
 ###################
 
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 9612e456b..c8802e354 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2093,6 +2093,7 @@ def provider_fw_rule_create(context, rule):
     return fw_rule_ref
 
 
+@require_admin_context
 def provider_fw_rule_get_all(context):
     session = get_session()
     return session.query(models.ProviderFirewallRule).\
@@ -2100,6 +2101,26 @@ def provider_fw_rule_get_all(context):
                    all()
 
 
+@require_admin_context
+def provider_fw_rule_get_all_by_cidr(context, cidr):
+    session = get_session()
+    return session.query(models.ProviderFirewallRule).\
+                   filter_by(deleted=can_read_deleted(context)).\
+                   filter_by(cidr=cidr).\
+                   all()
+
+
+@require_admin_context
+def provider_fw_rule_destroy(context, rule_id):
+    session = get_session()
+    with session.begin():
+        session.query(models.ProviderFirewallRule).\
+                filter_by(id=rule_id).\
+                update({'deleted': True,
+                        'deleted_at': utils.utcnow(),
+                        'updated_at': literal_column('updated_at')})
+
+
 ###################
 
 
-- 
cgit 


From 0a6aeacfedfd5e666e109b54c5c03908eeb47c31 Mon Sep 17 00:00:00 2001
From: Todd Willey <todd@ansolabs.com>
Date: Sat, 11 Jun 2011 18:38:44 -0400
Subject: fix method chaining in database layer to pass right parameters.

---
 nova/db/api.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/db')

diff --git a/nova/db/api.py b/nova/db/api.py
index 62368c438..6ff6ec2f3 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -1006,12 +1006,12 @@ def provider_fw_rule_get_all(context):
 
 def provider_fw_rule_get_all_by_cidr(context, cidr):
     """Get all provider-level firewall rules."""
-    return IMPL.provider_fw_rule_get_all_by_cidr(context)
+    return IMPL.provider_fw_rule_get_all_by_cidr(context, cidr)
 
 
 def provider_fw_rule_destroy(context, rule_id):
     """Delete a provider firewall rule from the database."""
-    return IMPL.provider_fw_rule_destroy(context)
+    return IMPL.provider_fw_rule_destroy(context, rule_id)
 
 
 ###################
-- 
cgit