openstack/neutron
Code Issues Proposed changes

Local IP: skip ports with invalid ofport

Browse Source 
Some time ago a patch was merged that let's OVS agent to not
skip ports with invalid ofport [1].
Thus for Local IP processing we need to explicitly skip such
ports.

[1] https://review.opendev.org/c/openstack/neutron/+/640258

Partial-Bug: #1930200
Change-Id: I43ba007b4813c02b1cf712252b0925e649fa5813
This commit is contained in:
Oleg Bondarev 2022-01-12 12:31:21 +03:00
parent a2e44f16b6
commit 2a41b0e152
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/br_int.py
View File

@ -462,6 +462,11 @@ class OVSIntegrationBridge(ovs_bridge.OVSAgentBridge,
eth_type=0x86DD)
def setup_local_egress_flows(self, in_port, vlan):
if in_port == constants.OFPORT_INVALID:
LOG.warning("Invalid ofport: %s, vlan: %s - "
"skipping setup_local_egress_flows", in_port, vlan)
return
# Setting priority to 8 to give advantage to ARP/MAC spoofing rules
self.install_goto(table_id=constants.LOCAL_SWITCHING,
priority=8,

7
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/native/test_br_int.py
View File

@ -716,6 +716,13 @@ class OVSIntegrationBridgeTest(ovs_bridge_test_base.OVSBridgeTestBase):
]
self.assertEqual(expected, self.mock.mock_calls)
def test_setup_local_egress_flows_ofport_invalid(self):
in_port = constants.OFPORT_INVALID
vlan = 3333
self.br.setup_local_egress_flows(in_port=in_port, vlan=vlan)
self.assertFalse(self.mock.called)
def test_install_garp_blocker(self):
vlan = 2222
ip = '192.0.0.10'