merge orm

1 files changed, 25 insertions, 25 deletions

diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 064894e97..cab0c63b5 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -56,18 +56,18 @@ class NovaBase(object):
         """Get all objects of this type"""
         if not session:
             session = get_session()
-        return session.query(cls) \
-                      .filter_by(deleted=deleted) \
-                      .all()
+        return session.query(cls
+                     ).filter_by(deleted=deleted
+                     ).all()
 
     @classmethod
     def count(cls, session=None, deleted=False):
         """Count objects of this type"""
         if not session:
             session = get_session()
-        return session.query(cls) \
-                      .filter_by(deleted=deleted) \
-                      .count()
+        return session.query(cls
+                     ).filter_by(deleted=deleted
+                     ).count()
 
     @classmethod
     def find(cls, obj_id, session=None, deleted=False):
@@ -75,10 +75,10 @@ class NovaBase(object):
         if not session:
             session = get_session()
         try:
-            return session.query(cls) \
-                          .filter_by(id=obj_id) \
-                          .filter_by(deleted=deleted) \
-                          .one()
+            return session.query(cls
+                         ).filter_by(id=obj_id
+                         ).filter_by(deleted=deleted
+                         ).one()
         except exc.NoResultFound:
             new_exc = exception.NotFound("No model for id %s" % obj_id)
             raise new_exc.__class__, new_exc, sys.exc_info()[2]
@@ -172,11 +172,11 @@ class Service(BASE, NovaBase):
         if not session:
             session = get_session()
         try:
-            return session.query(cls) \
-                          .filter_by(host=host) \
-                          .filter_by(binary=binary) \
-                          .filter_by(deleted=False) \
-                          .one()
+            return session.query(cls
+                         ).filter_by(host=host
+                         ).filter_by(binary=binary
+                         ).filter_by(deleted=deleted
+                         ).one()
         except exc.NoResultFound:
             new_exc = exception.NotFound("No model for %s, %s" % (host,
                                                               binary))
@@ -335,14 +335,14 @@ class FixedIp(BASE, NovaBase):
         return self.address
 
     @classmethod
-    def find_by_str(cls, str_id, session=None):
+    def find_by_str(cls, str_id, session=None, deleted=deleted):
         if not session:
             session = get_session()
         try:
-            return session.query(cls) \
-                          .filter_by(address=str_id) \
-                          .filter_by(deleted=False) \
-                          .one()
+            return session.query(cls
+                         ).filter_by(address=str_id
+                         ).filter_by(deleted=deleted
+                         ).one()
         except exc.NoResultFound:
             new_exc = exception.NotFound("No model for address %s" % str_id)
             raise new_exc.__class__, new_exc, sys.exc_info()[2]
@@ -364,14 +364,14 @@ class FloatingIp(BASE, NovaBase):
         return self.address
 
     @classmethod
-    def find_by_str(cls, str_id, session=None):
+    def find_by_str(cls, str_id, session=None, deleted=deleted):
         if not session:
             session = get_session()
         try:
-            return session.query(cls) \
-                          .filter_by(address=str_id) \
-                          .filter_by(deleted=False) \
-                          .one()
+            return session.query(cls
+                         ).filter_by(address=str_id
+                         ).filter_by(deleted=deleted
+                         ).one()
         except exc.NoResultFound:
             session.rollback()
             new_exc = exception.NotFound("No model for address %s" % str_id)