From c0abb5cd45314e072096e173830b2e3d379bf3e7 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Wed, 29 Sep 2010 00:42:18 -0700 Subject: removed a few extra items --- nova/db/sqlalchemy/api.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index e823bf15e..7ef92cad5 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -29,7 +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 contains_eager, joinedload_all +from sqlalchemy.orm import joinedload_all from sqlalchemy.sql import exists, func FLAGS = flags.FLAGS @@ -951,14 +951,6 @@ def volume_update(_context, volume_id, values): ################### -INSTANCES_OR = or_(models.Instance.deleted == False, - models.Instance.deleted == None) - - -RULES_OR = or_(models.SecurityGroupIngressRule.deleted == False, - models.SecurityGroupIngressRule.deleted == None) - - def security_group_get_all(_context): session = get_session() return session.query(models.SecurityGroup @@ -1002,9 +994,6 @@ def security_group_get_by_project(_context, project_id): ).filter_by(project_id=project_id ).filter_by(deleted=False ).options(joinedload_all('rules') - ).outerjoin(models.SecurityGroup.rules - ).options(contains_eager(models.SecurityGroup.rules) - ).filter(RULES_OR ).all() -- cgit