summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-09-28 09:28:39 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-09-28 09:28:39 -0700
commit9febbe9188ac1e0019d362d34331f32b5f295037 (patch)
tree83a51c5502eb00754d9414744dd8f617d5e76656
parent16deee5871be47c655c831064202068a92383152 (diff)
parent669cf475d11700064aa16f959077d0512e6b1531 (diff)
merged floating-ip-by-project
-rw-r--r--nova/db/sqlalchemy/api.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 1ee7b6eda..b5caae940 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -19,6 +19,8 @@
Implementation of SQLAlchemy backend
"""
+import sys
+
from nova import db
from nova import exception
from nova import flags
@@ -359,6 +361,7 @@ def fixed_ip_get_by_address(_context, address):
raise exception.NotFound("No model for address %s" % address)
return result
+
def fixed_ip_get_instance(_context, address):
session = get_session()
with session.begin():
@@ -731,7 +734,7 @@ def auth_create_token(_context, token):
tk[k] = v
tk.save()
return tk
-
+
###################