openstack
/
neutron-dynamic-routing
Code Issues Proposed changes
Browse Source

Merge "use context manager from neutron-lib"

changes/91/623691/1
Zuul 4 years ago committed by Gerrit Code Review
parent
66e13d17e7 155f66337c
commit
b1d4b8baa6
2 changed files with 40 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      neutron_dynamic_routing/db/bgp_db.py
  2. 8
      neutron_dynamic_routing/db/bgp_dragentscheduler_db.py

72
neutron_dynamic_routing/db/bgp_db.py
Unescape View File

@ -16,7 +16,6 @@ import itertools
import netaddr
from neutron.db import api as db_api
from neutron.db import common_db_mixin as common_db
from neutron.db import l3_dvr_db
from neutron.db.models import address_scope as address_scope_db
@ -27,6 +26,7 @@ from neutron.plugins.ml2 import models as ml2_models
from neutron_lib.api import validators
from neutron_lib import constants as lib_consts
from neutron_lib.db import api as db_api
from neutron_lib.db import model_base
from neutron_lib.db import model_query
from neutron_lib import exceptions as n_exc
@ -134,7 +134,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def get_bgp_speakers(self, context, filters=None, fields=None,
sorts=None, limit=None, marker=None,
page_reverse=False):
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
return self._get_collection(context, BgpSpeaker,
self._make_bgp_speaker_dict,
filters=filters, fields=fields,
@ -142,7 +142,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
page_reverse=page_reverse)
def get_bgp_speaker(self, context, bgp_speaker_id, fields=None):
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
bgp_speaker = self._get_bgp_speaker(context, bgp_speaker_id)
return self._make_bgp_speaker_dict(bgp_speaker, fields)
@ -150,7 +150,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
bgp_speaker_id):
bgp_speaker_attrs = ['id', 'local_as', 'tenant_id']
bgp_peer_attrs = ['peer_ip', 'remote_as', 'auth_type', 'password']
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
bgp_speaker = self.get_bgp_speaker(context, bgp_speaker_id,
fields=bgp_speaker_attrs)
res = dict((k, bgp_speaker[k]) for k in bgp_speaker_attrs)
@ -164,7 +164,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def update_bgp_speaker(self, context, bgp_speaker_id, bgp_speaker):
bp = bgp_speaker[bgp_ext.BGP_SPEAKER_BODY_KEY_NAME]
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
bgp_speaker_db = self._get_bgp_speaker(context, bgp_speaker_id)
bgp_speaker_db.update(bp)
@ -174,7 +174,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def _save_bgp_speaker(self, context, bgp_speaker, uuid):
ri = bgp_speaker[bgp_ext.BGP_SPEAKER_BODY_KEY_NAME]
ri['tenant_id'] = context.tenant_id
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
res_keys = ['local_as', 'tenant_id', 'name', 'ip_version',
'advertise_floating_ip_host_routes',
'advertise_tenant_networks']
@ -199,7 +199,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def add_gateway_network(self, context, bgp_speaker_id, network_info):
network_id = self._get_id_for(network_info, 'network_id')
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
try:
self._save_bgp_speaker_network_binding(context,
bgp_speaker_id,
@ -211,7 +211,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
return {'network_id': network_id}
def remove_gateway_network(self, context, bgp_speaker_id, network_info):
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
network_id = self._get_id_for(network_info, 'network_id')
self._remove_bgp_speaker_network_binding(context,
bgp_speaker_id,
@ -219,7 +219,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
return {'network_id': network_id}
def delete_bgp_speaker(self, context, bgp_speaker_id):
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
bgp_speaker_db = self._get_bgp_speaker(context, bgp_speaker_id)
context.session.delete(bgp_speaker_db)
@ -230,7 +230,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
if auth_type == 'md5' and not password:
raise bgp_ext.InvalidBgpPeerMd5Authentication()
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
res_keys = ['tenant_id', 'name', 'remote_as', 'peer_ip',
'auth_type', 'password']
res = dict((k, ri[k]) for k in res_keys)
@ -253,7 +253,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
bgp_speaker_id, fields=None):
filters = [BgpSpeakerPeerBinding.bgp_speaker_id == bgp_speaker_id,
BgpSpeakerPeerBinding.bgp_peer_id == BgpPeer.id]
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
query = context.session.query(BgpPeer)
query = query.filter(*filters)
return [self._make_bgp_peer_dict(x, fields) for x in query.all()]
@ -263,13 +263,13 @@ class BgpDbMixin(common_db.CommonDbMixin):
return self._make_bgp_peer_dict(bgp_peer_db, fields=fields)
def delete_bgp_peer(self, context, bgp_peer_id):
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
bgp_peer_db = self._get_bgp_peer(context, bgp_peer_id)
context.session.delete(bgp_peer_db)
def update_bgp_peer(self, context, bgp_peer_id, bgp_peer):
bp = bgp_peer[bgp_ext.BGP_PEER_BODY_KEY_NAME]
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
bgp_peer_db = self._get_bgp_peer(context, bgp_peer_id)
if ((bp.get('password') is not None) and
(bgp_peer_db['auth_type'] == 'none')):
@ -287,7 +287,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
raise bgp_ext.BgpSpeakerNotFound(id=bgp_speaker_id)
def _get_bgp_speaker_ids_by_router(self, context, router_id):
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
network_binding = aliased(BgpSpeakerNetworkBinding)
r_port = aliased(l3_db.RouterPort)
query = context.session.query(network_binding.bgp_speaker_id)
@ -300,7 +300,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
return [binding.bgp_speaker_id for binding in query.all()]
def _get_bgp_speaker_ids_by_binding_network(self, context, network_id):
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
query = context.session.query(
BgpSpeakerNetworkBinding.bgp_speaker_id)
query = query.filter(
@ -323,7 +323,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
return uuid
def _get_bgp_peers_by_bgp_speaker_binding(self, context, bgp_speaker_id):
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
query = context.session.query(BgpPeer)
query = query.filter(
BgpSpeakerPeerBinding.bgp_speaker_id == bgp_speaker_id,
@ -332,7 +332,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def _save_bgp_speaker_peer_binding(self, context, bgp_speaker_id,
bgp_peer_id):
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
try:
bgp_speaker = self._get_by_id(context, BgpSpeaker,
bgp_speaker_id)
@ -362,7 +362,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def _remove_bgp_speaker_peer_binding(self, context, bgp_speaker_id,
bgp_peer_id):
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
try:
binding = self._get_bgp_speaker_peer_binding(context,
@ -378,7 +378,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
context,
bgp_speaker_id,
network_id):
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
try:
bgp_speaker = self._get_by_id(context, BgpSpeaker,
bgp_speaker_id)
@ -399,7 +399,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def _remove_bgp_speaker_network_binding(self, context,
bgp_speaker_id, network_id):
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
try:
binding = self._get_bgp_speaker_network_binding(
@ -453,7 +453,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
return self._fields(res, fields)
def _get_address_scope_ids_for_bgp_speaker(self, context, bgp_speaker_id):
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
binding = aliased(BgpSpeakerNetworkBinding)
address_scope = aliased(address_scope_db.AddressScope)
query = context.session.query(address_scope)
@ -467,7 +467,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def get_routes_by_bgp_speaker_id(self, context, bgp_speaker_id):
"""Get all routes that should be advertised by a BgpSpeaker."""
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
net_routes = self._get_tenant_network_routes_by_bgp_speaker(
context,
bgp_speaker_id)
@ -482,7 +482,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def get_routes_by_bgp_speaker_binding(self, context,
bgp_speaker_id, network_id):
"""Get all routes for the given bgp_speaker binding."""
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
fip_routes = self._get_central_fip_host_routes_by_binding(
context,
network_id,
@ -521,7 +521,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def _get_central_fip_host_routes_by_router(self, context, router_id,
bgp_speaker_id):
"""Get floating IP host routes with the given router as nexthop."""
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
dest_alias = aliased(l3_db.FloatingIP,
name='destination')
next_hop_alias = aliased(models_v2.IPAllocation,
@ -556,7 +556,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def _get_dvr_fip_host_routes_by_router(self, context, bgp_speaker_id,
router_id):
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
gw_query = self._get_gateway_query(context, bgp_speaker_id)
fip_query = self._get_fip_query(context, bgp_speaker_id)
@ -572,7 +572,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def _get_central_fip_host_routes_by_binding(self, context,
network_id, bgp_speaker_id):
"""Get all floating IP host routes for the given network binding."""
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
# Query the DB for floating IP's and the IP address of the
# gateway port
dest_alias = aliased(l3_db.FloatingIP,
@ -610,7 +610,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def _get_dvr_fip_host_routes_by_binding(self, context, network_id,
bgp_speaker_id):
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
BgpBinding = BgpSpeakerNetworkBinding
gw_query = self._get_gateway_query(context, bgp_speaker_id)
@ -629,7 +629,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def _get_central_fip_host_routes_by_bgp_speaker(self, context,
bgp_speaker_id):
"""Get all the floating IP host routes advertised by a BgpSpeaker."""
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
dest_alias = aliased(l3_db.FloatingIP,
name='destination')
next_hop_alias = aliased(models_v2.IPAllocation,
@ -706,7 +706,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def _get_dvr_fip_host_routes_by_bgp_speaker(self, context,
bgp_speaker_id):
router_attrs = l3_attrs_db.RouterExtraAttributes
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
gw_query = self._get_gateway_query(context, bgp_speaker_id)
fip_query = self._get_fip_query(context, bgp_speaker_id)
@ -735,7 +735,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
network_id, bgp_speaker_id):
"""Get all tenant network routes for the given network."""
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
tenant_networks_query = self._tenant_networks_by_network_query(
context,
network_id,
@ -754,7 +754,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
bgp_speaker_id):
"""Get all tenant network routes with the given router as nexthop."""
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
scopes = self._get_address_scope_ids_for_bgp_speaker(
context,
bgp_speaker_id)
@ -801,7 +801,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
bgp_speaker_id):
"""Get all tenant network routes to be advertised by a BgpSpeaker."""
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
tenant_nets_q = self._tenant_networks_by_bgp_speaker_query(
context,
bgp_speaker_id)
@ -938,7 +938,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
models_v2.IPAllocation.subnet_id == models_v2.Subnet.id]
def _tenant_prefixes_by_router(self, context, router_id, bgp_speaker_id):
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
query = context.session.query(models_v2.Subnet.cidr.distinct())
filters = self._tenant_prefixes_by_router_filters(router_id,
bgp_speaker_id)
@ -966,7 +966,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
context,
router_port_id,
bgp_speaker_id):
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
query = context.session.query(models_v2.Subnet.cidr.distinct())
filters = self._tenant_prefixes_by_router_filters(router_port_id,
bgp_speaker_id)
@ -989,7 +989,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def _bgp_speakers_for_gateway_network(self, context, network_id):
"""Return all BgpSpeakers for the given gateway network"""
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
query = context.session.query(BgpSpeaker)
query = query.filter(
BgpSpeakerNetworkBinding.network_id == network_id,
@ -999,7 +999,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
def _bgp_speakers_for_gw_network_by_family(self, context,
network_id, ip_version):
"""Return the BgpSpeaker by given gateway network and ip_version"""
with db_api.context_manager.reader.using(context):
with db_api.CONTEXT_READER.using(context):
query = context.session.query(BgpSpeaker)
query = query.filter(
BgpSpeakerNetworkBinding.network_id == network_id,

8
neutron_dynamic_routing/db/bgp_dragentscheduler_db.py
Unescape View File

@ -14,6 +14,7 @@
# under the License.
from neutron_lib import context as ncontext
from neutron_lib.db import api as db_api
from neutron_lib.db import model_base
from oslo_config import cfg
from oslo_db import exception as db_exc
@ -23,7 +24,6 @@ from sqlalchemy import orm
from sqlalchemy.orm import exc
from neutron.db import agentschedulers_db as as_db
from neutron.db import api as db_api
from neutron.db.models import agent as agent_model
from neutron_dynamic_routing._i18n import _
@ -122,7 +122,7 @@ class BgpDrAgentSchedulerDbMixin(bgp_dras_ext.BgpDrSchedulerPluginBase,
def _save_bgp_speaker_dragent_binding(self, context,
agent_id, speaker_id):
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
agent_db = self._get_agent(context, agent_id)
agent_up = agent_db['admin_state_up']
is_agent_bgp = (agent_db['agent_type'] ==
@ -162,7 +162,7 @@ class BgpDrAgentSchedulerDbMixin(bgp_dras_ext.BgpDrSchedulerPluginBase,
context, [bgp_speaker_id])[0]
bgp_speaker = self.get_bgp_speaker(context, bgp_speaker_id)
dragent_id = dragent.id
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
self._remove_bgp_speaker_from_dragent(
context, dragent_id, bgp_speaker_id)
self.schedule_bgp_speaker(context, bgp_speaker)
@ -174,7 +174,7 @@ class BgpDrAgentSchedulerDbMixin(bgp_dras_ext.BgpDrSchedulerPluginBase,
failure_reason="no eligible dr agent found")
def _remove_bgp_speaker_from_dragent(self, context, agent_id, speaker_id):
with db_api.context_manager.writer.using(context):
with db_api.CONTEXT_WRITER.using(context):
agent_db = self._get_agent(context, agent_id)
is_agent_bgp = (agent_db['agent_type'] ==
bgp_consts.AGENT_TYPE_BGP_ROUTING)

Write Preview
Loading…
Cancel
Save