summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIWAMOTO Toshihiro <iwamoto@valinux.co.jp>2016-09-13 16:04:37 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2016-09-16 19:12:54 +0900
commit827138298f366792e3f893d3e6b09670e8649cc8 (patch)
treee1f9944627f01fc3948ccd8e4f3e5e9efa524618
parente0e30d3d96eeda01f7c59ddb1773793994e830f4 (diff)
Add Nicira extension vlan_tci field
This Nicira extension field is VLAN VID+CFI+PCP. OXM_OF_VLAN_VID and OXM_OF_VLAN_PCP should work fine in theory, but in OvS it seems vlan_tci must be used to access the CFI bit from NX_LEARN actions. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/ofproto/nicira_ext.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/ryu/ofproto/nicira_ext.py b/ryu/ofproto/nicira_ext.py
index e2fca47e..ef44ccff 100644
--- a/ryu/ofproto/nicira_ext.py
+++ b/ryu/ofproto/nicira_ext.py
@@ -431,6 +431,8 @@ eth_src_nxm MAC address Ethernet source address.
eth_type_nxm Integer 16bit Ethernet type. Needed to support Nicira
extensions that require the eth_type to
be set. (i.e. tcp_flags_nxm)
+vlan_tci Integer 16bit VLAN TCI. Basically same as vlan_vid plus
+ vlan_pcp.
ip_proto_nxm Integer 8bit IP protocol. Needed to support Nicira
extensions that require the ip_proto to
be set. (i.e. tcp_flags_nxm)
@@ -482,6 +484,7 @@ oxm_types = [
oxm_fields.NiciraExtended0('eth_dst_nxm', 1, type_desc.MacAddr),
oxm_fields.NiciraExtended0('eth_src_nxm', 2, type_desc.MacAddr),
oxm_fields.NiciraExtended0('eth_type_nxm', 3, type_desc.Int2),
+ oxm_fields.NiciraExtended0('vlan_tci', 4, type_desc.Int2),
oxm_fields.NiciraExtended0('ip_proto_nxm', 6, type_desc.Int1),
oxm_fields.NiciraExtended1('tunnel_id_nxm', 16, type_desc.Int8),
oxm_fields.NiciraExtended1('tun_ipv4_src', 31, type_desc.IPv4Addr),