From 704dcc786aa9f975a9d486d9a1699fd7995ecd4b Mon Sep 17 00:00:00 2001 From: IWAMOTO Toshihiro Date: Wed, 13 Jun 2018 12:02:16 +0900 Subject: [PATCH] nx_actions: Fix NXActionSetTunnel docstring set_tunnel and set_field:xxx->tun_id are different actions. Signed-off-by: IWAMOTO Toshihiro Signed-off-by: FUJITA Tomonori --- ryu/ofproto/nx_actions.py | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/ryu/ofproto/nx_actions.py b/ryu/ofproto/nx_actions.py index 5fe0d545..7f543471 100644 --- a/ryu/ofproto/nx_actions.py +++ b/ryu/ofproto/nx_actions.py @@ -561,10 +561,9 @@ def generate(ofp_name, ofpp_name): And equivalent to the followings action of ovs-ofctl command. .. note:: - ovs-ofctl command of the OpenFlow1.0 is different from that - of OpenFlow1.2 or later. - - OpenFlow1.0 + This actions is supported by + ``OFPActionSetField`` + in OpenFlow1.2 or later. .. set_tunnel:id @@ -574,16 +573,6 @@ def generate(ofp_name, ofpp_name): | **set_tunnel**\:\ *id* | +------------------------+ - OpenFlow1.2 or later - - .. - set_field:value->tun_id - .. - - +-----------------------------------+ - | **set_field**\:\ *value*\->tun_id | - +-----------------------------------+ - ================ ====================================================== Attribute Description ================ ====================================================== @@ -609,10 +598,9 @@ def generate(ofp_name, ofpp_name): And equivalent to the followings action of ovs-ofctl command. .. note:: - ovs-ofctl command of the OpenFlow1.0 is different from that - of OpenFlow1.2 or later. - - OpenFlow1.0 + This actions is supported by + ``OFPActionSetField`` + in OpenFlow1.2 or later. .. set_tunnel64:id @@ -622,16 +610,6 @@ def generate(ofp_name, ofpp_name): | **set_tunnel64**\:\ *id* | +--------------------------+ - OpenFlow1.2 or later - - .. - set_field:value->tun_id - .. - - +-----------------------------------+ - | **set_field**\:\ *value*\->tun_id | - +-----------------------------------+ - ================ ====================================================== Attribute Description ================ ======================================================