x/vmware-nsx
Code Issues Proposed changes

use payloads for SERVICE_EDGE events

Browse Source 
This patch switches over to the payload style of callbacks for
SERVICE_EDGE based callback events.

Change-Id: I126b93f068b0f4b3631d0395b9790744b336dd77
This commit is contained in:
Boden R 2018-08-29 15:01:07 -06:00
parent 502bc3ad65
commit 7a8e6faeb0
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vmware_nsx/plugins/nsx_v/drivers/abstract_router_driver.py
View File

@ -80,13 +80,15 @@ class RouterBaseDriver(RouterAbstractDriver):
self._availability_zones = nsx_az.NsxVAvailabilityZones() self._availability_zones = nsx_az.NsxVAvailabilityZones()
def _notify_after_router_edge_association(self, context, router): def _notify_after_router_edge_association(self, context, router):
registry.notify(nsxv_constants.SERVICE_EDGE, events.AFTER_CREATE, registry.publish(nsxv_constants.SERVICE_EDGE, events.AFTER_CREATE,
self, context=context, router=router) self, payload=events.DBEventPayload(
context, states=(router,)))
def _notify_before_router_edge_association(self, context, router, def _notify_before_router_edge_association(self, context, router,
edge_id=None): edge_id=None):
registry.notify(nsxv_constants.SERVICE_EDGE, events.BEFORE_DELETE, registry.publish(nsxv_constants.SERVICE_EDGE, events.BEFORE_DELETE,
self, context=context, router=router, edge_id=edge_id) self, payload=events.DBEventPayload(
context, states=(router,), resource_id=edge_id))
def _get_external_network_id_by_router(self, context, router_id): def _get_external_network_id_by_router(self, context, router_id):
"""Get router's external network id if it has.""" """Get router's external network id if it has."""

14
vmware_nsx/services/dynamic_routing/bgp_plugin.py
View File

@ -328,12 +328,12 @@ class NSXBgpPlugin(service_base.ServicePluginBase, bgp_db.BgpDbMixin):
context, speaker, router, updated_port) context, speaker, router, updated_port)
def _before_service_edge_delete_callback(self, resource, event, def _before_service_edge_delete_callback(self, resource, event,
trigger, **kwargs): trigger, payload=None):
context = kwargs['context'].elevated() context = payload.context.elevated()
router = kwargs['router'] router = payload.latest_state
ext_net_id = router.gw_port and router.gw_port['network_id'] ext_net_id = router.gw_port and router.gw_port['network_id']
gw_ip = router.gw_port and router.gw_port['fixed_ips'][0]['ip_address'] gw_ip = router.gw_port and router.gw_port['fixed_ips'][0]['ip_address']
edge_id = kwargs.get('edge_id') edge_id = payload.resource_id
speakers = self._bgp_speakers_for_gateway_network(context, ext_net_id) speakers = self._bgp_speakers_for_gateway_network(context, ext_net_id)
for speaker in speakers: for speaker in speakers:
driver = self._get_driver_by_project( driver = self._get_driver_by_project(
@ -347,9 +347,9 @@ class NSXBgpPlugin(service_base.ServicePluginBase, bgp_db.BgpDbMixin):
gw_ip, edge_id) gw_ip, edge_id)
def _after_service_edge_create_callback(self, resource, event, def _after_service_edge_create_callback(self, resource, event,
trigger, **kwargs): trigger, payload=None):
context = kwargs['context'].elevated() context = payload.context.elevated()
router = kwargs['router'] router = payload.latest_state
ext_net_id = router.gw_port and router.gw_port['network_id'] ext_net_id = router.gw_port and router.gw_port['network_id']
speakers = self._bgp_speakers_for_gateway_network(context, ext_net_id) speakers = self._bgp_speakers_for_gateway_network(context, ext_net_id)
for speaker in speakers: for speaker in speakers: