Merge "Remove unnecessary joinedload" into stable/stein
This commit is contained in:
commit
7eb216605a
@ -27,7 +27,6 @@ from oslo_log import log as logging
|
|||||||
from oslo_serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
from oslo_utils import excutils
|
from oslo_utils import excutils
|
||||||
from oslo_utils import uuidutils
|
from oslo_utils import uuidutils
|
||||||
from sqlalchemy.orm import joinedload
|
|
||||||
from sqlalchemy.orm import noload
|
from sqlalchemy.orm import noload
|
||||||
from sqlalchemy.orm import subqueryload
|
from sqlalchemy.orm import subqueryload
|
||||||
from sqlalchemy.sql.expression import false
|
from sqlalchemy.sql.expression import false
|
||||||
@ -1194,10 +1193,7 @@ class AmphoraRepository(BaseRepository):
|
|||||||
.filter(models.Amphora.status != consts.DELETED)
|
.filter(models.Amphora.status != consts.DELETED)
|
||||||
# And the LB is also not DELETED
|
# And the LB is also not DELETED
|
||||||
.filter(models.LoadBalancer.provisioning_status !=
|
.filter(models.LoadBalancer.provisioning_status !=
|
||||||
consts.DELETED)
|
consts.DELETED)).first()
|
||||||
# And what does this do? Some SQLAlchemy magic?
|
|
||||||
.options(joinedload('*'))
|
|
||||||
).first()
|
|
||||||
if db_lb:
|
if db_lb:
|
||||||
return db_lb.to_data_model()
|
return db_lb.to_data_model()
|
||||||
return None
|
return None
|
||||||
|
Loading…
Reference in New Issue
Block a user