Signed-off-by: IWASE Yusuke <[email protected]>
---
 ryu/ofproto/ofproto_v1_2_parser.py | 16 ++++++++++++++++
 ryu/ofproto/ofproto_v1_3_parser.py | 16 ++++++++++++++++
 ryu/ofproto/ofproto_v1_4_parser.py | 14 ++++++++++++++
 ryu/ofproto/ofproto_v1_5_parser.py | 13 +++++++++++++
 4 files changed, 59 insertions(+)

diff --git a/ryu/ofproto/ofproto_v1_2_parser.py 
b/ryu/ofproto/ofproto_v1_2_parser.py
index 7f38e36..1771050 100644
--- a/ryu/ofproto/ofproto_v1_2_parser.py
+++ b/ryu/ofproto/ofproto_v1_2_parser.py
@@ -1617,6 +1617,11 @@ class OFPActionExperimenter(OFPAction):
     ================ ======================================================
     experimenter     Experimenter ID
     ================ ======================================================
+
+    .. Note::
+
+        For the list of the supported Nicira experimenter actions,
+        please refer to :ref:`ryu.ofproto.nx_actions <nx_actions_structures>`.
     """
     def __init__(self, experimenter, type_=None, len_=None):
         super(OFPActionExperimenter, self).__init__()
@@ -3330,6 +3335,12 @@ class OFPMatch(StringifyMixin):
     ipv6_nd_tll      MAC address     Target link-layer for ND
     mpls_label       Integer 32bit   MPLS label
     mpls_tc          Integer 8bit    MPLS TC
+    pbb_uca          Integer 8bit    PBB UCA header field
+                                     (EXT-256 Old version of ONF Extension)
+    tcp_flags        Integer 16bit   TCP flags
+                                     (EXT-109 ONF Extension)
+    actset_output    Integer 32bit   Output port from action set metadata
+                                     (EXT-233 ONF Extension)
     ================ =============== ==================================
 
     Example::
@@ -3349,6 +3360,11 @@ class OFPMatch(StringifyMixin):
 
     .. Note::
 
+        For the list of the supported Nicira experimenter matches,
+        please refer to :ref:`ryu.ofproto.nx_match <nx_match_structures>`.
+
+    .. Note::
+
         For VLAN id match field, special values are defined in OpenFlow Spec.
 
         1) Packets with and without a VLAN tag
diff --git a/ryu/ofproto/ofproto_v1_3_parser.py 
b/ryu/ofproto/ofproto_v1_3_parser.py
index 8d85525..b7b95e9 100644
--- a/ryu/ofproto/ofproto_v1_3_parser.py
+++ b/ryu/ofproto/ofproto_v1_3_parser.py
@@ -727,6 +727,12 @@ class OFPMatch(StringifyMixin):
     pbb_isid         Integer 24bit   PBB I-SID
     tunnel_id        Integer 64bit   Logical Port Metadata
     ipv6_exthdr      Integer 16bit   IPv6 Extension Header pseudo-field
+    pbb_uca          Integer 8bit    PBB UCA header field
+                                     (EXT-256 Old version of ONF Extension)
+    tcp_flags        Integer 16bit   TCP flags
+                                     (EXT-109 ONF Extension)
+    actset_output    Integer 32bit   Output port from action set metadata
+                                     (EXT-233 ONF Extension)
     ================ =============== ==================================
 
     Example::
@@ -746,6 +752,11 @@ class OFPMatch(StringifyMixin):
 
     .. Note::
 
+        For the list of the supported Nicira experimenter matches,
+        please refer to :ref:`ryu.ofproto.nx_match <nx_match_structures>`.
+
+    .. Note::
+
         For VLAN id match field, special values are defined in OpenFlow Spec.
 
         1) Packets with and without a VLAN tag
@@ -3369,6 +3380,11 @@ class OFPActionExperimenter(OFPAction):
     ================ ======================================================
     experimenter     Experimenter ID
     ================ ======================================================
+
+    .. Note::
+
+        For the list of the supported Nicira experimenter actions,
+        please refer to :ref:`ryu.ofproto.nx_actions <nx_actions_structures>`.
     """
 
     def __init__(self, experimenter):
diff --git a/ryu/ofproto/ofproto_v1_4_parser.py 
b/ryu/ofproto/ofproto_v1_4_parser.py
index 86d4568..3b7af03 100644
--- a/ryu/ofproto/ofproto_v1_4_parser.py
+++ b/ryu/ofproto/ofproto_v1_4_parser.py
@@ -622,6 +622,10 @@ class OFPMatch(StringifyMixin):
     tunnel_id        Integer 64bit   Logical Port Metadata
     ipv6_exthdr      Integer 16bit   IPv6 Extension Header pseudo-field
     pbb_uca          Integer 8bit    PBB UCA header field
+    tcp_flags        Integer 16bit   TCP flags
+                                     (EXT-109 ONF Extension)
+    actset_output    Integer 32bit   Output port from action set metadata
+                                     (EXT-233 ONF Extension)
     ================ =============== ==================================
 
     Example::
@@ -641,6 +645,11 @@ class OFPMatch(StringifyMixin):
 
     .. Note::
 
+        For the list of the supported Nicira experimenter matches,
+        please refer to :ref:`ryu.ofproto.nx_match <nx_match_structures>`.
+
+    .. Note::
+
         For VLAN id match field, special values are defined in OpenFlow Spec.
 
         1) Packets with and without a VLAN tag
@@ -4963,6 +4972,11 @@ class OFPActionExperimenter(OFPAction):
     ================ ======================================================
     experimenter     Experimenter ID
     ================ ======================================================
+
+    .. Note::
+
+        For the list of the supported Nicira experimenter actions,
+        please refer to :ref:`ryu.ofproto.nx_actions <nx_actions_structures>`.
     """
     def __init__(self, experimenter, data=None, type_=None, len_=None):
         super(OFPActionExperimenter, self).__init__()
diff --git a/ryu/ofproto/ofproto_v1_5_parser.py 
b/ryu/ofproto/ofproto_v1_5_parser.py
index 2d671b7..fdcffd9 100644
--- a/ryu/ofproto/ofproto_v1_5_parser.py
+++ b/ryu/ofproto/ofproto_v1_5_parser.py
@@ -623,6 +623,9 @@ class OFPMatch(StringifyMixin):
     tunnel_id        Integer 64bit   Logical Port Metadata
     ipv6_exthdr      Integer 16bit   IPv6 Extension Header pseudo-field
     pbb_uca          Integer 8bit    PBB UCA header field
+    tcp_flags        Integer 16bit   TCP flags
+    actset_output    Integer 32bit   Output port from action set metadata
+    packet_type      Integer 32bit   Packet type value
     ================ =============== ==================================
 
     Example::
@@ -642,6 +645,11 @@ class OFPMatch(StringifyMixin):
 
     .. Note::
 
+        For the list of the supported Nicira experimenter matches,
+        please refer to :ref:`ryu.ofproto.nx_match <nx_match_structures>`.
+
+    .. Note::
+
         For VLAN id match field, special values are defined in OpenFlow Spec.
 
         1) Packets with and without a VLAN tag
@@ -5916,6 +5924,11 @@ class OFPActionExperimenter(OFPAction):
     ================ ======================================================
     experimenter     Experimenter ID
     ================ ======================================================
+
+    .. Note::
+
+        For the list of the supported Nicira experimenter actions,
+        please refer to :ref:`ryu.ofproto.nx_actions <nx_actions_structures>`.
     """
 
     def __init__(self, experimenter):
-- 
1.9.1


------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel

Reply via email to