summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIWAMOTO Toshihiro <iwamoto@valinux.co.jp>2018-06-13 12:02:16 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2018-06-20 12:05:11 +0900
commit704dcc786aa9f975a9d486d9a1699fd7995ecd4b (patch)
tree2e313a029b5e9ff29325be707169423aaf8b374e
parent4bc29b2c5f7e3eca6245da658743738bc400ecb9 (diff)
nx_actions: Fix NXActionSetTunnel docstring
set_tunnel and set_field:xxx->tun_id are different 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/nx_actions.py34
1 files 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
================ ======================================================