openstack/neutron
Code Issues Proposed changes

Merge "ovs agent, native ARP response: set Eth src/dst"

Browse Source
This commit is contained in:
Jenkins 2016-09-16 07:08:57 +00:00 committed by Gerrit Code Review
commit 281fd2e441
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/br_tun.py
View File

@ -229,6 +229,10 @@ class OVSTunnelBridge(ovs_bridge.OVSAgentBridge,
n_bits=32), n_bits=32),
ofpp.OFPActionSetField(arp_sha=mac), ofpp.OFPActionSetField(arp_sha=mac),
ofpp.OFPActionSetField(arp_spa=ip), ofpp.OFPActionSetField(arp_spa=ip),
ofpp.NXActionRegMove(src_field='eth_src',
dst_field='eth_dst',
n_bits=48),
ofpp.OFPActionSetField(eth_src_nxm=mac),
ofpp.OFPActionOutput(ofp.OFPP_IN_PORT, 0)] ofpp.OFPActionOutput(ofp.OFPP_IN_PORT, 0)]
self.install_apply_actions(table_id=constants.ARP_RESPONDER, self.install_apply_actions(table_id=constants.ARP_RESPONDER,
priority=1, priority=1,

4
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/native/test_br_tun.py
View File

@ -402,6 +402,10 @@ class OVSTunnelBridgeTest(ovs_bridge_test_base.OVSBridgeTestBase,
src_field='arp_spa'), src_field='arp_spa'),
ofpp.OFPActionSetField(arp_sha=mac), ofpp.OFPActionSetField(arp_sha=mac),
ofpp.OFPActionSetField(arp_spa=ip), ofpp.OFPActionSetField(arp_spa=ip),
ofpp.NXActionRegMove(src_field='eth_src',
dst_field='eth_dst',
n_bits=48),
ofpp.OFPActionSetField(eth_src_nxm=mac),
ofpp.OFPActionOutput(ofp.OFPP_IN_PORT, 0), ofpp.OFPActionOutput(ofp.OFPP_IN_PORT, 0),
]), ]),
], ],