openstack/neutron
Code Issues Proposed changes

Merge "use callback payloads for AGENT OVS_RESTARTED events"

Browse Source
This commit is contained in:
Zuul 2019-04-02 12:02:02 +00:00 committed by Gerrit Code Review
commit 29ad31be10
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/linux/openvswitch_firewall/firewall.py
View File

@ -411,7 +411,7 @@ class OVSFirewallDriver(firewall.FirewallDriver):
callbacks_resources.AGENT,
callbacks_events.OVS_RESTARTED)
def _init_firewall_callback(self, resource, event, trigger, **kwargs):
def _init_firewall_callback(self, resource, event, trigger, payload=None):
LOG.info("Reinitialize Openvswitch firewall after OVS restart.")
self._initialize_firewall()

4
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
View File

@ -2127,10 +2127,10 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
self.dvr_agent.reset_dvr_parameters()
self.dvr_agent.setup_dvr_flows()
# notify that OVS has restarted
registry.notify(
registry.publish(
callback_resources.AGENT,
callback_events.OVS_RESTARTED,
self)
self, payload=None)
# restart the polling manager so that it will signal as added
# all the current ports
# REVISIT (rossella_s) Define a method "reset" in

2
neutron/tests/functional/agent/test_l2_ovs_agent.py
View File

@ -341,7 +341,7 @@ class TestOVSAgent(base.OVSAgentTestFramework):
callback.assert_called_with(resources.AGENT,
events.OVS_RESTARTED,
mock.ANY)
mock.ANY, payload=None)
class TestOVSAgentExtensionConfig(base.OVSAgentTestFramework):