summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdietz <mdietz@openstack>2010-10-05 19:52:12 +0000
committermdietz <mdietz@openstack>2010-10-05 19:52:12 +0000
commit091cf4ec5851e87bf722ed0bbbbfdf64dd599389 (patch)
tree124c74c90dec3bc18e17be15c8a6b9adbf548ce8
parentcde00c93345147f724ccb1686393e866fe732446 (diff)
downloadnova-091cf4ec5851e87bf722ed0bbbbfdf64dd599389.tar.gz
nova-091cf4ec5851e87bf722ed0bbbbfdf64dd599389.tar.xz
nova-091cf4ec5851e87bf722ed0bbbbfdf64dd599389.zip
A little more clean up
-rw-r--r--nova/db/sqlalchemy/api.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 7429057ca..6f1ea7c23 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -29,8 +29,7 @@ from nova.db.sqlalchemy import models
from nova.db.sqlalchemy.session import get_session
from sqlalchemy import or_
from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import joinedload_all
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.orm import joinedload, joinedload_all
from sqlalchemy.sql import exists, func
FLAGS = flags.FLAGS
@@ -451,7 +450,6 @@ def fixed_ip_create(_context, values):
fixed_ip_ref.save()
return fixed_ip_ref['address']
-
@require_context
def fixed_ip_disassociate(context, address):
session = get_session()