From a2d71f3198b8563884c0ae761f9c4210f577e63d Mon Sep 17 00:00:00 2001 From: IWASE Yusuke Date: Mon, 18 Jan 2016 16:37:57 +0900 Subject: [PATCH] doc: ofproto_ref: Update supported actions/matches list Signed-off-by: IWASE Yusuke Signed-off-by: FUJITA Tomonori --- 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 9292b78d..c0255c53 100644 --- a/ryu/ofproto/ofproto_v1_2_parser.py +++ b/ryu/ofproto/ofproto_v1_2_parser.py @@ -1618,6 +1618,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 `. """ def __init__(self, experimenter, type_=None, len_=None): super(OFPActionExperimenter, self).__init__() @@ -3332,6 +3337,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): ... ('2001:db8:bd05:1d2:288a:1fc0:1:10ee', 'ffff:ffff:ffff:ffff::') + .. Note:: + + For the list of the supported Nicira experimenter matches, + please refer to :ref:`ryu.ofproto.nx_match `. + .. Note:: For VLAN id match field, special values are defined in OpenFlow Spec. diff --git a/ryu/ofproto/ofproto_v1_3_parser.py b/ryu/ofproto/ofproto_v1_3_parser.py index f3e2b45d..374604aa 100644 --- a/ryu/ofproto/ofproto_v1_3_parser.py +++ b/ryu/ofproto/ofproto_v1_3_parser.py @@ -728,6 +728,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:: @@ -745,6 +751,11 @@ class OFPMatch(StringifyMixin): ... ('2001:db8:bd05:1d2:288a:1fc0:1:10ee', 'ffff:ffff:ffff:ffff::') + .. Note:: + + For the list of the supported Nicira experimenter matches, + please refer to :ref:`ryu.ofproto.nx_match `. + .. Note:: For VLAN id match field, special values are defined in OpenFlow Spec. @@ -3371,6 +3382,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 `. """ def __init__(self, experimenter): diff --git a/ryu/ofproto/ofproto_v1_4_parser.py b/ryu/ofproto/ofproto_v1_4_parser.py index 51e86196..72bd212e 100644 --- a/ryu/ofproto/ofproto_v1_4_parser.py +++ b/ryu/ofproto/ofproto_v1_4_parser.py @@ -623,6 +623,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:: @@ -640,6 +644,11 @@ class OFPMatch(StringifyMixin): ... ('2001:db8:bd05:1d2:288a:1fc0:1:10ee', 'ffff:ffff:ffff:ffff::') + .. Note:: + + For the list of the supported Nicira experimenter matches, + please refer to :ref:`ryu.ofproto.nx_match `. + .. Note:: For VLAN id match field, special values are defined in OpenFlow Spec. @@ -4972,6 +4981,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 `. """ 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 a6e5136f..ac91af91 100644 --- a/ryu/ofproto/ofproto_v1_5_parser.py +++ b/ryu/ofproto/ofproto_v1_5_parser.py @@ -624,6 +624,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:: @@ -641,6 +644,11 @@ class OFPMatch(StringifyMixin): ... ('2001:db8:bd05:1d2:288a:1fc0:1:10ee', 'ffff:ffff:ffff:ffff::') + .. Note:: + + For the list of the supported Nicira experimenter matches, + please refer to :ref:`ryu.ofproto.nx_match `. + .. Note:: For VLAN id match field, special values are defined in OpenFlow Spec. @@ -5931,6 +5939,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 `. """ def __init__(self, experimenter):