Revert "tests: Separate test files from Ryu module"

This reverts commit a67ed2858417b9d795460f05126c01fb0cd344f9.

The commit breaks OpenStack neutron dynamic routing.

1 files changed, 42 insertions, 42 deletions

diff --git a/doc/source/ofproto_v1_2_ref.rst b/doc/source/ofproto_v1_2_ref.rst
index f592ae6f..525cdcc9 100644
--- a/doc/source/ofproto_v1_2_ref.rst
+++ b/doc/source/ofproto_v1_2_ref.rst
@@ -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
 ===============