From f6e2134f29e530d8de71373b31abd37ed8dd4aaa Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 15 May 2015 11:03:38 +0900 Subject: [PATCH] ofproto_v1_5: Add legacy NXM aliases for some OXMs A motivation of this change is UTs comparing on-wire binaries; some of NX actions (eg. learn) includes OXM/NXMs fields and Open vSwitch prefers legacy NXMs over OXMs when encoding them. Signed-off-by: YAMAMOTO Takashi Signed-off-by: FUJITA Tomonori --- ryu/ofproto/ofproto_v1_5.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ryu/ofproto/ofproto_v1_5.py b/ryu/ofproto/ofproto_v1_5.py index eb7183f4..f9a36687 100644 --- a/ryu/ofproto/ofproto_v1_5.py +++ b/ryu/ofproto/ofproto_v1_5.py @@ -390,7 +390,9 @@ oxm_types = [ oxm_fields.OpenFlowBasic('in_phy_port', 1, type_desc.Int4), oxm_fields.OpenFlowBasic('metadata', 2, type_desc.Int8), oxm_fields.OpenFlowBasic('eth_dst', 3, type_desc.MacAddr), + oxm_fields.NiciraExtended0('eth_dst_nxm', 1, type_desc.MacAddr), oxm_fields.OpenFlowBasic('eth_src', 4, type_desc.MacAddr), + oxm_fields.NiciraExtended0('eth_src_nxm', 2, type_desc.MacAddr), oxm_fields.OpenFlowBasic('eth_type', 5, type_desc.Int2), oxm_fields.OpenFlowBasic('vlan_vid', 6, type_desc.Int2), oxm_fields.OpenFlowBasic('vlan_pcp', 7, type_desc.Int1), @@ -425,6 +427,7 @@ oxm_types = [ oxm_fields.OpenFlowBasic('mpls_bos', 36, type_desc.Int1), oxm_fields.OpenFlowBasic('pbb_isid', 37, type_desc.Int3), oxm_fields.OpenFlowBasic('tunnel_id', 38, type_desc.Int8), + oxm_fields.NiciraExtended1('tunnel_id_nxm', 16, type_desc.Int8), oxm_fields.OpenFlowBasic('ipv6_exthdr', 39, type_desc.Int2), oxm_fields.OpenFlowBasic('pbb_uca', 41, type_desc.Int1), oxm_fields.OpenFlowBasic('tcp_flags', 42, type_desc.Int2),