deleted network_is_associated from nova.db api

3 files changed, 3 insertions, 15 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index b274c5bd1..94b0d5946 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -547,8 +547,8 @@ class NetworkCommands(object):
 
     def delete(self, fixed_range):
         """Deletes a network"""
-        print db.network_get_by_cidr(context.get_admin_context(), fixed_range)
-
+        network = db.network_get_by_cidr(context.get_admin_context(), fixed_range)
+         
 class ServiceCommands(object):
     """Enable and disable running services"""
 
diff --git a/nova/db/api.py b/nova/db/api.py
index c73796487..04f5fd72f 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -459,11 +459,6 @@ 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."""
     return IMPL.network_count(context)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index bd2de70c7..c8f42425d 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -994,13 +994,6 @@ 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).\
@@ -1132,7 +1125,7 @@ def network_get_by_cidr(context, cidr):
     if not result:
         raise exception.NotFound(_('Network with cidr %s does not exist') %
                                   cidr)
-    return result.id
+    return result
 
 @require_admin_context
 def network_get_by_instance(_context, instance_id):