From f4a7ad439ee4e54482a1dc89e04954ca12ea294e Mon Sep 17 00:00:00 2001 From: Thomas Morin Date: Fri, 16 Sep 2016 14:12:20 +0200 Subject: [PATCH] Fix useless use of _nxm variant in an OVS field name Fix useless use of _nxm variant in an OVS field name. This was supposed to be part of I9a095add42ba5799bd81887f1cbe5507ab9ba48c, but wasn't because I messed up. Change-Id: I7f708289ae8f6776a7a54bdd26a19a14b69260bd --- .../ml2/drivers/openvswitch/agent/openflow/native/br_tun.py | 2 +- .../drivers/openvswitch/agent/openflow/native/test_br_tun.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/br_tun.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/br_tun.py index 8f903b6acba..f07e21f016c 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/br_tun.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/br_tun.py @@ -232,7 +232,7 @@ class OVSTunnelBridge(ovs_bridge.OVSAgentBridge, ofpp.NXActionRegMove(src_field='eth_src', dst_field='eth_dst', n_bits=48), - ofpp.OFPActionSetField(eth_src_nxm=mac), + ofpp.OFPActionSetField(eth_src=mac), ofpp.OFPActionOutput(ofp.OFPP_IN_PORT, 0)] self.install_apply_actions(table_id=constants.ARP_RESPONDER, priority=1, diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/native/test_br_tun.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/native/test_br_tun.py index 7a10169873b..849617a294c 100644 --- a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/native/test_br_tun.py +++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/native/test_br_tun.py @@ -405,7 +405,7 @@ class OVSTunnelBridgeTest(ovs_bridge_test_base.OVSBridgeTestBase, ofpp.NXActionRegMove(src_field='eth_src', dst_field='eth_dst', n_bits=48), - ofpp.OFPActionSetField(eth_src_nxm=mac), + ofpp.OFPActionSetField(eth_src=mac), ofpp.OFPActionOutput(ofp.OFPP_IN_PORT, 0), ]), ],