summaryrefslogtreecommitdiffstats
path: root/nova/db
diff options
context:
space:
mode:
authorRicardo Carrillo Cruz <emaildericky@gmail.com>2011-03-09 19:16:26 +0100
committerRicardo Carrillo Cruz <emaildericky@gmail.com>2011-03-09 19:16:26 +0100
commite44f085ed464a3397e3bf89a3e5355e538c71a65 (patch)
treebdddd5c2aae199c51cebff3fceb58b065473083c /nova/db
parent48c8b911899db4db36dfc2e0ddaf3410c3179071 (diff)
downloadnova-e44f085ed464a3397e3bf89a3e5355e538c71a65.tar.gz
nova-e44f085ed464a3397e3bf89a3e5355e538c71a65.tar.xz
nova-e44f085ed464a3397e3bf89a3e5355e538c71a65.zip
Fixed pep8 issues
Diffstat (limited to 'nova/db')
-rw-r--r--nova/db/api.py7
-rw-r--r--nova/db/sqlalchemy/api.py7
2 files changed, 10 insertions, 4 deletions
diff --git a/nova/db/api.py b/nova/db/api.py
index 7ad99c1f4..5c34a02e4 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -459,6 +459,7 @@ def network_associate(context, project_id):
"""Associate a free network to a project."""
return IMPL.network_associate(context, project_id)
+
def network_count(context):
"""Return the number of networks."""
return IMPL.network_count(context)
@@ -488,9 +489,9 @@ def network_create_safe(context, values):
"""
return IMPL.network_create_safe(context, values)
+
def network_delete_safe(context, network_id):
- """Delete network with key network_id
-
+ """Delete network with key network_id.
This method assumes that the network is not associated with any project
"""
return IMPL.network_delete_safe(context, network_id)
@@ -531,10 +532,12 @@ 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."""
return IMPL.network_get_by_instance(context, instance_id)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 90730d325..3a1162a17 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1042,12 +1042,14 @@ def network_create_safe(context, values):
except IntegrityError:
return None
+
@require_admin_context
def network_delete_safe(context, network_id):
session = get_session()
with session.begin():
- network_ref = network_get(context, network_id=network_id, session=session)
- session.delete(network_ref)
+ network_ref = network_get(context, network_id=network_id, \
+ session=session)
+ session.delete(network_ref)
@require_admin_context
@@ -1134,6 +1136,7 @@ def network_get_by_cidr(context, cidr):
cidr)
return result
+
@require_admin_context
def network_get_by_instance(_context, instance_id):
session = get_session()