openstack/neutron
Code Issues Proposed changes

Merge "Use new enginefacade for servicetype_db"

Browse Source
This commit is contained in:
Jenkins 2016-11-14 15:37:14 +00:00 committed by Gerrit Code Review
commit 732ee4fe58
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/db/servicetype_db.py
View File

@ -18,6 +18,7 @@ from itertools import chain
from oslo_log import log as logging from oslo_log import log as logging
from neutron.common import _deprecate from neutron.common import _deprecate
from neutron.db import api as db_api
from neutron.db.models import servicetype as st_model from neutron.db.models import servicetype as st_model
from neutron.services import provider_configuration as pconf from neutron.services import provider_configuration as pconf
@ -86,7 +87,7 @@ class ServiceTypeManager(object):
raise pconf.ServiceProviderNotFound(provider=provider_name, raise pconf.ServiceProviderNotFound(provider=provider_name,
service_type=service_type) service_type=service_type)
with context.session.begin(subtransactions=True): with db_api.context_manager.writer.using(context):
# we don't actually need service type for association. # we don't actually need service type for association.
# resource_id is unique and belongs to specific service # resource_id is unique and belongs to specific service
# which knows its type # which knows its type
@ -105,7 +106,7 @@ class ServiceTypeManager(object):
def del_resource_associations(self, context, resource_ids): def del_resource_associations(self, context, resource_ids):
if not resource_ids: if not resource_ids:
return return
with context.session.begin(subtransactions=True): with db_api.context_manager.writer.using(context):
(context.session.query(st_model.ProviderResourceAssociation). (context.session.query(st_model.ProviderResourceAssociation).
filter( filter(
st_model.ProviderResourceAssociation.resource_id.in_( st_model.ProviderResourceAssociation.resource_id.in_(