x
/
group-based-policy
Code Issues Proposed changes

Stopping the use of deprecated get_session() 

And replacing with get_reader_session() or get_writer_session()
as appropriate.

Change-Id: Ia0260d163c90c85434ffc5fe19d2c421387fdcff
This commit is contained in:
Sumit Naiksatam 2018-01-11 16:26:03 -08:00
parent 72c08183bb
commit 904c5476b8
11 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gbpservice/neutron/plugins/ml2plus/drivers/apic_aim/mechanism_driver.py
View File

@ -114,7 +114,7 @@ class KeystoneNotificationEndpoint(object):
# we only update tenants which have been created in APIC. For other
# cases, their nameAlias will be set when the first resource is
# being created under that tenant
session = db_api.get_session()
session = db_api.get_writer_session()
tenant_aname = self._driver.name_mapper.project(session, tenant_id)
aim_ctx = aim_context.AimContext(session)
tenant = aim_resource.Tenant(name=tenant_aname)
@ -133,7 +133,7 @@ class KeystoneNotificationEndpoint(object):
self._driver.project_name_cache.purge_gbp(self)
# delete the tenant and AP in AIM also
session = db_api.get_session()
session = db_api.get_writer_session()
tenant_aname = self._driver.name_mapper.project(session, tenant_id)
aim_ctx = aim_context.AimContext(session)
ap = aim_resource.ApplicationProfile(tenant_name=tenant_aname,
@ -202,7 +202,7 @@ class ApicMechanismDriver(api_plus.MechanismDriver,
self._ensure_static_resources()
def _ensure_static_resources(self):
session = db_api.get_session()
session = db_api.get_writer_session()
aim_ctx = aim_context.AimContext(session)
self._ensure_common_tenant(aim_ctx)
self._ensure_unrouted_vrf(aim_ctx)

2
gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/port_ha_ipaddress_binding.py
View File

@ -48,7 +48,7 @@ class HAIPAddressToPortAssocation(model_base.BASEV2):
class PortForHAIPAddress(object):
def __init__(self):
self.session = db_api.get_session()
self.session = db_api.get_writer_session()
def _get_ha_ipaddress(self, port_id, ipaddress):
return self.session.query(HAIPAddressToPortAssocation).filter_by(

2
gbpservice/neutron/services/servicechain/plugins/ncp/node_drivers/heat_node_driver.py
View File

@ -228,7 +228,7 @@ class HeatNodeDriver(driver_base.NodeDriverBase):
for x in range(0, DELETE_VIP_PORT_RETRIES):
# We intentionally get a new session so as to be
# able to read the updated DB
session = db_api.get_session()
session = db_api.get_reader_session()
vip_port = session.query(ndb.Port).filter_by(
id=vip_port_id).all()
if vip_port:

2
gbpservice/neutron/tests/unit/nfp/orchestrator/db/test_nfp_db.py
View File

@ -72,7 +72,7 @@ class NFPDBTestCase(SqlTestCase):
super(NFPDBTestCase, self).setUp()
self.ctx = context.get_admin_context()
self.nfp_db = NFPDB()
self.session = db_api.get_session()
self.session = db_api.get_writer_session()
def create_network_function(self, attributes=None):
if attributes is None:

49
gbpservice/neutron/tests/unit/plugins/ml2plus/test_apic_aim.py
View File

@ -348,7 +348,7 @@ class ApicAimTestCase(test_address_scope.AddressScopeTestCase,
return self.deserialize(self.fmt, res)
def _get_sg(self, sg_name, tenant_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
sg = aim_resource.SecurityGroup(tenant_name=tenant_name,
name=sg_name)
@ -357,14 +357,14 @@ class ApicAimTestCase(test_address_scope.AddressScopeTestCase,
return sg
def _sg_should_not_exist(self, sg_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
sgs = self.aim_mgr.find(
aim_ctx, aim_resource.SecurityGroup, name=sg_name)
self.assertEqual([], sgs)
def _get_sg_subject(self, sg_subject_name, sg_name, tenant_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
sg_subject = aim_resource.SecurityGroupSubject(
tenant_name=tenant_name, security_group_name=sg_name,
@ -375,7 +375,7 @@ class ApicAimTestCase(test_address_scope.AddressScopeTestCase,
def _get_sg_rule(self, sg_rule_name, sg_subject_name, sg_name,
tenant_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
sg_rule = aim_resource.SecurityGroupRule(
tenant_name=tenant_name, security_group_name=sg_name,
@ -385,7 +385,7 @@ class ApicAimTestCase(test_address_scope.AddressScopeTestCase,
return sg_rule
def _sg_rule_should_not_exist(self, sg_rule_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
sg_rules = self.aim_mgr.find(
aim_ctx, aim_resource.SecurityGroupRule, name=sg_rule_name)
@ -411,7 +411,7 @@ class TestAimMapping(ApicAimTestCase):
super(TestAimMapping, self).tearDown()
def _get_tenant(self, tenant_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
tenant = aim_resource.Tenant(name=tenant_name)
tenant = self.aim_mgr.get(aim_ctx, tenant)
@ -419,7 +419,7 @@ class TestAimMapping(ApicAimTestCase):
return tenant
def _get_vrf(self, vrf_name, tenant_name, should_exist=True):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
vrf = aim_resource.VRF(tenant_name=tenant_name,
name=vrf_name)
@ -431,13 +431,13 @@ class TestAimMapping(ApicAimTestCase):
self.assertIsNone(vrf)
def _vrf_should_not_exist(self, vrf_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
vrfs = self.aim_mgr.find(aim_ctx, aim_resource.VRF, name=vrf_name)
self.assertEqual([], vrfs)
def _get_bd(self, bd_name, tenant_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
bd = aim_resource.BridgeDomain(tenant_name=tenant_name,
name=bd_name)
@ -446,14 +446,14 @@ class TestAimMapping(ApicAimTestCase):
return bd
def _bd_should_not_exist(self, bd_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
bds = self.aim_mgr.find(
aim_ctx, aim_resource.BridgeDomain, name=bd_name)
self.assertEqual([], bds)
def _get_subnet(self, gw_ip_mask, bd_name, tenant_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
subnet = aim_resource.Subnet(tenant_name=tenant_name,
bd_name=bd_name,
@ -463,7 +463,7 @@ class TestAimMapping(ApicAimTestCase):
return subnet
def _subnet_should_not_exist(self, gw_ip_mask, bd_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
subnets = self.aim_mgr.find(
aim_ctx, aim_resource.Subnet, bd_name=bd_name,
@ -481,14 +481,14 @@ class TestAimMapping(ApicAimTestCase):
return epg
def _epg_should_not_exist(self, epg_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
epgs = self.aim_mgr.find(aim_ctx, aim_resource.EndpointGroup,
name=epg_name)
self.assertEqual([], epgs)
def _get_contract(self, contract_name, tenant_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
contract = aim_resource.Contract(tenant_name=tenant_name,
name=contract_name)
@ -497,14 +497,14 @@ class TestAimMapping(ApicAimTestCase):
return contract
def _contract_should_not_exist(self, contract_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
contracts = self.aim_mgr.find(aim_ctx, aim_resource.Contract,
name=contract_name)
self.assertEqual([], contracts)
def _get_subject(self, subject_name, contract_name, tenant_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
subject = aim_resource.ContractSubject(tenant_name=tenant_name,
contract_name=contract_name,
@ -514,7 +514,7 @@ class TestAimMapping(ApicAimTestCase):
return subject
def _subject_should_not_exist(self, subject_name, contract_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
subjects = self.aim_mgr.find(
aim_ctx, aim_resource.ContractSubject,
@ -522,7 +522,7 @@ class TestAimMapping(ApicAimTestCase):
self.assertEqual([], subjects)
def _get_filter(self, filter_name, tenant_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
filter = aim_resource.Filter(tenant_name=tenant_name,
name=filter_name)
@ -531,7 +531,7 @@ class TestAimMapping(ApicAimTestCase):
return filter
def _get_filter_entry(self, entry_name, filter_name, tenant_name):
session = db_api.get_session()
session = db_api.get_reader_session()
aim_ctx = aim_context.AimContext(session)
entry = aim_resource.FilterEntry(tenant_name=tenant_name,
filter_name=filter_name,
@ -3962,7 +3962,7 @@ class TestMl2SubnetPoolsV2(test_plugin.TestSubnetPoolsV2,
class TestExtensionAttributes(ApicAimTestCase):
def test_external_network_lifecycle(self):
session = db_api.get_session()
session = db_api.get_reader_session()
extn = extn_db.ExtensionDbMixin()
# create with APIC DN, nat_typeand default CIDR
@ -4040,7 +4040,7 @@ class TestExtensionAttributes(ApicAimTestCase):
self._update('networks', net1['id'], {'apic:nat_type': ''}, 400)
def test_external_subnet_lifecycle(self):
session = db_api.get_session()
session = db_api.get_reader_session()
extn = extn_db.ExtensionDbMixin()
net1 = self._make_ext_network('net1',
@ -4088,7 +4088,7 @@ class TestExtensionAttributes(ApicAimTestCase):
self.assertTrue(subnet2[SNAT_POOL])
def test_router_lifecycle(self):
session = db_api.get_session()
session = db_api.get_reader_session()
extn = extn_db.ExtensionDbMixin()
# create router with default values
@ -4138,7 +4138,7 @@ class TestExtensionAttributes(ApicAimTestCase):
self.assertEqual([], rtr2[CONS])
def test_address_scope_lifecycle(self):
session = db_api.get_session()
session = db_api.get_writer_session()
aim_ctx = aim_context.AimContext(db_session=session)
# Create VRF.
@ -4225,7 +4225,8 @@ class TestExtensionAttributes(ApicAimTestCase):
self.assertIn('is not valid VRF DN', resp['NeutronError']['message'])
# Update APIC DN
aim_ctx = aim_context.AimContext(db_session=db_api.get_session())
aim_ctx = aim_context.AimContext(
db_session=db_api.get_writer_session())
self.aim_mgr.create(
aim_ctx, aim_resource.Tenant(name=self.t1_aname, monitored=True))
vrf = aim_resource.VRF(tenant_name=self.t1_aname, name='default',

4
gbpservice/neutron/tests/unit/services/grouppolicy/test_aim_mapping_driver.py
View File

@ -138,7 +138,7 @@ class AIMBaseTestCase(test_nr_base.CommonNeutronBaseTestCase,
policy_drivers=policy_drivers, core_plugin=core_plugin,
ml2_options=ml2_opts, l3_plugin=l3_plugin,
sc_plugin=sc_plugin, qos_plugin=qos_plugin)
self.db_session = db_api.get_session()
self.db_session = db_api.get_writer_session()
self.initialize_db_config(self.db_session)
self.l3_plugin = directory.get_plugin(n_constants.L3)
config.cfg.CONF.set_override('network_vlan_ranges',
@ -1815,7 +1815,7 @@ class TestL2PolicyWithAutoPTG(TestL2PolicyBase):
def _test_epg_policy_enforcement_attr(self, ptg):
aim_epg_name = self.driver.apic_epg_name_for_policy_target_group(
db_api.get_session(), ptg['id'],
db_api.get_writer_session(), ptg['id'],
context=self._neutron_context)
aim_epg = self.aim_mgr.find(
self._aim_context, aim_resource.EndpointGroup,

2
gbpservice/neutron/tests/unit/services/grouppolicy/test_apic_allowed_vm_name.py
View File

@ -80,7 +80,7 @@ class ExtensionDriverTestCase(test_ext_base.ExtensionDriverTestBase):
self.delete_l3_policy(l3p['id'], tenant_id=l3p['tenant_id'],
expected_res_status=204)
session = db_api.get_session()
session = db_api.get_reader_session()
rows = (session.query(db.ApicAllowedVMNameDB).filter_by(
l3_policy_id=l3p['id']).all())
self.assertEqual([], rows)

2
gbpservice/neutron/tests/unit/services/grouppolicy/test_apic_segmentation_label.py
View File

@ -78,7 +78,7 @@ class ExtensionDriverTestCaseMixin(object):
self.assertItemsEqual(labels, pt['segmentation_labels'])
self.delete_policy_target(pt['id'], expected_res_status=204)
session = db_api.get_session()
session = db_api.get_reader_session()
rows = (session.query(db.ApicSegmentationLabelDB).filter_by(
policy_target_id=pt['id']).all())
self.assertEqual([], rows)

4
gbpservice/nfp/orchestrator/config_drivers/heat_driver.py
View File

@ -235,7 +235,7 @@ class HeatDriver(object):
def loadbalancer_post_stack_create(self, network_function_details):
db_handler = nfp_db.NFPDbBase()
db_session = db_api.get_session()
db_session = db_api.get_writer_session()
service_details = self.get_service_details(network_function_details)
service_profile = service_details['service_profile']
if service_profile['service_type'] == pconst.LOADBALANCERV2:
@ -1310,7 +1310,7 @@ class HeatDriver(object):
def get_service_details(self, network_function_details):
db_handler = nfp_db.NFPDbBase()
db_session = db_api.get_session()
db_session = db_api.get_writer_session()
network_function = network_function_details['network_function']
network_function_instance = network_function_details.get(
'network_function_instance')

2
gbpservice/nfp/orchestrator/modules/device_orchestrator.py
View File

@ -268,7 +268,7 @@ class DeviceOrchestrator(nfp_api.NfpEventHandler):
@property
def db_session(self):
return db_api.get_session()
return db_api.get_writer_session()
def event_method_mapping(self, event_id):
event_handler_mapping = {

2
gbpservice/nfp/orchestrator/modules/service_orchestrator.py
View File

@ -520,7 +520,7 @@ class ServiceOrchestrator(nfp_api.NfpEventHandler):
@property
def db_session(self):
return db_api.get_session()
return db_api.get_writer_session()
def event_method_mapping(self, event_id):
event_handler_mapping = {