2 files changed, 25 insertions, 0 deletions
diff --git a/nova/db/api.py b/nova/db/api.py
index d23f14a3c..c73796487 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -459,6 +459,10 @@ def network_associate(context, project_id):
     """Associate a free network to a project."""
     return IMPL.network_associate(context, project_id)
 
+def network_is_associated(context, project_id):
+    """Returns true the the network is associated to a project"""
+    return IMPL.network_is_associated(context, project_id)
+
 
 def network_count(context):
     """Return the number of networks."""
@@ -525,6 +529,9 @@ def network_get_by_bridge(context, bridge):
     """Get a network by bridge or raise if it does not exist."""
     return IMPL.network_get_by_bridge(context, bridge)
 
+def network_get_by_cidr(context, cidr):
+    """Get a network by cidr or raise if it does not exist"""
+    return IMPL.network_get_by_cidr(context, cidr)
 
 def network_get_by_instance(context, instance_id):
     """Get a network by instance id or raise if it does not exist."""
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 919dda118..bd2de70c7 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -994,6 +994,13 @@ def network_associate(context, project_id):
 
 
 @require_admin_context
+def network_is_associated(context, project_id):
+    session = get_session()
+    network = session.query(models.Network.project_id).filter(project_id=1).first()
+    print network 
+
+
+@require_admin_context
 def network_count(context):
     session = get_session()
     return session.query(models.Network).\
@@ -1117,6 +1124,17 @@ def network_get_by_bridge(context, bridge):
 
 
 @require_admin_context
+def network_get_by_cidr(context, cidr):
+    session = get_session()
+    result = session.query(models.Network).\
+                filter_by(cidr=cidr).first()
+
+    if not result:
+        raise exception.NotFound(_('Network with cidr %s does not exist') %
+                                  cidr)
+    return result.id
+
+@require_admin_context
 def network_get_by_instance(_context, instance_id):
     session = get_session()
     rv = session.query(models.Network).\