openstack
/
os-ken
Code Issues Proposed changes

Revert "tests: Separate test files from Ryu module" 

This reverts commit a67ed28584.

The commit breaks OpenStack neutron dynamic routing.
This commit is contained in:
FUJITA Tomonori 2017-06-30 14:23:03 +09:00
parent a67ed28584
commit a991fed7e4
984 changed files with 349 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -16,7 +16,7 @@ sudo: required # Required to enable Docker service
install:
- pip install tox coveralls
- bash tests/integrated/common/install_docker_test_pkg_for_travis.sh
- bash ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh
script:
- NOSE_VERBOSE=0 tox -e $TOX_ENV

2
CONTRIBUTING.rst
View File

@ -87,7 +87,7 @@ Coding style guide
* JSON files:
Ryu source tree has JSON files under tests/unit/ofproto/json.
Ryu source tree has JSON files under ryu/tests/unit/ofproto/json.
They are used by unit tests. To make patches easier to read,
they are normalized using tools/normalize_json.py. Please re-run
the script before committing changes to these JSON files.

3
MANIFEST.in
View File

@ -6,7 +6,8 @@ graft doc
graft etc
graft tools
recursive-exclude doc/build *
recursive-exclude tests/*
recursive-exclude ryu/tests/packet_data_generator *
recursive-exclude ryu/tests/packet_data_generator2 *
global-exclude *~
global-exclude *.pyc
global-exclude .gitignore

68
doc/source/ofproto_v1_0_ref.rst
View File

@ -14,13 +14,13 @@ Handshake
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of10/1-5-features_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-5-features_request.packet.json
.. autoclass:: OFPSwitchFeatures
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json
Switch Configuration
--------------------
@ -29,19 +29,19 @@ Switch Configuration
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-7-ofp_set_config.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-7-ofp_set_config.packet.json
.. autoclass:: OFPGetConfigRequest
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-8-ofp_get_config_request.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-8-ofp_get_config_request.packet.json
.. autoclass:: OFPGetConfigReply
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-9-ofp_get_config_reply.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-9-ofp_get_config_reply.packet.json
Modify State Messages
---------------------
@ -50,14 +50,14 @@ Modify State Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-3-ofp_flow_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-3-ofp_flow_mod.packet.json
.. autoclass:: OFPPortMod
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-22-ofp_port_mod.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-22-ofp_port_mod.packet.json
Queue Configuration Messages
----------------------------
@ -66,13 +66,13 @@ Queue Configuration Messages
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-35-ofp_queue_get_config_request.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-35-ofp_queue_get_config_request.packet.json
.. autoclass:: OFPQueueGetConfigReply
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-36-ofp_queue_get_config_reply.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-36-ofp_queue_get_config_reply.packet.json
Read State Messages
-------------------
@ -81,74 +81,74 @@ Read State Messages
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-24-ofp_desc_stats_request.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-24-ofp_desc_stats_request.packet.json
.. autoclass:: OFPDescStatsReply
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-0-ofp_desc_stats_reply.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-0-ofp_desc_stats_reply.packet.json
.. autoclass:: OFPFlowStatsRequest
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-11-ofp_flow_stats_request.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-11-ofp_flow_stats_request.packet.json
.. autoclass:: OFPFlowStatsReply
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-12-ofp_flow_stats_reply.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-12-ofp_flow_stats_reply.packet.json
.. autoclass:: OFPAggregateStatsRequest
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-25-ofp_aggregate_stats_request.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-25-ofp_aggregate_stats_request.packet.json
.. autoclass:: OFPAggregateStatsReply
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-26-ofp_aggregate_stats_reply.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-26-ofp_aggregate_stats_reply.packet.json
.. autoclass:: OFPTableStatsRequest
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-27-ofp_table_stats_request.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-27-ofp_table_stats_request.packet.json
.. autoclass:: OFPTableStatsReply
.. XXX commented out because it's too long
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-28-ofp_table_stats_reply.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-28-ofp_table_stats_reply.packet.json
.. autoclass:: OFPPortStatsRequest
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-29-ofp_port_stats_request.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-29-ofp_port_stats_request.packet.json
.. autoclass:: OFPPortStatsReply
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-30-ofp_port_stats_reply.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-30-ofp_port_stats_reply.packet.json
.. autoclass:: OFPQueueStatsRequest
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-37-ofp_queue_stats_request.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-37-ofp_queue_stats_request.packet.json
.. autoclass:: OFPQueueStatsReply
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-38-ofp_queue_stats_reply.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-38-ofp_queue_stats_reply.packet.json
.. autoclass:: OFPVendorStatsRequest
.. autoclass:: OFPVendorStatsReply
@ -160,7 +160,7 @@ Send Packet Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json
Barrier Message
---------------
@ -169,13 +169,13 @@ Barrier Message
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-17-ofp_barrier_request.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-17-ofp_barrier_request.packet.json
.. autoclass:: OFPBarrierReply
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-18-ofp_barrier_reply.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-18-ofp_barrier_reply.packet.json
Asynchronous Messages
@ -188,7 +188,7 @@ Packet-In Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json
Flow Removed Message
--------------------
@ -197,7 +197,7 @@ Flow Removed Message
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-40-ofp_flow_removed.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-40-ofp_flow_removed.packet.json
Port Status Message
-------------------
@ -206,7 +206,7 @@ Port Status Message
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-39-ofp_port_status.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-39-ofp_port_status.packet.json
Error Message
-------------
@ -215,8 +215,8 @@ Error Message
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-15-ofp_error_msg.packet.json
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-41-ofp_error_msg_vendor.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-15-ofp_error_msg.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-41-ofp_error_msg_vendor.packet.json
Symmetric Messages
==================
@ -228,7 +228,7 @@ Hello
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-10-ofp_hello.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-10-ofp_hello.packet.json
Echo Request
------------
@ -237,7 +237,7 @@ Echo Request
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-13-ofp_echo_request.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-13-ofp_echo_request.packet.json
Echo Reply
@ -247,7 +247,7 @@ Echo Reply
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-14-ofp_echo_reply.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-14-ofp_echo_reply.packet.json
Vendor
@ -257,7 +257,7 @@ Vendor
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-16-ofp_vendor.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-16-ofp_vendor.packet.json
Port Structures
===============

84
doc/source/ofproto_v1_2_ref.rst
View File

@ -14,13 +14,13 @@ Handshake
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-5-ofp_features_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-5-ofp_features_request.packet.json
.. autoclass:: OFPSwitchFeatures
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-6-ofp_features_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-6-ofp_features_reply.packet.json
Switch Configuration
--------------------
@ -29,19 +29,19 @@ Switch Configuration
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-7-ofp_set_config.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-7-ofp_set_config.packet.json
.. autoclass:: OFPGetConfigRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-8-ofp_get_config_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-8-ofp_get_config_request.packet.json
.. autoclass:: OFPGetConfigReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-9-ofp_get_config_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-9-ofp_get_config_reply.packet.json
Flow Table Configuration
------------------------
@ -50,7 +50,7 @@ Flow Table Configuration
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-23-ofp_table_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-23-ofp_table_mod.packet.json
Modify State Messages
---------------------
@ -59,20 +59,20 @@ Modify State Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json
.. autoclass:: OFPGroupMod
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json
.. autoclass:: OFPPortMod
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-22-ofp_port_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-22-ofp_port_mod.packet.json
Read State Messages
-------------------
@ -81,74 +81,74 @@ Read State Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-24-ofp_desc_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-24-ofp_desc_stats_request.packet.json
.. autoclass:: OFPDescStats
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-0-ofp_desc_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-0-ofp_desc_stats_reply.packet.json
.. autoclass:: OFPFlowStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json
.. autoclass:: OFPFlowStats
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json
.. autoclass:: OFPAggregateStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json
.. autoclass:: OFPAggregateStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-26-ofp_aggregate_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-26-ofp_aggregate_stats_reply.packet.json
.. autoclass:: OFPTableStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-27-ofp_table_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-27-ofp_table_stats_request.packet.json
.. autoclass:: OFPTableStats
.. XXX commented out because it's too long
.. JSON Example:
..
.. .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-28-ofp_table_stats_reply.packet.json
.. .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-28-ofp_table_stats_reply.packet.json
.. autoclass:: OFPPortStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-29-ofp_port_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-29-ofp_port_stats_request.packet.json
.. autoclass:: OFPPortStats
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-30-ofp_port_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-30-ofp_port_stats_reply.packet.json
.. autoclass:: OFPQueueStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-37-ofp_queue_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-37-ofp_queue_stats_request.packet.json
.. autoclass:: OFPQueueStats
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-38-ofp_queue_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-38-ofp_queue_stats_reply.packet.json
.. autoclass:: OFPGroupStatsRequest
.. autoclass:: OFPGroupStats
@ -156,25 +156,25 @@ Read State Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-33-ofp_group_desc_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-33-ofp_group_desc_stats_request.packet.json
.. autoclass:: OFPGroupDescStats
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json
.. autoclass:: OFPGroupFeaturesStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-31-ofp_group_features_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-31-ofp_group_features_stats_request.packet.json
.. autoclass:: OFPGroupFeaturesStats
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-32-ofp_group_features_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-32-ofp_group_features_stats_reply.packet.json
Queue Configuration Messages
----------------------------
@ -183,13 +183,13 @@ Queue Configuration Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-35-ofp_queue_get_config_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-35-ofp_queue_get_config_request.packet.json
.. autoclass:: OFPQueueGetConfigReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json
Packet-Out Message
------------------
@ -198,7 +198,7 @@ Packet-Out Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json
Barrier Message
---------------
@ -207,13 +207,13 @@ Barrier Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-17-ofp_barrier_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-17-ofp_barrier_request.packet.json
.. autoclass:: OFPBarrierReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-18-ofp_barrier_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-18-ofp_barrier_reply.packet.json
Role Request Message
--------------------
@ -222,13 +222,13 @@ Role Request Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-19-ofp_role_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-19-ofp_role_request.packet.json
.. autoclass:: OFPRoleReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-20-ofp_role_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-20-ofp_role_reply.packet.json
Asynchronous Messages
@ -241,7 +241,7 @@ Packet-In Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json
Flow Removed Message
--------------------
@ -250,7 +250,7 @@ Flow Removed Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json
Port Status Message
-------------------
@ -259,7 +259,7 @@ Port Status Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-39-ofp_port_status.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-39-ofp_port_status.packet.json
Error Message
-------------
@ -268,8 +268,8 @@ Error Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-15-ofp_error_msg.packet.json
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-15-ofp_error_msg.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json
Symmetric Messages
==================
@ -281,7 +281,7 @@ Hello
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-10-ofp_hello.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-10-ofp_hello.packet.json
Echo Request
------------
@ -290,7 +290,7 @@ Echo Request
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-13-ofp_echo_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-13-ofp_echo_request.packet.json
Echo Reply
@ -300,7 +300,7 @@ Echo Reply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-14-ofp_echo_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-14-ofp_echo_reply.packet.json
Experimenter
@ -310,7 +310,7 @@ Experimenter
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of12/3-16-ofp_experimenter.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-16-ofp_experimenter.packet.json
Port Structures
===============

110
doc/source/ofproto_v1_3_ref.rst
View File

@ -14,13 +14,13 @@ Handshake
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-5-ofp_features_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-5-ofp_features_request.packet.json
.. autoclass:: OFPSwitchFeatures
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-6-ofp_features_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-6-ofp_features_reply.packet.json
Switch Configuration
--------------------
@ -29,19 +29,19 @@ Switch Configuration
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-7-ofp_set_config.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-7-ofp_set_config.packet.json
.. autoclass:: OFPGetConfigRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-8-ofp_get_config_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-8-ofp_get_config_request.packet.json
.. autoclass:: OFPGetConfigReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-9-ofp_get_config_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-9-ofp_get_config_reply.packet.json
Flow Table Configuration
------------------------
@ -50,7 +50,7 @@ Flow Table Configuration
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-23-ofp_table_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-23-ofp_table_mod.packet.json
Modify State Messages
---------------------
@ -59,27 +59,27 @@ Modify State Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json
.. autoclass:: OFPGroupMod
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-21-ofp_group_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-21-ofp_group_mod.packet.json
.. autoclass:: OFPPortMod
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-22-ofp_port_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-22-ofp_port_mod.packet.json
.. autoclass:: OFPMeterMod
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-45-ofp_meter_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-45-ofp_meter_mod.packet.json
Multipart Messages
------------------
@ -88,85 +88,85 @@ Multipart Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json
.. autoclass:: OFPDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json
.. autoclass:: OFPFlowStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json
.. autoclass:: OFPFlowStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json
.. autoclass:: OFPAggregateStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json
.. autoclass:: OFPAggregateStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json
.. autoclass:: OFPTableStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json
.. autoclass:: OFPTableStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json
.. autoclass:: OFPPortStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json
.. autoclass:: OFPPortStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json
.. autoclass:: OFPPortDescStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json
.. autoclass:: OFPPortDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json
.. autoclass:: OFPQueueStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json
.. autoclass:: OFPQueueStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json
.. autoclass:: OFPGroupStatsRequest
.. autoclass:: OFPGroupStatsReply
@ -174,61 +174,61 @@ Multipart Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json
.. autoclass:: OFPGroupDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json
.. autoclass:: OFPGroupFeaturesStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json
.. autoclass:: OFPGroupFeaturesStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json
.. autoclass:: OFPMeterStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json
.. autoclass:: OFPMeterStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json
.. autoclass:: OFPMeterConfigStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json
.. autoclass:: OFPMeterConfigStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json
.. autoclass:: OFPMeterFeaturesStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json
.. autoclass:: OFPMeterFeaturesStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json
.. autoclass:: OFPTableFeaturesStatsRequest
.. autoclass:: OFPTableFeaturesStatsReply
@ -237,7 +237,7 @@ Multipart Messages
See an example in:
``tests/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json``
``ryu/tests/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json``
Queue Configuration Messages
----------------------------
@ -246,13 +246,13 @@ Queue Configuration Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-35-ofp_queue_get_config_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-35-ofp_queue_get_config_request.packet.json
.. autoclass:: OFPQueueGetConfigReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-36-ofp_queue_get_config_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-36-ofp_queue_get_config_reply.packet.json
Packet-Out Message
------------------
@ -261,7 +261,7 @@ Packet-Out Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-1-ofp_packet_out.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-1-ofp_packet_out.packet.json
Barrier Message
---------------
@ -270,13 +270,13 @@ Barrier Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-17-ofp_barrier_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-17-ofp_barrier_request.packet.json
.. autoclass:: OFPBarrierReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-18-ofp_barrier_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-18-ofp_barrier_reply.packet.json
Role Request Message
--------------------
@ -285,13 +285,13 @@ Role Request Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-19-ofp_role_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-19-ofp_role_request.packet.json
.. autoclass:: OFPRoleReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-20-ofp_role_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-20-ofp_role_reply.packet.json
Set Asynchronous Configuration Message
--------------------------------------
@ -300,19 +300,19 @@ Set Asynchronous Configuration Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-44-ofp_set_async.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-44-ofp_set_async.packet.json
.. autoclass:: OFPGetAsyncRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-42-ofp_get_async_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-42-ofp_get_async_request.packet.json
.. autoclass:: OFPGetAsyncReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-43-ofp_get_async_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-43-ofp_get_async_reply.packet.json
Asynchronous Messages
@ -325,7 +325,7 @@ Packet-In Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json
Flow Removed Message
--------------------
@ -334,7 +334,7 @@ Flow Removed Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json
Port Status Message
-------------------
@ -343,7 +343,7 @@ Port Status Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-39-ofp_port_status.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-39-ofp_port_status.packet.json
Error Message
-------------
@ -352,7 +352,7 @@ Error Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-15-ofp_error_msg.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-15-ofp_error_msg.packet.json
Symmetric Messages
@ -365,7 +365,7 @@ Hello
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-10-ofp_hello.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-10-ofp_hello.packet.json
.. autoclass:: OFPHelloElemVersionBitmap
@ -376,7 +376,7 @@ Echo Request
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-13-ofp_echo_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-13-ofp_echo_request.packet.json
Echo Reply
----------
@ -385,7 +385,7 @@ Echo Reply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-14-ofp_echo_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-14-ofp_echo_reply.packet.json
Experimenter
------------
@ -394,7 +394,7 @@ Experimenter
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of13/4-16-ofp_experimenter.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-16-ofp_experimenter.packet.json
Port Structures
===============

142
doc/source/ofproto_v1_4_ref.rst
View File

@ -14,13 +14,13 @@ Handshake
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-5-ofp_features_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-5-ofp_features_request.packet.json
.. autoclass:: OFPSwitchFeatures
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-6-ofp_features_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-6-ofp_features_reply.packet.json
Switch Configuration
--------------------
@ -29,19 +29,19 @@ Switch Configuration
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-7-ofp_set_config.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-7-ofp_set_config.packet.json
.. autoclass:: OFPGetConfigRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-8-ofp_get_config_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-8-ofp_get_config_request.packet.json
.. autoclass:: OFPGetConfigReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-9-ofp_get_config_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-9-ofp_get_config_reply.packet.json
Modify State Messages
---------------------
@ -50,34 +50,34 @@ Modify State Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json
.. autoclass:: OFPFlowMod
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-3-ofp_flow_mod.packet.json
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-44-ofp_flow_mod.packet.json
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-58-ofp_flow_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-3-ofp_flow_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-44-ofp_flow_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-58-ofp_flow_mod.packet.json
.. autoclass:: OFPGroupMod
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-21-ofp_group_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-21-ofp_group_mod.packet.json
.. autoclass:: OFPPortMod
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json
.. autoclass:: OFPMeterMod
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-43-ofp_meter_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-43-ofp_meter_mod.packet.json
Multipart Messages
------------------
@ -86,61 +86,61 @@ Multipart Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-24-ofp_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-24-ofp_desc_request.packet.json
.. autoclass:: OFPDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-0-ofp_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-0-ofp_desc_reply.packet.json
.. autoclass:: OFPFlowStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-11-ofp_flow_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-11-ofp_flow_stats_request.packet.json
.. autoclass:: OFPFlowStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json
.. autoclass:: OFPAggregateStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-25-ofp_aggregate_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-25-ofp_aggregate_stats_request.packet.json
.. autoclass:: OFPAggregateStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-26-ofp_aggregate_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-26-ofp_aggregate_stats_reply.packet.json
.. autoclass:: OFPTableStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-27-ofp_table_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-27-ofp_table_stats_request.packet.json
.. autoclass:: OFPTableStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-28-ofp_table_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-28-ofp_table_stats_reply.packet.json
.. autoclass:: OFPTableDescStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-61-ofp_table_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-61-ofp_table_desc_request.packet.json
.. autoclass:: OFPTableDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json
.. autoclass:: OFPTableFeaturesStatsRequest
@ -148,7 +148,7 @@ Multipart Messages
See an example in:
``tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json``
``ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json``
.. autoclass:: OFPTableFeaturesStatsReply
@ -156,151 +156,151 @@ Multipart Messages
See an example in:
``tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json``
``ryu/tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json``
.. autoclass:: OFPPortStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-29-ofp_port_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-29-ofp_port_stats_request.packet.json
.. autoclass:: OFPPortStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json
.. autoclass:: OFPPortDescStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-51-ofp_port_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-51-ofp_port_desc_request.packet.json
.. autoclass:: OFPPortDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json
.. autoclass:: OFPQueueStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-35-ofp_queue_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-35-ofp_queue_stats_request.packet.json
.. autoclass:: OFPQueueStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json
.. autoclass:: OFPQueueDescStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-63-ofp_queue_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-63-ofp_queue_desc_request.packet.json
.. autoclass:: OFPQueueDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json
.. autoclass:: OFPGroupStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-55-ofp_group_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-55-ofp_group_stats_request.packet.json
.. autoclass:: OFPGroupStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-56-ofp_group_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-56-ofp_group_stats_reply.packet.json
.. autoclass:: OFPGroupDescStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-33-ofp_group_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-33-ofp_group_desc_request.packet.json
.. autoclass:: OFPGroupDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-34-ofp_group_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-34-ofp_group_desc_reply.packet.json
.. autoclass:: OFPGroupFeaturesStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-31-ofp_group_features_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-31-ofp_group_features_request.packet.json
.. autoclass:: OFPGroupFeaturesStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-32-ofp_group_features_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-32-ofp_group_features_reply.packet.json
.. autoclass:: OFPMeterStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-47-ofp_meter_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-47-ofp_meter_stats_request.packet.json
.. autoclass:: OFPMeterStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-48-ofp_meter_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-48-ofp_meter_stats_reply.packet.json
.. autoclass:: OFPMeterConfigStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-45-ofp_meter_config_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-45-ofp_meter_config_request.packet.json
.. autoclass:: OFPMeterConfigStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-46-ofp_meter_config_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-46-ofp_meter_config_reply.packet.json
.. autoclass:: OFPMeterFeaturesStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-49-ofp_meter_features_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-49-ofp_meter_features_request.packet.json
.. autoclass:: OFPMeterFeaturesStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json
.. autoclass:: OFPFlowMonitorRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-66-ofp_flow_monitor_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-66-ofp_flow_monitor_request.packet.json
.. autoclass:: OFPFlowMonitorReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json
.. autoclass:: OFPExperimenterStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-59-ofp_experimenter_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-59-ofp_experimenter_request.packet.json
.. autoclass:: OFPExperimenterStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-60-ofp_experimenter_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-60-ofp_experimenter_reply.packet.json
Packet-Out Message
------------------
@ -309,7 +309,7 @@ Packet-Out Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-1-ofp_packet_out.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-1-ofp_packet_out.packet.json
Barrier Message
---------------
@ -318,13 +318,13 @@ Barrier Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-17-ofp_barrier_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-17-ofp_barrier_request.packet.json
.. autoclass:: OFPBarrierReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-18-ofp_barrier_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-18-ofp_barrier_reply.packet.json
Role Request Message
--------------------
@ -333,13 +333,13 @@ Role Request Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-19-ofp_role_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-19-ofp_role_request.packet.json
.. autoclass:: OFPRoleReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-20-ofp_role_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-20-ofp_role_reply.packet.json
Bundle Messages
---------------
@ -348,13 +348,13 @@ Bundle Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json
.. autoclass:: OFPBundleAddMsg
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-70-ofp_bundle_add_msg.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-70-ofp_bundle_add_msg.packet.json
Set Asynchronous Configuration Message
--------------------------------------
@ -363,19 +363,19 @@ Set Asynchronous Configuration Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-42-ofp_set_async.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-42-ofp_set_async.packet.json
.. autoclass:: OFPGetAsyncRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-40-ofp_get_async_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-40-ofp_get_async_request.packet.json
.. autoclass:: OFPGetAsyncReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-41-ofp_get_async_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-41-ofp_get_async_reply.packet.json
Asynchronous Messages
@ -388,8 +388,8 @@ Packet-In Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-4-ofp_packet_in.packet.json
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-57-ofp_packet_in.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-4-ofp_packet_in.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-57-ofp_packet_in.packet.json
Flow Removed Message
--------------------
@ -398,7 +398,7 @@ Flow Removed Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-38-ofp_flow_removed.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-38-ofp_flow_removed.packet.json
Port Status Message
-------------------
@ -407,7 +407,7 @@ Port Status Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json
Controller Role Status Message
------------------------------
@ -416,7 +416,7 @@ Controller Role Status Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json
Table Status Message
--------------------
@ -425,7 +425,7 @@ Table Status Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-68-ofp_table_status.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-68-ofp_table_status.packet.json
Request Forward Message
-----------------------
@ -434,7 +434,7 @@ Request Forward Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-71-ofp_requestforward.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-71-ofp_requestforward.packet.json
Symmetric Messages
@ -447,7 +447,7 @@ Hello
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-10-ofp_hello.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-10-ofp_hello.packet.json
.. autoclass:: OFPHelloElemVersionBitmap
@ -458,7 +458,7 @@ Echo Request
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-13-ofp_echo_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-13-ofp_echo_request.packet.json
Echo Reply
----------
@ -467,7 +467,7 @@ Echo Reply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-14-ofp_echo_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-14-ofp_echo_reply.packet.json
Error Message
-------------
@ -476,7 +476,7 @@ Error Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-15-ofp_error_msg.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-15-ofp_error_msg.packet.json
Experimenter
------------
@ -485,7 +485,7 @@ Experimenter
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of14/5-16-ofp_experimenter.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-16-ofp_experimenter.packet.json
Port Structures
===============

152
doc/source/ofproto_v1_5_ref.rst
View File

@ -14,13 +14,13 @@ Handshake
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-features_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-features_request.packet.json
.. autoclass:: OFPSwitchFeatures
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-features_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-features_reply.packet.json
Switch Configuration
--------------------
@ -29,19 +29,19 @@ Switch Configuration
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-set_config.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-set_config.packet.json
.. autoclass:: OFPGetConfigRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_request.packet.json
.. autoclass:: OFPGetConfigReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_reply.packet.json
Modify State Messages
---------------------
@ -50,33 +50,33 @@ Modify State Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json
.. autoclass:: OFPFlowMod
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json
.. autoclass:: OFPGroupMod
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json
.. autoclass:: OFPPortMod
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-port_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_mod.packet.json
.. autoclass:: OFPMeterMod
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json
Multipart Messages
------------------
@ -85,253 +85,253 @@ Multipart Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_request.packet.json
.. autoclass:: OFPDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_reply.packet.json
.. autoclass:: OFPFlowDescStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json
.. autoclass:: OFPFlowDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json
.. autoclass:: OFPFlowStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_request.packet.json
.. autoclass:: OFPFlowStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json
.. autoclass:: OFPAggregateStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_request.packet.json
.. autoclass:: OFPAggregateStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json
.. autoclass:: OFPPortStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_request.packet.json
.. autoclass:: OFPPortStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_reply.packet.json
.. autoclass:: OFPPortDescStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_request.packet.json
.. autoclass:: OFPPortDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_reply.packet.json
.. autoclass:: OFPQueueStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json
.. autoclass:: OFPQueueStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_reply.packet.json
.. autoclass:: OFPQueueDescStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_request.packet.json
.. autoclass:: OFPQueueDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_reply.packet.json
.. autoclass:: OFPGroupStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_request.packet.json
.. autoclass:: OFPGroupStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_reply.packet.json
.. autoclass:: OFPGroupDescStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json
.. autoclass:: OFPGroupDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_reply.packet.json
.. autoclass:: OFPGroupFeaturesStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_request.packet.json
.. autoclass:: OFPGroupFeaturesStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_reply.packet.json
.. autoclass:: OFPMeterStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_request.packet.json
.. autoclass:: OFPMeterStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_reply.packet.json
.. autoclass:: OFPMeterDescStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_request.packet.json
.. autoclass:: OFPMeterDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_reply.packet.json
.. autoclass:: OFPMeterFeaturesStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_request.packet.json
.. autoclass:: OFPMeterFeaturesStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json
.. autoclass:: OFPControllerStatusStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json
.. autoclass:: OFPControllerStatusStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json
.. autoclass:: OFPTableStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_request.packet.json
.. autoclass:: OFPTableStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_reply.packet.json
.. autoclass:: OFPTableDescStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_request.packet.json
.. autoclass:: OFPTableDescStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_reply.packet.json
.. autoclass:: OFPTableFeaturesStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_request.packet.json
.. autoclass:: OFPTableFeaturesStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_reply.packet.json
.. autoclass:: OFPFlowMonitorRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_request.packet.json
.. autoclass:: OFPFlowMonitorReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_reply.packet.json
.. autoclass:: OFPBundleFeaturesStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_request.packet.json
.. autoclass:: OFPBundleFeaturesStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_reply.packet.json
.. autoclass:: OFPExperimenterStatsRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_request.packet.json
.. autoclass:: OFPExperimenterStatsReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_reply.packet.json
Packet-Out Message
------------------
@ -340,7 +340,7 @@ Packet-Out Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-packet_out.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_out.packet.json
Barrier Message
---------------
@ -349,13 +349,13 @@ Barrier Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_request.packet.json
.. autoclass:: OFPBarrierReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_reply.packet.json
Role Request Message
--------------------
@ -364,13 +364,13 @@ Role Request Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json
.. autoclass:: OFPRoleReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json
Bundle Messages
---------------
@ -379,13 +379,13 @@ Bundle Messages
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_ctrl.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_ctrl.packet.json
.. autoclass:: OFPBundleAddMsg
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json
Set Asynchronous Configuration Message
--------------------------------------
@ -394,19 +394,19 @@ Set Asynchronous Configuration Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-set_async.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-set_async.packet.json
.. autoclass:: OFPGetAsyncRequest
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_request.packet.json
.. autoclass:: OFPGetAsyncReply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_reply.packet.json
Asynchronous Messages
=====================
@ -418,7 +418,7 @@ Packet-In Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-packet_in.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_in.packet.json
Flow Removed Message
--------------------
@ -427,7 +427,7 @@ Flow Removed Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json
Port Status Message
-------------------
@ -436,7 +436,7 @@ Port Status Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-port_status.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_status.packet.json
Controller Role Status Message
------------------------------
@ -445,7 +445,7 @@ Controller Role Status Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json
Table Status Message
--------------------
@ -454,7 +454,7 @@ Table Status Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_status.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_status.packet.json
Request Forward Message
-----------------------
@ -463,7 +463,7 @@ Request Forward Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json
Controller Status Message
-------------------------
@ -472,7 +472,7 @@ Controller Status Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json
Symmetric Messages
==================
@ -484,7 +484,7 @@ Hello
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json
.. autoclass:: OFPHelloElemVersionBitmap
@ -495,7 +495,7 @@ Echo Request
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json
Echo Reply
----------
@ -504,7 +504,7 @@ Echo Reply
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json
Error Message
-------------
@ -513,7 +513,7 @@ Error Message
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json
Experimenter
------------
@ -522,7 +522,7 @@ Experimenter
JSON Example:
.. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json
.. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json
Port Structures
===============

4
doc/source/test-vrrp.rst
View File

@ -9,8 +9,8 @@ Running integrated tests
Some testing scripts are available.
* tests/integrated/test_vrrp_linux_multi.py
* tests/integrated/test_vrrp_multi.py
* ryu/tests/integrated/test_vrrp_linux_multi.py
* ryu/tests/integrated/test_vrrp_multi.py
Each files include how to run in the comment.
Please refer to it.

2
doc/source/writing_ryu_app.rst
View File

@ -122,5 +122,5 @@ switch? Move to `the next step
can learn from the existing Ryu applications at `ryu/app
<https://github.com/osrg/ryu/blob/master/ryu/app/>`_ directory and
`integrated tests
<https://github.com/osrg/ryu/blob/master/tests/integrated/>`_
<https://github.com/osrg/ryu/blob/master/ryu/tests/integrated/>`_
directory.

6
run_tests.sh
View File

@ -90,7 +90,7 @@ run_tests() {
run_pylint() {
echo "Running pylint ..."
PYLINT_OPTIONS="--rcfile=.pylintrc --output-format=parseable"
PYLINT_INCLUDE="ryu bin/ryu bin/ryu-manager tests/integrated tests/packet_data_generator3 tests/unit"
PYLINT_INCLUDE="ryu bin/ryu bin/ryu-manager ryu/tests/bin/ryu-client"
export PYTHONPATH=$PYTHONPATH:.ryu
PYLINT_LOG=pylint.log
@ -115,11 +115,11 @@ run_pep8() {
run_integrated() {
echo "Running integrated test ..."
INTEGRATED_TEST_RUNNER="./tests/integrated/run_tests_with_ovs12.py"
INTEGRATED_TEST_RUNNER="./ryu/tests/integrated/run_tests_with_ovs12.py"
sudo PYTHONPATH=. nosetests -s $INTEGRATED_TEST_RUNNER
}
#NOSETESTS="nosetests $noseopts $noseargs"
NOSETESTS="${PYTHON} ./tests/run_tests.py $noseopts $noseargs"
NOSETESTS="${PYTHON} ./ryu/tests/run_tests.py $noseopts $noseargs"
#if [ -n "$PLUGIN_DIR" ]
#then

0
tests/__init__.py → ryu/tests/integrated/__init__.py
View File

0
tests/integrated/__init__.py → ryu/tests/integrated/bgp/__init__.py
View File

6
tests/integrated/bgp/base.py → ryu/tests/integrated/bgp/base.py
View File

@ -20,9 +20,9 @@ import logging
import sys
import unittest
from tests.integrated.common import docker_base as ctn_base
from tests.integrated.common import ryubgp
from tests.integrated.common import quagga
from ryu.tests.integrated.common import docker_base as ctn_base
from ryu.tests.integrated.common import ryubgp
from ryu.tests.integrated.common import quagga
LOG = logging.getLogger(__name__)

6
tests/integrated/bgp/base_ip6.py → ryu/tests/integrated/bgp/base_ip6.py
View File

@ -20,9 +20,9 @@ import logging
import sys
import unittest
from tests.integrated.common import docker_base as ctn_base
from tests.integrated.common import ryubgp
from tests.integrated.common import quagga
from ryu.tests.integrated.common import docker_base as ctn_base
from ryu.tests.integrated.common import ryubgp
from ryu.tests.integrated.common import quagga
LOG = logging.getLogger(__name__)

2
tests/integrated/bgp/test_basic.py → ryu/tests/integrated/bgp/test_basic.py
View File

@ -18,7 +18,7 @@ from __future__ import absolute_import
import time
from tests.integrated.common import docker_base as ctn_base
from ryu.tests.integrated.common import docker_base as ctn_base
from . import base

2
tests/integrated/bgp/test_ip6_basic.py → ryu/tests/integrated/bgp/test_ip6_basic.py
View File

@ -18,7 +18,7 @@ from __future__ import absolute_import
import time
from tests.integrated.common import docker_base as ctn_base
from ryu.tests.integrated.common import docker_base as ctn_base
from . import base_ip6 as base

0
tests/integrated/bgp/__init__.py → ryu/tests/integrated/common/__init__.py
View File

0
tests/integrated/common/docker_base.py → ryu/tests/integrated/common/docker_base.py
View File

0
tests/integrated/common/install_docker_test_pkg.sh → ryu/tests/integrated/common/install_docker_test_pkg.sh
View File

0
tests/integrated/common/install_docker_test_pkg_common.sh → ryu/tests/integrated/common/install_docker_test_pkg_common.sh
View File

0
tests/integrated/common/install_docker_test_pkg_for_travis.sh → ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh
View File

0
tests/integrated/common/quagga.py → ryu/tests/integrated/common/quagga.py
View File

0
tests/integrated/common/ryubgp.py → ryu/tests/integrated/common/ryubgp.py
View File

4
tests/integrated/run_test.py → ryu/tests/integrated/run_test.py
View File

@ -26,9 +26,9 @@ from ryu import log
def load_tests(loader, tests, pattern):
dirname = os.path.dirname(os.path.abspath(__file__))
base_path = os.path.abspath(dirname + '/../..')
base_path = os.path.abspath(dirname + '/../../..')
suite = unittest.TestSuite()
for test_dir in ['tests/integrated/bgp']:
for test_dir in ['ryu/tests/integrated/bgp']:
if not pattern:
suite.addTests(loader.discover(test_dir,
top_level_dir=base_path))

8
tests/integrated/run_tests_with_ovs12.py → ryu/tests/integrated/run_tests_with_ovs12.py
View File

@ -62,22 +62,22 @@ class TestWithOVS12(unittest.TestCase):
@timed(TIMEOUT)
def test_add_flow_v10(self):
app = 'test/integrated/test_add_flow_v10.py'
app = 'ryu/tests/integrated/test_add_flow_v10.py'
self._run_ryu_manager_and_check_output(app)
@timed(TIMEOUT)
def test_request_reply_v12(self):
app = 'test/integrated/test_request_reply_v12.py'
app = 'ryu/tests/integrated/test_request_reply_v12.py'
self._run_ryu_manager_and_check_output(app)
@timed(TIMEOUT)
def test_add_flow_v12_actions(self):
app = 'test/integrated/test_add_flow_v12_actions.py'
app = 'ryu/tests/integrated/test_add_flow_v12_actions.py'
self._run_ryu_manager_and_check_output(app)
@timed(TIMEOUT)
def test_add_flow_v12_matches(self):
app = 'test/integrated/test_add_flow_v12_matches.py'
app = 'ryu/tests/integrated/test_add_flow_v12_matches.py'
self._run_ryu_manager_and_check_output(app)
@nottest

3
tests/integrated/test_add_flow_v10.py → ryu/tests/integrated/test_add_flow_v10.py
View File

@ -17,12 +17,11 @@
import logging
from ryu.tests.integrated import tester
from ryu.ofproto import ofproto_v1_0
from ryu.ofproto import ether
from ryu.ofproto import nx_match
from tests.integrated import tester
LOG = logging.getLogger(__name__)

3
tests/integrated/test_add_flow_v12_actions.py → ryu/tests/integrated/test_add_flow_v12_actions.py
View File

@ -20,8 +20,7 @@ import logging
from ryu.ofproto import ofproto_v1_2
from ryu.ofproto import ether
from ryu.ofproto import inet
from tests.integrated import tester
from ryu.tests.integrated import tester
LOG = logging.getLogger(__name__)

3
tests/integrated/test_add_flow_v12_matches.py → ryu/tests/integrated/test_add_flow_v12_matches.py
View File

@ -20,8 +20,7 @@ import logging
from ryu.ofproto import ofproto_v1_2
from ryu.ofproto import ether
from ryu.ofproto import inet
from tests.integrated import tester
from ryu.tests.integrated import tester
LOG = logging.getLogger(__name__)

2
tests/integrated/test_of_config.py → ryu/tests/integrated/test_of_config.py
View File

@ -34,7 +34,7 @@ Then run linc
Then run ryu
# PYTHONPATH=. ./bin/ryu-manager --verbose \
tests/integrated/test_of_config.py
ryu/tests/integrated/test_of_config.py
Here is my sys.config used for this test.

3
tests/integrated/test_request_reply_v12.py → ryu/tests/integrated/test_request_reply_v12.py
View File

@ -22,8 +22,7 @@ from ryu.controller import ofp_event
from ryu.controller.handler import MAIN_DISPATCHER
from ryu.controller.handler import set_ev_cls
from ryu.ofproto import ofproto_v1_2
from tests.integrated import tester
from ryu.tests.integrated import tester
LOG = logging.getLogger(__name__)

4
tests/integrated/test_vrrp_linux_multi.py → ryu/tests/integrated/test_vrrp_linux_multi.py
View File

@ -19,8 +19,8 @@ Usage:
PYTHONPATH=. ./bin/ryu-manager --verbose \
ryu.services.protocols.vrrp.dumper \
ryu.services.protocols.vrrp.sample_manager.py \
ryu.app.rest \
tests.integrated.test_vrrp_linux_multi
ryu.tests.integrated.test_vrrp_linux_multi \
ryu.app.rest
ryu.services.protocols.vrrp.dumper is optional.
ryu.app.rest is merely to prevent ryu-manager from exiting.

0
tests/integrated/test_vrrp_linux_multi.sh → ryu/tests/integrated/test_vrrp_linux_multi.sh
View File

4
tests/integrated/test_vrrp_multi.py → ryu/tests/integrated/test_vrrp_multi.py
View File

@ -18,8 +18,8 @@
Usage:
PYTHONPATH=. ./bin/ryu-manager --verbose \
ryu.topology.switches \
ryu.services.protocols.vrrp.dumper \
tests.integrated.test_vrrp_multi
ryu.tests.integrated.test_vrrp_multi \
ryu.services.protocols.vrrp.dumper
ryu.services.protocols.vrrp.dumper is optional.

0
tests/integrated/test_vrrp_multi.sh → ryu/tests/integrated/test_vrrp_multi.sh
View File

0
tests/integrated/tester.py → ryu/tests/integrated/tester.py
View File

0
tests/integrated/vrrp_common.py → ryu/tests/integrated/vrrp_common.py
View File

0
tests/mininet/l2/mpls/PopMPLS_mpls.mn → ryu/tests/mininet/l2/mpls/PopMPLS_mpls.mn
View File

0
tests/mininet/l2/mpls/PushMPLS_ip.mn → ryu/tests/mininet/l2/mpls/PushMPLS_ip.mn
View File

0
tests/mininet/l2/mpls/PushMPLS_mpls.mn → ryu/tests/mininet/l2/mpls/PushMPLS_mpls.mn
View File

0
tests/mininet/l2/mpls/test_mpls.py → ryu/tests/mininet/l2/mpls/test_mpls.py
View File

0
tests/mininet/l2/vlan/PopVLAN_vlan.mn → ryu/tests/mininet/l2/vlan/PopVLAN_vlan.mn
View File

0
tests/mininet/l2/vlan/PopVLAN_vlanvlan.mn → ryu/tests/mininet/l2/vlan/PopVLAN_vlanvlan.mn
View File

0
tests/mininet/l2/vlan/PushVLAN_icmp.mn → ryu/tests/mininet/l2/vlan/PushVLAN_icmp.mn
View File

0
tests/mininet/l2/vlan/test_vlan.py → ryu/tests/mininet/l2/vlan/test_vlan.py
View File

0
tests/mininet/l3/icmp/ICMP_ping.mn → ryu/tests/mininet/l3/icmp/ICMP_ping.mn
View File

0
tests/mininet/l3/icmp/ICMP_reply.mn → ryu/tests/mininet/l3/icmp/ICMP_reply.mn
View File

0
tests/mininet/l3/icmp/test_icmp.py → ryu/tests/mininet/l3/icmp/test_icmp.py
View File

0
tests/mininet/l3/ip_ttl/DecNwTtl.mn → ryu/tests/mininet/l3/ip_ttl/DecNwTtl.mn
View File

0
tests/mininet/l3/ip_ttl/test_ip_ttl.py → ryu/tests/mininet/l3/ip_ttl/test_ip_ttl.py
View File

0
tests/mininet/packet_lib/arp/ARP_gratuitous.mn → ryu/tests/mininet/packet_lib/arp/ARP_gratuitous.mn
View File

0
tests/mininet/packet_lib/arp/ARP_reply.mn → ryu/tests/mininet/packet_lib/arp/ARP_reply.mn
View File

0
tests/mininet/packet_lib/arp/ARP_request.mn → ryu/tests/mininet/packet_lib/arp/ARP_request.mn
View File

0
tests/mininet/packet_lib/arp/test_arp.py → ryu/tests/mininet/packet_lib/arp/test_arp.py
View File

0
tests/mininet/run_mnet-test.sh → ryu/tests/mininet/run_mnet-test.sh
View File

0
tests/packet_data/bgp4/bgp4-keepalive.pcap → ryu/tests/packet_data/bgp4/bgp4-keepalive.pcap
View File

0
tests/packet_data/bgp4/bgp4-open.pcap → ryu/tests/packet_data/bgp4/bgp4-open.pcap
View File

0
tests/packet_data/bgp4/bgp4-update.pcap → ryu/tests/packet_data/bgp4/bgp4-update.pcap
View File

0
tests/packet_data/bgp4/bgp4-update_ipv6.pcap → ryu/tests/packet_data/bgp4/bgp4-update_ipv6.pcap
View File

0
tests/packet_data/bgp4/bgp4-update_vpnv6.pcap → ryu/tests/packet_data/bgp4/bgp4-update_vpnv6.pcap
View File

0
tests/packet_data/bgp4/evpn_esi_arbitrary.pcap → ryu/tests/packet_data/bgp4/evpn_esi_arbitrary.pcap
View File

0
tests/packet_data/bgp4/evpn_esi_as_based.pcap → ryu/tests/packet_data/bgp4/evpn_esi_as_based.pcap
View File

0
tests/packet_data/bgp4/evpn_esi_l2_bridge.pcap → ryu/tests/packet_data/bgp4/evpn_esi_l2_bridge.pcap
View File

0
tests/packet_data/bgp4/evpn_esi_lacp.pcap → ryu/tests/packet_data/bgp4/evpn_esi_lacp.pcap
View File

0
tests/packet_data/bgp4/evpn_esi_mac_base.pcap → ryu/tests/packet_data/bgp4/evpn_esi_mac_base.pcap
View File

0
tests/packet_data/bgp4/evpn_esi_router_id.pcap → ryu/tests/packet_data/bgp4/evpn_esi_router_id.pcap
View File

0
tests/packet_data/bgp4/evpn_nlri_eth_a-d.pcap → ryu/tests/packet_data/bgp4/evpn_nlri_eth_a-d.pcap
View File

0
tests/packet_data/bgp4/evpn_nlri_eth_seg.pcap → ryu/tests/packet_data/bgp4/evpn_nlri_eth_seg.pcap
View File

0
tests/packet_data/bgp4/evpn_nlri_inc_multi_eth_tag.pcap → ryu/tests/packet_data/bgp4/evpn_nlri_inc_multi_eth_tag.pcap
View File

0
tests/packet_data/bgp4/evpn_nlri_ip_prefix.pcap → ryu/tests/packet_data/bgp4/evpn_nlri_ip_prefix.pcap
View File

0
tests/packet_data/bgp4/evpn_nlri_mac_ip_ad.pcap → ryu/tests/packet_data/bgp4/evpn_nlri_mac_ip_ad.pcap
View File

0
tests/packet_data/bgp4/flowspec_action_redirect.pcap → ryu/tests/packet_data/bgp4/flowspec_action_redirect.pcap
View File

0
tests/packet_data/bgp4/flowspec_action_traffic_action.pcap → ryu/tests/packet_data/bgp4/flowspec_action_traffic_action.pcap
View File

0
tests/packet_data/bgp4/flowspec_action_traffic_marking.pcap → ryu/tests/packet_data/bgp4/flowspec_action_traffic_marking.pcap
View File

0
tests/packet_data/bgp4/flowspec_action_traffic_rate.pcap → ryu/tests/packet_data/bgp4/flowspec_action_traffic_rate.pcap
View File

0
tests/packet_data/bgp4/flowspec_nlri_ipv4.pcap → ryu/tests/packet_data/bgp4/flowspec_nlri_ipv4.pcap
View File

0
tests/packet_data/bgp4/flowspec_nlri_ipv6.pcap → ryu/tests/packet_data/bgp4/flowspec_nlri_ipv6.pcap
View File

0
tests/packet_data/bgp4/flowspec_nlri_l2vpn.pcap → ryu/tests/packet_data/bgp4/flowspec_nlri_l2vpn.pcap
View File

0
tests/packet_data/bgp4/flowspec_nlri_vpn4.pcap → ryu/tests/packet_data/bgp4/flowspec_nlri_vpn4.pcap
View File

0
tests/packet_data/bgp4/flowspec_nlri_vpn6.pcap → ryu/tests/packet_data/bgp4/flowspec_nlri_vpn6.pcap
View File

0
tests/packet_data/mrt/rib.20161101.0000_pick.bz2 → ryu/tests/packet_data/mrt/rib.20161101.0000_pick.bz2
View File

0
tests/packet_data/mrt/updates.20161101.0000.bz2 → ryu/tests/packet_data/mrt/updates.20161101.0000.bz2
View File

0
tests/packet_data/of10/1-1-ofp_packet_out.packet → ryu/tests/packet_data/of10/1-1-ofp_packet_out.packet
View File

0
tests/packet_data/of10/1-2-ofp_flow_mod.packet → ryu/tests/packet_data/of10/1-2-ofp_flow_mod.packet
View File

0
tests/packet_data/of10/1-4-ofp_packet_in.packet → ryu/tests/packet_data/of10/1-4-ofp_packet_in.packet
View File

0
tests/packet_data/of10/1-5-features_request.packet → ryu/tests/packet_data/of10/1-5-features_request.packet
View File

0
tests/packet_data/of10/1-6-ofp_switch_features.packet → ryu/tests/packet_data/of10/1-6-ofp_switch_features.packet
View File

0
tests/packet_data/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet → ryu/tests/packet_data/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet
View File

0
tests/packet_data/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet → ryu/tests/packet_data/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet
View File

0
tests/packet_data/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet → ryu/tests/packet_data/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet
View File

0
tests/packet_data/of10/ovs-ofctl-of10-action_pop_mpls.packet → ryu/tests/packet_data/of10/ovs-ofctl-of10-action_pop_mpls.packet
View File

0
tests/packet_data/of10/ovs-ofctl-of10-action_push_mpls.packet → ryu/tests/packet_data/of10/ovs-ofctl-of10-action_push_mpls.packet
View File

0
tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_label.packet → ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_label.packet
View File

0
tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_tc.packet → ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_tc.packet
View File

0
tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet → ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet
View File

0
tests/packet_data/of12/3-0-ofp_desc_stats_reply.packet → ryu/tests/packet_data/of12/3-0-ofp_desc_stats_reply.packet
View File

0
tests/packet_data/of12/3-1-ofp_packet_out.packet → ryu/tests/packet_data/of12/3-1-ofp_packet_out.packet
View File

0
tests/packet_data/of12/3-10-ofp_hello.packet → ryu/tests/packet_data/of12/3-10-ofp_hello.packet
View File

0
tests/packet_data/of12/3-11-ofp_flow_stats_request.packet → ryu/tests/packet_data/of12/3-11-ofp_flow_stats_request.packet
View File

0
tests/packet_data/of12/3-12-ofp_flow_stats_reply.packet → ryu/tests/packet_data/of12/3-12-ofp_flow_stats_reply.packet
View File

Some files were not shown because too many files have changed in this diff Show More