x
/
group-based-policy
Code Issues Proposed changes

Merge "[AIM] Make topological calls synchronous"

This commit is contained in:
Zuul 2018-04-20 02:13:37 +00:00 committed by Gerrit Code Review
parent 7a5988717f 53d19a9c08
commit 8982ce37e4
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,7 @@ class ApicMechanismDriver(api_plus.MechanismDriver,
db.DbMixin):
class TopologyRpcEndpoint(object):
target = oslo_messaging.Target(version='2.0')
target = oslo_messaging.Target(version='3.0')
def __init__(self, mechanism_driver):
self.md = mechanism_driver
@ -183,12 +183,16 @@ class ApicMechanismDriver(api_plus.MechanismDriver,
@db_api.retry_if_session_inactive()
def update_link(self, context, *args, **kwargs):
context._session = db_api.get_writer_session()
self.md.update_link(context, *args, **kwargs)
return self.md.update_link(context, *args, **kwargs)
@db_api.retry_if_session_inactive()
def delete_link(self, context, *args, **kwargs):
context._session = db_api.get_writer_session()
self.md.delete_link(context, *args, **kwargs)
# Don't take any action on link deletion in order to tolerate
# situations like fabric upgrade or flapping links. Old links
# are removed once a specific host is attached somewhere else.
# To completely decommission the host, aimctl can be used to
# cleanup the hostlink table
return
def __init__(self):
LOG.info("APIC AIM MD __init__")
@ -2086,8 +2090,6 @@ class ApicMechanismDriver(api_plus.MechanismDriver,
pod_id, port_description)]))
with db_api.context_manager.writer.using(context):
if not switch:
self.delete_link(context, host, interface, mac, switch, module,
port)
return
session = context.session

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

@ -7095,7 +7095,7 @@ class TestPortVlanNetwork(ApicAimTestCase):
check_epg_static_paths(expected_hlink10.path)
# remove first link
self.driver.update_link(nctx, 'h10', 'eth0', 'A:A', 0, 0, 0, 0, '')
self.driver.delete_link(nctx, 'h10', 'eth0', 'A:A', 0, 0, 0)
self.assertIsNone(self.aim_mgr.get(aim_ctx, expected_hlink10))
if is_svi:
check_svi_paths(None)