From a991fed7e4faa485dc67daf50ba64fe01f83415d Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Fri, 30 Jun 2017 14:23:03 +0900 Subject: [PATCH] Revert "tests: Separate test files from Ryu module" This reverts commit a67ed2858417b9d795460f05126c01fb0cd344f9. The commit breaks OpenStack neutron dynamic routing. --- .travis.yml | 2 +- CONTRIBUTING.rst | 2 +- MANIFEST.in | 3 +- doc/source/ofproto_v1_0_ref.rst | 68 ++++---- doc/source/ofproto_v1_2_ref.rst | 84 +++++----- doc/source/ofproto_v1_3_ref.rst | 110 ++++++------- doc/source/ofproto_v1_4_ref.rst | 142 ++++++++-------- doc/source/ofproto_v1_5_ref.rst | 152 +++++++++--------- doc/source/test-vrrp.rst | 4 +- doc/source/writing_ryu_app.rst | 2 +- run_tests.sh | 6 +- {tests => ryu/tests/integrated}/__init__.py | 0 .../tests/integrated/bgp}/__init__.py | 0 {tests => ryu/tests}/integrated/bgp/base.py | 6 +- .../tests}/integrated/bgp/base_ip6.py | 6 +- .../tests}/integrated/bgp/test_basic.py | 2 +- .../tests}/integrated/bgp/test_ip6_basic.py | 2 +- .../tests/integrated/common}/__init__.py | 0 .../tests}/integrated/common/docker_base.py | 0 .../common/install_docker_test_pkg.sh | 0 .../common/install_docker_test_pkg_common.sh | 0 .../install_docker_test_pkg_for_travis.sh | 0 .../tests}/integrated/common/quagga.py | 0 .../tests}/integrated/common/ryubgp.py | 0 {tests => ryu/tests}/integrated/run_test.py | 4 +- .../tests}/integrated/run_tests_with_ovs12.py | 8 +- .../tests}/integrated/test_add_flow_v10.py | 3 +- .../integrated/test_add_flow_v12_actions.py | 3 +- .../integrated/test_add_flow_v12_matches.py | 3 +- .../tests}/integrated/test_of_config.py | 2 +- .../integrated/test_request_reply_v12.py | 3 +- .../integrated/test_vrrp_linux_multi.py | 4 +- .../integrated/test_vrrp_linux_multi.sh | 0 .../tests}/integrated/test_vrrp_multi.py | 4 +- .../tests}/integrated/test_vrrp_multi.sh | 0 {tests => ryu/tests}/integrated/tester.py | 0 .../tests}/integrated/vrrp_common.py | 0 .../tests}/mininet/l2/mpls/PopMPLS_mpls.mn | 0 .../tests}/mininet/l2/mpls/PushMPLS_ip.mn | 0 .../tests}/mininet/l2/mpls/PushMPLS_mpls.mn | 0 .../tests}/mininet/l2/mpls/test_mpls.py | 0 .../tests}/mininet/l2/vlan/PopVLAN_vlan.mn | 0 .../mininet/l2/vlan/PopVLAN_vlanvlan.mn | 0 .../tests}/mininet/l2/vlan/PushVLAN_icmp.mn | 0 .../tests}/mininet/l2/vlan/test_vlan.py | 0 .../tests}/mininet/l3/icmp/ICMP_ping.mn | 0 .../tests}/mininet/l3/icmp/ICMP_reply.mn | 0 .../tests}/mininet/l3/icmp/test_icmp.py | 0 .../tests}/mininet/l3/ip_ttl/DecNwTtl.mn | 0 .../tests}/mininet/l3/ip_ttl/test_ip_ttl.py | 0 .../mininet/packet_lib/arp/ARP_gratuitous.mn | 0 .../mininet/packet_lib/arp/ARP_reply.mn | 0 .../mininet/packet_lib/arp/ARP_request.mn | 0 .../tests}/mininet/packet_lib/arp/test_arp.py | 0 {tests => ryu/tests}/mininet/run_mnet-test.sh | 0 .../packet_data/bgp4/bgp4-keepalive.pcap | Bin .../tests}/packet_data/bgp4/bgp4-open.pcap | Bin .../tests}/packet_data/bgp4/bgp4-update.pcap | Bin .../packet_data/bgp4/bgp4-update_ipv6.pcap | Bin .../packet_data/bgp4/bgp4-update_vpnv6.pcap | Bin .../packet_data/bgp4/evpn_esi_arbitrary.pcap | Bin .../packet_data/bgp4/evpn_esi_as_based.pcap | Bin .../packet_data/bgp4/evpn_esi_l2_bridge.pcap | Bin .../packet_data/bgp4/evpn_esi_lacp.pcap | Bin .../packet_data/bgp4/evpn_esi_mac_base.pcap | Bin .../packet_data/bgp4/evpn_esi_router_id.pcap | Bin .../packet_data/bgp4/evpn_nlri_eth_a-d.pcap | Bin .../packet_data/bgp4/evpn_nlri_eth_seg.pcap | Bin .../bgp4/evpn_nlri_inc_multi_eth_tag.pcap | Bin .../packet_data/bgp4/evpn_nlri_ip_prefix.pcap | Bin .../packet_data/bgp4/evpn_nlri_mac_ip_ad.pcap | Bin .../bgp4/flowspec_action_redirect.pcap | Bin .../bgp4/flowspec_action_traffic_action.pcap | Bin .../bgp4/flowspec_action_traffic_marking.pcap | Bin .../bgp4/flowspec_action_traffic_rate.pcap | Bin .../packet_data/bgp4/flowspec_nlri_ipv4.pcap | Bin .../packet_data/bgp4/flowspec_nlri_ipv6.pcap | Bin .../packet_data/bgp4/flowspec_nlri_l2vpn.pcap | Bin .../packet_data/bgp4/flowspec_nlri_vpn4.pcap | Bin .../packet_data/bgp4/flowspec_nlri_vpn6.pcap | Bin .../mrt/rib.20161101.0000_pick.bz2 | Bin .../packet_data/mrt/updates.20161101.0000.bz2 | Bin .../of10/1-1-ofp_packet_out.packet | Bin .../packet_data/of10/1-2-ofp_flow_mod.packet | Bin .../packet_data/of10/1-4-ofp_packet_in.packet | Bin .../of10/1-5-features_request.packet | Bin .../of10/1-6-ofp_switch_features.packet | Bin ...OFP10-ofp_packet_out_packet_library.packet | Bin .../ovs-ofctl-of10-action_dec_mpls_ttl.packet | Bin .../ovs-ofctl-of10-action_dec_nw_ttl.packet | Bin .../ovs-ofctl-of10-action_pop_mpls.packet | Bin .../ovs-ofctl-of10-action_push_mpls.packet | Bin ...vs-ofctl-of10-action_set_mpls_label.packet | Bin .../ovs-ofctl-of10-action_set_mpls_tc.packet | Bin .../ovs-ofctl-of10-action_set_mpls_ttl.packet | Bin .../of12/3-0-ofp_desc_stats_reply.packet | Bin .../of12/3-1-ofp_packet_out.packet | Bin .../packet_data/of12/3-10-ofp_hello.packet | Bin .../of12/3-11-ofp_flow_stats_request.packet | Bin .../of12/3-12-ofp_flow_stats_reply.packet | Bin .../of12/3-13-ofp_echo_request.packet | Bin .../of12/3-14-ofp_echo_reply.packet | Bin .../of12/3-15-ofp_error_msg.packet | Bin .../of12/3-16-ofp_experimenter.packet | Bin .../of12/3-17-ofp_barrier_request.packet | Bin .../of12/3-18-ofp_barrier_reply.packet | Bin .../of12/3-19-ofp_role_request.packet | Bin .../packet_data/of12/3-2-ofp_flow_mod.packet | Bin .../of12/3-20-ofp_role_reply.packet | Bin .../of12/3-21-ofp_group_mod.packet | Bin .../packet_data/of12/3-22-ofp_port_mod.packet | Bin .../of12/3-23-ofp_table_mod.packet | Bin .../of12/3-24-ofp_desc_stats_request.packet | Bin .../3-25-ofp_aggregate_stats_request.packet | Bin .../3-26-ofp_aggregate_stats_reply.packet | Bin .../of12/3-27-ofp_table_stats_request.packet | Bin .../of12/3-28-ofp_table_stats_reply.packet | Bin .../of12/3-29-ofp_port_stats_request.packet | Bin .../packet_data/of12/3-3-ofp_flow_mod.packet | Bin .../of12/3-30-ofp_port_stats_reply.packet | Bin ...31-ofp_group_features_stats_request.packet | Bin ...3-32-ofp_group_features_stats_reply.packet | Bin .../3-33-ofp_group_desc_stats_request.packet | Bin .../3-34-ofp_group_desc_stats_reply.packet | Bin .../3-35-ofp_queue_get_config_request.packet | Bin .../3-36-ofp_queue_get_config_reply.packet | Bin .../of12/3-37-ofp_queue_stats_request.packet | Bin .../of12/3-38-ofp_queue_stats_reply.packet | Bin .../of12/3-39-ofp_port_status.packet | Bin .../packet_data/of12/3-4-ofp_packet_in.packet | Bin .../of12/3-40-ofp_flow_removed.packet | Bin .../3-41-ofp_error_msg_experimenter.packet | Bin .../of12/3-5-ofp_features_request.packet | Bin .../of12/3-59-ofp_packet_in.packet | Bin .../of12/3-6-ofp_features_reply.packet | Bin .../packet_data/of12/3-60-ofp_flow_mod.packet | Bin .../of12/3-61-ofp_group_stats_request.packet | Bin .../of12/3-62-ofp_group_stats_reply.packet | Bin .../of12/3-7-ofp_set_config.packet | Bin .../of12/3-8-ofp_get_config_request.packet | Bin .../of12/3-9-ofp_get_config_reply.packet | Bin ...OFP12-ofp_packet_out_packet_library.packet | Bin .../of13/4-0-ofp_desc_reply.packet | Bin .../of13/4-1-ofp_packet_out.packet | Bin .../packet_data/of13/4-10-ofp_hello.packet | Bin .../of13/4-11-ofp_flow_stats_request.packet | Bin .../of13/4-12-ofp_flow_stats_reply.packet | Bin .../of13/4-13-ofp_echo_request.packet | Bin .../of13/4-14-ofp_echo_reply.packet | Bin .../of13/4-15-ofp_error_msg.packet | Bin .../of13/4-16-ofp_experimenter.packet | Bin .../of13/4-17-ofp_barrier_request.packet | Bin .../of13/4-18-ofp_barrier_reply.packet | Bin .../of13/4-19-ofp_role_request.packet | Bin .../packet_data/of13/4-2-ofp_flow_mod.packet | Bin .../of13/4-20-ofp_role_reply.packet | Bin .../of13/4-21-ofp_group_mod.packet | Bin .../packet_data/of13/4-22-ofp_port_mod.packet | Bin .../of13/4-23-ofp_table_mod.packet | Bin .../of13/4-24-ofp_desc_request.packet | Bin .../4-25-ofp_aggregate_stats_request.packet | Bin .../4-26-ofp_aggregate_stats_reply.packet | Bin .../of13/4-27-ofp_table_stats_request.packet | Bin .../of13/4-28-ofp_table_stats_reply.packet | Bin .../of13/4-29-ofp_port_stats_request.packet | Bin .../packet_data/of13/4-3-ofp_flow_mod.packet | Bin .../of13/4-30-ofp_port_stats_reply.packet | Bin .../4-31-ofp_group_features_request.packet | Bin .../of13/4-32-ofp_group_features_reply.packet | Bin .../of13/4-33-ofp_group_desc_request.packet | Bin .../of13/4-34-ofp_group_desc_reply.packet | Bin .../4-35-ofp_queue_get_config_request.packet | Bin .../4-36-ofp_queue_get_config_reply.packet | Bin .../of13/4-37-ofp_queue_stats_request.packet | Bin .../of13/4-38-ofp_queue_stats_reply.packet | Bin .../of13/4-39-ofp_port_status.packet | Bin .../packet_data/of13/4-4-ofp_packet_in.packet | Bin .../of13/4-40-ofp_flow_removed.packet | Bin .../4-41-ofp_error_msg_experimenter.packet | Bin .../of13/4-42-ofp_get_async_request.packet | Bin .../of13/4-43-ofp_get_async_reply.packet | Bin .../of13/4-44-ofp_set_async.packet | Bin .../of13/4-45-ofp_meter_mod.packet | Bin .../packet_data/of13/4-46-ofp_flow_mod.packet | Bin .../of13/4-47-ofp_meter_config_request.packet | Bin .../of13/4-48-ofp_meter_config_reply.packet | Bin .../of13/4-49-ofp_meter_stats_request.packet | Bin .../of13/4-5-ofp_features_request.packet | Bin .../of13/4-50-ofp_meter_stats_reply.packet | Bin .../4-51-ofp_meter_features_request.packet | Bin .../of13/4-52-ofp_meter_features_reply.packet | Bin .../of13/4-53-ofp_port_desc_request.packet | Bin .../of13/4-54-ofp_port_desc_reply.packet | Bin .../4-55-ofp_table_features_request.packet | Bin .../of13/4-56-ofp_table_features_reply.packet | Bin .../of13/4-57-ofp_group_stats_request.packet | Bin .../of13/4-58-ofp_group_stats_reply.packet | Bin .../of13/4-59-ofp_packet_in.packet | Bin .../of13/4-6-ofp_features_reply.packet | Bin .../packet_data/of13/4-60-ofp_flow_mod.packet | Bin .../of13/4-61-ofp_experimenter_request.packet | Bin .../of13/4-62-ofp_experimenter_reply.packet | Bin .../of13/4-63-onf_flow_monitor_request.packet | Bin .../of13/4-7-ofp_set_config.packet | Bin .../of13/4-8-ofp_get_config_request.packet | Bin .../of13/4-9-ofp_get_config_reply.packet | Bin .../of13/libofproto-OFP13-echo_reply.packet | Bin .../of13/libofproto-OFP13-echo_request.packet | Bin .../of13/libofproto-OFP13-error_msg.packet | Bin .../libofproto-OFP13-features_reply.packet | Bin .../of13/libofproto-OFP13-flow_mod.packet | Bin .../libofproto-OFP13-flow_mod.truncated64 | 0 ...bofproto-OFP13-flow_mod_conjunction.packet | Bin ...ibofproto-OFP13-flow_mod_match_conj.packet | Bin .../of13/libofproto-OFP13-flow_removed.packet | Bin .../libofproto-OFP13-get_config_reply.packet | Bin .../of13/libofproto-OFP13-hello.packet | Bin .../of13/libofproto-OFP13-meter_mod.packet | Bin ...OFP13-ofp_packet_out_packet_library.packet | Bin .../of13/libofproto-OFP13-packet_in.packet | Bin .../of13/libofproto-OFP13-port_mod.packet | Bin .../of13/libofproto-OFP13-port_status.packet | Bin .../of13/libofproto-OFP13-set_config.packet | Bin .../of13/libofproto-OFP13-table_mod.packet | Bin .../ovs-ofctl-of13-action_conjunction.packet | Bin .../ovs-ofctl-of13-action_controller.packet | Bin .../ovs-ofctl-of13-action_controller2.packet | Bin .../of13/ovs-ofctl-of13-action_ct.packet | Bin .../of13/ovs-ofctl-of13-action_ct_exec.packet | Bin .../of13/ovs-ofctl-of13-action_ct_nat.packet | Bin .../ovs-ofctl-of13-action_ct_nat_v6.packet | Bin ...s-ofctl-of13-action_dec_ttl_cnt_ids.packet | Bin .../ovs-ofctl-of13-action_fintimeout.packet | Bin .../of13/ovs-ofctl-of13-action_learn.packet | Bin .../of13/ovs-ofctl-of13-action_note.packet | Bin .../ovs-ofctl-of13-action_output_trunc.packet | Bin .../ovs-ofctl-of13-action_resubmit.packet | Bin .../of13/ovs-ofctl-of13-action_sample.packet | Bin .../of13/ovs-ofctl-of13-action_sample2.packet | Bin .../ovs-ofctl-of13-action_stack_pop.packet | Bin .../ovs-ofctl-of13-action_stack_push.packet | Bin .../of13/ovs-ofctl-of13-match_conj.packet | Bin ...s-ofctl-of13-match_load_nx_register.packet | Bin ...s-ofctl-of13-match_move_nx_register.packet | Bin .../of13/ovs-ofctl-of13-match_pkt_mark.packet | Bin ...vs-ofctl-of13-match_pkt_mark_masked.packet | Bin .../of14/5-0-ofp_desc_reply.packet | Bin .../of14/5-1-ofp_packet_out.packet | Bin .../packet_data/of14/5-10-ofp_hello.packet | Bin .../of14/5-11-ofp_flow_stats_request.packet | Bin .../of14/5-12-ofp_flow_stats_reply.packet | Bin .../of14/5-13-ofp_echo_request.packet | Bin .../of14/5-14-ofp_echo_reply.packet | Bin .../of14/5-15-ofp_error_msg.packet | Bin .../of14/5-16-ofp_experimenter.packet | Bin .../of14/5-17-ofp_barrier_request.packet | Bin .../of14/5-18-ofp_barrier_reply.packet | Bin .../of14/5-19-ofp_role_request.packet | Bin .../packet_data/of14/5-2-ofp_flow_mod.packet | Bin .../of14/5-20-ofp_role_reply.packet | Bin .../of14/5-21-ofp_group_mod.packet | Bin .../packet_data/of14/5-22-ofp_port_mod.packet | Bin .../of14/5-23-ofp_table_mod.packet | Bin .../of14/5-24-ofp_desc_request.packet | Bin .../5-25-ofp_aggregate_stats_request.packet | Bin .../5-26-ofp_aggregate_stats_reply.packet | Bin .../of14/5-27-ofp_table_stats_request.packet | Bin .../of14/5-28-ofp_table_stats_reply.packet | Bin .../of14/5-29-ofp_port_stats_request.packet | Bin .../packet_data/of14/5-3-ofp_flow_mod.packet | Bin .../of14/5-30-ofp_port_stats_reply.packet | Bin .../5-31-ofp_group_features_request.packet | Bin .../of14/5-32-ofp_group_features_reply.packet | Bin .../of14/5-33-ofp_group_desc_request.packet | Bin .../of14/5-34-ofp_group_desc_reply.packet | Bin .../of14/5-35-ofp_queue_stats_request.packet | Bin .../of14/5-36-ofp_queue_stats_reply.packet | Bin .../of14/5-37-ofp_port_status.packet | Bin .../of14/5-38-ofp_flow_removed.packet | Bin .../5-39-ofp_error_msg_experimenter.packet | Bin .../packet_data/of14/5-4-ofp_packet_in.packet | Bin .../of14/5-40-ofp_get_async_request.packet | Bin .../of14/5-41-ofp_get_async_reply.packet | Bin .../of14/5-42-ofp_set_async.packet | Bin .../of14/5-43-ofp_meter_mod.packet | Bin .../packet_data/of14/5-44-ofp_flow_mod.packet | Bin .../of14/5-45-ofp_meter_config_request.packet | Bin .../of14/5-46-ofp_meter_config_reply.packet | Bin .../of14/5-47-ofp_meter_stats_request.packet | Bin .../of14/5-48-ofp_meter_stats_reply.packet | Bin .../5-49-ofp_meter_features_request.packet | Bin .../of14/5-5-ofp_features_request.packet | Bin .../of14/5-50-ofp_meter_features_reply.packet | Bin .../of14/5-51-ofp_port_desc_request.packet | Bin .../of14/5-52-ofp_port_desc_reply.packet | Bin .../5-53-ofp_table_features_request.packet | Bin .../of14/5-54-ofp_table_features_reply.packet | Bin .../of14/5-55-ofp_group_stats_request.packet | Bin .../of14/5-56-ofp_group_stats_reply.packet | Bin .../of14/5-57-ofp_packet_in.packet | Bin .../packet_data/of14/5-58-ofp_flow_mod.packet | Bin .../of14/5-59-ofp_experimenter_request.packet | Bin .../of14/5-6-ofp_features_reply.packet | Bin .../of14/5-60-ofp_experimenter_reply.packet | Bin .../of14/5-61-ofp_table_desc_request.packet | Bin .../of14/5-62-ofp_table_desc_reply.packet | Bin .../of14/5-63-ofp_queue_desc_request.packet | Bin .../of14/5-64-ofp_queue_desc_reply.packet | Bin .../of14/5-65-ofp_role_status.packet | Bin .../of14/5-66-ofp_flow_monitor_request.packet | Bin .../of14/5-67-ofp_flow_monitor_reply.packet | Bin .../of14/5-68-ofp_table_status.packet | Bin .../of14/5-69-ofp_bundle_ctrl_msg.packet | Bin .../of14/5-7-ofp_set_config.packet | Bin .../of14/5-70-ofp_bundle_add_msg.packet | Bin .../of14/5-71-ofp_requestforward.packet | Bin .../of14/5-8-ofp_get_config_request.packet | Bin .../of14/5-9-ofp_get_config_reply.packet | Bin ...OFP14-ofp_packet_out_packet_library.packet | Bin ...ofproto-OFP15-aggregate_stats_reply.packet | Bin ...proto-OFP15-aggregate_stats_request.packet | Bin .../libofproto-OFP15-barrier_reply.packet | Bin .../libofproto-OFP15-barrier_request.packet | Bin .../of15/libofproto-OFP15-bundle_add.packet | Bin .../of15/libofproto-OFP15-bundle_ctrl.packet | Bin ...ofproto-OFP15-bundle_features_reply.packet | Bin ...proto-OFP15-bundle_features_request.packet | Bin .../libofproto-OFP15-controller_status.packet | Bin ...proto-OFP15-controller_status_reply.packet | Bin ...oto-OFP15-controller_status_request.packet | Bin .../of15/libofproto-OFP15-desc_reply.packet | Bin .../of15/libofproto-OFP15-desc_request.packet | Bin .../of15/libofproto-OFP15-echo_reply.packet | Bin .../of15/libofproto-OFP15-echo_request.packet | Bin .../of15/libofproto-OFP15-error_msg.packet | Bin ...fproto-OFP15-error_msg_experimenter.packet | Bin .../of15/libofproto-OFP15-experimenter.packet | Bin ...libofproto-OFP15-experimenter_reply.packet | Bin ...bofproto-OFP15-experimenter_request.packet | Bin .../libofproto-OFP15-features_reply.packet | Bin .../libofproto-OFP15-features_request.packet | Bin .../libofproto-OFP15-flow_desc_reply.packet | Bin .../libofproto-OFP15-flow_desc_request.packet | Bin .../of15/libofproto-OFP15-flow_mod.packet | Bin ...bofproto-OFP15-flow_mod_conjunction.packet | Bin ...ibofproto-OFP15-flow_mod_match_conj.packet | Bin ...libofproto-OFP15-flow_monitor_reply.packet | Bin ...bofproto-OFP15-flow_monitor_request.packet | Bin .../of15/libofproto-OFP15-flow_removed.packet | Bin .../libofproto-OFP15-flow_stats_reply.packet | Bin ...libofproto-OFP15-flow_stats_request.packet | Bin .../libofproto-OFP15-get_async_reply.packet | Bin .../libofproto-OFP15-get_async_request.packet | Bin .../libofproto-OFP15-get_config_reply.packet | Bin ...libofproto-OFP15-get_config_request.packet | Bin .../libofproto-OFP15-group_desc_reply.packet | Bin ...libofproto-OFP15-group_desc_request.packet | Bin ...bofproto-OFP15-group_features_reply.packet | Bin ...fproto-OFP15-group_features_request.packet | Bin .../of15/libofproto-OFP15-group_mod.packet | Bin .../libofproto-OFP15-group_stats_reply.packet | Bin ...ibofproto-OFP15-group_stats_request.packet | Bin .../of15/libofproto-OFP15-hello.packet | Bin .../libofproto-OFP15-meter_desc_reply.packet | Bin ...libofproto-OFP15-meter_desc_request.packet | Bin ...bofproto-OFP15-meter_features_reply.packet | Bin ...fproto-OFP15-meter_features_request.packet | Bin .../of15/libofproto-OFP15-meter_mod.packet | Bin .../libofproto-OFP15-meter_stats_reply.packet | Bin ...ibofproto-OFP15-meter_stats_request.packet | Bin .../of15/libofproto-OFP15-packet_in.packet | Bin .../of15/libofproto-OFP15-packet_out.packet | Bin .../libofproto-OFP15-port_desc_reply.packet | Bin .../libofproto-OFP15-port_desc_request.packet | Bin .../of15/libofproto-OFP15-port_mod.packet | Bin .../libofproto-OFP15-port_stats_reply.packet | Bin ...libofproto-OFP15-port_stats_request.packet | Bin .../of15/libofproto-OFP15-port_status.packet | Bin .../libofproto-OFP15-queue_desc_reply.packet | Bin ...libofproto-OFP15-queue_desc_request.packet | Bin .../libofproto-OFP15-queue_stats_reply.packet | Bin ...ibofproto-OFP15-queue_stats_request.packet | Bin .../libofproto-OFP15-requestforward.packet | Bin .../of15/libofproto-OFP15-role_reply.packet | Bin .../of15/libofproto-OFP15-role_request.packet | Bin .../of15/libofproto-OFP15-role_status.packet | Bin .../of15/libofproto-OFP15-set_async.packet | Bin .../of15/libofproto-OFP15-set_config.packet | Bin .../libofproto-OFP15-table_desc_reply.packet | Bin ...libofproto-OFP15-table_desc_request.packet | Bin ...bofproto-OFP15-table_features_reply.packet | Bin ...fproto-OFP15-table_features_request.packet | Bin .../of15/libofproto-OFP15-table_mod.packet | Bin .../libofproto-OFP15-table_stats_reply.packet | Bin ...ibofproto-OFP15-table_stats_request.packet | Bin .../of15/libofproto-OFP15-table_status.packet | Bin .../tests}/packet_data/pcap/big_endian.pcap | Bin .../packet_data/pcap/geneve_unknown.pcap | Bin .../packet_data/pcap/gre_full_options.pcap | Bin .../packet_data/pcap/gre_no_option.pcap | Bin .../packet_data/pcap/gre_nvgre_option.pcap | Bin .../packet_data/pcap/little_endian.pcap | Bin .../packet_data/pcap/openflow_flowmod.pcap | Bin .../pcap/openflow_flowstats_req.pcap | Bin .../pcap/openflow_invalid_version.pcap | Bin .../tests}/packet_data/pcap/zebra_v2.pcap | Bin .../tests}/packet_data/pcap/zebra_v3.pcap | Bin .../tests}/packet_data_generator/Makefile | 0 .../tests}/packet_data_generator/rebar.config | 0 .../packet_data_generator/src/er.app.src | 0 .../tests}/packet_data_generator/src/x.erl | 0 .../tests}/packet_data_generator/src/x1.erl | 0 .../tests}/packet_data_generator/src/x3.erl | 0 .../tests}/packet_data_generator/src/x4.erl | 0 .../tests}/packet_data_generator/src/x5.erl | 0 .../src/x_flower_packet.erl | 0 .../src/x_of_protocol.erl | 0 .../packet_data_generator2/Makefile.BSD | 0 .../packet_data_generator2/Makefile.GNU | 0 .../tests}/packet_data_generator2/README | 4 +- .../tests}/packet_data_generator2/gen.c | 0 .../tests}/packet_data_generator3/gen.py | 0 {tests => ryu/tests}/run_tests.py | 6 +- {tests => ryu/tests}/test_lib.py | 0 {tests => ryu/tests}/unit/__init__.py | 0 .../common => ryu/tests/unit/app}/__init__.py | 0 .../tests}/unit/app/ofctl_rest_json/of10.json | 0 .../tests}/unit/app/ofctl_rest_json/of12.json | 0 .../tests}/unit/app/ofctl_rest_json/of13.json | 0 .../tests}/unit/app/ofctl_rest_json/of14.json | 0 .../tests}/unit/app/ofctl_rest_json/of15.json | 0 .../tests}/unit/app/test_ofctl_rest.py | 3 +- {tests => ryu/tests}/unit/app/test_tester.py | 2 +- .../tests}/unit/app/test_ws_topology.py | 0 {tests => ryu/tests}/unit/app/test_wsgi.py | 0 {tests => ryu/tests}/unit/cmd/__init__.py | 0 {tests => ryu/tests}/unit/cmd/dummy_app.py | 0 .../tests}/unit/cmd/dummy_openflow_app.py | 0 {tests => ryu/tests}/unit/cmd/test_manager.py | 4 +- .../tests/unit/controller}/__init__.py | 0 .../tests}/unit/controller/test_controller.py | 0 .../tests/unit/lib}/__init__.py | 0 .../of10/1-2-ofp_flow_mod.packet.json | 0 .../of12/3-0-ofp_desc_stats_reply.packet.json | 0 .../3-11-ofp_flow_stats_request.packet.json | 0 .../3-12-ofp_flow_stats_reply.packet.json | 0 .../of12/3-16-ofp_experimenter.packet.json | 0 .../of12/3-2-ofp_flow_mod.packet.json | 0 .../of12/3-21-ofp_group_mod.packet.json | 0 .../of12/3-22-ofp_port_mod.packet.json | 0 ...25-ofp_aggregate_stats_request.packet.json | 0 ...3-26-ofp_aggregate_stats_reply.packet.json | 0 .../3-28-ofp_table_stats_reply.packet.json | 0 .../3-30-ofp_port_stats_reply.packet.json | 0 ...ofp_group_features_stats_reply.packet.json | 0 ...-34-ofp_group_desc_stats_reply.packet.json | 0 ...5-ofp_queue_get_config_request.packet.json | 0 ...-36-ofp_queue_get_config_reply.packet.json | 0 .../3-38-ofp_queue_stats_reply.packet.json | 0 .../of12/3-6-ofp_features_reply.packet.json | 0 .../3-62-ofp_group_stats_reply.packet.json | 0 ...-ofctl-ofp_group_stats_request.packet.json | 0 ...b-ofctl-ofp_port_stats_request.packet.json | 0 ...l-ofp_queue_get_config_request.packet.json | 0 ...ofctl-ofp_queue_stats_request.packet1.json | 0 ...ofctl-ofp_queue_stats_request.packet2.json | 0 ...ofctl-ofp_queue_stats_request.packet3.json | 0 .../of13/4-0-ofp_desc_reply.packet.json | 0 .../4-11-ofp_flow_stats_request.packet.json | 0 .../4-12-ofp_flow_stats_reply.packet.json | 0 .../of13/4-16-ofp_experimenter.packet.json | 0 .../of13/4-2-ofp_flow_mod.packet.json | 0 .../of13/4-21-ofp_group_mod.packet.json | 0 .../of13/4-22-ofp_port_mod.packet.json | 0 ...25-ofp_aggregate_stats_request.packet.json | 0 ...4-26-ofp_aggregate_stats_reply.packet.json | 0 .../4-28-ofp_table_stats_reply.packet.json | 0 .../4-30-ofp_port_stats_reply.packet.json | 0 .../4-32-ofp_group_features_reply.packet.json | 0 .../4-34-ofp_group_desc_reply.packet.json | 0 ...5-ofp_queue_get_config_request.packet.json | 0 ...-36-ofp_queue_get_config_reply.packet.json | 0 .../4-38-ofp_queue_stats_reply.packet.json | 0 .../of13/4-45-ofp_meter_mod.packet.json | 0 .../4-48-ofp_meter_config_reply.packet.json | 0 .../4-50-ofp_meter_stats_reply.packet.json | 0 .../4-52-ofp_meter_features_reply.packet.json | 0 .../of13/4-54-ofp_port_desc_reply.packet.json | 0 .../4-56-ofp_table_features_reply.packet.json | 0 .../4-58-ofp_group_stats_reply.packet.json | 0 ...-ofctl-ofp_group_stats_request.packet.json | 0 ...ofctl-ofp_meter_config_request.packet.json | 0 ...-ofctl-ofp_meter_stats_request.packet.json | 0 ...b-ofctl-ofp_port_stats_request.packet.json | 0 ...l-ofp_queue_get_config_request.packet.json | 0 ...ofctl-ofp_queue_stats_request.packet1.json | 0 ...ofctl-ofp_queue_stats_request.packet2.json | 0 ...ofctl-ofp_queue_stats_request.packet3.json | 0 .../of14/5-0-ofp_desc_reply.packet.json | 0 .../5-11-ofp_flow_stats_request.packet.json | 0 .../5-12-ofp_flow_stats_reply.packet.json | 0 .../of14/5-16-ofp_experimenter.packet.json | 0 .../of14/5-2-ofp_flow_mod.packet.json | 0 .../of14/5-21-ofp_group_mod.packet.json | 0 .../of14/5-22-ofp_port_mod.packet.json | 0 ...25-ofp_aggregate_stats_request.packet.json | 0 ...5-26-ofp_aggregate_stats_reply.packet.json | 0 .../5-28-ofp_table_stats_reply.packet.json | 0 .../5-30-ofp_port_stats_reply.packet.json | 0 .../5-32-ofp_group_features_reply.packet.json | 0 .../5-34-ofp_group_desc_reply.packet.json | 0 .../5-36-ofp_queue_stats_reply.packet.json | 0 .../of14/5-43-ofp_meter_mod.packet.json | 0 .../5-46-ofp_meter_config_reply.packet.json | 0 .../5-48-ofp_meter_stats_reply.packet.json | 0 .../5-50-ofp_meter_features_reply.packet.json | 0 .../of14/5-52-ofp_port_desc_reply.packet.json | 0 .../5-54-ofp_table_features_reply.packet.json | 0 .../5-56-ofp_group_stats_reply.packet.json | 0 .../5-63-ofp_queue_desc_request.packet.json | 0 .../5-64-ofp_queue_desc_reply.packet.json | 0 ...ib-ofctl-OFP15-flow_desc_reply.packet.json | 0 ...-ofctl-OFP15-flow_desc_request.packet.json | 0 .../of15/lib-ofctl-OFP15-flow_mod.packet.json | 0 ...to-OFP15-aggregate_stats_reply.packet.json | 0 ...-OFP15-aggregate_stats_request.packet.json | 0 .../libofproto-OFP15-desc_reply.packet.json | 0 .../libofproto-OFP15-experimenter.packet.json | 0 ...bofproto-OFP15-flow_desc_reply.packet.json | 0 ...fproto-OFP15-flow_desc_request.packet.json | 0 ...ibofproto-OFP15-flow_mod_no_nx.packet.json | 0 ...ofproto-OFP15-flow_stats_reply.packet.json | 0 ...proto-OFP15-flow_stats_request.packet.json | 0 ...ofproto-OFP15-group_desc_reply.packet.json | 0 ...proto-OFP15-group_desc_request.packet.json | 0 ...oto-OFP15-group_features_reply.packet.json | 0 .../libofproto-OFP15-group_mod.packet.json | 0 ...fproto-OFP15-group_stats_reply.packet.json | 0 ...ofproto-OFP15-meter_desc_reply.packet.json | 0 ...oto-OFP15-meter_features_reply.packet.json | 0 .../libofproto-OFP15-meter_mod.packet.json | 0 ...fproto-OFP15-meter_stats_reply.packet.json | 0 ...bofproto-OFP15-port_desc_reply.packet.json | 0 ...fproto-OFP15-port_desc_request.packet.json | 0 .../libofproto-OFP15-port_mod.packet.json | 0 ...ofproto-OFP15-port_stats_reply.packet.json | 0 ...ofproto-OFP15-queue_desc_reply.packet.json | 0 ...proto-OFP15-queue_desc_request.packet.json | 0 ...fproto-OFP15-queue_stats_reply.packet.json | 0 ...oto-OFP15-table_features_reply.packet.json | 0 ...fproto-OFP15-table_stats_reply.packet.json | 0 .../tests/unit/lib/ovs}/__init__.py | 0 .../tests}/unit/lib/ovs/test_vsctl.py | 0 .../tests}/unit/lib/test_addrconv.py | 0 {tests => ryu/tests}/unit/lib/test_hub.py | 0 .../tests}/unit/lib/test_import_module.py | 10 +- {tests => ryu/tests}/unit/lib/test_ip.py | 0 {tests => ryu/tests}/unit/lib/test_mac.py | 0 .../tests}/unit/lib/test_mod/__init__.py | 0 .../tests}/unit/lib/test_mod/aaa/__init__.py | 0 .../tests}/unit/lib/test_mod/aaa/mod.py | 0 .../tests}/unit/lib/test_mod/bbb/__init__.py | 0 .../tests}/unit/lib/test_mod/bbb/mod.py | 0 .../tests}/unit/lib/test_mod/ccc/__init__.py | 0 .../tests}/unit/lib/test_mod/ccc/mod.py | 0 .../tests}/unit/lib/test_mod/ddd/__init__.py | 0 .../tests}/unit/lib/test_mod/ddd/mod.py | 0 {tests => ryu/tests}/unit/lib/test_mod/eee.py | 0 {tests => ryu/tests}/unit/lib/test_mod/fff.py | 0 {tests => ryu/tests}/unit/lib/test_mod/ggg.py | 0 {tests => ryu/tests}/unit/lib/test_mrtlib.py | 0 .../tests}/unit/lib/test_of_config_classes.py | 0 {tests => ryu/tests}/unit/lib/test_ofctl.py | 3 +- .../unit/lib/test_ofctl_action_match.py | 3 +- .../tests}/unit/lib/test_ofctl_string.py | 0 .../tests}/unit/lib/test_ofctl_utils.py | 0 .../tests}/unit/lib/test_ofctl_v1_3.py | 0 .../tests}/unit/lib/test_ofp_pktinfilter.py | 0 .../tests}/unit/lib/test_pack_utils.py | 0 {tests => ryu/tests}/unit/lib/test_pcaplib.py | 0 {tests => ryu/tests}/unit/lib/test_rpc.py | 0 .../tests}/unit/lib/test_stringify.py | 0 .../tests/unit/ofproto}/__init__.py | 0 .../json/of10/1-1-ofp_packet_out.packet.json | 0 .../json/of10/1-2-ofp_flow_mod.packet.json | 0 .../json/of10/1-4-ofp_packet_in.packet.json | 0 .../of10/1-5-features_request.packet.json | 0 .../of10/1-6-ofp_switch_features.packet.json | 0 ...-ofp_packet_out_packet_library.packet.json | 0 ...ofctl-of10-action_dec_mpls_ttl.packet.json | 0 ...s-ofctl-of10-action_dec_nw_ttl.packet.json | 0 ...ovs-ofctl-of10-action_pop_mpls.packet.json | 0 ...vs-ofctl-of10-action_push_mpls.packet.json | 0 ...ctl-of10-action_set_mpls_label.packet.json | 0 ...-ofctl-of10-action_set_mpls_tc.packet.json | 0 ...ofctl-of10-action_set_mpls_ttl.packet.json | 0 .../of12/3-0-ofp_desc_stats_reply.packet.json | 0 .../json/of12/3-1-ofp_packet_out.packet.json | 0 .../json/of12/3-10-ofp_hello.packet.json | 0 .../3-11-ofp_flow_stats_request.packet.json | 0 .../3-12-ofp_flow_stats_reply.packet.json | 0 .../of12/3-13-ofp_echo_request.packet.json | 0 .../json/of12/3-14-ofp_echo_reply.packet.json | 0 .../json/of12/3-15-ofp_error_msg.packet.json | 0 .../of12/3-16-ofp_experimenter.packet.json | 0 .../of12/3-17-ofp_barrier_request.packet.json | 0 .../of12/3-18-ofp_barrier_reply.packet.json | 0 .../of12/3-19-ofp_role_request.packet.json | 0 .../json/of12/3-2-ofp_flow_mod.packet.json | 0 .../json/of12/3-20-ofp_role_reply.packet.json | 0 .../json/of12/3-21-ofp_group_mod.packet.json | 0 .../json/of12/3-22-ofp_port_mod.packet.json | 0 .../json/of12/3-23-ofp_table_mod.packet.json | 0 .../3-24-ofp_desc_stats_request.packet.json | 0 ...25-ofp_aggregate_stats_request.packet.json | 0 ...3-26-ofp_aggregate_stats_reply.packet.json | 0 .../3-27-ofp_table_stats_request.packet.json | 0 .../3-28-ofp_table_stats_reply.packet.json | 0 .../3-29-ofp_port_stats_request.packet.json | 0 .../json/of12/3-3-ofp_flow_mod.packet.json | 0 .../3-30-ofp_port_stats_reply.packet.json | 0 ...p_group_features_stats_request.packet.json | 0 ...ofp_group_features_stats_reply.packet.json | 0 ...3-ofp_group_desc_stats_request.packet.json | 0 ...-34-ofp_group_desc_stats_reply.packet.json | 0 ...5-ofp_queue_get_config_request.packet.json | 0 ...-36-ofp_queue_get_config_reply.packet.json | 0 .../3-37-ofp_queue_stats_request.packet.json | 0 .../3-38-ofp_queue_stats_reply.packet.json | 0 .../of12/3-39-ofp_port_status.packet.json | 0 .../json/of12/3-4-ofp_packet_in.packet.json | 0 .../of12/3-40-ofp_flow_removed.packet.json | 0 ...-41-ofp_error_msg_experimenter.packet.json | 0 .../of12/3-5-ofp_features_request.packet.json | 0 .../json/of12/3-59-ofp_packet_in.packet.json | 0 .../of12/3-6-ofp_features_reply.packet.json | 0 .../json/of12/3-60-ofp_flow_mod.packet.json | 0 .../3-61-ofp_group_stats_request.packet.json | 0 .../3-62-ofp_group_stats_reply.packet.json | 0 .../json/of12/3-7-ofp_set_config.packet.json | 0 .../3-8-ofp_get_config_request.packet.json | 0 .../of12/3-9-ofp_get_config_reply.packet.json | 0 ...-ofctl-ofp_group_stats_request.packet.json | 0 ...b-ofctl-ofp_port_stats_request.packet.json | 0 ...l-ofp_queue_get_config_request.packet.json | 0 ...ofctl-ofp_queue_stats_request.packet1.json | 0 ...ofctl-ofp_queue_stats_request.packet2.json | 0 ...ofctl-ofp_queue_stats_request.packet3.json | 0 ...-ofp_packet_out_packet_library.packet.json | 0 .../json/of13/4-0-ofp_desc_reply.packet.json | 0 .../json/of13/4-1-ofp_packet_out.packet.json | 0 .../json/of13/4-10-ofp_hello.packet.json | 0 .../4-11-ofp_flow_stats_request.packet.json | 0 .../4-12-ofp_flow_stats_reply.packet.json | 0 .../of13/4-13-ofp_echo_request.packet.json | 0 .../json/of13/4-14-ofp_echo_reply.packet.json | 0 .../json/of13/4-15-ofp_error_msg.packet.json | 0 .../of13/4-16-ofp_experimenter.packet.json | 0 .../of13/4-17-ofp_barrier_request.packet.json | 0 .../of13/4-18-ofp_barrier_reply.packet.json | 0 .../of13/4-19-ofp_role_request.packet.json | 0 .../json/of13/4-2-ofp_flow_mod.packet.json | 0 .../json/of13/4-20-ofp_role_reply.packet.json | 0 .../json/of13/4-21-ofp_group_mod.packet.json | 0 .../json/of13/4-22-ofp_port_mod.packet.json | 0 .../json/of13/4-23-ofp_table_mod.packet.json | 0 .../of13/4-24-ofp_desc_request.packet.json | 0 ...25-ofp_aggregate_stats_request.packet.json | 0 ...4-26-ofp_aggregate_stats_reply.packet.json | 0 .../4-27-ofp_table_stats_request.packet.json | 0 .../4-28-ofp_table_stats_reply.packet.json | 0 .../4-29-ofp_port_stats_request.packet.json | 0 .../json/of13/4-3-ofp_flow_mod.packet.json | 0 .../4-30-ofp_port_stats_reply.packet.json | 0 ...-31-ofp_group_features_request.packet.json | 0 .../4-32-ofp_group_features_reply.packet.json | 0 .../4-33-ofp_group_desc_request.packet.json | 0 .../4-34-ofp_group_desc_reply.packet.json | 0 ...5-ofp_queue_get_config_request.packet.json | 0 ...-36-ofp_queue_get_config_reply.packet.json | 0 .../4-37-ofp_queue_stats_request.packet.json | 0 .../4-38-ofp_queue_stats_reply.packet.json | 0 .../of13/4-39-ofp_port_status.packet.json | 0 .../json/of13/4-4-ofp_packet_in.packet.json | 0 .../of13/4-40-ofp_flow_removed.packet.json | 0 ...-41-ofp_error_msg_experimenter.packet.json | 0 .../4-42-ofp_get_async_request.packet.json | 0 .../of13/4-43-ofp_get_async_reply.packet.json | 0 .../json/of13/4-44-ofp_set_async.packet.json | 0 .../json/of13/4-45-ofp_meter_mod.packet.json | 0 .../json/of13/4-46-ofp_flow_mod.packet.json | 0 .../4-47-ofp_meter_config_request.packet.json | 0 .../4-48-ofp_meter_config_reply.packet.json | 0 .../4-49-ofp_meter_stats_request.packet.json | 0 .../of13/4-5-ofp_features_request.packet.json | 0 .../4-50-ofp_meter_stats_reply.packet.json | 0 ...-51-ofp_meter_features_request.packet.json | 0 .../4-52-ofp_meter_features_reply.packet.json | 0 .../4-53-ofp_port_desc_request.packet.json | 0 .../of13/4-54-ofp_port_desc_reply.packet.json | 0 ...-55-ofp_table_features_request.packet.json | 0 .../4-56-ofp_table_features_reply.packet.json | 0 .../4-57-ofp_group_stats_request.packet.json | 0 .../4-58-ofp_group_stats_reply.packet.json | 0 .../json/of13/4-59-ofp_packet_in.packet.json | 0 .../of13/4-6-ofp_features_reply.packet.json | 0 .../json/of13/4-60-ofp_flow_mod.packet.json | 0 .../4-61-ofp_experimenter_request.packet.json | 0 .../4-62-ofp_experimenter_reply.packet.json | 0 .../4-63-onf_flow_monitor_request.packet.json | 0 .../json/of13/4-7-ofp_set_config.packet.json | 0 .../4-8-ofp_get_config_request.packet.json | 0 .../of13/4-9-ofp_get_config_reply.packet.json | 0 ...-ofctl-ofp_group_stats_request.packet.json | 0 ...ofctl-ofp_meter_config_request.packet.json | 0 ...-ofctl-ofp_meter_stats_request.packet.json | 0 ...b-ofctl-ofp_port_stats_request.packet.json | 0 ...l-ofp_queue_get_config_request.packet.json | 0 ...ofctl-ofp_queue_stats_request.packet1.json | 0 ...ofctl-ofp_queue_stats_request.packet2.json | 0 ...ofctl-ofp_queue_stats_request.packet3.json | 0 ...ctl-ofp_table_features_request.packet.json | 0 .../libofproto-OFP13-echo_reply.packet.json | 0 .../libofproto-OFP13-echo_request.packet.json | 0 .../libofproto-OFP13-error_msg.packet.json | 0 ...ibofproto-OFP13-features_reply.packet.json | 0 .../libofproto-OFP13-flow_mod.packet.json | 0 ...oto-OFP13-flow_mod.packet.truncated64.json | 0 ...oto-OFP13-flow_mod_conjunction.packet.json | 0 ...roto-OFP13-flow_mod_match_conj.packet.json | 0 .../libofproto-OFP13-flow_removed.packet.json | 0 ...ofproto-OFP13-get_config_reply.packet.json | 0 .../of13/libofproto-OFP13-hello.packet.json | 0 .../libofproto-OFP13-meter_mod.packet.json | 0 ...-ofp_packet_out_packet_library.packet.json | 0 .../libofproto-OFP13-packet_in.packet.json | 0 .../libofproto-OFP13-port_mod.packet.json | 0 .../libofproto-OFP13-port_status.packet.json | 0 .../libofproto-OFP13-set_config.packet.json | 0 .../libofproto-OFP13-table_mod.packet.json | 0 ...-ofctl-of13-action_conjunction.packet.json | 0 ...s-ofctl-of13-action_controller.packet.json | 0 ...-ofctl-of13-action_controller2.packet.json | 0 .../of13/ovs-ofctl-of13-action_ct.packet.json | 0 .../ovs-ofctl-of13-action_ct_exec.packet.json | 0 .../ovs-ofctl-of13-action_ct_nat.packet.json | 0 ...vs-ofctl-of13-action_ct_nat_v6.packet.json | 0 ...tl-of13-action_dec_ttl_cnt_ids.packet.json | 0 ...s-ofctl-of13-action_fintimeout.packet.json | 0 .../ovs-ofctl-of13-action_learn.packet.json | 0 .../ovs-ofctl-of13-action_note.packet.json | 0 ...ofctl-of13-action_output_trunc.packet.json | 0 ...ovs-ofctl-of13-action_resubmit.packet.json | 0 .../ovs-ofctl-of13-action_sample.packet.json | 0 .../ovs-ofctl-of13-action_sample2.packet.json | 0 ...vs-ofctl-of13-action_stack_pop.packet.json | 0 ...s-ofctl-of13-action_stack_push.packet.json | 0 .../ovs-ofctl-of13-match_conj.packet.json | 0 ...tl-of13-match_load_nx_register.packet.json | 0 ...tl-of13-match_move_nx_register.packet.json | 0 .../ovs-ofctl-of13-match_pkt_mark.packet.json | 0 ...ctl-of13-match_pkt_mark_masked.packet.json | 0 .../json/of14/5-0-ofp_desc_reply.packet.json | 0 .../json/of14/5-1-ofp_packet_out.packet.json | 0 .../json/of14/5-10-ofp_hello.packet.json | 0 .../5-11-ofp_flow_stats_request.packet.json | 0 .../5-12-ofp_flow_stats_reply.packet.json | 0 .../of14/5-13-ofp_echo_request.packet.json | 0 .../json/of14/5-14-ofp_echo_reply.packet.json | 0 .../json/of14/5-15-ofp_error_msg.packet.json | 0 .../of14/5-16-ofp_experimenter.packet.json | 0 .../of14/5-17-ofp_barrier_request.packet.json | 0 .../of14/5-18-ofp_barrier_reply.packet.json | 0 .../of14/5-19-ofp_role_request.packet.json | 0 .../json/of14/5-2-ofp_flow_mod.packet.json | 0 .../json/of14/5-20-ofp_role_reply.packet.json | 0 .../json/of14/5-21-ofp_group_mod.packet.json | 0 .../json/of14/5-22-ofp_port_mod.packet.json | 0 .../json/of14/5-23-ofp_table_mod.packet.json | 0 .../of14/5-24-ofp_desc_request.packet.json | 0 ...25-ofp_aggregate_stats_request.packet.json | 0 ...5-26-ofp_aggregate_stats_reply.packet.json | 0 .../5-27-ofp_table_stats_request.packet.json | 0 .../5-28-ofp_table_stats_reply.packet.json | 0 .../5-29-ofp_port_stats_request.packet.json | 0 .../json/of14/5-3-ofp_flow_mod.packet.json | 0 .../5-30-ofp_port_stats_reply.packet.json | 0 ...-31-ofp_group_features_request.packet.json | 0 .../5-32-ofp_group_features_reply.packet.json | 0 .../5-33-ofp_group_desc_request.packet.json | 0 .../5-34-ofp_group_desc_reply.packet.json | 0 .../5-35-ofp_queue_stats_request.packet.json | 0 .../5-36-ofp_queue_stats_reply.packet.json | 0 .../of14/5-37-ofp_port_status.packet.json | 0 .../of14/5-38-ofp_flow_removed.packet.json | 0 ...-39-ofp_error_msg_experimenter.packet.json | 0 .../json/of14/5-4-ofp_packet_in.packet.json | 0 .../5-40-ofp_get_async_request.packet.json | 0 .../of14/5-41-ofp_get_async_reply.packet.json | 0 .../json/of14/5-42-ofp_set_async.packet.json | 0 .../json/of14/5-43-ofp_meter_mod.packet.json | 0 .../json/of14/5-44-ofp_flow_mod.packet.json | 0 .../5-45-ofp_meter_config_request.packet.json | 0 .../5-46-ofp_meter_config_reply.packet.json | 0 .../5-47-ofp_meter_stats_request.packet.json | 0 .../5-48-ofp_meter_stats_reply.packet.json | 0 ...-49-ofp_meter_features_request.packet.json | 0 .../of14/5-5-ofp_features_request.packet.json | 0 .../5-50-ofp_meter_features_reply.packet.json | 0 .../5-51-ofp_port_desc_request.packet.json | 0 .../of14/5-52-ofp_port_desc_reply.packet.json | 0 ...-53-ofp_table_features_request.packet.json | 0 .../5-54-ofp_table_features_reply.packet.json | 0 .../5-55-ofp_group_stats_request.packet.json | 0 .../5-56-ofp_group_stats_reply.packet.json | 0 .../json/of14/5-57-ofp_packet_in.packet.json | 0 .../json/of14/5-58-ofp_flow_mod.packet.json | 0 .../5-59-ofp_experimenter_request.packet.json | 0 .../of14/5-6-ofp_features_reply.packet.json | 0 .../5-60-ofp_experimenter_reply.packet.json | 0 .../5-61-ofp_table_desc_request.packet.json | 0 .../5-62-ofp_table_desc_reply.packet.json | 0 .../5-63-ofp_queue_desc_request.packet.json | 0 .../5-64-ofp_queue_desc_reply.packet.json | 0 .../of14/5-65-ofp_role_status.packet.json | 0 .../5-66-ofp_flow_monitor_request.packet.json | 0 .../5-67-ofp_flow_monitor_reply.packet.json | 0 .../of14/5-68-ofp_table_status.packet.json | 0 .../of14/5-69-ofp_bundle_ctrl_msg.packet.json | 0 .../json/of14/5-7-ofp_set_config.packet.json | 0 .../of14/5-70-ofp_bundle_add_msg.packet.json | 0 .../of14/5-71-ofp_requestforward.packet.json | 0 .../5-8-ofp_get_config_request.packet.json | 0 .../of14/5-9-ofp_get_config_reply.packet.json | 0 ...ctl-ofp_table_features_request.packet.json | 0 ...-ofp_packet_out_packet_library.packet.json | 0 ...ib-ofctl-OFP15-flow_desc_reply.packet.json | 0 ...-ofctl-OFP15-flow_desc_request.packet.json | 0 .../of15/lib-ofctl-OFP15-flow_mod.packet.json | 0 ...-ofctl-ofp_queue_stats_request.packet.json | 0 ...ctl-ofp_table_features_request.packet.json | 0 ...to-OFP15-aggregate_stats_reply.packet.json | 0 ...-OFP15-aggregate_stats_request.packet.json | 0 ...libofproto-OFP15-barrier_reply.packet.json | 0 ...bofproto-OFP15-barrier_request.packet.json | 0 .../libofproto-OFP15-bundle_add.packet.json | 0 .../libofproto-OFP15-bundle_ctrl.packet.json | 0 ...to-OFP15-bundle_features_reply.packet.json | 0 ...-OFP15-bundle_features_request.packet.json | 0 ...fproto-OFP15-controller_status.packet.json | 0 ...-OFP15-controller_status_reply.packet.json | 0 ...FP15-controller_status_request.packet.json | 0 .../libofproto-OFP15-desc_reply.packet.json | 0 .../libofproto-OFP15-desc_request.packet.json | 0 .../libofproto-OFP15-echo_reply.packet.json | 0 .../libofproto-OFP15-echo_request.packet.json | 0 .../libofproto-OFP15-error_msg.packet.json | 0 ...o-OFP15-error_msg_experimenter.packet.json | 0 .../libofproto-OFP15-experimenter.packet.json | 0 ...proto-OFP15-experimenter_reply.packet.json | 0 ...oto-OFP15-experimenter_request.packet.json | 0 ...ibofproto-OFP15-features_reply.packet.json | 0 ...ofproto-OFP15-features_request.packet.json | 0 ...bofproto-OFP15-flow_desc_reply.packet.json | 0 ...fproto-OFP15-flow_desc_request.packet.json | 0 .../libofproto-OFP15-flow_mod.packet.json | 0 ...oto-OFP15-flow_mod_conjunction.packet.json | 0 ...roto-OFP15-flow_mod_match_conj.packet.json | 0 ...ibofproto-OFP15-flow_mod_no_nx.packet.json | 0 ...proto-OFP15-flow_monitor_reply.packet.json | 0 ...oto-OFP15-flow_monitor_request.packet.json | 0 .../libofproto-OFP15-flow_removed.packet.json | 0 ...ofproto-OFP15-flow_stats_reply.packet.json | 0 ...proto-OFP15-flow_stats_request.packet.json | 0 ...bofproto-OFP15-get_async_reply.packet.json | 0 ...fproto-OFP15-get_async_request.packet.json | 0 ...ofproto-OFP15-get_config_reply.packet.json | 0 ...proto-OFP15-get_config_request.packet.json | 0 ...ofproto-OFP15-group_desc_reply.packet.json | 0 ...proto-OFP15-group_desc_request.packet.json | 0 ...oto-OFP15-group_features_reply.packet.json | 0 ...o-OFP15-group_features_request.packet.json | 0 .../libofproto-OFP15-group_mod.packet.json | 0 ...fproto-OFP15-group_stats_reply.packet.json | 0 ...roto-OFP15-group_stats_request.packet.json | 0 .../of15/libofproto-OFP15-hello.packet.json | 0 ...ofproto-OFP15-meter_desc_reply.packet.json | 0 ...proto-OFP15-meter_desc_request.packet.json | 0 ...oto-OFP15-meter_features_reply.packet.json | 0 ...o-OFP15-meter_features_request.packet.json | 0 .../libofproto-OFP15-meter_mod.packet.json | 0 ...fproto-OFP15-meter_stats_reply.packet.json | 0 ...roto-OFP15-meter_stats_request.packet.json | 0 .../libofproto-OFP15-packet_in.packet.json | 0 .../libofproto-OFP15-packet_out.packet.json | 0 ...bofproto-OFP15-port_desc_reply.packet.json | 0 ...fproto-OFP15-port_desc_request.packet.json | 0 .../libofproto-OFP15-port_mod.packet.json | 0 ...ofproto-OFP15-port_stats_reply.packet.json | 0 ...proto-OFP15-port_stats_request.packet.json | 0 .../libofproto-OFP15-port_status.packet.json | 0 ...ofproto-OFP15-queue_desc_reply.packet.json | 0 ...proto-OFP15-queue_desc_request.packet.json | 0 ...fproto-OFP15-queue_stats_reply.packet.json | 0 ...roto-OFP15-queue_stats_request.packet.json | 0 ...ibofproto-OFP15-requestforward.packet.json | 0 .../libofproto-OFP15-role_reply.packet.json | 0 .../libofproto-OFP15-role_request.packet.json | 0 .../libofproto-OFP15-role_status.packet.json | 0 .../libofproto-OFP15-set_async.packet.json | 0 .../libofproto-OFP15-set_config.packet.json | 0 ...ofproto-OFP15-table_desc_reply.packet.json | 0 ...proto-OFP15-table_desc_request.packet.json | 0 ...oto-OFP15-table_features_reply.packet.json | 0 ...o-OFP15-table_features_request.packet.json | 0 .../libofproto-OFP15-table_mod.packet.json | 0 ...fproto-OFP15-table_stats_reply.packet.json | 0 ...roto-OFP15-table_stats_request.packet.json | 0 .../libofproto-OFP15-table_status.packet.json | 0 .../tests}/unit/ofproto/test_ether.py | 0 .../tests}/unit/ofproto/test_inet.py | 0 .../tests}/unit/ofproto/test_nx_flow_spec.py | 0 .../tests}/unit/ofproto/test_ofproto.py | 0 .../unit/ofproto/test_ofproto_common.py | 0 .../unit/ofproto/test_ofproto_parser.py | 0 .../tests}/unit/ofproto/test_ofproto_v12.py | 0 {tests => ryu/tests}/unit/ofproto/test_oxm.py | 0 {tests => ryu/tests}/unit/ofproto/test_oxs.py | 0 .../tests}/unit/ofproto/test_parser.py | 10 +- .../tests}/unit/ofproto/test_parser_compat.py | 11 +- .../unit/ofproto/test_parser_ofpmatch.py | 6 +- .../unit/ofproto/test_parser_ofpstats.py | 7 +- .../tests}/unit/ofproto/test_parser_v10.py | 0 .../tests}/unit/ofproto/test_parser_v12.py | 0 .../tests}/unit/ofproto/test_parser_v13.py | 0 .../tests/unit/packet}/__init__.py | 0 {tests => ryu/tests}/unit/packet/test_arp.py | 0 {tests => ryu/tests}/unit/packet/test_bfd.py | 0 {tests => ryu/tests}/unit/packet/test_bgp.py | 0 {tests => ryu/tests}/unit/packet/test_bmp.py | 0 {tests => ryu/tests}/unit/packet/test_bpdu.py | 0 {tests => ryu/tests}/unit/packet/test_cfm.py | 0 {tests => ryu/tests}/unit/packet/test_dhcp.py | 0 .../tests}/unit/packet/test_ethernet.py | 0 .../tests}/unit/packet/test_geneve.py | 0 {tests => ryu/tests}/unit/packet/test_gre.py | 0 {tests => ryu/tests}/unit/packet/test_icmp.py | 0 .../tests}/unit/packet/test_icmpv6.py | 0 {tests => ryu/tests}/unit/packet/test_igmp.py | 0 {tests => ryu/tests}/unit/packet/test_ipv4.py | 0 {tests => ryu/tests}/unit/packet/test_ipv6.py | 0 {tests => ryu/tests}/unit/packet/test_llc.py | 0 {tests => ryu/tests}/unit/packet/test_lldp.py | 0 {tests => ryu/tests}/unit/packet/test_mpls.py | 0 .../tests}/unit/packet/test_openflow.py | 0 {tests => ryu/tests}/unit/packet/test_ospf.py | 0 .../tests}/unit/packet/test_packet.py | 0 {tests => ryu/tests}/unit/packet/test_pbb.py | 0 {tests => ryu/tests}/unit/packet/test_sctp.py | 0 {tests => ryu/tests}/unit/packet/test_slow.py | 0 {tests => ryu/tests}/unit/packet/test_tcp.py | 0 {tests => ryu/tests}/unit/packet/test_udp.py | 0 {tests => ryu/tests}/unit/packet/test_vlan.py | 0 {tests => ryu/tests}/unit/packet/test_vrrp.py | 0 .../tests}/unit/packet/test_vxlan.py | 0 .../tests}/unit/packet/test_zebra.py | 0 .../tests/unit/sample}/__init__.py | 0 .../tests}/unit/sample/test_sample1.py | 2 +- .../tests}/unit/sample/test_sample2.py | 0 .../tests/unit/services}/__init__.py | 0 .../unit/services/protocols}/__init__.py | 0 .../unit/services/protocols/bgp}/__init__.py | 0 .../protocols/bgp/core_managers}/__init__.py | 0 .../bgp/core_managers/test_table_manager.py | 0 .../services/protocols/bgp/test_bgpspeaker.py | 0 .../unit/services/protocols/bgp/test_peer.py | 0 .../services/protocols/bgp/utils}/__init__.py | 0 .../services/protocols/bgp/utils/test_bgp.py | 0 .../protocols/bgp/utils/test_validation.py | 0 .../tests}/unit/test_requirements.py | 4 +- {tests => ryu/tests}/unit/test_utils.py | 0 .../services/protocols/bgp/utils/__init__.py | 0 tools/normalize_json.py | 2 +- tox.ini | 6 +- 984 files changed, 349 insertions(+), 359 deletions(-) rename {tests => ryu/tests/integrated}/__init__.py (100%) rename {tests/integrated => ryu/tests/integrated/bgp}/__init__.py (100%) rename {tests => ryu/tests}/integrated/bgp/base.py (94%) rename {tests => ryu/tests}/integrated/bgp/base_ip6.py (94%) rename {tests => ryu/tests}/integrated/bgp/test_basic.py (96%) rename {tests => ryu/tests}/integrated/bgp/test_ip6_basic.py (96%) rename {tests/integrated/bgp => ryu/tests/integrated/common}/__init__.py (100%) rename {tests => ryu/tests}/integrated/common/docker_base.py (100%) rename {tests => ryu/tests}/integrated/common/install_docker_test_pkg.sh (100%) rename {tests => ryu/tests}/integrated/common/install_docker_test_pkg_common.sh (100%) rename {tests => ryu/tests}/integrated/common/install_docker_test_pkg_for_travis.sh (100%) rename {tests => ryu/tests}/integrated/common/quagga.py (100%) rename {tests => ryu/tests}/integrated/common/ryubgp.py (100%) rename {tests => ryu/tests}/integrated/run_test.py (94%) rename {tests => ryu/tests}/integrated/run_tests_with_ovs12.py (92%) rename {tests => ryu/tests}/integrated/test_add_flow_v10.py (99%) rename {tests => ryu/tests}/integrated/test_add_flow_v12_actions.py (99%) rename {tests => ryu/tests}/integrated/test_add_flow_v12_matches.py (99%) rename {tests => ryu/tests}/integrated/test_of_config.py (99%) rename {tests => ryu/tests}/integrated/test_request_reply_v12.py (99%) rename {tests => ryu/tests}/integrated/test_vrrp_linux_multi.py (97%) rename {tests => ryu/tests}/integrated/test_vrrp_linux_multi.sh (100%) rename {tests => ryu/tests}/integrated/test_vrrp_multi.py (97%) rename {tests => ryu/tests}/integrated/test_vrrp_multi.sh (100%) rename {tests => ryu/tests}/integrated/tester.py (100%) rename {tests => ryu/tests}/integrated/vrrp_common.py (100%) rename {tests => ryu/tests}/mininet/l2/mpls/PopMPLS_mpls.mn (100%) rename {tests => ryu/tests}/mininet/l2/mpls/PushMPLS_ip.mn (100%) rename {tests => ryu/tests}/mininet/l2/mpls/PushMPLS_mpls.mn (100%) rename {tests => ryu/tests}/mininet/l2/mpls/test_mpls.py (100%) rename {tests => ryu/tests}/mininet/l2/vlan/PopVLAN_vlan.mn (100%) rename {tests => ryu/tests}/mininet/l2/vlan/PopVLAN_vlanvlan.mn (100%) rename {tests => ryu/tests}/mininet/l2/vlan/PushVLAN_icmp.mn (100%) rename {tests => ryu/tests}/mininet/l2/vlan/test_vlan.py (100%) rename {tests => ryu/tests}/mininet/l3/icmp/ICMP_ping.mn (100%) rename {tests => ryu/tests}/mininet/l3/icmp/ICMP_reply.mn (100%) rename {tests => ryu/tests}/mininet/l3/icmp/test_icmp.py (100%) rename {tests => ryu/tests}/mininet/l3/ip_ttl/DecNwTtl.mn (100%) rename {tests => ryu/tests}/mininet/l3/ip_ttl/test_ip_ttl.py (100%) rename {tests => ryu/tests}/mininet/packet_lib/arp/ARP_gratuitous.mn (100%) rename {tests => ryu/tests}/mininet/packet_lib/arp/ARP_reply.mn (100%) rename {tests => ryu/tests}/mininet/packet_lib/arp/ARP_request.mn (100%) rename {tests => ryu/tests}/mininet/packet_lib/arp/test_arp.py (100%) rename {tests => ryu/tests}/mininet/run_mnet-test.sh (100%) rename {tests => ryu/tests}/packet_data/bgp4/bgp4-keepalive.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/bgp4-open.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/bgp4-update.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/bgp4-update_ipv6.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/bgp4-update_vpnv6.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/evpn_esi_arbitrary.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/evpn_esi_as_based.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/evpn_esi_l2_bridge.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/evpn_esi_lacp.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/evpn_esi_mac_base.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/evpn_esi_router_id.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/evpn_nlri_eth_a-d.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/evpn_nlri_eth_seg.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/evpn_nlri_inc_multi_eth_tag.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/evpn_nlri_ip_prefix.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/evpn_nlri_mac_ip_ad.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/flowspec_action_redirect.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/flowspec_action_traffic_action.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/flowspec_action_traffic_marking.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/flowspec_action_traffic_rate.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/flowspec_nlri_ipv4.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/flowspec_nlri_ipv6.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/flowspec_nlri_l2vpn.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/flowspec_nlri_vpn4.pcap (100%) rename {tests => ryu/tests}/packet_data/bgp4/flowspec_nlri_vpn6.pcap (100%) rename {tests => ryu/tests}/packet_data/mrt/rib.20161101.0000_pick.bz2 (100%) rename {tests => ryu/tests}/packet_data/mrt/updates.20161101.0000.bz2 (100%) rename {tests => ryu/tests}/packet_data/of10/1-1-ofp_packet_out.packet (100%) rename {tests => ryu/tests}/packet_data/of10/1-2-ofp_flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of10/1-4-ofp_packet_in.packet (100%) rename {tests => ryu/tests}/packet_data/of10/1-5-features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of10/1-6-ofp_switch_features.packet (100%) rename {tests => ryu/tests}/packet_data/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet (100%) rename {tests => ryu/tests}/packet_data/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet (100%) rename {tests => ryu/tests}/packet_data/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet (100%) rename {tests => ryu/tests}/packet_data/of10/ovs-ofctl-of10-action_pop_mpls.packet (100%) rename {tests => ryu/tests}/packet_data/of10/ovs-ofctl-of10-action_push_mpls.packet (100%) rename {tests => ryu/tests}/packet_data/of10/ovs-ofctl-of10-action_set_mpls_label.packet (100%) rename {tests => ryu/tests}/packet_data/of10/ovs-ofctl-of10-action_set_mpls_tc.packet (100%) rename {tests => ryu/tests}/packet_data/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-0-ofp_desc_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-1-ofp_packet_out.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-10-ofp_hello.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-11-ofp_flow_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-12-ofp_flow_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-13-ofp_echo_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-14-ofp_echo_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-15-ofp_error_msg.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-16-ofp_experimenter.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-17-ofp_barrier_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-18-ofp_barrier_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-19-ofp_role_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-2-ofp_flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-20-ofp_role_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-21-ofp_group_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-22-ofp_port_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-23-ofp_table_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-24-ofp_desc_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-25-ofp_aggregate_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-26-ofp_aggregate_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-27-ofp_table_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-28-ofp_table_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-29-ofp_port_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-3-ofp_flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-30-ofp_port_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-31-ofp_group_features_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-32-ofp_group_features_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-33-ofp_group_desc_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-34-ofp_group_desc_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-35-ofp_queue_get_config_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-36-ofp_queue_get_config_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-37-ofp_queue_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-38-ofp_queue_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-39-ofp_port_status.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-4-ofp_packet_in.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-40-ofp_flow_removed.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-41-ofp_error_msg_experimenter.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-5-ofp_features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-59-ofp_packet_in.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-6-ofp_features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-60-ofp_flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-61-ofp_group_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-62-ofp_group_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-7-ofp_set_config.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-8-ofp_get_config_request.packet (100%) rename {tests => ryu/tests}/packet_data/of12/3-9-ofp_get_config_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-0-ofp_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-1-ofp_packet_out.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-10-ofp_hello.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-11-ofp_flow_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-12-ofp_flow_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-13-ofp_echo_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-14-ofp_echo_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-15-ofp_error_msg.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-16-ofp_experimenter.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-17-ofp_barrier_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-18-ofp_barrier_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-19-ofp_role_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-2-ofp_flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-20-ofp_role_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-21-ofp_group_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-22-ofp_port_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-23-ofp_table_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-24-ofp_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-25-ofp_aggregate_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-26-ofp_aggregate_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-27-ofp_table_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-28-ofp_table_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-29-ofp_port_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-3-ofp_flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-30-ofp_port_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-31-ofp_group_features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-32-ofp_group_features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-33-ofp_group_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-34-ofp_group_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-35-ofp_queue_get_config_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-36-ofp_queue_get_config_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-37-ofp_queue_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-38-ofp_queue_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-39-ofp_port_status.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-4-ofp_packet_in.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-40-ofp_flow_removed.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-41-ofp_error_msg_experimenter.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-42-ofp_get_async_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-43-ofp_get_async_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-44-ofp_set_async.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-45-ofp_meter_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-46-ofp_flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-47-ofp_meter_config_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-48-ofp_meter_config_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-49-ofp_meter_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-5-ofp_features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-50-ofp_meter_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-51-ofp_meter_features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-52-ofp_meter_features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-53-ofp_port_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-54-ofp_port_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-55-ofp_table_features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-56-ofp_table_features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-57-ofp_group_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-58-ofp_group_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-59-ofp_packet_in.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-6-ofp_features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-60-ofp_flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-61-ofp_experimenter_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-62-ofp_experimenter_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-63-onf_flow_monitor_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-7-ofp_set_config.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-8-ofp_get_config_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/4-9-ofp_get_config_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-echo_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-echo_request.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-error_msg.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-flow_mod.truncated64 (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-flow_mod_conjunction.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-flow_mod_match_conj.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-flow_removed.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-get_config_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-hello.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-meter_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-packet_in.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-port_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-port_status.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-set_config.packet (100%) rename {tests => ryu/tests}/packet_data/of13/libofproto-OFP13-table_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_conjunction.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_controller.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_controller2.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_ct.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_ct_exec.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_ct_nat.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_ct_nat_v6.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_fintimeout.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_learn.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_note.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_output_trunc.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_resubmit.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_sample.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_sample2.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_stack_pop.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-action_stack_push.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-match_conj.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-match_load_nx_register.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-match_move_nx_register.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-match_pkt_mark.packet (100%) rename {tests => ryu/tests}/packet_data/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-0-ofp_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-1-ofp_packet_out.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-10-ofp_hello.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-11-ofp_flow_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-12-ofp_flow_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-13-ofp_echo_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-14-ofp_echo_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-15-ofp_error_msg.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-16-ofp_experimenter.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-17-ofp_barrier_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-18-ofp_barrier_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-19-ofp_role_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-2-ofp_flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-20-ofp_role_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-21-ofp_group_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-22-ofp_port_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-23-ofp_table_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-24-ofp_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-25-ofp_aggregate_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-26-ofp_aggregate_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-27-ofp_table_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-28-ofp_table_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-29-ofp_port_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-3-ofp_flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-30-ofp_port_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-31-ofp_group_features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-32-ofp_group_features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-33-ofp_group_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-34-ofp_group_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-35-ofp_queue_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-36-ofp_queue_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-37-ofp_port_status.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-38-ofp_flow_removed.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-39-ofp_error_msg_experimenter.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-4-ofp_packet_in.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-40-ofp_get_async_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-41-ofp_get_async_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-42-ofp_set_async.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-43-ofp_meter_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-44-ofp_flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-45-ofp_meter_config_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-46-ofp_meter_config_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-47-ofp_meter_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-48-ofp_meter_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-49-ofp_meter_features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-5-ofp_features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-50-ofp_meter_features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-51-ofp_port_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-52-ofp_port_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-53-ofp_table_features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-54-ofp_table_features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-55-ofp_group_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-56-ofp_group_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-57-ofp_packet_in.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-58-ofp_flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-59-ofp_experimenter_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-6-ofp_features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-60-ofp_experimenter_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-61-ofp_table_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-62-ofp_table_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-63-ofp_queue_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-64-ofp_queue_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-65-ofp_role_status.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-66-ofp_flow_monitor_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-67-ofp_flow_monitor_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-68-ofp_table_status.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-69-ofp_bundle_ctrl_msg.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-7-ofp_set_config.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-70-ofp_bundle_add_msg.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-71-ofp_requestforward.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-8-ofp_get_config_request.packet (100%) rename {tests => ryu/tests}/packet_data/of14/5-9-ofp_get_config_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-aggregate_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-aggregate_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-barrier_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-barrier_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-bundle_add.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-bundle_ctrl.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-bundle_features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-bundle_features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-controller_status.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-controller_status_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-controller_status_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-echo_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-echo_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-error_msg.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-error_msg_experimenter.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-experimenter.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-experimenter_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-experimenter_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-flow_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-flow_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-flow_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-flow_mod_conjunction.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-flow_mod_match_conj.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-flow_monitor_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-flow_monitor_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-flow_removed.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-flow_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-flow_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-get_async_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-get_async_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-get_config_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-get_config_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-group_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-group_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-group_features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-group_features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-group_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-group_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-group_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-hello.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-meter_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-meter_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-meter_features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-meter_features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-meter_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-meter_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-meter_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-packet_in.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-packet_out.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-port_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-port_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-port_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-port_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-port_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-port_status.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-queue_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-queue_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-queue_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-queue_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-requestforward.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-role_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-role_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-role_status.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-set_async.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-set_config.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-table_desc_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-table_desc_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-table_features_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-table_features_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-table_mod.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-table_stats_reply.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-table_stats_request.packet (100%) rename {tests => ryu/tests}/packet_data/of15/libofproto-OFP15-table_status.packet (100%) rename {tests => ryu/tests}/packet_data/pcap/big_endian.pcap (100%) rename {tests => ryu/tests}/packet_data/pcap/geneve_unknown.pcap (100%) rename {tests => ryu/tests}/packet_data/pcap/gre_full_options.pcap (100%) rename {tests => ryu/tests}/packet_data/pcap/gre_no_option.pcap (100%) rename {tests => ryu/tests}/packet_data/pcap/gre_nvgre_option.pcap (100%) rename {tests => ryu/tests}/packet_data/pcap/little_endian.pcap (100%) rename {tests => ryu/tests}/packet_data/pcap/openflow_flowmod.pcap (100%) rename {tests => ryu/tests}/packet_data/pcap/openflow_flowstats_req.pcap (100%) rename {tests => ryu/tests}/packet_data/pcap/openflow_invalid_version.pcap (100%) rename {tests => ryu/tests}/packet_data/pcap/zebra_v2.pcap (100%) rename {tests => ryu/tests}/packet_data/pcap/zebra_v3.pcap (100%) rename {tests => ryu/tests}/packet_data_generator/Makefile (100%) rename {tests => ryu/tests}/packet_data_generator/rebar.config (100%) rename {tests => ryu/tests}/packet_data_generator/src/er.app.src (100%) rename {tests => ryu/tests}/packet_data_generator/src/x.erl (100%) rename {tests => ryu/tests}/packet_data_generator/src/x1.erl (100%) rename {tests => ryu/tests}/packet_data_generator/src/x3.erl (100%) rename {tests => ryu/tests}/packet_data_generator/src/x4.erl (100%) rename {tests => ryu/tests}/packet_data_generator/src/x5.erl (100%) rename {tests => ryu/tests}/packet_data_generator/src/x_flower_packet.erl (100%) rename {tests => ryu/tests}/packet_data_generator/src/x_of_protocol.erl (100%) rename {tests => ryu/tests}/packet_data_generator2/Makefile.BSD (100%) rename {tests => ryu/tests}/packet_data_generator2/Makefile.GNU (100%) rename {tests => ryu/tests}/packet_data_generator2/README (88%) rename {tests => ryu/tests}/packet_data_generator2/gen.c (100%) rename {tests => ryu/tests}/packet_data_generator3/gen.py (100%) rename {tests => ryu/tests}/run_tests.py (86%) rename {tests => ryu/tests}/test_lib.py (100%) rename {tests => ryu/tests}/unit/__init__.py (100%) rename {tests/integrated/common => ryu/tests/unit/app}/__init__.py (100%) rename {tests => ryu/tests}/unit/app/ofctl_rest_json/of10.json (100%) rename {tests => ryu/tests}/unit/app/ofctl_rest_json/of12.json (100%) rename {tests => ryu/tests}/unit/app/ofctl_rest_json/of13.json (100%) rename {tests => ryu/tests}/unit/app/ofctl_rest_json/of14.json (100%) rename {tests => ryu/tests}/unit/app/ofctl_rest_json/of15.json (100%) rename {tests => ryu/tests}/unit/app/test_ofctl_rest.py (99%) rename {tests => ryu/tests}/unit/app/test_tester.py (99%) rename {tests => ryu/tests}/unit/app/test_ws_topology.py (100%) rename {tests => ryu/tests}/unit/app/test_wsgi.py (100%) rename {tests => ryu/tests}/unit/cmd/__init__.py (100%) rename {tests => ryu/tests}/unit/cmd/dummy_app.py (100%) rename {tests => ryu/tests}/unit/cmd/dummy_openflow_app.py (100%) rename {tests => ryu/tests}/unit/cmd/test_manager.py (93%) rename {tests/unit/app => ryu/tests/unit/controller}/__init__.py (100%) rename {tests => ryu/tests}/unit/controller/test_controller.py (100%) rename {tests/unit/controller => ryu/tests/unit/lib}/__init__.py (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of10/1-2-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-0-ofp_desc_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-11-ofp_flow_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-16-ofp_experimenter.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-2-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-21-ofp_group_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-22-ofp_port_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-25-ofp_aggregate_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-26-ofp_aggregate_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-30-ofp_port_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-32-ofp_group_features_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-34-ofp_group_desc_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-35-ofp_queue_get_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-36-ofp_queue_get_config_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-38-ofp_queue_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-6-ofp_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/3-62-ofp_group_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/lib-ofctl-ofp_group_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/lib-ofctl-ofp_port_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-0-ofp_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-11-ofp_flow_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-16-ofp_experimenter.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-2-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-21-ofp_group_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-22-ofp_port_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-25-ofp_aggregate_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-26-ofp_aggregate_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-28-ofp_table_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-30-ofp_port_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-32-ofp_group_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-34-ofp_group_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-35-ofp_queue_get_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-36-ofp_queue_get_config_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-38-ofp_queue_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-45-ofp_meter_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-48-ofp_meter_config_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-50-ofp_meter_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-52-ofp_meter_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-54-ofp_port_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-56-ofp_table_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/4-58-ofp_group_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/lib-ofctl-ofp_group_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/lib-ofctl-ofp_port_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-0-ofp_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-11-ofp_flow_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-12-ofp_flow_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-16-ofp_experimenter.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-2-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-21-ofp_group_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-22-ofp_port_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-25-ofp_aggregate_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-26-ofp_aggregate_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-28-ofp_table_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-30-ofp_port_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-32-ofp_group_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-34-ofp_group_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-36-ofp_queue_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-43-ofp_meter_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-46-ofp_meter_config_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-48-ofp_meter_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-50-ofp_meter_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-52-ofp_port_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-54-ofp_table_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-56-ofp_group_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-63-ofp_queue_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of14/5-64-ofp_queue_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-experimenter.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-group_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-group_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-group_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-port_mod.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-port_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-table_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/lib/ofctl_json/of15/libofproto-OFP15-table_stats_reply.packet.json (100%) rename {tests/unit/lib => ryu/tests/unit/lib/ovs}/__init__.py (100%) rename {tests => ryu/tests}/unit/lib/ovs/test_vsctl.py (100%) rename {tests => ryu/tests}/unit/lib/test_addrconv.py (100%) rename {tests => ryu/tests}/unit/lib/test_hub.py (100%) rename {tests => ryu/tests}/unit/lib/test_import_module.py (86%) rename {tests => ryu/tests}/unit/lib/test_ip.py (100%) rename {tests => ryu/tests}/unit/lib/test_mac.py (100%) rename {tests => ryu/tests}/unit/lib/test_mod/__init__.py (100%) rename {tests => ryu/tests}/unit/lib/test_mod/aaa/__init__.py (100%) rename {tests => ryu/tests}/unit/lib/test_mod/aaa/mod.py (100%) rename {tests => ryu/tests}/unit/lib/test_mod/bbb/__init__.py (100%) rename {tests => ryu/tests}/unit/lib/test_mod/bbb/mod.py (100%) rename {tests => ryu/tests}/unit/lib/test_mod/ccc/__init__.py (100%) rename {tests => ryu/tests}/unit/lib/test_mod/ccc/mod.py (100%) rename {tests => ryu/tests}/unit/lib/test_mod/ddd/__init__.py (100%) rename {tests => ryu/tests}/unit/lib/test_mod/ddd/mod.py (100%) rename {tests => ryu/tests}/unit/lib/test_mod/eee.py (100%) rename {tests => ryu/tests}/unit/lib/test_mod/fff.py (100%) rename {tests => ryu/tests}/unit/lib/test_mod/ggg.py (100%) rename {tests => ryu/tests}/unit/lib/test_mrtlib.py (100%) rename {tests => ryu/tests}/unit/lib/test_of_config_classes.py (100%) rename {tests => ryu/tests}/unit/lib/test_ofctl.py (99%) rename {tests => ryu/tests}/unit/lib/test_ofctl_action_match.py (99%) rename {tests => ryu/tests}/unit/lib/test_ofctl_string.py (100%) rename {tests => ryu/tests}/unit/lib/test_ofctl_utils.py (100%) rename {tests => ryu/tests}/unit/lib/test_ofctl_v1_3.py (100%) rename {tests => ryu/tests}/unit/lib/test_ofp_pktinfilter.py (100%) rename {tests => ryu/tests}/unit/lib/test_pack_utils.py (100%) rename {tests => ryu/tests}/unit/lib/test_pcaplib.py (100%) rename {tests => ryu/tests}/unit/lib/test_rpc.py (100%) rename {tests => ryu/tests}/unit/lib/test_stringify.py (100%) rename {tests/unit/lib/ovs => ryu/tests/unit/ofproto}/__init__.py (100%) rename {tests => ryu/tests}/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of10/1-5-features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of10/ovs-ofctl-of10-action_pop_mpls.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of10/ovs-ofctl-of10-action_push_mpls.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_label.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_tc.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-0-ofp_desc_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-10-ofp_hello.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-13-ofp_echo_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-14-ofp_echo_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-15-ofp_error_msg.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-16-ofp_experimenter.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-17-ofp_barrier_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-18-ofp_barrier_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-19-ofp_role_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-20-ofp_role_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-22-ofp_port_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-23-ofp_table_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-24-ofp_desc_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-26-ofp_aggregate_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-27-ofp_table_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-28-ofp_table_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-29-ofp_port_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-30-ofp_port_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-31-ofp_group_features_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-32-ofp_group_features_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-33-ofp_group_desc_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-35-ofp_queue_get_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-37-ofp_queue_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-38-ofp_queue_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-39-ofp_port_status.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-5-ofp_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-59-ofp_packet_in.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-6-ofp_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-60-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-61-ofp_group_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-62-ofp_group_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-7-ofp_set_config.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-8-ofp_get_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/3-9-ofp_get_config_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/lib-ofctl-ofp_group_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/lib-ofctl-ofp_port_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-1-ofp_packet_out.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-10-ofp_hello.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-13-ofp_echo_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-14-ofp_echo_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-15-ofp_error_msg.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-16-ofp_experimenter.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-17-ofp_barrier_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-18-ofp_barrier_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-19-ofp_role_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-20-ofp_role_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-21-ofp_group_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-22-ofp_port_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-23-ofp_table_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-35-ofp_queue_get_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-36-ofp_queue_get_config_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-39-ofp_port_status.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-41-ofp_error_msg_experimenter.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-42-ofp_get_async_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-43-ofp_get_async_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-44-ofp_set_async.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-45-ofp_meter_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-5-ofp_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-55-ofp_table_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-57-ofp_group_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-58-ofp_group_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-6-ofp_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-61-ofp_experimenter_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-62-ofp_experimenter_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-7-ofp_set_config.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-8-ofp_get_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/4-9-ofp_get_config_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/lib-ofctl-ofp_group_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/lib-ofctl-ofp_meter_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/lib-ofctl-ofp_meter_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/lib-ofctl-ofp_port_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/lib-ofctl-ofp_table_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-echo_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-echo_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-error_msg.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.truncated64.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-flow_removed.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-get_config_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-hello.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-meter_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-packet_in.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-port_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-port_status.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-set_config.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/libofproto-OFP13-table_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_conjunction.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller2.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat_v6.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_fintimeout.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_note.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_output_trunc.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_resubmit.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample2.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_pop.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_push.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-match_conj.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-match_load_nx_register.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-match_move_nx_register.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-0-ofp_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-1-ofp_packet_out.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-10-ofp_hello.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-11-ofp_flow_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-13-ofp_echo_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-14-ofp_echo_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-15-ofp_error_msg.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-16-ofp_experimenter.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-17-ofp_barrier_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-18-ofp_barrier_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-19-ofp_role_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-20-ofp_role_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-21-ofp_group_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-24-ofp_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-25-ofp_aggregate_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-26-ofp_aggregate_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-27-ofp_table_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-28-ofp_table_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-29-ofp_port_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-3-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-31-ofp_group_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-32-ofp_group_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-33-ofp_group_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-34-ofp_group_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-35-ofp_queue_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-38-ofp_flow_removed.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-39-ofp_error_msg_experimenter.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-4-ofp_packet_in.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-40-ofp_get_async_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-41-ofp_get_async_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-42-ofp_set_async.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-43-ofp_meter_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-44-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-45-ofp_meter_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-46-ofp_meter_config_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-47-ofp_meter_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-48-ofp_meter_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-49-ofp_meter_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-5-ofp_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-51-ofp_port_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-55-ofp_group_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-56-ofp_group_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-57-ofp_packet_in.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-58-ofp_flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-59-ofp_experimenter_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-6-ofp_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-60-ofp_experimenter_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-61-ofp_table_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-63-ofp_queue_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-66-ofp_flow_monitor_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-68-ofp_table_status.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-7-ofp_set_config.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-70-ofp_bundle_add_msg.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-71-ofp_requestforward.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-8-ofp_get_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/5-9-ofp_get_config_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/lib-ofctl-ofp_table_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/lib-ofctl-ofp_queue_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/lib-ofctl-ofp_table_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-barrier_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-barrier_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-bundle_ctrl.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-experimenter.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-experimenter_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-experimenter_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-get_async_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-get_async_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-get_config_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-get_config_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-group_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-group_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-group_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-group_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-group_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-meter_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-packet_in.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-packet_out.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-port_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-port_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-port_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-port_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-port_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-port_status.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-set_async.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-set_config.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-table_desc_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-table_desc_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-table_features_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-table_features_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-table_stats_reply.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-table_stats_request.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/json/of15/libofproto-OFP15-table_status.packet.json (100%) rename {tests => ryu/tests}/unit/ofproto/test_ether.py (100%) rename {tests => ryu/tests}/unit/ofproto/test_inet.py (100%) rename {tests => ryu/tests}/unit/ofproto/test_nx_flow_spec.py (100%) rename {tests => ryu/tests}/unit/ofproto/test_ofproto.py (100%) rename {tests => ryu/tests}/unit/ofproto/test_ofproto_common.py (100%) rename {tests => ryu/tests}/unit/ofproto/test_ofproto_parser.py (100%) rename {tests => ryu/tests}/unit/ofproto/test_ofproto_v12.py (100%) rename {tests => ryu/tests}/unit/ofproto/test_oxm.py (100%) rename {tests => ryu/tests}/unit/ofproto/test_oxs.py (100%) rename {tests => ryu/tests}/unit/ofproto/test_parser.py (99%) rename {tests => ryu/tests}/unit/ofproto/test_parser_compat.py (98%) rename {tests => ryu/tests}/unit/ofproto/test_parser_ofpmatch.py (99%) rename {tests => ryu/tests}/unit/ofproto/test_parser_ofpstats.py (99%) rename {tests => ryu/tests}/unit/ofproto/test_parser_v10.py (100%) rename {tests => ryu/tests}/unit/ofproto/test_parser_v12.py (100%) rename {tests => ryu/tests}/unit/ofproto/test_parser_v13.py (100%) rename {tests/unit/ofproto => ryu/tests/unit/packet}/__init__.py (100%) rename {tests => ryu/tests}/unit/packet/test_arp.py (100%) rename {tests => ryu/tests}/unit/packet/test_bfd.py (100%) rename {tests => ryu/tests}/unit/packet/test_bgp.py (100%) rename {tests => ryu/tests}/unit/packet/test_bmp.py (100%) rename {tests => ryu/tests}/unit/packet/test_bpdu.py (100%) rename {tests => ryu/tests}/unit/packet/test_cfm.py (100%) rename {tests => ryu/tests}/unit/packet/test_dhcp.py (100%) rename {tests => ryu/tests}/unit/packet/test_ethernet.py (100%) rename {tests => ryu/tests}/unit/packet/test_geneve.py (100%) rename {tests => ryu/tests}/unit/packet/test_gre.py (100%) rename {tests => ryu/tests}/unit/packet/test_icmp.py (100%) rename {tests => ryu/tests}/unit/packet/test_icmpv6.py (100%) rename {tests => ryu/tests}/unit/packet/test_igmp.py (100%) rename {tests => ryu/tests}/unit/packet/test_ipv4.py (100%) rename {tests => ryu/tests}/unit/packet/test_ipv6.py (100%) rename {tests => ryu/tests}/unit/packet/test_llc.py (100%) rename {tests => ryu/tests}/unit/packet/test_lldp.py (100%) rename {tests => ryu/tests}/unit/packet/test_mpls.py (100%) rename {tests => ryu/tests}/unit/packet/test_openflow.py (100%) rename {tests => ryu/tests}/unit/packet/test_ospf.py (100%) rename {tests => ryu/tests}/unit/packet/test_packet.py (100%) rename {tests => ryu/tests}/unit/packet/test_pbb.py (100%) rename {tests => ryu/tests}/unit/packet/test_sctp.py (100%) rename {tests => ryu/tests}/unit/packet/test_slow.py (100%) rename {tests => ryu/tests}/unit/packet/test_tcp.py (100%) rename {tests => ryu/tests}/unit/packet/test_udp.py (100%) rename {tests => ryu/tests}/unit/packet/test_vlan.py (100%) rename {tests => ryu/tests}/unit/packet/test_vrrp.py (100%) rename {tests => ryu/tests}/unit/packet/test_vxlan.py (100%) rename {tests => ryu/tests}/unit/packet/test_zebra.py (100%) rename {tests/unit/packet => ryu/tests/unit/sample}/__init__.py (100%) rename {tests => ryu/tests}/unit/sample/test_sample1.py (86%) rename {tests => ryu/tests}/unit/sample/test_sample2.py (100%) rename {tests/unit/sample => ryu/tests/unit/services}/__init__.py (100%) rename {tests/unit/services => ryu/tests/unit/services/protocols}/__init__.py (100%) rename {tests/unit/services/protocols => ryu/tests/unit/services/protocols/bgp}/__init__.py (100%) rename {tests/unit/services/protocols/bgp => ryu/tests/unit/services/protocols/bgp/core_managers}/__init__.py (100%) rename {tests => ryu/tests}/unit/services/protocols/bgp/core_managers/test_table_manager.py (100%) rename {tests => ryu/tests}/unit/services/protocols/bgp/test_bgpspeaker.py (100%) rename {tests => ryu/tests}/unit/services/protocols/bgp/test_peer.py (100%) rename {tests/unit/services/protocols/bgp/core_managers => ryu/tests/unit/services/protocols/bgp/utils}/__init__.py (100%) rename {tests => ryu/tests}/unit/services/protocols/bgp/utils/test_bgp.py (100%) rename {tests => ryu/tests}/unit/services/protocols/bgp/utils/test_validation.py (100%) rename {tests => ryu/tests}/unit/test_requirements.py (97%) rename {tests => ryu/tests}/unit/test_utils.py (100%) delete mode 100644 tests/unit/services/protocols/bgp/utils/__init__.py diff --git a/.travis.yml b/.travis.yml index 7f35ff23..9e5474a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 8d80de20..8e4945d3 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -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. diff --git a/MANIFEST.in b/MANIFEST.in index d782ce6a..990c333f 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -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 diff --git a/doc/source/ofproto_v1_0_ref.rst b/doc/source/ofproto_v1_0_ref.rst index 8d8f0898..91ed2a45 100644 --- a/doc/source/ofproto_v1_0_ref.rst +++ b/doc/source/ofproto_v1_0_ref.rst @@ -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 =============== 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 =============== diff --git a/doc/source/ofproto_v1_3_ref.rst b/doc/source/ofproto_v1_3_ref.rst index f5c9d884..e48bb485 100644 --- a/doc/source/ofproto_v1_3_ref.rst +++ b/doc/source/ofproto_v1_3_ref.rst @@ -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 =============== diff --git a/doc/source/ofproto_v1_4_ref.rst b/doc/source/ofproto_v1_4_ref.rst index 4ab1dcd2..8e84790e 100644 --- a/doc/source/ofproto_v1_4_ref.rst +++ b/doc/source/ofproto_v1_4_ref.rst @@ -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 =============== diff --git a/doc/source/ofproto_v1_5_ref.rst b/doc/source/ofproto_v1_5_ref.rst index d6a78e2e..a78cfb67 100644 --- a/doc/source/ofproto_v1_5_ref.rst +++ b/doc/source/ofproto_v1_5_ref.rst @@ -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 =============== diff --git a/doc/source/test-vrrp.rst b/doc/source/test-vrrp.rst index aa03d4ae..6e3783a1 100644 --- a/doc/source/test-vrrp.rst +++ b/doc/source/test-vrrp.rst @@ -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. diff --git a/doc/source/writing_ryu_app.rst b/doc/source/writing_ryu_app.rst index ff1fd755..8f8556bb 100644 --- a/doc/source/writing_ryu_app.rst +++ b/doc/source/writing_ryu_app.rst @@ -122,5 +122,5 @@ switch? Move to `the next step can learn from the existing Ryu applications at `ryu/app `_ directory and `integrated tests -`_ +`_ directory. diff --git a/run_tests.sh b/run_tests.sh index 2f448dce..1ab8aea7 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -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 diff --git a/tests/__init__.py b/ryu/tests/integrated/__init__.py similarity index 100% rename from tests/__init__.py rename to ryu/tests/integrated/__init__.py diff --git a/tests/integrated/__init__.py b/ryu/tests/integrated/bgp/__init__.py similarity index 100% rename from tests/integrated/__init__.py rename to ryu/tests/integrated/bgp/__init__.py diff --git a/tests/integrated/bgp/base.py b/ryu/tests/integrated/bgp/base.py similarity index 94% rename from tests/integrated/bgp/base.py rename to ryu/tests/integrated/bgp/base.py index 9d057075..26fa396c 100644 --- a/tests/integrated/bgp/base.py +++ b/ryu/tests/integrated/bgp/base.py @@ -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__) diff --git a/tests/integrated/bgp/base_ip6.py b/ryu/tests/integrated/bgp/base_ip6.py similarity index 94% rename from tests/integrated/bgp/base_ip6.py rename to ryu/tests/integrated/bgp/base_ip6.py index 8d3ef419..be26fafd 100644 --- a/tests/integrated/bgp/base_ip6.py +++ b/ryu/tests/integrated/bgp/base_ip6.py @@ -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__) diff --git a/tests/integrated/bgp/test_basic.py b/ryu/tests/integrated/bgp/test_basic.py similarity index 96% rename from tests/integrated/bgp/test_basic.py rename to ryu/tests/integrated/bgp/test_basic.py index 9ef430c7..7c6c8cf5 100644 --- a/tests/integrated/bgp/test_basic.py +++ b/ryu/tests/integrated/bgp/test_basic.py @@ -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 diff --git a/tests/integrated/bgp/test_ip6_basic.py b/ryu/tests/integrated/bgp/test_ip6_basic.py similarity index 96% rename from tests/integrated/bgp/test_ip6_basic.py rename to ryu/tests/integrated/bgp/test_ip6_basic.py index a92e4edb..288e9e68 100644 --- a/tests/integrated/bgp/test_ip6_basic.py +++ b/ryu/tests/integrated/bgp/test_ip6_basic.py @@ -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 diff --git a/tests/integrated/bgp/__init__.py b/ryu/tests/integrated/common/__init__.py similarity index 100% rename from tests/integrated/bgp/__init__.py rename to ryu/tests/integrated/common/__init__.py diff --git a/tests/integrated/common/docker_base.py b/ryu/tests/integrated/common/docker_base.py similarity index 100% rename from tests/integrated/common/docker_base.py rename to ryu/tests/integrated/common/docker_base.py diff --git a/tests/integrated/common/install_docker_test_pkg.sh b/ryu/tests/integrated/common/install_docker_test_pkg.sh similarity index 100% rename from tests/integrated/common/install_docker_test_pkg.sh rename to ryu/tests/integrated/common/install_docker_test_pkg.sh diff --git a/tests/integrated/common/install_docker_test_pkg_common.sh b/ryu/tests/integrated/common/install_docker_test_pkg_common.sh similarity index 100% rename from tests/integrated/common/install_docker_test_pkg_common.sh rename to ryu/tests/integrated/common/install_docker_test_pkg_common.sh diff --git a/tests/integrated/common/install_docker_test_pkg_for_travis.sh b/ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh similarity index 100% rename from tests/integrated/common/install_docker_test_pkg_for_travis.sh rename to ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh diff --git a/tests/integrated/common/quagga.py b/ryu/tests/integrated/common/quagga.py similarity index 100% rename from tests/integrated/common/quagga.py rename to ryu/tests/integrated/common/quagga.py diff --git a/tests/integrated/common/ryubgp.py b/ryu/tests/integrated/common/ryubgp.py similarity index 100% rename from tests/integrated/common/ryubgp.py rename to ryu/tests/integrated/common/ryubgp.py diff --git a/tests/integrated/run_test.py b/ryu/tests/integrated/run_test.py similarity index 94% rename from tests/integrated/run_test.py rename to ryu/tests/integrated/run_test.py index 77d39345..2aca03db 100644 --- a/tests/integrated/run_test.py +++ b/ryu/tests/integrated/run_test.py @@ -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)) diff --git a/tests/integrated/run_tests_with_ovs12.py b/ryu/tests/integrated/run_tests_with_ovs12.py similarity index 92% rename from tests/integrated/run_tests_with_ovs12.py rename to ryu/tests/integrated/run_tests_with_ovs12.py index b6393c43..9d82d370 100755 --- a/tests/integrated/run_tests_with_ovs12.py +++ b/ryu/tests/integrated/run_tests_with_ovs12.py @@ -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 diff --git a/tests/integrated/test_add_flow_v10.py b/ryu/tests/integrated/test_add_flow_v10.py similarity index 99% rename from tests/integrated/test_add_flow_v10.py rename to ryu/tests/integrated/test_add_flow_v10.py index 895cf15d..6a09646c 100644 --- a/tests/integrated/test_add_flow_v10.py +++ b/ryu/tests/integrated/test_add_flow_v10.py @@ -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__) diff --git a/tests/integrated/test_add_flow_v12_actions.py b/ryu/tests/integrated/test_add_flow_v12_actions.py similarity index 99% rename from tests/integrated/test_add_flow_v12_actions.py rename to ryu/tests/integrated/test_add_flow_v12_actions.py index 3c1625ad..7c75aa53 100644 --- a/tests/integrated/test_add_flow_v12_actions.py +++ b/ryu/tests/integrated/test_add_flow_v12_actions.py @@ -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__) diff --git a/tests/integrated/test_add_flow_v12_matches.py b/ryu/tests/integrated/test_add_flow_v12_matches.py similarity index 99% rename from tests/integrated/test_add_flow_v12_matches.py rename to ryu/tests/integrated/test_add_flow_v12_matches.py index 404e45ef..588855a6 100644 --- a/tests/integrated/test_add_flow_v12_matches.py +++ b/ryu/tests/integrated/test_add_flow_v12_matches.py @@ -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__) diff --git a/tests/integrated/test_of_config.py b/ryu/tests/integrated/test_of_config.py similarity index 99% rename from tests/integrated/test_of_config.py rename to ryu/tests/integrated/test_of_config.py index 654b1489..6bcc7d0b 100644 --- a/tests/integrated/test_of_config.py +++ b/ryu/tests/integrated/test_of_config.py @@ -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. diff --git a/tests/integrated/test_request_reply_v12.py b/ryu/tests/integrated/test_request_reply_v12.py similarity index 99% rename from tests/integrated/test_request_reply_v12.py rename to ryu/tests/integrated/test_request_reply_v12.py index ea031182..ae99bcc7 100644 --- a/tests/integrated/test_request_reply_v12.py +++ b/ryu/tests/integrated/test_request_reply_v12.py @@ -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__) diff --git a/tests/integrated/test_vrrp_linux_multi.py b/ryu/tests/integrated/test_vrrp_linux_multi.py similarity index 97% rename from tests/integrated/test_vrrp_linux_multi.py rename to ryu/tests/integrated/test_vrrp_linux_multi.py index ae4d837a..dca70c47 100644 --- a/tests/integrated/test_vrrp_linux_multi.py +++ b/ryu/tests/integrated/test_vrrp_linux_multi.py @@ -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. diff --git a/tests/integrated/test_vrrp_linux_multi.sh b/ryu/tests/integrated/test_vrrp_linux_multi.sh similarity index 100% rename from tests/integrated/test_vrrp_linux_multi.sh rename to ryu/tests/integrated/test_vrrp_linux_multi.sh diff --git a/tests/integrated/test_vrrp_multi.py b/ryu/tests/integrated/test_vrrp_multi.py similarity index 97% rename from tests/integrated/test_vrrp_multi.py rename to ryu/tests/integrated/test_vrrp_multi.py index 9d586119..6aee6395 100644 --- a/tests/integrated/test_vrrp_multi.py +++ b/ryu/tests/integrated/test_vrrp_multi.py @@ -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. diff --git a/tests/integrated/test_vrrp_multi.sh b/ryu/tests/integrated/test_vrrp_multi.sh similarity index 100% rename from tests/integrated/test_vrrp_multi.sh rename to ryu/tests/integrated/test_vrrp_multi.sh diff --git a/tests/integrated/tester.py b/ryu/tests/integrated/tester.py similarity index 100% rename from tests/integrated/tester.py rename to ryu/tests/integrated/tester.py diff --git a/tests/integrated/vrrp_common.py b/ryu/tests/integrated/vrrp_common.py similarity index 100% rename from tests/integrated/vrrp_common.py rename to ryu/tests/integrated/vrrp_common.py diff --git a/tests/mininet/l2/mpls/PopMPLS_mpls.mn b/ryu/tests/mininet/l2/mpls/PopMPLS_mpls.mn similarity index 100% rename from tests/mininet/l2/mpls/PopMPLS_mpls.mn rename to ryu/tests/mininet/l2/mpls/PopMPLS_mpls.mn diff --git a/tests/mininet/l2/mpls/PushMPLS_ip.mn b/ryu/tests/mininet/l2/mpls/PushMPLS_ip.mn similarity index 100% rename from tests/mininet/l2/mpls/PushMPLS_ip.mn rename to ryu/tests/mininet/l2/mpls/PushMPLS_ip.mn diff --git a/tests/mininet/l2/mpls/PushMPLS_mpls.mn b/ryu/tests/mininet/l2/mpls/PushMPLS_mpls.mn similarity index 100% rename from tests/mininet/l2/mpls/PushMPLS_mpls.mn rename to ryu/tests/mininet/l2/mpls/PushMPLS_mpls.mn diff --git a/tests/mininet/l2/mpls/test_mpls.py b/ryu/tests/mininet/l2/mpls/test_mpls.py similarity index 100% rename from tests/mininet/l2/mpls/test_mpls.py rename to ryu/tests/mininet/l2/mpls/test_mpls.py diff --git a/tests/mininet/l2/vlan/PopVLAN_vlan.mn b/ryu/tests/mininet/l2/vlan/PopVLAN_vlan.mn similarity index 100% rename from tests/mininet/l2/vlan/PopVLAN_vlan.mn rename to ryu/tests/mininet/l2/vlan/PopVLAN_vlan.mn diff --git a/tests/mininet/l2/vlan/PopVLAN_vlanvlan.mn b/ryu/tests/mininet/l2/vlan/PopVLAN_vlanvlan.mn similarity index 100% rename from tests/mininet/l2/vlan/PopVLAN_vlanvlan.mn rename to ryu/tests/mininet/l2/vlan/PopVLAN_vlanvlan.mn diff --git a/tests/mininet/l2/vlan/PushVLAN_icmp.mn b/ryu/tests/mininet/l2/vlan/PushVLAN_icmp.mn similarity index 100% rename from tests/mininet/l2/vlan/PushVLAN_icmp.mn rename to ryu/tests/mininet/l2/vlan/PushVLAN_icmp.mn diff --git a/tests/mininet/l2/vlan/test_vlan.py b/ryu/tests/mininet/l2/vlan/test_vlan.py similarity index 100% rename from tests/mininet/l2/vlan/test_vlan.py rename to ryu/tests/mininet/l2/vlan/test_vlan.py diff --git a/tests/mininet/l3/icmp/ICMP_ping.mn b/ryu/tests/mininet/l3/icmp/ICMP_ping.mn similarity index 100% rename from tests/mininet/l3/icmp/ICMP_ping.mn rename to ryu/tests/mininet/l3/icmp/ICMP_ping.mn diff --git a/tests/mininet/l3/icmp/ICMP_reply.mn b/ryu/tests/mininet/l3/icmp/ICMP_reply.mn similarity index 100% rename from tests/mininet/l3/icmp/ICMP_reply.mn rename to ryu/tests/mininet/l3/icmp/ICMP_reply.mn diff --git a/tests/mininet/l3/icmp/test_icmp.py b/ryu/tests/mininet/l3/icmp/test_icmp.py similarity index 100% rename from tests/mininet/l3/icmp/test_icmp.py rename to ryu/tests/mininet/l3/icmp/test_icmp.py diff --git a/tests/mininet/l3/ip_ttl/DecNwTtl.mn b/ryu/tests/mininet/l3/ip_ttl/DecNwTtl.mn similarity index 100% rename from tests/mininet/l3/ip_ttl/DecNwTtl.mn rename to ryu/tests/mininet/l3/ip_ttl/DecNwTtl.mn diff --git a/tests/mininet/l3/ip_ttl/test_ip_ttl.py b/ryu/tests/mininet/l3/ip_ttl/test_ip_ttl.py similarity index 100% rename from tests/mininet/l3/ip_ttl/test_ip_ttl.py rename to ryu/tests/mininet/l3/ip_ttl/test_ip_ttl.py diff --git a/tests/mininet/packet_lib/arp/ARP_gratuitous.mn b/ryu/tests/mininet/packet_lib/arp/ARP_gratuitous.mn similarity index 100% rename from tests/mininet/packet_lib/arp/ARP_gratuitous.mn rename to ryu/tests/mininet/packet_lib/arp/ARP_gratuitous.mn diff --git a/tests/mininet/packet_lib/arp/ARP_reply.mn b/ryu/tests/mininet/packet_lib/arp/ARP_reply.mn similarity index 100% rename from tests/mininet/packet_lib/arp/ARP_reply.mn rename to ryu/tests/mininet/packet_lib/arp/ARP_reply.mn diff --git a/tests/mininet/packet_lib/arp/ARP_request.mn b/ryu/tests/mininet/packet_lib/arp/ARP_request.mn similarity index 100% rename from tests/mininet/packet_lib/arp/ARP_request.mn rename to ryu/tests/mininet/packet_lib/arp/ARP_request.mn diff --git a/tests/mininet/packet_lib/arp/test_arp.py b/ryu/tests/mininet/packet_lib/arp/test_arp.py similarity index 100% rename from tests/mininet/packet_lib/arp/test_arp.py rename to ryu/tests/mininet/packet_lib/arp/test_arp.py diff --git a/tests/mininet/run_mnet-test.sh b/ryu/tests/mininet/run_mnet-test.sh similarity index 100% rename from tests/mininet/run_mnet-test.sh rename to ryu/tests/mininet/run_mnet-test.sh diff --git a/tests/packet_data/bgp4/bgp4-keepalive.pcap b/ryu/tests/packet_data/bgp4/bgp4-keepalive.pcap similarity index 100% rename from tests/packet_data/bgp4/bgp4-keepalive.pcap rename to ryu/tests/packet_data/bgp4/bgp4-keepalive.pcap diff --git a/tests/packet_data/bgp4/bgp4-open.pcap b/ryu/tests/packet_data/bgp4/bgp4-open.pcap similarity index 100% rename from tests/packet_data/bgp4/bgp4-open.pcap rename to ryu/tests/packet_data/bgp4/bgp4-open.pcap diff --git a/tests/packet_data/bgp4/bgp4-update.pcap b/ryu/tests/packet_data/bgp4/bgp4-update.pcap similarity index 100% rename from tests/packet_data/bgp4/bgp4-update.pcap rename to ryu/tests/packet_data/bgp4/bgp4-update.pcap diff --git a/tests/packet_data/bgp4/bgp4-update_ipv6.pcap b/ryu/tests/packet_data/bgp4/bgp4-update_ipv6.pcap similarity index 100% rename from tests/packet_data/bgp4/bgp4-update_ipv6.pcap rename to ryu/tests/packet_data/bgp4/bgp4-update_ipv6.pcap diff --git a/tests/packet_data/bgp4/bgp4-update_vpnv6.pcap b/ryu/tests/packet_data/bgp4/bgp4-update_vpnv6.pcap similarity index 100% rename from tests/packet_data/bgp4/bgp4-update_vpnv6.pcap rename to ryu/tests/packet_data/bgp4/bgp4-update_vpnv6.pcap diff --git a/tests/packet_data/bgp4/evpn_esi_arbitrary.pcap b/ryu/tests/packet_data/bgp4/evpn_esi_arbitrary.pcap similarity index 100% rename from tests/packet_data/bgp4/evpn_esi_arbitrary.pcap rename to ryu/tests/packet_data/bgp4/evpn_esi_arbitrary.pcap diff --git a/tests/packet_data/bgp4/evpn_esi_as_based.pcap b/ryu/tests/packet_data/bgp4/evpn_esi_as_based.pcap similarity index 100% rename from tests/packet_data/bgp4/evpn_esi_as_based.pcap rename to ryu/tests/packet_data/bgp4/evpn_esi_as_based.pcap diff --git a/tests/packet_data/bgp4/evpn_esi_l2_bridge.pcap b/ryu/tests/packet_data/bgp4/evpn_esi_l2_bridge.pcap similarity index 100% rename from tests/packet_data/bgp4/evpn_esi_l2_bridge.pcap rename to ryu/tests/packet_data/bgp4/evpn_esi_l2_bridge.pcap diff --git a/tests/packet_data/bgp4/evpn_esi_lacp.pcap b/ryu/tests/packet_data/bgp4/evpn_esi_lacp.pcap similarity index 100% rename from tests/packet_data/bgp4/evpn_esi_lacp.pcap rename to ryu/tests/packet_data/bgp4/evpn_esi_lacp.pcap diff --git a/tests/packet_data/bgp4/evpn_esi_mac_base.pcap b/ryu/tests/packet_data/bgp4/evpn_esi_mac_base.pcap similarity index 100% rename from tests/packet_data/bgp4/evpn_esi_mac_base.pcap rename to ryu/tests/packet_data/bgp4/evpn_esi_mac_base.pcap diff --git a/tests/packet_data/bgp4/evpn_esi_router_id.pcap b/ryu/tests/packet_data/bgp4/evpn_esi_router_id.pcap similarity index 100% rename from tests/packet_data/bgp4/evpn_esi_router_id.pcap rename to ryu/tests/packet_data/bgp4/evpn_esi_router_id.pcap diff --git a/tests/packet_data/bgp4/evpn_nlri_eth_a-d.pcap b/ryu/tests/packet_data/bgp4/evpn_nlri_eth_a-d.pcap similarity index 100% rename from tests/packet_data/bgp4/evpn_nlri_eth_a-d.pcap rename to ryu/tests/packet_data/bgp4/evpn_nlri_eth_a-d.pcap diff --git a/tests/packet_data/bgp4/evpn_nlri_eth_seg.pcap b/ryu/tests/packet_data/bgp4/evpn_nlri_eth_seg.pcap similarity index 100% rename from tests/packet_data/bgp4/evpn_nlri_eth_seg.pcap rename to ryu/tests/packet_data/bgp4/evpn_nlri_eth_seg.pcap diff --git a/tests/packet_data/bgp4/evpn_nlri_inc_multi_eth_tag.pcap b/ryu/tests/packet_data/bgp4/evpn_nlri_inc_multi_eth_tag.pcap similarity index 100% rename from tests/packet_data/bgp4/evpn_nlri_inc_multi_eth_tag.pcap rename to ryu/tests/packet_data/bgp4/evpn_nlri_inc_multi_eth_tag.pcap diff --git a/tests/packet_data/bgp4/evpn_nlri_ip_prefix.pcap b/ryu/tests/packet_data/bgp4/evpn_nlri_ip_prefix.pcap similarity index 100% rename from tests/packet_data/bgp4/evpn_nlri_ip_prefix.pcap rename to ryu/tests/packet_data/bgp4/evpn_nlri_ip_prefix.pcap diff --git a/tests/packet_data/bgp4/evpn_nlri_mac_ip_ad.pcap b/ryu/tests/packet_data/bgp4/evpn_nlri_mac_ip_ad.pcap similarity index 100% rename from tests/packet_data/bgp4/evpn_nlri_mac_ip_ad.pcap rename to ryu/tests/packet_data/bgp4/evpn_nlri_mac_ip_ad.pcap diff --git a/tests/packet_data/bgp4/flowspec_action_redirect.pcap b/ryu/tests/packet_data/bgp4/flowspec_action_redirect.pcap similarity index 100% rename from tests/packet_data/bgp4/flowspec_action_redirect.pcap rename to ryu/tests/packet_data/bgp4/flowspec_action_redirect.pcap diff --git a/tests/packet_data/bgp4/flowspec_action_traffic_action.pcap b/ryu/tests/packet_data/bgp4/flowspec_action_traffic_action.pcap similarity index 100% rename from tests/packet_data/bgp4/flowspec_action_traffic_action.pcap rename to ryu/tests/packet_data/bgp4/flowspec_action_traffic_action.pcap diff --git a/tests/packet_data/bgp4/flowspec_action_traffic_marking.pcap b/ryu/tests/packet_data/bgp4/flowspec_action_traffic_marking.pcap similarity index 100% rename from tests/packet_data/bgp4/flowspec_action_traffic_marking.pcap rename to ryu/tests/packet_data/bgp4/flowspec_action_traffic_marking.pcap diff --git a/tests/packet_data/bgp4/flowspec_action_traffic_rate.pcap b/ryu/tests/packet_data/bgp4/flowspec_action_traffic_rate.pcap similarity index 100% rename from tests/packet_data/bgp4/flowspec_action_traffic_rate.pcap rename to ryu/tests/packet_data/bgp4/flowspec_action_traffic_rate.pcap diff --git a/tests/packet_data/bgp4/flowspec_nlri_ipv4.pcap b/ryu/tests/packet_data/bgp4/flowspec_nlri_ipv4.pcap similarity index 100% rename from tests/packet_data/bgp4/flowspec_nlri_ipv4.pcap rename to ryu/tests/packet_data/bgp4/flowspec_nlri_ipv4.pcap diff --git a/tests/packet_data/bgp4/flowspec_nlri_ipv6.pcap b/ryu/tests/packet_data/bgp4/flowspec_nlri_ipv6.pcap similarity index 100% rename from tests/packet_data/bgp4/flowspec_nlri_ipv6.pcap rename to ryu/tests/packet_data/bgp4/flowspec_nlri_ipv6.pcap diff --git a/tests/packet_data/bgp4/flowspec_nlri_l2vpn.pcap b/ryu/tests/packet_data/bgp4/flowspec_nlri_l2vpn.pcap similarity index 100% rename from tests/packet_data/bgp4/flowspec_nlri_l2vpn.pcap rename to ryu/tests/packet_data/bgp4/flowspec_nlri_l2vpn.pcap diff --git a/tests/packet_data/bgp4/flowspec_nlri_vpn4.pcap b/ryu/tests/packet_data/bgp4/flowspec_nlri_vpn4.pcap similarity index 100% rename from tests/packet_data/bgp4/flowspec_nlri_vpn4.pcap rename to ryu/tests/packet_data/bgp4/flowspec_nlri_vpn4.pcap diff --git a/tests/packet_data/bgp4/flowspec_nlri_vpn6.pcap b/ryu/tests/packet_data/bgp4/flowspec_nlri_vpn6.pcap similarity index 100% rename from tests/packet_data/bgp4/flowspec_nlri_vpn6.pcap rename to ryu/tests/packet_data/bgp4/flowspec_nlri_vpn6.pcap diff --git a/tests/packet_data/mrt/rib.20161101.0000_pick.bz2 b/ryu/tests/packet_data/mrt/rib.20161101.0000_pick.bz2 similarity index 100% rename from tests/packet_data/mrt/rib.20161101.0000_pick.bz2 rename to ryu/tests/packet_data/mrt/rib.20161101.0000_pick.bz2 diff --git a/tests/packet_data/mrt/updates.20161101.0000.bz2 b/ryu/tests/packet_data/mrt/updates.20161101.0000.bz2 similarity index 100% rename from tests/packet_data/mrt/updates.20161101.0000.bz2 rename to ryu/tests/packet_data/mrt/updates.20161101.0000.bz2 diff --git a/tests/packet_data/of10/1-1-ofp_packet_out.packet b/ryu/tests/packet_data/of10/1-1-ofp_packet_out.packet similarity index 100% rename from tests/packet_data/of10/1-1-ofp_packet_out.packet rename to ryu/tests/packet_data/of10/1-1-ofp_packet_out.packet diff --git a/tests/packet_data/of10/1-2-ofp_flow_mod.packet b/ryu/tests/packet_data/of10/1-2-ofp_flow_mod.packet similarity index 100% rename from tests/packet_data/of10/1-2-ofp_flow_mod.packet rename to ryu/tests/packet_data/of10/1-2-ofp_flow_mod.packet diff --git a/tests/packet_data/of10/1-4-ofp_packet_in.packet b/ryu/tests/packet_data/of10/1-4-ofp_packet_in.packet similarity index 100% rename from tests/packet_data/of10/1-4-ofp_packet_in.packet rename to ryu/tests/packet_data/of10/1-4-ofp_packet_in.packet diff --git a/tests/packet_data/of10/1-5-features_request.packet b/ryu/tests/packet_data/of10/1-5-features_request.packet similarity index 100% rename from tests/packet_data/of10/1-5-features_request.packet rename to ryu/tests/packet_data/of10/1-5-features_request.packet diff --git a/tests/packet_data/of10/1-6-ofp_switch_features.packet b/ryu/tests/packet_data/of10/1-6-ofp_switch_features.packet similarity index 100% rename from tests/packet_data/of10/1-6-ofp_switch_features.packet rename to ryu/tests/packet_data/of10/1-6-ofp_switch_features.packet diff --git a/tests/packet_data/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet b/ryu/tests/packet_data/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet similarity index 100% rename from tests/packet_data/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet rename to ryu/tests/packet_data/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet similarity index 100% rename from tests/packet_data/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet rename to ryu/tests/packet_data/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet similarity index 100% rename from tests/packet_data/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet rename to ryu/tests/packet_data/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_pop_mpls.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_pop_mpls.packet similarity index 100% rename from tests/packet_data/of10/ovs-ofctl-of10-action_pop_mpls.packet rename to ryu/tests/packet_data/of10/ovs-ofctl-of10-action_pop_mpls.packet diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_push_mpls.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_push_mpls.packet similarity index 100% rename from tests/packet_data/of10/ovs-ofctl-of10-action_push_mpls.packet rename to ryu/tests/packet_data/of10/ovs-ofctl-of10-action_push_mpls.packet diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_label.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_label.packet similarity index 100% rename from tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_label.packet rename to ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_label.packet diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_tc.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_tc.packet similarity index 100% rename from tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_tc.packet rename to ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_tc.packet diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet similarity index 100% rename from tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet rename to ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet diff --git a/tests/packet_data/of12/3-0-ofp_desc_stats_reply.packet b/ryu/tests/packet_data/of12/3-0-ofp_desc_stats_reply.packet similarity index 100% rename from tests/packet_data/of12/3-0-ofp_desc_stats_reply.packet rename to ryu/tests/packet_data/of12/3-0-ofp_desc_stats_reply.packet diff --git a/tests/packet_data/of12/3-1-ofp_packet_out.packet b/ryu/tests/packet_data/of12/3-1-ofp_packet_out.packet similarity index 100% rename from tests/packet_data/of12/3-1-ofp_packet_out.packet rename to ryu/tests/packet_data/of12/3-1-ofp_packet_out.packet diff --git a/tests/packet_data/of12/3-10-ofp_hello.packet b/ryu/tests/packet_data/of12/3-10-ofp_hello.packet similarity index 100% rename from tests/packet_data/of12/3-10-ofp_hello.packet rename to ryu/tests/packet_data/of12/3-10-ofp_hello.packet diff --git a/tests/packet_data/of12/3-11-ofp_flow_stats_request.packet b/ryu/tests/packet_data/of12/3-11-ofp_flow_stats_request.packet similarity index 100% rename from tests/packet_data/of12/3-11-ofp_flow_stats_request.packet rename to ryu/tests/packet_data/of12/3-11-ofp_flow_stats_request.packet diff --git a/tests/packet_data/of12/3-12-ofp_flow_stats_reply.packet b/ryu/tests/packet_data/of12/3-12-ofp_flow_stats_reply.packet similarity index 100% rename from tests/packet_data/of12/3-12-ofp_flow_stats_reply.packet rename to ryu/tests/packet_data/of12/3-12-ofp_flow_stats_reply.packet diff --git a/tests/packet_data/of12/3-13-ofp_echo_request.packet b/ryu/tests/packet_data/of12/3-13-ofp_echo_request.packet similarity index 100% rename from tests/packet_data/of12/3-13-ofp_echo_request.packet rename to ryu/tests/packet_data/of12/3-13-ofp_echo_request.packet diff --git a/tests/packet_data/of12/3-14-ofp_echo_reply.packet b/ryu/tests/packet_data/of12/3-14-ofp_echo_reply.packet similarity index 100% rename from tests/packet_data/of12/3-14-ofp_echo_reply.packet rename to ryu/tests/packet_data/of12/3-14-ofp_echo_reply.packet diff --git a/tests/packet_data/of12/3-15-ofp_error_msg.packet b/ryu/tests/packet_data/of12/3-15-ofp_error_msg.packet similarity index 100% rename from tests/packet_data/of12/3-15-ofp_error_msg.packet rename to ryu/tests/packet_data/of12/3-15-ofp_error_msg.packet diff --git a/tests/packet_data/of12/3-16-ofp_experimenter.packet b/ryu/tests/packet_data/of12/3-16-ofp_experimenter.packet similarity index 100% rename from tests/packet_data/of12/3-16-ofp_experimenter.packet rename to ryu/tests/packet_data/of12/3-16-ofp_experimenter.packet diff --git a/tests/packet_data/of12/3-17-ofp_barrier_request.packet b/ryu/tests/packet_data/of12/3-17-ofp_barrier_request.packet similarity index 100% rename from tests/packet_data/of12/3-17-ofp_barrier_request.packet rename to ryu/tests/packet_data/of12/3-17-ofp_barrier_request.packet diff --git a/tests/packet_data/of12/3-18-ofp_barrier_reply.packet b/ryu/tests/packet_data/of12/3-18-ofp_barrier_reply.packet similarity index 100% rename from tests/packet_data/of12/3-18-ofp_barrier_reply.packet rename to ryu/tests/packet_data/of12/3-18-ofp_barrier_reply.packet diff --git a/tests/packet_data/of12/3-19-ofp_role_request.packet b/ryu/tests/packet_data/of12/3-19-ofp_role_request.packet similarity index 100% rename from tests/packet_data/of12/3-19-ofp_role_request.packet rename to ryu/tests/packet_data/of12/3-19-ofp_role_request.packet diff --git a/tests/packet_data/of12/3-2-ofp_flow_mod.packet b/ryu/tests/packet_data/of12/3-2-ofp_flow_mod.packet similarity index 100% rename from tests/packet_data/of12/3-2-ofp_flow_mod.packet rename to ryu/tests/packet_data/of12/3-2-ofp_flow_mod.packet diff --git a/tests/packet_data/of12/3-20-ofp_role_reply.packet b/ryu/tests/packet_data/of12/3-20-ofp_role_reply.packet similarity index 100% rename from tests/packet_data/of12/3-20-ofp_role_reply.packet rename to ryu/tests/packet_data/of12/3-20-ofp_role_reply.packet diff --git a/tests/packet_data/of12/3-21-ofp_group_mod.packet b/ryu/tests/packet_data/of12/3-21-ofp_group_mod.packet similarity index 100% rename from tests/packet_data/of12/3-21-ofp_group_mod.packet rename to ryu/tests/packet_data/of12/3-21-ofp_group_mod.packet diff --git a/tests/packet_data/of12/3-22-ofp_port_mod.packet b/ryu/tests/packet_data/of12/3-22-ofp_port_mod.packet similarity index 100% rename from tests/packet_data/of12/3-22-ofp_port_mod.packet rename to ryu/tests/packet_data/of12/3-22-ofp_port_mod.packet diff --git a/tests/packet_data/of12/3-23-ofp_table_mod.packet b/ryu/tests/packet_data/of12/3-23-ofp_table_mod.packet similarity index 100% rename from tests/packet_data/of12/3-23-ofp_table_mod.packet rename to ryu/tests/packet_data/of12/3-23-ofp_table_mod.packet diff --git a/tests/packet_data/of12/3-24-ofp_desc_stats_request.packet b/ryu/tests/packet_data/of12/3-24-ofp_desc_stats_request.packet similarity index 100% rename from tests/packet_data/of12/3-24-ofp_desc_stats_request.packet rename to ryu/tests/packet_data/of12/3-24-ofp_desc_stats_request.packet diff --git a/tests/packet_data/of12/3-25-ofp_aggregate_stats_request.packet b/ryu/tests/packet_data/of12/3-25-ofp_aggregate_stats_request.packet similarity index 100% rename from tests/packet_data/of12/3-25-ofp_aggregate_stats_request.packet rename to ryu/tests/packet_data/of12/3-25-ofp_aggregate_stats_request.packet diff --git a/tests/packet_data/of12/3-26-ofp_aggregate_stats_reply.packet b/ryu/tests/packet_data/of12/3-26-ofp_aggregate_stats_reply.packet similarity index 100% rename from tests/packet_data/of12/3-26-ofp_aggregate_stats_reply.packet rename to ryu/tests/packet_data/of12/3-26-ofp_aggregate_stats_reply.packet diff --git a/tests/packet_data/of12/3-27-ofp_table_stats_request.packet b/ryu/tests/packet_data/of12/3-27-ofp_table_stats_request.packet similarity index 100% rename from tests/packet_data/of12/3-27-ofp_table_stats_request.packet rename to ryu/tests/packet_data/of12/3-27-ofp_table_stats_request.packet diff --git a/tests/packet_data/of12/3-28-ofp_table_stats_reply.packet b/ryu/tests/packet_data/of12/3-28-ofp_table_stats_reply.packet similarity index 100% rename from tests/packet_data/of12/3-28-ofp_table_stats_reply.packet rename to ryu/tests/packet_data/of12/3-28-ofp_table_stats_reply.packet diff --git a/tests/packet_data/of12/3-29-ofp_port_stats_request.packet b/ryu/tests/packet_data/of12/3-29-ofp_port_stats_request.packet similarity index 100% rename from tests/packet_data/of12/3-29-ofp_port_stats_request.packet rename to ryu/tests/packet_data/of12/3-29-ofp_port_stats_request.packet diff --git a/tests/packet_data/of12/3-3-ofp_flow_mod.packet b/ryu/tests/packet_data/of12/3-3-ofp_flow_mod.packet similarity index 100% rename from tests/packet_data/of12/3-3-ofp_flow_mod.packet rename to ryu/tests/packet_data/of12/3-3-ofp_flow_mod.packet diff --git a/tests/packet_data/of12/3-30-ofp_port_stats_reply.packet b/ryu/tests/packet_data/of12/3-30-ofp_port_stats_reply.packet similarity index 100% rename from tests/packet_data/of12/3-30-ofp_port_stats_reply.packet rename to ryu/tests/packet_data/of12/3-30-ofp_port_stats_reply.packet diff --git a/tests/packet_data/of12/3-31-ofp_group_features_stats_request.packet b/ryu/tests/packet_data/of12/3-31-ofp_group_features_stats_request.packet similarity index 100% rename from tests/packet_data/of12/3-31-ofp_group_features_stats_request.packet rename to ryu/tests/packet_data/of12/3-31-ofp_group_features_stats_request.packet diff --git a/tests/packet_data/of12/3-32-ofp_group_features_stats_reply.packet b/ryu/tests/packet_data/of12/3-32-ofp_group_features_stats_reply.packet similarity index 100% rename from tests/packet_data/of12/3-32-ofp_group_features_stats_reply.packet rename to ryu/tests/packet_data/of12/3-32-ofp_group_features_stats_reply.packet diff --git a/tests/packet_data/of12/3-33-ofp_group_desc_stats_request.packet b/ryu/tests/packet_data/of12/3-33-ofp_group_desc_stats_request.packet similarity index 100% rename from tests/packet_data/of12/3-33-ofp_group_desc_stats_request.packet rename to ryu/tests/packet_data/of12/3-33-ofp_group_desc_stats_request.packet diff --git a/tests/packet_data/of12/3-34-ofp_group_desc_stats_reply.packet b/ryu/tests/packet_data/of12/3-34-ofp_group_desc_stats_reply.packet similarity index 100% rename from tests/packet_data/of12/3-34-ofp_group_desc_stats_reply.packet rename to ryu/tests/packet_data/of12/3-34-ofp_group_desc_stats_reply.packet diff --git a/tests/packet_data/of12/3-35-ofp_queue_get_config_request.packet b/ryu/tests/packet_data/of12/3-35-ofp_queue_get_config_request.packet similarity index 100% rename from tests/packet_data/of12/3-35-ofp_queue_get_config_request.packet rename to ryu/tests/packet_data/of12/3-35-ofp_queue_get_config_request.packet diff --git a/tests/packet_data/of12/3-36-ofp_queue_get_config_reply.packet b/ryu/tests/packet_data/of12/3-36-ofp_queue_get_config_reply.packet similarity index 100% rename from tests/packet_data/of12/3-36-ofp_queue_get_config_reply.packet rename to ryu/tests/packet_data/of12/3-36-ofp_queue_get_config_reply.packet diff --git a/tests/packet_data/of12/3-37-ofp_queue_stats_request.packet b/ryu/tests/packet_data/of12/3-37-ofp_queue_stats_request.packet similarity index 100% rename from tests/packet_data/of12/3-37-ofp_queue_stats_request.packet rename to ryu/tests/packet_data/of12/3-37-ofp_queue_stats_request.packet diff --git a/tests/packet_data/of12/3-38-ofp_queue_stats_reply.packet b/ryu/tests/packet_data/of12/3-38-ofp_queue_stats_reply.packet similarity index 100% rename from tests/packet_data/of12/3-38-ofp_queue_stats_reply.packet rename to ryu/tests/packet_data/of12/3-38-ofp_queue_stats_reply.packet diff --git a/tests/packet_data/of12/3-39-ofp_port_status.packet b/ryu/tests/packet_data/of12/3-39-ofp_port_status.packet similarity index 100% rename from tests/packet_data/of12/3-39-ofp_port_status.packet rename to ryu/tests/packet_data/of12/3-39-ofp_port_status.packet diff --git a/tests/packet_data/of12/3-4-ofp_packet_in.packet b/ryu/tests/packet_data/of12/3-4-ofp_packet_in.packet similarity index 100% rename from tests/packet_data/of12/3-4-ofp_packet_in.packet rename to ryu/tests/packet_data/of12/3-4-ofp_packet_in.packet diff --git a/tests/packet_data/of12/3-40-ofp_flow_removed.packet b/ryu/tests/packet_data/of12/3-40-ofp_flow_removed.packet similarity index 100% rename from tests/packet_data/of12/3-40-ofp_flow_removed.packet rename to ryu/tests/packet_data/of12/3-40-ofp_flow_removed.packet diff --git a/tests/packet_data/of12/3-41-ofp_error_msg_experimenter.packet b/ryu/tests/packet_data/of12/3-41-ofp_error_msg_experimenter.packet similarity index 100% rename from tests/packet_data/of12/3-41-ofp_error_msg_experimenter.packet rename to ryu/tests/packet_data/of12/3-41-ofp_error_msg_experimenter.packet diff --git a/tests/packet_data/of12/3-5-ofp_features_request.packet b/ryu/tests/packet_data/of12/3-5-ofp_features_request.packet similarity index 100% rename from tests/packet_data/of12/3-5-ofp_features_request.packet rename to ryu/tests/packet_data/of12/3-5-ofp_features_request.packet diff --git a/tests/packet_data/of12/3-59-ofp_packet_in.packet b/ryu/tests/packet_data/of12/3-59-ofp_packet_in.packet similarity index 100% rename from tests/packet_data/of12/3-59-ofp_packet_in.packet rename to ryu/tests/packet_data/of12/3-59-ofp_packet_in.packet diff --git a/tests/packet_data/of12/3-6-ofp_features_reply.packet b/ryu/tests/packet_data/of12/3-6-ofp_features_reply.packet similarity index 100% rename from tests/packet_data/of12/3-6-ofp_features_reply.packet rename to ryu/tests/packet_data/of12/3-6-ofp_features_reply.packet diff --git a/tests/packet_data/of12/3-60-ofp_flow_mod.packet b/ryu/tests/packet_data/of12/3-60-ofp_flow_mod.packet similarity index 100% rename from tests/packet_data/of12/3-60-ofp_flow_mod.packet rename to ryu/tests/packet_data/of12/3-60-ofp_flow_mod.packet diff --git a/tests/packet_data/of12/3-61-ofp_group_stats_request.packet b/ryu/tests/packet_data/of12/3-61-ofp_group_stats_request.packet similarity index 100% rename from tests/packet_data/of12/3-61-ofp_group_stats_request.packet rename to ryu/tests/packet_data/of12/3-61-ofp_group_stats_request.packet diff --git a/tests/packet_data/of12/3-62-ofp_group_stats_reply.packet b/ryu/tests/packet_data/of12/3-62-ofp_group_stats_reply.packet similarity index 100% rename from tests/packet_data/of12/3-62-ofp_group_stats_reply.packet rename to ryu/tests/packet_data/of12/3-62-ofp_group_stats_reply.packet diff --git a/tests/packet_data/of12/3-7-ofp_set_config.packet b/ryu/tests/packet_data/of12/3-7-ofp_set_config.packet similarity index 100% rename from tests/packet_data/of12/3-7-ofp_set_config.packet rename to ryu/tests/packet_data/of12/3-7-ofp_set_config.packet diff --git a/tests/packet_data/of12/3-8-ofp_get_config_request.packet b/ryu/tests/packet_data/of12/3-8-ofp_get_config_request.packet similarity index 100% rename from tests/packet_data/of12/3-8-ofp_get_config_request.packet rename to ryu/tests/packet_data/of12/3-8-ofp_get_config_request.packet diff --git a/tests/packet_data/of12/3-9-ofp_get_config_reply.packet b/ryu/tests/packet_data/of12/3-9-ofp_get_config_reply.packet similarity index 100% rename from tests/packet_data/of12/3-9-ofp_get_config_reply.packet rename to ryu/tests/packet_data/of12/3-9-ofp_get_config_reply.packet diff --git a/tests/packet_data/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet b/ryu/tests/packet_data/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet similarity index 100% rename from tests/packet_data/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet rename to ryu/tests/packet_data/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet diff --git a/tests/packet_data/of13/4-0-ofp_desc_reply.packet b/ryu/tests/packet_data/of13/4-0-ofp_desc_reply.packet similarity index 100% rename from tests/packet_data/of13/4-0-ofp_desc_reply.packet rename to ryu/tests/packet_data/of13/4-0-ofp_desc_reply.packet diff --git a/tests/packet_data/of13/4-1-ofp_packet_out.packet b/ryu/tests/packet_data/of13/4-1-ofp_packet_out.packet similarity index 100% rename from tests/packet_data/of13/4-1-ofp_packet_out.packet rename to ryu/tests/packet_data/of13/4-1-ofp_packet_out.packet diff --git a/tests/packet_data/of13/4-10-ofp_hello.packet b/ryu/tests/packet_data/of13/4-10-ofp_hello.packet similarity index 100% rename from tests/packet_data/of13/4-10-ofp_hello.packet rename to ryu/tests/packet_data/of13/4-10-ofp_hello.packet diff --git a/tests/packet_data/of13/4-11-ofp_flow_stats_request.packet b/ryu/tests/packet_data/of13/4-11-ofp_flow_stats_request.packet similarity index 100% rename from tests/packet_data/of13/4-11-ofp_flow_stats_request.packet rename to ryu/tests/packet_data/of13/4-11-ofp_flow_stats_request.packet diff --git a/tests/packet_data/of13/4-12-ofp_flow_stats_reply.packet b/ryu/tests/packet_data/of13/4-12-ofp_flow_stats_reply.packet similarity index 100% rename from tests/packet_data/of13/4-12-ofp_flow_stats_reply.packet rename to ryu/tests/packet_data/of13/4-12-ofp_flow_stats_reply.packet diff --git a/tests/packet_data/of13/4-13-ofp_echo_request.packet b/ryu/tests/packet_data/of13/4-13-ofp_echo_request.packet similarity index 100% rename from tests/packet_data/of13/4-13-ofp_echo_request.packet rename to ryu/tests/packet_data/of13/4-13-ofp_echo_request.packet diff --git a/tests/packet_data/of13/4-14-ofp_echo_reply.packet b/ryu/tests/packet_data/of13/4-14-ofp_echo_reply.packet similarity index 100% rename from tests/packet_data/of13/4-14-ofp_echo_reply.packet rename to ryu/tests/packet_data/of13/4-14-ofp_echo_reply.packet diff --git a/tests/packet_data/of13/4-15-ofp_error_msg.packet b/ryu/tests/packet_data/of13/4-15-ofp_error_msg.packet similarity index 100% rename from tests/packet_data/of13/4-15-ofp_error_msg.packet rename to ryu/tests/packet_data/of13/4-15-ofp_error_msg.packet diff --git a/tests/packet_data/of13/4-16-ofp_experimenter.packet b/ryu/tests/packet_data/of13/4-16-ofp_experimenter.packet similarity index 100% rename from tests/packet_data/of13/4-16-ofp_experimenter.packet rename to ryu/tests/packet_data/of13/4-16-ofp_experimenter.packet diff --git a/tests/packet_data/of13/4-17-ofp_barrier_request.packet b/ryu/tests/packet_data/of13/4-17-ofp_barrier_request.packet similarity index 100% rename from tests/packet_data/of13/4-17-ofp_barrier_request.packet rename to ryu/tests/packet_data/of13/4-17-ofp_barrier_request.packet diff --git a/tests/packet_data/of13/4-18-ofp_barrier_reply.packet b/ryu/tests/packet_data/of13/4-18-ofp_barrier_reply.packet similarity index 100% rename from tests/packet_data/of13/4-18-ofp_barrier_reply.packet rename to ryu/tests/packet_data/of13/4-18-ofp_barrier_reply.packet diff --git a/tests/packet_data/of13/4-19-ofp_role_request.packet b/ryu/tests/packet_data/of13/4-19-ofp_role_request.packet similarity index 100% rename from tests/packet_data/of13/4-19-ofp_role_request.packet rename to ryu/tests/packet_data/of13/4-19-ofp_role_request.packet diff --git a/tests/packet_data/of13/4-2-ofp_flow_mod.packet b/ryu/tests/packet_data/of13/4-2-ofp_flow_mod.packet similarity index 100% rename from tests/packet_data/of13/4-2-ofp_flow_mod.packet rename to ryu/tests/packet_data/of13/4-2-ofp_flow_mod.packet diff --git a/tests/packet_data/of13/4-20-ofp_role_reply.packet b/ryu/tests/packet_data/of13/4-20-ofp_role_reply.packet similarity index 100% rename from tests/packet_data/of13/4-20-ofp_role_reply.packet rename to ryu/tests/packet_data/of13/4-20-ofp_role_reply.packet diff --git a/tests/packet_data/of13/4-21-ofp_group_mod.packet b/ryu/tests/packet_data/of13/4-21-ofp_group_mod.packet similarity index 100% rename from tests/packet_data/of13/4-21-ofp_group_mod.packet rename to ryu/tests/packet_data/of13/4-21-ofp_group_mod.packet diff --git a/tests/packet_data/of13/4-22-ofp_port_mod.packet b/ryu/tests/packet_data/of13/4-22-ofp_port_mod.packet similarity index 100% rename from tests/packet_data/of13/4-22-ofp_port_mod.packet rename to ryu/tests/packet_data/of13/4-22-ofp_port_mod.packet diff --git a/tests/packet_data/of13/4-23-ofp_table_mod.packet b/ryu/tests/packet_data/of13/4-23-ofp_table_mod.packet similarity index 100% rename from tests/packet_data/of13/4-23-ofp_table_mod.packet rename to ryu/tests/packet_data/of13/4-23-ofp_table_mod.packet diff --git a/tests/packet_data/of13/4-24-ofp_desc_request.packet b/ryu/tests/packet_data/of13/4-24-ofp_desc_request.packet similarity index 100% rename from tests/packet_data/of13/4-24-ofp_desc_request.packet rename to ryu/tests/packet_data/of13/4-24-ofp_desc_request.packet diff --git a/tests/packet_data/of13/4-25-ofp_aggregate_stats_request.packet b/ryu/tests/packet_data/of13/4-25-ofp_aggregate_stats_request.packet similarity index 100% rename from tests/packet_data/of13/4-25-ofp_aggregate_stats_request.packet rename to ryu/tests/packet_data/of13/4-25-ofp_aggregate_stats_request.packet diff --git a/tests/packet_data/of13/4-26-ofp_aggregate_stats_reply.packet b/ryu/tests/packet_data/of13/4-26-ofp_aggregate_stats_reply.packet similarity index 100% rename from tests/packet_data/of13/4-26-ofp_aggregate_stats_reply.packet rename to ryu/tests/packet_data/of13/4-26-ofp_aggregate_stats_reply.packet diff --git a/tests/packet_data/of13/4-27-ofp_table_stats_request.packet b/ryu/tests/packet_data/of13/4-27-ofp_table_stats_request.packet similarity index 100% rename from tests/packet_data/of13/4-27-ofp_table_stats_request.packet rename to ryu/tests/packet_data/of13/4-27-ofp_table_stats_request.packet diff --git a/tests/packet_data/of13/4-28-ofp_table_stats_reply.packet b/ryu/tests/packet_data/of13/4-28-ofp_table_stats_reply.packet similarity index 100% rename from tests/packet_data/of13/4-28-ofp_table_stats_reply.packet rename to ryu/tests/packet_data/of13/4-28-ofp_table_stats_reply.packet diff --git a/tests/packet_data/of13/4-29-ofp_port_stats_request.packet b/ryu/tests/packet_data/of13/4-29-ofp_port_stats_request.packet similarity index 100% rename from tests/packet_data/of13/4-29-ofp_port_stats_request.packet rename to ryu/tests/packet_data/of13/4-29-ofp_port_stats_request.packet diff --git a/tests/packet_data/of13/4-3-ofp_flow_mod.packet b/ryu/tests/packet_data/of13/4-3-ofp_flow_mod.packet similarity index 100% rename from tests/packet_data/of13/4-3-ofp_flow_mod.packet rename to ryu/tests/packet_data/of13/4-3-ofp_flow_mod.packet diff --git a/tests/packet_data/of13/4-30-ofp_port_stats_reply.packet b/ryu/tests/packet_data/of13/4-30-ofp_port_stats_reply.packet similarity index 100% rename from tests/packet_data/of13/4-30-ofp_port_stats_reply.packet rename to ryu/tests/packet_data/of13/4-30-ofp_port_stats_reply.packet diff --git a/tests/packet_data/of13/4-31-ofp_group_features_request.packet b/ryu/tests/packet_data/of13/4-31-ofp_group_features_request.packet similarity index 100% rename from tests/packet_data/of13/4-31-ofp_group_features_request.packet rename to ryu/tests/packet_data/of13/4-31-ofp_group_features_request.packet diff --git a/tests/packet_data/of13/4-32-ofp_group_features_reply.packet b/ryu/tests/packet_data/of13/4-32-ofp_group_features_reply.packet similarity index 100% rename from tests/packet_data/of13/4-32-ofp_group_features_reply.packet rename to ryu/tests/packet_data/of13/4-32-ofp_group_features_reply.packet diff --git a/tests/packet_data/of13/4-33-ofp_group_desc_request.packet b/ryu/tests/packet_data/of13/4-33-ofp_group_desc_request.packet similarity index 100% rename from tests/packet_data/of13/4-33-ofp_group_desc_request.packet rename to ryu/tests/packet_data/of13/4-33-ofp_group_desc_request.packet diff --git a/tests/packet_data/of13/4-34-ofp_group_desc_reply.packet b/ryu/tests/packet_data/of13/4-34-ofp_group_desc_reply.packet similarity index 100% rename from tests/packet_data/of13/4-34-ofp_group_desc_reply.packet rename to ryu/tests/packet_data/of13/4-34-ofp_group_desc_reply.packet diff --git a/tests/packet_data/of13/4-35-ofp_queue_get_config_request.packet b/ryu/tests/packet_data/of13/4-35-ofp_queue_get_config_request.packet similarity index 100% rename from tests/packet_data/of13/4-35-ofp_queue_get_config_request.packet rename to ryu/tests/packet_data/of13/4-35-ofp_queue_get_config_request.packet diff --git a/tests/packet_data/of13/4-36-ofp_queue_get_config_reply.packet b/ryu/tests/packet_data/of13/4-36-ofp_queue_get_config_reply.packet similarity index 100% rename from tests/packet_data/of13/4-36-ofp_queue_get_config_reply.packet rename to ryu/tests/packet_data/of13/4-36-ofp_queue_get_config_reply.packet diff --git a/tests/packet_data/of13/4-37-ofp_queue_stats_request.packet b/ryu/tests/packet_data/of13/4-37-ofp_queue_stats_request.packet similarity index 100% rename from tests/packet_data/of13/4-37-ofp_queue_stats_request.packet rename to ryu/tests/packet_data/of13/4-37-ofp_queue_stats_request.packet diff --git a/tests/packet_data/of13/4-38-ofp_queue_stats_reply.packet b/ryu/tests/packet_data/of13/4-38-ofp_queue_stats_reply.packet similarity index 100% rename from tests/packet_data/of13/4-38-ofp_queue_stats_reply.packet rename to ryu/tests/packet_data/of13/4-38-ofp_queue_stats_reply.packet diff --git a/tests/packet_data/of13/4-39-ofp_port_status.packet b/ryu/tests/packet_data/of13/4-39-ofp_port_status.packet similarity index 100% rename from tests/packet_data/of13/4-39-ofp_port_status.packet rename to ryu/tests/packet_data/of13/4-39-ofp_port_status.packet diff --git a/tests/packet_data/of13/4-4-ofp_packet_in.packet b/ryu/tests/packet_data/of13/4-4-ofp_packet_in.packet similarity index 100% rename from tests/packet_data/of13/4-4-ofp_packet_in.packet rename to ryu/tests/packet_data/of13/4-4-ofp_packet_in.packet diff --git a/tests/packet_data/of13/4-40-ofp_flow_removed.packet b/ryu/tests/packet_data/of13/4-40-ofp_flow_removed.packet similarity index 100% rename from tests/packet_data/of13/4-40-ofp_flow_removed.packet rename to ryu/tests/packet_data/of13/4-40-ofp_flow_removed.packet diff --git a/tests/packet_data/of13/4-41-ofp_error_msg_experimenter.packet b/ryu/tests/packet_data/of13/4-41-ofp_error_msg_experimenter.packet similarity index 100% rename from tests/packet_data/of13/4-41-ofp_error_msg_experimenter.packet rename to ryu/tests/packet_data/of13/4-41-ofp_error_msg_experimenter.packet diff --git a/tests/packet_data/of13/4-42-ofp_get_async_request.packet b/ryu/tests/packet_data/of13/4-42-ofp_get_async_request.packet similarity index 100% rename from tests/packet_data/of13/4-42-ofp_get_async_request.packet rename to ryu/tests/packet_data/of13/4-42-ofp_get_async_request.packet diff --git a/tests/packet_data/of13/4-43-ofp_get_async_reply.packet b/ryu/tests/packet_data/of13/4-43-ofp_get_async_reply.packet similarity index 100% rename from tests/packet_data/of13/4-43-ofp_get_async_reply.packet rename to ryu/tests/packet_data/of13/4-43-ofp_get_async_reply.packet diff --git a/tests/packet_data/of13/4-44-ofp_set_async.packet b/ryu/tests/packet_data/of13/4-44-ofp_set_async.packet similarity index 100% rename from tests/packet_data/of13/4-44-ofp_set_async.packet rename to ryu/tests/packet_data/of13/4-44-ofp_set_async.packet diff --git a/tests/packet_data/of13/4-45-ofp_meter_mod.packet b/ryu/tests/packet_data/of13/4-45-ofp_meter_mod.packet similarity index 100% rename from tests/packet_data/of13/4-45-ofp_meter_mod.packet rename to ryu/tests/packet_data/of13/4-45-ofp_meter_mod.packet diff --git a/tests/packet_data/of13/4-46-ofp_flow_mod.packet b/ryu/tests/packet_data/of13/4-46-ofp_flow_mod.packet similarity index 100% rename from tests/packet_data/of13/4-46-ofp_flow_mod.packet rename to ryu/tests/packet_data/of13/4-46-ofp_flow_mod.packet diff --git a/tests/packet_data/of13/4-47-ofp_meter_config_request.packet b/ryu/tests/packet_data/of13/4-47-ofp_meter_config_request.packet similarity index 100% rename from tests/packet_data/of13/4-47-ofp_meter_config_request.packet rename to ryu/tests/packet_data/of13/4-47-ofp_meter_config_request.packet diff --git a/tests/packet_data/of13/4-48-ofp_meter_config_reply.packet b/ryu/tests/packet_data/of13/4-48-ofp_meter_config_reply.packet similarity index 100% rename from tests/packet_data/of13/4-48-ofp_meter_config_reply.packet rename to ryu/tests/packet_data/of13/4-48-ofp_meter_config_reply.packet diff --git a/tests/packet_data/of13/4-49-ofp_meter_stats_request.packet b/ryu/tests/packet_data/of13/4-49-ofp_meter_stats_request.packet similarity index 100% rename from tests/packet_data/of13/4-49-ofp_meter_stats_request.packet rename to ryu/tests/packet_data/of13/4-49-ofp_meter_stats_request.packet diff --git a/tests/packet_data/of13/4-5-ofp_features_request.packet b/ryu/tests/packet_data/of13/4-5-ofp_features_request.packet similarity index 100% rename from tests/packet_data/of13/4-5-ofp_features_request.packet rename to ryu/tests/packet_data/of13/4-5-ofp_features_request.packet diff --git a/tests/packet_data/of13/4-50-ofp_meter_stats_reply.packet b/ryu/tests/packet_data/of13/4-50-ofp_meter_stats_reply.packet similarity index 100% rename from tests/packet_data/of13/4-50-ofp_meter_stats_reply.packet rename to ryu/tests/packet_data/of13/4-50-ofp_meter_stats_reply.packet diff --git a/tests/packet_data/of13/4-51-ofp_meter_features_request.packet b/ryu/tests/packet_data/of13/4-51-ofp_meter_features_request.packet similarity index 100% rename from tests/packet_data/of13/4-51-ofp_meter_features_request.packet rename to ryu/tests/packet_data/of13/4-51-ofp_meter_features_request.packet diff --git a/tests/packet_data/of13/4-52-ofp_meter_features_reply.packet b/ryu/tests/packet_data/of13/4-52-ofp_meter_features_reply.packet similarity index 100% rename from tests/packet_data/of13/4-52-ofp_meter_features_reply.packet rename to ryu/tests/packet_data/of13/4-52-ofp_meter_features_reply.packet diff --git a/tests/packet_data/of13/4-53-ofp_port_desc_request.packet b/ryu/tests/packet_data/of13/4-53-ofp_port_desc_request.packet similarity index 100% rename from tests/packet_data/of13/4-53-ofp_port_desc_request.packet rename to ryu/tests/packet_data/of13/4-53-ofp_port_desc_request.packet diff --git a/tests/packet_data/of13/4-54-ofp_port_desc_reply.packet b/ryu/tests/packet_data/of13/4-54-ofp_port_desc_reply.packet similarity index 100% rename from tests/packet_data/of13/4-54-ofp_port_desc_reply.packet rename to ryu/tests/packet_data/of13/4-54-ofp_port_desc_reply.packet diff --git a/tests/packet_data/of13/4-55-ofp_table_features_request.packet b/ryu/tests/packet_data/of13/4-55-ofp_table_features_request.packet similarity index 100% rename from tests/packet_data/of13/4-55-ofp_table_features_request.packet rename to ryu/tests/packet_data/of13/4-55-ofp_table_features_request.packet diff --git a/tests/packet_data/of13/4-56-ofp_table_features_reply.packet b/ryu/tests/packet_data/of13/4-56-ofp_table_features_reply.packet similarity index 100% rename from tests/packet_data/of13/4-56-ofp_table_features_reply.packet rename to ryu/tests/packet_data/of13/4-56-ofp_table_features_reply.packet diff --git a/tests/packet_data/of13/4-57-ofp_group_stats_request.packet b/ryu/tests/packet_data/of13/4-57-ofp_group_stats_request.packet similarity index 100% rename from tests/packet_data/of13/4-57-ofp_group_stats_request.packet rename to ryu/tests/packet_data/of13/4-57-ofp_group_stats_request.packet diff --git a/tests/packet_data/of13/4-58-ofp_group_stats_reply.packet b/ryu/tests/packet_data/of13/4-58-ofp_group_stats_reply.packet similarity index 100% rename from tests/packet_data/of13/4-58-ofp_group_stats_reply.packet rename to ryu/tests/packet_data/of13/4-58-ofp_group_stats_reply.packet diff --git a/tests/packet_data/of13/4-59-ofp_packet_in.packet b/ryu/tests/packet_data/of13/4-59-ofp_packet_in.packet similarity index 100% rename from tests/packet_data/of13/4-59-ofp_packet_in.packet rename to ryu/tests/packet_data/of13/4-59-ofp_packet_in.packet diff --git a/tests/packet_data/of13/4-6-ofp_features_reply.packet b/ryu/tests/packet_data/of13/4-6-ofp_features_reply.packet similarity index 100% rename from tests/packet_data/of13/4-6-ofp_features_reply.packet rename to ryu/tests/packet_data/of13/4-6-ofp_features_reply.packet diff --git a/tests/packet_data/of13/4-60-ofp_flow_mod.packet b/ryu/tests/packet_data/of13/4-60-ofp_flow_mod.packet similarity index 100% rename from tests/packet_data/of13/4-60-ofp_flow_mod.packet rename to ryu/tests/packet_data/of13/4-60-ofp_flow_mod.packet diff --git a/tests/packet_data/of13/4-61-ofp_experimenter_request.packet b/ryu/tests/packet_data/of13/4-61-ofp_experimenter_request.packet similarity index 100% rename from tests/packet_data/of13/4-61-ofp_experimenter_request.packet rename to ryu/tests/packet_data/of13/4-61-ofp_experimenter_request.packet diff --git a/tests/packet_data/of13/4-62-ofp_experimenter_reply.packet b/ryu/tests/packet_data/of13/4-62-ofp_experimenter_reply.packet similarity index 100% rename from tests/packet_data/of13/4-62-ofp_experimenter_reply.packet rename to ryu/tests/packet_data/of13/4-62-ofp_experimenter_reply.packet diff --git a/tests/packet_data/of13/4-63-onf_flow_monitor_request.packet b/ryu/tests/packet_data/of13/4-63-onf_flow_monitor_request.packet similarity index 100% rename from tests/packet_data/of13/4-63-onf_flow_monitor_request.packet rename to ryu/tests/packet_data/of13/4-63-onf_flow_monitor_request.packet diff --git a/tests/packet_data/of13/4-7-ofp_set_config.packet b/ryu/tests/packet_data/of13/4-7-ofp_set_config.packet similarity index 100% rename from tests/packet_data/of13/4-7-ofp_set_config.packet rename to ryu/tests/packet_data/of13/4-7-ofp_set_config.packet diff --git a/tests/packet_data/of13/4-8-ofp_get_config_request.packet b/ryu/tests/packet_data/of13/4-8-ofp_get_config_request.packet similarity index 100% rename from tests/packet_data/of13/4-8-ofp_get_config_request.packet rename to ryu/tests/packet_data/of13/4-8-ofp_get_config_request.packet diff --git a/tests/packet_data/of13/4-9-ofp_get_config_reply.packet b/ryu/tests/packet_data/of13/4-9-ofp_get_config_reply.packet similarity index 100% rename from tests/packet_data/of13/4-9-ofp_get_config_reply.packet rename to ryu/tests/packet_data/of13/4-9-ofp_get_config_reply.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-echo_reply.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-echo_reply.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-echo_reply.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-echo_reply.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-echo_request.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-echo_request.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-echo_request.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-echo_request.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-error_msg.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-error_msg.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-error_msg.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-error_msg.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-features_reply.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-features_reply.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-features_reply.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-features_reply.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-flow_mod.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-flow_mod.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-flow_mod.truncated64 b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod.truncated64 similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-flow_mod.truncated64 rename to ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod.truncated64 diff --git a/tests/packet_data/of13/libofproto-OFP13-flow_mod_conjunction.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod_conjunction.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-flow_mod_conjunction.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod_conjunction.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-flow_mod_match_conj.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod_match_conj.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-flow_mod_match_conj.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod_match_conj.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-flow_removed.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_removed.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-flow_removed.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-flow_removed.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-get_config_reply.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-get_config_reply.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-get_config_reply.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-get_config_reply.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-hello.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-hello.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-hello.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-hello.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-meter_mod.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-meter_mod.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-meter_mod.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-meter_mod.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-packet_in.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-packet_in.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-packet_in.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-packet_in.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-port_mod.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-port_mod.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-port_mod.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-port_mod.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-port_status.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-port_status.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-port_status.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-port_status.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-set_config.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-set_config.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-set_config.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-set_config.packet diff --git a/tests/packet_data/of13/libofproto-OFP13-table_mod.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-table_mod.packet similarity index 100% rename from tests/packet_data/of13/libofproto-OFP13-table_mod.packet rename to ryu/tests/packet_data/of13/libofproto-OFP13-table_mod.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_conjunction.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_conjunction.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_conjunction.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_conjunction.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_controller.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_controller.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_controller.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_controller.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_controller2.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_controller2.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_controller2.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_controller2.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_ct_exec.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_exec.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_ct_exec.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_exec.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat_v6.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat_v6.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat_v6.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat_v6.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_fintimeout.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_fintimeout.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_fintimeout.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_fintimeout.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_learn.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_learn.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_learn.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_learn.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_note.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_note.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_note.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_note.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_output_trunc.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_output_trunc.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_output_trunc.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_output_trunc.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_resubmit.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_resubmit.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_resubmit.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_resubmit.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_sample.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_sample.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_sample.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_sample.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_sample2.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_sample2.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_sample2.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_sample2.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_stack_pop.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_stack_pop.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_stack_pop.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_stack_pop.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_stack_push.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_stack_push.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-action_stack_push.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-action_stack_push.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-match_conj.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_conj.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-match_conj.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-match_conj.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-match_load_nx_register.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_load_nx_register.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-match_load_nx_register.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-match_load_nx_register.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-match_move_nx_register.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_move_nx_register.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-match_move_nx_register.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-match_move_nx_register.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark.packet diff --git a/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet similarity index 100% rename from tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet rename to ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet diff --git a/tests/packet_data/of14/5-0-ofp_desc_reply.packet b/ryu/tests/packet_data/of14/5-0-ofp_desc_reply.packet similarity index 100% rename from tests/packet_data/of14/5-0-ofp_desc_reply.packet rename to ryu/tests/packet_data/of14/5-0-ofp_desc_reply.packet diff --git a/tests/packet_data/of14/5-1-ofp_packet_out.packet b/ryu/tests/packet_data/of14/5-1-ofp_packet_out.packet similarity index 100% rename from tests/packet_data/of14/5-1-ofp_packet_out.packet rename to ryu/tests/packet_data/of14/5-1-ofp_packet_out.packet diff --git a/tests/packet_data/of14/5-10-ofp_hello.packet b/ryu/tests/packet_data/of14/5-10-ofp_hello.packet similarity index 100% rename from tests/packet_data/of14/5-10-ofp_hello.packet rename to ryu/tests/packet_data/of14/5-10-ofp_hello.packet diff --git a/tests/packet_data/of14/5-11-ofp_flow_stats_request.packet b/ryu/tests/packet_data/of14/5-11-ofp_flow_stats_request.packet similarity index 100% rename from tests/packet_data/of14/5-11-ofp_flow_stats_request.packet rename to ryu/tests/packet_data/of14/5-11-ofp_flow_stats_request.packet diff --git a/tests/packet_data/of14/5-12-ofp_flow_stats_reply.packet b/ryu/tests/packet_data/of14/5-12-ofp_flow_stats_reply.packet similarity index 100% rename from tests/packet_data/of14/5-12-ofp_flow_stats_reply.packet rename to ryu/tests/packet_data/of14/5-12-ofp_flow_stats_reply.packet diff --git a/tests/packet_data/of14/5-13-ofp_echo_request.packet b/ryu/tests/packet_data/of14/5-13-ofp_echo_request.packet similarity index 100% rename from tests/packet_data/of14/5-13-ofp_echo_request.packet rename to ryu/tests/packet_data/of14/5-13-ofp_echo_request.packet diff --git a/tests/packet_data/of14/5-14-ofp_echo_reply.packet b/ryu/tests/packet_data/of14/5-14-ofp_echo_reply.packet similarity index 100% rename from tests/packet_data/of14/5-14-ofp_echo_reply.packet rename to ryu/tests/packet_data/of14/5-14-ofp_echo_reply.packet diff --git a/tests/packet_data/of14/5-15-ofp_error_msg.packet b/ryu/tests/packet_data/of14/5-15-ofp_error_msg.packet similarity index 100% rename from tests/packet_data/of14/5-15-ofp_error_msg.packet rename to ryu/tests/packet_data/of14/5-15-ofp_error_msg.packet diff --git a/tests/packet_data/of14/5-16-ofp_experimenter.packet b/ryu/tests/packet_data/of14/5-16-ofp_experimenter.packet similarity index 100% rename from tests/packet_data/of14/5-16-ofp_experimenter.packet rename to ryu/tests/packet_data/of14/5-16-ofp_experimenter.packet diff --git a/tests/packet_data/of14/5-17-ofp_barrier_request.packet b/ryu/tests/packet_data/of14/5-17-ofp_barrier_request.packet similarity index 100% rename from tests/packet_data/of14/5-17-ofp_barrier_request.packet rename to ryu/tests/packet_data/of14/5-17-ofp_barrier_request.packet diff --git a/tests/packet_data/of14/5-18-ofp_barrier_reply.packet b/ryu/tests/packet_data/of14/5-18-ofp_barrier_reply.packet similarity index 100% rename from tests/packet_data/of14/5-18-ofp_barrier_reply.packet rename to ryu/tests/packet_data/of14/5-18-ofp_barrier_reply.packet diff --git a/tests/packet_data/of14/5-19-ofp_role_request.packet b/ryu/tests/packet_data/of14/5-19-ofp_role_request.packet similarity index 100% rename from tests/packet_data/of14/5-19-ofp_role_request.packet rename to ryu/tests/packet_data/of14/5-19-ofp_role_request.packet diff --git a/tests/packet_data/of14/5-2-ofp_flow_mod.packet b/ryu/tests/packet_data/of14/5-2-ofp_flow_mod.packet similarity index 100% rename from tests/packet_data/of14/5-2-ofp_flow_mod.packet rename to ryu/tests/packet_data/of14/5-2-ofp_flow_mod.packet diff --git a/tests/packet_data/of14/5-20-ofp_role_reply.packet b/ryu/tests/packet_data/of14/5-20-ofp_role_reply.packet similarity index 100% rename from tests/packet_data/of14/5-20-ofp_role_reply.packet rename to ryu/tests/packet_data/of14/5-20-ofp_role_reply.packet diff --git a/tests/packet_data/of14/5-21-ofp_group_mod.packet b/ryu/tests/packet_data/of14/5-21-ofp_group_mod.packet similarity index 100% rename from tests/packet_data/of14/5-21-ofp_group_mod.packet rename to ryu/tests/packet_data/of14/5-21-ofp_group_mod.packet diff --git a/tests/packet_data/of14/5-22-ofp_port_mod.packet b/ryu/tests/packet_data/of14/5-22-ofp_port_mod.packet similarity index 100% rename from tests/packet_data/of14/5-22-ofp_port_mod.packet rename to ryu/tests/packet_data/of14/5-22-ofp_port_mod.packet diff --git a/tests/packet_data/of14/5-23-ofp_table_mod.packet b/ryu/tests/packet_data/of14/5-23-ofp_table_mod.packet similarity index 100% rename from tests/packet_data/of14/5-23-ofp_table_mod.packet rename to ryu/tests/packet_data/of14/5-23-ofp_table_mod.packet diff --git a/tests/packet_data/of14/5-24-ofp_desc_request.packet b/ryu/tests/packet_data/of14/5-24-ofp_desc_request.packet similarity index 100% rename from tests/packet_data/of14/5-24-ofp_desc_request.packet rename to ryu/tests/packet_data/of14/5-24-ofp_desc_request.packet diff --git a/tests/packet_data/of14/5-25-ofp_aggregate_stats_request.packet b/ryu/tests/packet_data/of14/5-25-ofp_aggregate_stats_request.packet similarity index 100% rename from tests/packet_data/of14/5-25-ofp_aggregate_stats_request.packet rename to ryu/tests/packet_data/of14/5-25-ofp_aggregate_stats_request.packet diff --git a/tests/packet_data/of14/5-26-ofp_aggregate_stats_reply.packet b/ryu/tests/packet_data/of14/5-26-ofp_aggregate_stats_reply.packet similarity index 100% rename from tests/packet_data/of14/5-26-ofp_aggregate_stats_reply.packet rename to ryu/tests/packet_data/of14/5-26-ofp_aggregate_stats_reply.packet diff --git a/tests/packet_data/of14/5-27-ofp_table_stats_request.packet b/ryu/tests/packet_data/of14/5-27-ofp_table_stats_request.packet similarity index 100% rename from tests/packet_data/of14/5-27-ofp_table_stats_request.packet rename to ryu/tests/packet_data/of14/5-27-ofp_table_stats_request.packet diff --git a/tests/packet_data/of14/5-28-ofp_table_stats_reply.packet b/ryu/tests/packet_data/of14/5-28-ofp_table_stats_reply.packet similarity index 100% rename from tests/packet_data/of14/5-28-ofp_table_stats_reply.packet rename to ryu/tests/packet_data/of14/5-28-ofp_table_stats_reply.packet diff --git a/tests/packet_data/of14/5-29-ofp_port_stats_request.packet b/ryu/tests/packet_data/of14/5-29-ofp_port_stats_request.packet similarity index 100% rename from tests/packet_data/of14/5-29-ofp_port_stats_request.packet rename to ryu/tests/packet_data/of14/5-29-ofp_port_stats_request.packet diff --git a/tests/packet_data/of14/5-3-ofp_flow_mod.packet b/ryu/tests/packet_data/of14/5-3-ofp_flow_mod.packet similarity index 100% rename from tests/packet_data/of14/5-3-ofp_flow_mod.packet rename to ryu/tests/packet_data/of14/5-3-ofp_flow_mod.packet diff --git a/tests/packet_data/of14/5-30-ofp_port_stats_reply.packet b/ryu/tests/packet_data/of14/5-30-ofp_port_stats_reply.packet similarity index 100% rename from tests/packet_data/of14/5-30-ofp_port_stats_reply.packet rename to ryu/tests/packet_data/of14/5-30-ofp_port_stats_reply.packet diff --git a/tests/packet_data/of14/5-31-ofp_group_features_request.packet b/ryu/tests/packet_data/of14/5-31-ofp_group_features_request.packet similarity index 100% rename from tests/packet_data/of14/5-31-ofp_group_features_request.packet rename to ryu/tests/packet_data/of14/5-31-ofp_group_features_request.packet diff --git a/tests/packet_data/of14/5-32-ofp_group_features_reply.packet b/ryu/tests/packet_data/of14/5-32-ofp_group_features_reply.packet similarity index 100% rename from tests/packet_data/of14/5-32-ofp_group_features_reply.packet rename to ryu/tests/packet_data/of14/5-32-ofp_group_features_reply.packet diff --git a/tests/packet_data/of14/5-33-ofp_group_desc_request.packet b/ryu/tests/packet_data/of14/5-33-ofp_group_desc_request.packet similarity index 100% rename from tests/packet_data/of14/5-33-ofp_group_desc_request.packet rename to ryu/tests/packet_data/of14/5-33-ofp_group_desc_request.packet diff --git a/tests/packet_data/of14/5-34-ofp_group_desc_reply.packet b/ryu/tests/packet_data/of14/5-34-ofp_group_desc_reply.packet similarity index 100% rename from tests/packet_data/of14/5-34-ofp_group_desc_reply.packet rename to ryu/tests/packet_data/of14/5-34-ofp_group_desc_reply.packet diff --git a/tests/packet_data/of14/5-35-ofp_queue_stats_request.packet b/ryu/tests/packet_data/of14/5-35-ofp_queue_stats_request.packet similarity index 100% rename from tests/packet_data/of14/5-35-ofp_queue_stats_request.packet rename to ryu/tests/packet_data/of14/5-35-ofp_queue_stats_request.packet diff --git a/tests/packet_data/of14/5-36-ofp_queue_stats_reply.packet b/ryu/tests/packet_data/of14/5-36-ofp_queue_stats_reply.packet similarity index 100% rename from tests/packet_data/of14/5-36-ofp_queue_stats_reply.packet rename to ryu/tests/packet_data/of14/5-36-ofp_queue_stats_reply.packet diff --git a/tests/packet_data/of14/5-37-ofp_port_status.packet b/ryu/tests/packet_data/of14/5-37-ofp_port_status.packet similarity index 100% rename from tests/packet_data/of14/5-37-ofp_port_status.packet rename to ryu/tests/packet_data/of14/5-37-ofp_port_status.packet diff --git a/tests/packet_data/of14/5-38-ofp_flow_removed.packet b/ryu/tests/packet_data/of14/5-38-ofp_flow_removed.packet similarity index 100% rename from tests/packet_data/of14/5-38-ofp_flow_removed.packet rename to ryu/tests/packet_data/of14/5-38-ofp_flow_removed.packet diff --git a/tests/packet_data/of14/5-39-ofp_error_msg_experimenter.packet b/ryu/tests/packet_data/of14/5-39-ofp_error_msg_experimenter.packet similarity index 100% rename from tests/packet_data/of14/5-39-ofp_error_msg_experimenter.packet rename to ryu/tests/packet_data/of14/5-39-ofp_error_msg_experimenter.packet diff --git a/tests/packet_data/of14/5-4-ofp_packet_in.packet b/ryu/tests/packet_data/of14/5-4-ofp_packet_in.packet similarity index 100% rename from tests/packet_data/of14/5-4-ofp_packet_in.packet rename to ryu/tests/packet_data/of14/5-4-ofp_packet_in.packet diff --git a/tests/packet_data/of14/5-40-ofp_get_async_request.packet b/ryu/tests/packet_data/of14/5-40-ofp_get_async_request.packet similarity index 100% rename from tests/packet_data/of14/5-40-ofp_get_async_request.packet rename to ryu/tests/packet_data/of14/5-40-ofp_get_async_request.packet diff --git a/tests/packet_data/of14/5-41-ofp_get_async_reply.packet b/ryu/tests/packet_data/of14/5-41-ofp_get_async_reply.packet similarity index 100% rename from tests/packet_data/of14/5-41-ofp_get_async_reply.packet rename to ryu/tests/packet_data/of14/5-41-ofp_get_async_reply.packet diff --git a/tests/packet_data/of14/5-42-ofp_set_async.packet b/ryu/tests/packet_data/of14/5-42-ofp_set_async.packet similarity index 100% rename from tests/packet_data/of14/5-42-ofp_set_async.packet rename to ryu/tests/packet_data/of14/5-42-ofp_set_async.packet diff --git a/tests/packet_data/of14/5-43-ofp_meter_mod.packet b/ryu/tests/packet_data/of14/5-43-ofp_meter_mod.packet similarity index 100% rename from tests/packet_data/of14/5-43-ofp_meter_mod.packet rename to ryu/tests/packet_data/of14/5-43-ofp_meter_mod.packet diff --git a/tests/packet_data/of14/5-44-ofp_flow_mod.packet b/ryu/tests/packet_data/of14/5-44-ofp_flow_mod.packet similarity index 100% rename from tests/packet_data/of14/5-44-ofp_flow_mod.packet rename to ryu/tests/packet_data/of14/5-44-ofp_flow_mod.packet diff --git a/tests/packet_data/of14/5-45-ofp_meter_config_request.packet b/ryu/tests/packet_data/of14/5-45-ofp_meter_config_request.packet similarity index 100% rename from tests/packet_data/of14/5-45-ofp_meter_config_request.packet rename to ryu/tests/packet_data/of14/5-45-ofp_meter_config_request.packet diff --git a/tests/packet_data/of14/5-46-ofp_meter_config_reply.packet b/ryu/tests/packet_data/of14/5-46-ofp_meter_config_reply.packet similarity index 100% rename from tests/packet_data/of14/5-46-ofp_meter_config_reply.packet rename to ryu/tests/packet_data/of14/5-46-ofp_meter_config_reply.packet diff --git a/tests/packet_data/of14/5-47-ofp_meter_stats_request.packet b/ryu/tests/packet_data/of14/5-47-ofp_meter_stats_request.packet similarity index 100% rename from tests/packet_data/of14/5-47-ofp_meter_stats_request.packet rename to ryu/tests/packet_data/of14/5-47-ofp_meter_stats_request.packet diff --git a/tests/packet_data/of14/5-48-ofp_meter_stats_reply.packet b/ryu/tests/packet_data/of14/5-48-ofp_meter_stats_reply.packet similarity index 100% rename from tests/packet_data/of14/5-48-ofp_meter_stats_reply.packet rename to ryu/tests/packet_data/of14/5-48-ofp_meter_stats_reply.packet diff --git a/tests/packet_data/of14/5-49-ofp_meter_features_request.packet b/ryu/tests/packet_data/of14/5-49-ofp_meter_features_request.packet similarity index 100% rename from tests/packet_data/of14/5-49-ofp_meter_features_request.packet rename to ryu/tests/packet_data/of14/5-49-ofp_meter_features_request.packet diff --git a/tests/packet_data/of14/5-5-ofp_features_request.packet b/ryu/tests/packet_data/of14/5-5-ofp_features_request.packet similarity index 100% rename from tests/packet_data/of14/5-5-ofp_features_request.packet rename to ryu/tests/packet_data/of14/5-5-ofp_features_request.packet diff --git a/tests/packet_data/of14/5-50-ofp_meter_features_reply.packet b/ryu/tests/packet_data/of14/5-50-ofp_meter_features_reply.packet similarity index 100% rename from tests/packet_data/of14/5-50-ofp_meter_features_reply.packet rename to ryu/tests/packet_data/of14/5-50-ofp_meter_features_reply.packet diff --git a/tests/packet_data/of14/5-51-ofp_port_desc_request.packet b/ryu/tests/packet_data/of14/5-51-ofp_port_desc_request.packet similarity index 100% rename from tests/packet_data/of14/5-51-ofp_port_desc_request.packet rename to ryu/tests/packet_data/of14/5-51-ofp_port_desc_request.packet diff --git a/tests/packet_data/of14/5-52-ofp_port_desc_reply.packet b/ryu/tests/packet_data/of14/5-52-ofp_port_desc_reply.packet similarity index 100% rename from tests/packet_data/of14/5-52-ofp_port_desc_reply.packet rename to ryu/tests/packet_data/of14/5-52-ofp_port_desc_reply.packet diff --git a/tests/packet_data/of14/5-53-ofp_table_features_request.packet b/ryu/tests/packet_data/of14/5-53-ofp_table_features_request.packet similarity index 100% rename from tests/packet_data/of14/5-53-ofp_table_features_request.packet rename to ryu/tests/packet_data/of14/5-53-ofp_table_features_request.packet diff --git a/tests/packet_data/of14/5-54-ofp_table_features_reply.packet b/ryu/tests/packet_data/of14/5-54-ofp_table_features_reply.packet similarity index 100% rename from tests/packet_data/of14/5-54-ofp_table_features_reply.packet rename to ryu/tests/packet_data/of14/5-54-ofp_table_features_reply.packet diff --git a/tests/packet_data/of14/5-55-ofp_group_stats_request.packet b/ryu/tests/packet_data/of14/5-55-ofp_group_stats_request.packet similarity index 100% rename from tests/packet_data/of14/5-55-ofp_group_stats_request.packet rename to ryu/tests/packet_data/of14/5-55-ofp_group_stats_request.packet diff --git a/tests/packet_data/of14/5-56-ofp_group_stats_reply.packet b/ryu/tests/packet_data/of14/5-56-ofp_group_stats_reply.packet similarity index 100% rename from tests/packet_data/of14/5-56-ofp_group_stats_reply.packet rename to ryu/tests/packet_data/of14/5-56-ofp_group_stats_reply.packet diff --git a/tests/packet_data/of14/5-57-ofp_packet_in.packet b/ryu/tests/packet_data/of14/5-57-ofp_packet_in.packet similarity index 100% rename from tests/packet_data/of14/5-57-ofp_packet_in.packet rename to ryu/tests/packet_data/of14/5-57-ofp_packet_in.packet diff --git a/tests/packet_data/of14/5-58-ofp_flow_mod.packet b/ryu/tests/packet_data/of14/5-58-ofp_flow_mod.packet similarity index 100% rename from tests/packet_data/of14/5-58-ofp_flow_mod.packet rename to ryu/tests/packet_data/of14/5-58-ofp_flow_mod.packet diff --git a/tests/packet_data/of14/5-59-ofp_experimenter_request.packet b/ryu/tests/packet_data/of14/5-59-ofp_experimenter_request.packet similarity index 100% rename from tests/packet_data/of14/5-59-ofp_experimenter_request.packet rename to ryu/tests/packet_data/of14/5-59-ofp_experimenter_request.packet diff --git a/tests/packet_data/of14/5-6-ofp_features_reply.packet b/ryu/tests/packet_data/of14/5-6-ofp_features_reply.packet similarity index 100% rename from tests/packet_data/of14/5-6-ofp_features_reply.packet rename to ryu/tests/packet_data/of14/5-6-ofp_features_reply.packet diff --git a/tests/packet_data/of14/5-60-ofp_experimenter_reply.packet b/ryu/tests/packet_data/of14/5-60-ofp_experimenter_reply.packet similarity index 100% rename from tests/packet_data/of14/5-60-ofp_experimenter_reply.packet rename to ryu/tests/packet_data/of14/5-60-ofp_experimenter_reply.packet diff --git a/tests/packet_data/of14/5-61-ofp_table_desc_request.packet b/ryu/tests/packet_data/of14/5-61-ofp_table_desc_request.packet similarity index 100% rename from tests/packet_data/of14/5-61-ofp_table_desc_request.packet rename to ryu/tests/packet_data/of14/5-61-ofp_table_desc_request.packet diff --git a/tests/packet_data/of14/5-62-ofp_table_desc_reply.packet b/ryu/tests/packet_data/of14/5-62-ofp_table_desc_reply.packet similarity index 100% rename from tests/packet_data/of14/5-62-ofp_table_desc_reply.packet rename to ryu/tests/packet_data/of14/5-62-ofp_table_desc_reply.packet diff --git a/tests/packet_data/of14/5-63-ofp_queue_desc_request.packet b/ryu/tests/packet_data/of14/5-63-ofp_queue_desc_request.packet similarity index 100% rename from tests/packet_data/of14/5-63-ofp_queue_desc_request.packet rename to ryu/tests/packet_data/of14/5-63-ofp_queue_desc_request.packet diff --git a/tests/packet_data/of14/5-64-ofp_queue_desc_reply.packet b/ryu/tests/packet_data/of14/5-64-ofp_queue_desc_reply.packet similarity index 100% rename from tests/packet_data/of14/5-64-ofp_queue_desc_reply.packet rename to ryu/tests/packet_data/of14/5-64-ofp_queue_desc_reply.packet diff --git a/tests/packet_data/of14/5-65-ofp_role_status.packet b/ryu/tests/packet_data/of14/5-65-ofp_role_status.packet similarity index 100% rename from tests/packet_data/of14/5-65-ofp_role_status.packet rename to ryu/tests/packet_data/of14/5-65-ofp_role_status.packet diff --git a/tests/packet_data/of14/5-66-ofp_flow_monitor_request.packet b/ryu/tests/packet_data/of14/5-66-ofp_flow_monitor_request.packet similarity index 100% rename from tests/packet_data/of14/5-66-ofp_flow_monitor_request.packet rename to ryu/tests/packet_data/of14/5-66-ofp_flow_monitor_request.packet diff --git a/tests/packet_data/of14/5-67-ofp_flow_monitor_reply.packet b/ryu/tests/packet_data/of14/5-67-ofp_flow_monitor_reply.packet similarity index 100% rename from tests/packet_data/of14/5-67-ofp_flow_monitor_reply.packet rename to ryu/tests/packet_data/of14/5-67-ofp_flow_monitor_reply.packet diff --git a/tests/packet_data/of14/5-68-ofp_table_status.packet b/ryu/tests/packet_data/of14/5-68-ofp_table_status.packet similarity index 100% rename from tests/packet_data/of14/5-68-ofp_table_status.packet rename to ryu/tests/packet_data/of14/5-68-ofp_table_status.packet diff --git a/tests/packet_data/of14/5-69-ofp_bundle_ctrl_msg.packet b/ryu/tests/packet_data/of14/5-69-ofp_bundle_ctrl_msg.packet similarity index 100% rename from tests/packet_data/of14/5-69-ofp_bundle_ctrl_msg.packet rename to ryu/tests/packet_data/of14/5-69-ofp_bundle_ctrl_msg.packet diff --git a/tests/packet_data/of14/5-7-ofp_set_config.packet b/ryu/tests/packet_data/of14/5-7-ofp_set_config.packet similarity index 100% rename from tests/packet_data/of14/5-7-ofp_set_config.packet rename to ryu/tests/packet_data/of14/5-7-ofp_set_config.packet diff --git a/tests/packet_data/of14/5-70-ofp_bundle_add_msg.packet b/ryu/tests/packet_data/of14/5-70-ofp_bundle_add_msg.packet similarity index 100% rename from tests/packet_data/of14/5-70-ofp_bundle_add_msg.packet rename to ryu/tests/packet_data/of14/5-70-ofp_bundle_add_msg.packet diff --git a/tests/packet_data/of14/5-71-ofp_requestforward.packet b/ryu/tests/packet_data/of14/5-71-ofp_requestforward.packet similarity index 100% rename from tests/packet_data/of14/5-71-ofp_requestforward.packet rename to ryu/tests/packet_data/of14/5-71-ofp_requestforward.packet diff --git a/tests/packet_data/of14/5-8-ofp_get_config_request.packet b/ryu/tests/packet_data/of14/5-8-ofp_get_config_request.packet similarity index 100% rename from tests/packet_data/of14/5-8-ofp_get_config_request.packet rename to ryu/tests/packet_data/of14/5-8-ofp_get_config_request.packet diff --git a/tests/packet_data/of14/5-9-ofp_get_config_reply.packet b/ryu/tests/packet_data/of14/5-9-ofp_get_config_reply.packet similarity index 100% rename from tests/packet_data/of14/5-9-ofp_get_config_reply.packet rename to ryu/tests/packet_data/of14/5-9-ofp_get_config_reply.packet diff --git a/tests/packet_data/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet b/ryu/tests/packet_data/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet similarity index 100% rename from tests/packet_data/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet rename to ryu/tests/packet_data/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-aggregate_stats_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-aggregate_stats_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-barrier_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-barrier_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-barrier_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-barrier_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-barrier_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-barrier_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-barrier_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-barrier_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-bundle_add.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-bundle_add.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-bundle_add.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-bundle_add.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-bundle_ctrl.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-bundle_ctrl.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-bundle_ctrl.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-bundle_ctrl.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-bundle_features_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-bundle_features_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-bundle_features_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-bundle_features_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-bundle_features_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-bundle_features_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-bundle_features_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-bundle_features_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-controller_status.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-controller_status.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-controller_status.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-controller_status_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-controller_status_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-controller_status_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-controller_status_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-desc_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-desc_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-desc_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-desc_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-desc_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-desc_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-echo_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-echo_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-echo_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-echo_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-echo_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-echo_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-echo_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-echo_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-error_msg.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-error_msg.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-error_msg.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-error_msg.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-error_msg_experimenter.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-error_msg_experimenter.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-error_msg_experimenter.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-error_msg_experimenter.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-experimenter.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-experimenter.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-experimenter.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-experimenter.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-experimenter_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-experimenter_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-experimenter_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-experimenter_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-experimenter_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-experimenter_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-experimenter_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-experimenter_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-features_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-features_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-features_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-features_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-features_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-features_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-features_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-features_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-flow_desc_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-flow_desc_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_mod.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-flow_mod.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_mod_conjunction.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod_conjunction.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-flow_mod_conjunction.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod_conjunction.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_mod_match_conj.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod_match_conj.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-flow_mod_match_conj.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod_match_conj.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_monitor_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_monitor_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-flow_monitor_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-flow_monitor_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_monitor_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_monitor_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-flow_monitor_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-flow_monitor_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_removed.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_removed.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-flow_removed.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-flow_removed.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_stats_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-flow_stats_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-flow_stats_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_stats_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-flow_stats_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-flow_stats_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-get_async_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-get_async_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-get_async_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-get_async_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-get_async_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-get_async_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-get_async_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-get_async_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-get_config_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-get_config_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-get_config_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-get_config_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-get_config_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-get_config_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-get_config_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-get_config_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-group_desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_desc_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-group_desc_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-group_desc_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-group_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_desc_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-group_desc_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-group_desc_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-group_features_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_features_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-group_features_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-group_features_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-group_features_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_features_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-group_features_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-group_features_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-group_mod.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_mod.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-group_mod.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-group_mod.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-group_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_stats_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-group_stats_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-group_stats_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-group_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_stats_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-group_stats_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-group_stats_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-hello.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-hello.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-hello.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-hello.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_desc_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-meter_desc_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-meter_desc_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_desc_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-meter_desc_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-meter_desc_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_features_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_features_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-meter_features_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-meter_features_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_features_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_features_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-meter_features_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-meter_features_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_mod.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_mod.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-meter_mod.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-meter_mod.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_stats_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-meter_stats_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-meter_stats_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_stats_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-meter_stats_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-meter_stats_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-packet_in.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-packet_in.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-packet_in.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-packet_in.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-packet_out.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-packet_out.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-packet_out.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-packet_out.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-port_desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-port_desc_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-port_desc_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-port_desc_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-port_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-port_desc_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-port_desc_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-port_desc_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-port_mod.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-port_mod.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-port_mod.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-port_mod.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-port_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-port_stats_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-port_stats_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-port_stats_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-port_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-port_stats_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-port_stats_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-port_stats_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-port_status.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-port_status.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-port_status.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-port_status.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-queue_desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-queue_desc_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-queue_desc_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-queue_desc_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-queue_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-queue_desc_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-queue_desc_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-queue_desc_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-queue_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-queue_stats_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-queue_stats_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-queue_stats_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-queue_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-queue_stats_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-queue_stats_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-queue_stats_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-requestforward.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-requestforward.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-requestforward.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-requestforward.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-role_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-role_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-role_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-role_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-role_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-role_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-role_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-role_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-role_status.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-role_status.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-role_status.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-role_status.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-set_async.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-set_async.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-set_async.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-set_async.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-set_config.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-set_config.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-set_config.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-set_config.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-table_desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_desc_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-table_desc_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-table_desc_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-table_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_desc_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-table_desc_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-table_desc_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-table_features_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_features_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-table_features_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-table_features_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-table_features_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_features_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-table_features_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-table_features_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-table_mod.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_mod.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-table_mod.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-table_mod.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-table_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_stats_reply.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-table_stats_reply.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-table_stats_reply.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-table_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_stats_request.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-table_stats_request.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-table_stats_request.packet diff --git a/tests/packet_data/of15/libofproto-OFP15-table_status.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_status.packet similarity index 100% rename from tests/packet_data/of15/libofproto-OFP15-table_status.packet rename to ryu/tests/packet_data/of15/libofproto-OFP15-table_status.packet diff --git a/tests/packet_data/pcap/big_endian.pcap b/ryu/tests/packet_data/pcap/big_endian.pcap similarity index 100% rename from tests/packet_data/pcap/big_endian.pcap rename to ryu/tests/packet_data/pcap/big_endian.pcap diff --git a/tests/packet_data/pcap/geneve_unknown.pcap b/ryu/tests/packet_data/pcap/geneve_unknown.pcap similarity index 100% rename from tests/packet_data/pcap/geneve_unknown.pcap rename to ryu/tests/packet_data/pcap/geneve_unknown.pcap diff --git a/tests/packet_data/pcap/gre_full_options.pcap b/ryu/tests/packet_data/pcap/gre_full_options.pcap similarity index 100% rename from tests/packet_data/pcap/gre_full_options.pcap rename to ryu/tests/packet_data/pcap/gre_full_options.pcap diff --git a/tests/packet_data/pcap/gre_no_option.pcap b/ryu/tests/packet_data/pcap/gre_no_option.pcap similarity index 100% rename from tests/packet_data/pcap/gre_no_option.pcap rename to ryu/tests/packet_data/pcap/gre_no_option.pcap diff --git a/tests/packet_data/pcap/gre_nvgre_option.pcap b/ryu/tests/packet_data/pcap/gre_nvgre_option.pcap similarity index 100% rename from tests/packet_data/pcap/gre_nvgre_option.pcap rename to ryu/tests/packet_data/pcap/gre_nvgre_option.pcap diff --git a/tests/packet_data/pcap/little_endian.pcap b/ryu/tests/packet_data/pcap/little_endian.pcap similarity index 100% rename from tests/packet_data/pcap/little_endian.pcap rename to ryu/tests/packet_data/pcap/little_endian.pcap diff --git a/tests/packet_data/pcap/openflow_flowmod.pcap b/ryu/tests/packet_data/pcap/openflow_flowmod.pcap similarity index 100% rename from tests/packet_data/pcap/openflow_flowmod.pcap rename to ryu/tests/packet_data/pcap/openflow_flowmod.pcap diff --git a/tests/packet_data/pcap/openflow_flowstats_req.pcap b/ryu/tests/packet_data/pcap/openflow_flowstats_req.pcap similarity index 100% rename from tests/packet_data/pcap/openflow_flowstats_req.pcap rename to ryu/tests/packet_data/pcap/openflow_flowstats_req.pcap diff --git a/tests/packet_data/pcap/openflow_invalid_version.pcap b/ryu/tests/packet_data/pcap/openflow_invalid_version.pcap similarity index 100% rename from tests/packet_data/pcap/openflow_invalid_version.pcap rename to ryu/tests/packet_data/pcap/openflow_invalid_version.pcap diff --git a/tests/packet_data/pcap/zebra_v2.pcap b/ryu/tests/packet_data/pcap/zebra_v2.pcap similarity index 100% rename from tests/packet_data/pcap/zebra_v2.pcap rename to ryu/tests/packet_data/pcap/zebra_v2.pcap diff --git a/tests/packet_data/pcap/zebra_v3.pcap b/ryu/tests/packet_data/pcap/zebra_v3.pcap similarity index 100% rename from tests/packet_data/pcap/zebra_v3.pcap rename to ryu/tests/packet_data/pcap/zebra_v3.pcap diff --git a/tests/packet_data_generator/Makefile b/ryu/tests/packet_data_generator/Makefile similarity index 100% rename from tests/packet_data_generator/Makefile rename to ryu/tests/packet_data_generator/Makefile diff --git a/tests/packet_data_generator/rebar.config b/ryu/tests/packet_data_generator/rebar.config similarity index 100% rename from tests/packet_data_generator/rebar.config rename to ryu/tests/packet_data_generator/rebar.config diff --git a/tests/packet_data_generator/src/er.app.src b/ryu/tests/packet_data_generator/src/er.app.src similarity index 100% rename from tests/packet_data_generator/src/er.app.src rename to ryu/tests/packet_data_generator/src/er.app.src diff --git a/tests/packet_data_generator/src/x.erl b/ryu/tests/packet_data_generator/src/x.erl similarity index 100% rename from tests/packet_data_generator/src/x.erl rename to ryu/tests/packet_data_generator/src/x.erl diff --git a/tests/packet_data_generator/src/x1.erl b/ryu/tests/packet_data_generator/src/x1.erl similarity index 100% rename from tests/packet_data_generator/src/x1.erl rename to ryu/tests/packet_data_generator/src/x1.erl diff --git a/tests/packet_data_generator/src/x3.erl b/ryu/tests/packet_data_generator/src/x3.erl similarity index 100% rename from tests/packet_data_generator/src/x3.erl rename to ryu/tests/packet_data_generator/src/x3.erl diff --git a/tests/packet_data_generator/src/x4.erl b/ryu/tests/packet_data_generator/src/x4.erl similarity index 100% rename from tests/packet_data_generator/src/x4.erl rename to ryu/tests/packet_data_generator/src/x4.erl diff --git a/tests/packet_data_generator/src/x5.erl b/ryu/tests/packet_data_generator/src/x5.erl similarity index 100% rename from tests/packet_data_generator/src/x5.erl rename to ryu/tests/packet_data_generator/src/x5.erl diff --git a/tests/packet_data_generator/src/x_flower_packet.erl b/ryu/tests/packet_data_generator/src/x_flower_packet.erl similarity index 100% rename from tests/packet_data_generator/src/x_flower_packet.erl rename to ryu/tests/packet_data_generator/src/x_flower_packet.erl diff --git a/tests/packet_data_generator/src/x_of_protocol.erl b/ryu/tests/packet_data_generator/src/x_of_protocol.erl similarity index 100% rename from tests/packet_data_generator/src/x_of_protocol.erl rename to ryu/tests/packet_data_generator/src/x_of_protocol.erl diff --git a/tests/packet_data_generator2/Makefile.BSD b/ryu/tests/packet_data_generator2/Makefile.BSD similarity index 100% rename from tests/packet_data_generator2/Makefile.BSD rename to ryu/tests/packet_data_generator2/Makefile.BSD diff --git a/tests/packet_data_generator2/Makefile.GNU b/ryu/tests/packet_data_generator2/Makefile.GNU similarity index 100% rename from tests/packet_data_generator2/Makefile.GNU rename to ryu/tests/packet_data_generator2/Makefile.GNU diff --git a/tests/packet_data_generator2/README b/ryu/tests/packet_data_generator2/README similarity index 88% rename from tests/packet_data_generator2/README rename to ryu/tests/packet_data_generator2/README index 8f341709..3ad19301 100644 --- a/tests/packet_data_generator2/README +++ b/ryu/tests/packet_data_generator2/README @@ -4,8 +4,8 @@ unit tests [2]. As we have the generated files in the repository, you don't need to build this program unless you want to (re-)generate the files for some reasons, typically adding new test cases. -[1] tests/packet_data/of*/libofproto-*.packet -[2] tests.unit.ofproto.test_parser +[1] ryu/tests/packet_data/of*/libofproto-*.packet +[2] ryu.tests.unit.ofproto.test_parser The program requires libofproto library provided by Open vSwitch. It's a little tricky to build because Open vSwitch distribution diff --git a/tests/packet_data_generator2/gen.c b/ryu/tests/packet_data_generator2/gen.c similarity index 100% rename from tests/packet_data_generator2/gen.c rename to ryu/tests/packet_data_generator2/gen.c diff --git a/tests/packet_data_generator3/gen.py b/ryu/tests/packet_data_generator3/gen.py similarity index 100% rename from tests/packet_data_generator3/gen.py rename to ryu/tests/packet_data_generator3/gen.py diff --git a/tests/run_tests.py b/ryu/tests/run_tests.py similarity index 86% rename from tests/run_tests.py rename to ryu/tests/run_tests.py index 133c7e7e..835e789b 100755 --- a/tests/run_tests.py +++ b/ryu/tests/run_tests.py @@ -11,8 +11,8 @@ sys.path.append(os.getcwd()) sys.path.append(os.path.dirname(__file__)) -import tests.unit -from tests.test_lib import run_tests +import ryu.tests.unit +from ryu.tests.test_lib import run_tests if __name__ == '__main__': @@ -29,7 +29,7 @@ if __name__ == '__main__': includeExe=True, traverseNamespace=True, plugins=core.DefaultPluginManager()) - c.configureWhere(tests.unit.__path__) + c.configureWhere(ryu.tests.unit.__path__) exit_status = run_tests(c) sys.exit(exit_status) diff --git a/tests/test_lib.py b/ryu/tests/test_lib.py similarity index 100% rename from tests/test_lib.py rename to ryu/tests/test_lib.py diff --git a/tests/unit/__init__.py b/ryu/tests/unit/__init__.py similarity index 100% rename from tests/unit/__init__.py rename to ryu/tests/unit/__init__.py diff --git a/tests/integrated/common/__init__.py b/ryu/tests/unit/app/__init__.py similarity index 100% rename from tests/integrated/common/__init__.py rename to ryu/tests/unit/app/__init__.py diff --git a/tests/unit/app/ofctl_rest_json/of10.json b/ryu/tests/unit/app/ofctl_rest_json/of10.json similarity index 100% rename from tests/unit/app/ofctl_rest_json/of10.json rename to ryu/tests/unit/app/ofctl_rest_json/of10.json diff --git a/tests/unit/app/ofctl_rest_json/of12.json b/ryu/tests/unit/app/ofctl_rest_json/of12.json similarity index 100% rename from tests/unit/app/ofctl_rest_json/of12.json rename to ryu/tests/unit/app/ofctl_rest_json/of12.json diff --git a/tests/unit/app/ofctl_rest_json/of13.json b/ryu/tests/unit/app/ofctl_rest_json/of13.json similarity index 100% rename from tests/unit/app/ofctl_rest_json/of13.json rename to ryu/tests/unit/app/ofctl_rest_json/of13.json diff --git a/tests/unit/app/ofctl_rest_json/of14.json b/ryu/tests/unit/app/ofctl_rest_json/of14.json similarity index 100% rename from tests/unit/app/ofctl_rest_json/of14.json rename to ryu/tests/unit/app/ofctl_rest_json/of14.json diff --git a/tests/unit/app/ofctl_rest_json/of15.json b/ryu/tests/unit/app/ofctl_rest_json/of15.json similarity index 100% rename from tests/unit/app/ofctl_rest_json/of15.json rename to ryu/tests/unit/app/ofctl_rest_json/of15.json diff --git a/tests/unit/app/test_ofctl_rest.py b/ryu/tests/unit/app/test_ofctl_rest.py similarity index 99% rename from tests/unit/app/test_ofctl_rest.py rename to ryu/tests/unit/app/test_ofctl_rest.py index 5ed70ec4..5b7a5be7 100644 --- a/tests/unit/app/test_ofctl_rest.py +++ b/ryu/tests/unit/app/test_ofctl_rest.py @@ -37,8 +37,7 @@ from ryu.ofproto import ofproto_v1_2 from ryu.ofproto import ofproto_v1_3 from ryu.ofproto import ofproto_v1_4 from ryu.ofproto import ofproto_v1_5 - -from tests import test_lib +from ryu.tests import test_lib LOG = logging.getLogger(__name__) diff --git a/tests/unit/app/test_tester.py b/ryu/tests/unit/app/test_tester.py similarity index 99% rename from tests/unit/app/test_tester.py rename to ryu/tests/unit/app/test_tester.py index 64657f9e..3bba9867 100644 --- a/tests/unit/app/test_tester.py +++ b/ryu/tests/unit/app/test_tester.py @@ -411,7 +411,7 @@ class Test_tester(unittest.TestCase): def test__normalize_test_json(self): self.tests = TestPatterns( - "../../ryu/tests/switch/of13/action/00_OUTPUT.json", + "../switch/of13/action/00_OUTPUT.json", logging.getLogger("test_tester")) self.tests[SAMPLE_DESC]._normalize_test_json(Test_tester.test_json_1) diff --git a/tests/unit/app/test_ws_topology.py b/ryu/tests/unit/app/test_ws_topology.py similarity index 100% rename from tests/unit/app/test_ws_topology.py rename to ryu/tests/unit/app/test_ws_topology.py diff --git a/tests/unit/app/test_wsgi.py b/ryu/tests/unit/app/test_wsgi.py similarity index 100% rename from tests/unit/app/test_wsgi.py rename to ryu/tests/unit/app/test_wsgi.py diff --git a/tests/unit/cmd/__init__.py b/ryu/tests/unit/cmd/__init__.py similarity index 100% rename from tests/unit/cmd/__init__.py rename to ryu/tests/unit/cmd/__init__.py diff --git a/tests/unit/cmd/dummy_app.py b/ryu/tests/unit/cmd/dummy_app.py similarity index 100% rename from tests/unit/cmd/dummy_app.py rename to ryu/tests/unit/cmd/dummy_app.py diff --git a/tests/unit/cmd/dummy_openflow_app.py b/ryu/tests/unit/cmd/dummy_openflow_app.py similarity index 100% rename from tests/unit/cmd/dummy_openflow_app.py rename to ryu/tests/unit/cmd/dummy_openflow_app.py diff --git a/tests/unit/cmd/test_manager.py b/ryu/tests/unit/cmd/test_manager.py similarity index 93% rename from tests/unit/cmd/test_manager.py rename to ryu/tests/unit/cmd/test_manager.py index 5127fa52..0f8fb624 100644 --- a/tests/unit/cmd/test_manager.py +++ b/ryu/tests/unit/cmd/test_manager.py @@ -63,14 +63,14 @@ class Test_Manager(unittest.TestCase): reload(ryu.ofproto.ofproto_protocol) @mock.patch('sys.argv', new=['ryu-manager', '--verbose', - 'tests.unit.cmd.dummy_app']) + 'ryu.tests.unit.cmd.dummy_app']) def test_no_services(self): self._reset_globals() main() self._reset_globals() @mock.patch('sys.argv', new=['ryu-manager', '--verbose', - 'tests.unit.cmd.dummy_openflow_app']) + 'ryu.tests.unit.cmd.dummy_openflow_app']) def test_openflow_app(self): self._reset_globals() main() diff --git a/tests/unit/app/__init__.py b/ryu/tests/unit/controller/__init__.py similarity index 100% rename from tests/unit/app/__init__.py rename to ryu/tests/unit/controller/__init__.py diff --git a/tests/unit/controller/test_controller.py b/ryu/tests/unit/controller/test_controller.py similarity index 100% rename from tests/unit/controller/test_controller.py rename to ryu/tests/unit/controller/test_controller.py diff --git a/tests/unit/controller/__init__.py b/ryu/tests/unit/lib/__init__.py similarity index 100% rename from tests/unit/controller/__init__.py rename to ryu/tests/unit/lib/__init__.py diff --git a/tests/unit/lib/ofctl_json/of10/1-2-ofp_flow_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of10/1-2-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of10/1-2-ofp_flow_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of10/1-2-ofp_flow_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-0-ofp_desc_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-0-ofp_desc_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-0-ofp_desc_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-0-ofp_desc_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-11-ofp_flow_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-11-ofp_flow_stats_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-11-ofp_flow_stats_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-11-ofp_flow_stats_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-16-ofp_experimenter.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-16-ofp_experimenter.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-16-ofp_experimenter.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-16-ofp_experimenter.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-2-ofp_flow_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-2-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-2-ofp_flow_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-2-ofp_flow_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-21-ofp_group_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-21-ofp_group_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-21-ofp_group_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-21-ofp_group_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-22-ofp_port_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-22-ofp_port_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-22-ofp_port_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-22-ofp_port_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-25-ofp_aggregate_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-25-ofp_aggregate_stats_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-25-ofp_aggregate_stats_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-25-ofp_aggregate_stats_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-26-ofp_aggregate_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-26-ofp_aggregate_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-26-ofp_aggregate_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-26-ofp_aggregate_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-30-ofp_port_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-30-ofp_port_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-30-ofp_port_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-30-ofp_port_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-32-ofp_group_features_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-32-ofp_group_features_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-32-ofp_group_features_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-32-ofp_group_features_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-34-ofp_group_desc_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-34-ofp_group_desc_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-34-ofp_group_desc_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-34-ofp_group_desc_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-35-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-35-ofp_queue_get_config_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-35-ofp_queue_get_config_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-35-ofp_queue_get_config_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-36-ofp_queue_get_config_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-36-ofp_queue_get_config_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-36-ofp_queue_get_config_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-36-ofp_queue_get_config_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-38-ofp_queue_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-38-ofp_queue_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-38-ofp_queue_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-38-ofp_queue_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-6-ofp_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-6-ofp_features_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-6-ofp_features_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-6-ofp_features_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/3-62-ofp_group_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-62-ofp_group_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/3-62-ofp_group_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/3-62-ofp_group_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_group_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_group_stats_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_group_stats_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_group_stats_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_port_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_port_stats_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_port_stats_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_port_stats_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json rename to ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json diff --git a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json rename to ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json diff --git a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json similarity index 100% rename from tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json rename to ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json diff --git a/tests/unit/lib/ofctl_json/of13/4-0-ofp_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-0-ofp_desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-0-ofp_desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-0-ofp_desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-11-ofp_flow_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-11-ofp_flow_stats_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-11-ofp_flow_stats_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-11-ofp_flow_stats_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-16-ofp_experimenter.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-16-ofp_experimenter.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-16-ofp_experimenter.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-16-ofp_experimenter.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-2-ofp_flow_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-2-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-2-ofp_flow_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-2-ofp_flow_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-21-ofp_group_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-21-ofp_group_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-21-ofp_group_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-21-ofp_group_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-22-ofp_port_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-22-ofp_port_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-22-ofp_port_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-22-ofp_port_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-25-ofp_aggregate_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-25-ofp_aggregate_stats_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-25-ofp_aggregate_stats_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-25-ofp_aggregate_stats_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-26-ofp_aggregate_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-26-ofp_aggregate_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-26-ofp_aggregate_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-26-ofp_aggregate_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-28-ofp_table_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-28-ofp_table_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-28-ofp_table_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-28-ofp_table_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-30-ofp_port_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-30-ofp_port_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-30-ofp_port_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-30-ofp_port_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-32-ofp_group_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-32-ofp_group_features_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-32-ofp_group_features_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-32-ofp_group_features_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-34-ofp_group_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-34-ofp_group_desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-34-ofp_group_desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-34-ofp_group_desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-35-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-35-ofp_queue_get_config_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-35-ofp_queue_get_config_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-35-ofp_queue_get_config_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-36-ofp_queue_get_config_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-36-ofp_queue_get_config_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-36-ofp_queue_get_config_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-36-ofp_queue_get_config_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-38-ofp_queue_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-38-ofp_queue_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-38-ofp_queue_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-38-ofp_queue_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-45-ofp_meter_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-45-ofp_meter_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-45-ofp_meter_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-45-ofp_meter_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-48-ofp_meter_config_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-48-ofp_meter_config_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-48-ofp_meter_config_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-48-ofp_meter_config_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-50-ofp_meter_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-50-ofp_meter_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-50-ofp_meter_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-50-ofp_meter_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-52-ofp_meter_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-52-ofp_meter_features_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-52-ofp_meter_features_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-52-ofp_meter_features_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-54-ofp_port_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-54-ofp_port_desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-54-ofp_port_desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-54-ofp_port_desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-56-ofp_table_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-56-ofp_table_features_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-56-ofp_table_features_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-56-ofp_table_features_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/4-58-ofp_group_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-58-ofp_group_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/4-58-ofp_group_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/4-58-ofp_group_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_group_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_group_stats_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_group_stats_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_group_stats_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_config_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_config_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_config_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_config_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_stats_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_stats_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_stats_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_port_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_port_stats_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_port_stats_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_port_stats_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json rename to ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json rename to ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json similarity index 100% rename from tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json rename to ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json diff --git a/tests/unit/lib/ofctl_json/of14/5-0-ofp_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-0-ofp_desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-0-ofp_desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-0-ofp_desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-11-ofp_flow_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-11-ofp_flow_stats_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-11-ofp_flow_stats_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-11-ofp_flow_stats_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-12-ofp_flow_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-12-ofp_flow_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-12-ofp_flow_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-16-ofp_experimenter.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-16-ofp_experimenter.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-16-ofp_experimenter.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-16-ofp_experimenter.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-2-ofp_flow_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-2-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-2-ofp_flow_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-2-ofp_flow_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-21-ofp_group_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-21-ofp_group_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-21-ofp_group_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-21-ofp_group_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-22-ofp_port_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-22-ofp_port_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-22-ofp_port_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-22-ofp_port_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-25-ofp_aggregate_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-25-ofp_aggregate_stats_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-25-ofp_aggregate_stats_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-25-ofp_aggregate_stats_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-26-ofp_aggregate_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-26-ofp_aggregate_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-26-ofp_aggregate_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-26-ofp_aggregate_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-28-ofp_table_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-28-ofp_table_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-28-ofp_table_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-28-ofp_table_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-30-ofp_port_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-30-ofp_port_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-30-ofp_port_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-30-ofp_port_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-32-ofp_group_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-32-ofp_group_features_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-32-ofp_group_features_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-32-ofp_group_features_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-34-ofp_group_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-34-ofp_group_desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-34-ofp_group_desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-34-ofp_group_desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-36-ofp_queue_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-36-ofp_queue_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-36-ofp_queue_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-36-ofp_queue_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-43-ofp_meter_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-43-ofp_meter_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-43-ofp_meter_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-43-ofp_meter_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-46-ofp_meter_config_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-46-ofp_meter_config_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-46-ofp_meter_config_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-46-ofp_meter_config_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-48-ofp_meter_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-48-ofp_meter_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-48-ofp_meter_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-48-ofp_meter_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-50-ofp_meter_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-50-ofp_meter_features_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-50-ofp_meter_features_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-50-ofp_meter_features_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-52-ofp_port_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-52-ofp_port_desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-52-ofp_port_desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-52-ofp_port_desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-54-ofp_table_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-54-ofp_table_features_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-54-ofp_table_features_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-54-ofp_table_features_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-56-ofp_group_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-56-ofp_group_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-56-ofp_group_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-56-ofp_group_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-63-ofp_queue_desc_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-63-ofp_queue_desc_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-63-ofp_queue_desc_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-63-ofp_queue_desc_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of14/5-64-ofp_queue_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-64-ofp_queue_desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of14/5-64-ofp_queue_desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of14/5-64-ofp_queue_desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-experimenter.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-experimenter.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-experimenter.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-experimenter.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_features_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_features_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_features_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_features_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_features_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_features_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_mod.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_mod.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_mod.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_request.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_request.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_request.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_stats_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_features_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_features_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_features_reply.packet.json diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_stats_reply.packet.json similarity index 100% rename from tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_stats_reply.packet.json rename to ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_stats_reply.packet.json diff --git a/tests/unit/lib/__init__.py b/ryu/tests/unit/lib/ovs/__init__.py similarity index 100% rename from tests/unit/lib/__init__.py rename to ryu/tests/unit/lib/ovs/__init__.py diff --git a/tests/unit/lib/ovs/test_vsctl.py b/ryu/tests/unit/lib/ovs/test_vsctl.py similarity index 100% rename from tests/unit/lib/ovs/test_vsctl.py rename to ryu/tests/unit/lib/ovs/test_vsctl.py diff --git a/tests/unit/lib/test_addrconv.py b/ryu/tests/unit/lib/test_addrconv.py similarity index 100% rename from tests/unit/lib/test_addrconv.py rename to ryu/tests/unit/lib/test_addrconv.py diff --git a/tests/unit/lib/test_hub.py b/ryu/tests/unit/lib/test_hub.py similarity index 100% rename from tests/unit/lib/test_hub.py rename to ryu/tests/unit/lib/test_hub.py diff --git a/tests/unit/lib/test_import_module.py b/ryu/tests/unit/lib/test_import_module.py similarity index 86% rename from tests/unit/lib/test_import_module.py rename to ryu/tests/unit/lib/test_import_module.py index 852ee21b..b8561d20 100644 --- a/tests/unit/lib/test_import_module.py +++ b/ryu/tests/unit/lib/test_import_module.py @@ -34,9 +34,9 @@ class Test_import_module(unittest.TestCase): return mod def test_import_module_with_same_basename(self): - aaa = import_module('tests.unit.lib.test_mod.aaa.mod') + aaa = import_module('ryu.tests.unit.lib.test_mod.aaa.mod') eq_("this is aaa", aaa.name) - bbb = import_module('tests.unit.lib.test_mod.bbb.mod') + bbb = import_module('ryu.tests.unit.lib.test_mod.bbb.mod') eq_("this is bbb", bbb.name) def test_import_module_by_filename(self): @@ -48,7 +48,7 @@ class Test_import_module(unittest.TestCase): eq_("this is ddd", ddd.name) def test_import_same_module1(self): - from tests.unit.lib.test_mod import eee as eee1 + from ryu.tests.unit.lib.test_mod import eee as eee1 eq_("this is eee", eee1.name) eee2 = import_module('./lib/test_mod/eee.py') eq_("this is eee", eee2.name) @@ -56,11 +56,11 @@ class Test_import_module(unittest.TestCase): def test_import_same_module2(self): fff1 = import_module('./lib/test_mod/fff.py') eq_("this is fff", fff1.name) - fff2 = import_module('tests.unit.lib.test_mod.fff') + fff2 = import_module('ryu.tests.unit.lib.test_mod.fff') eq_("this is fff", fff2.name) def test_import_same_module3(self): ggg1 = import_module('./lib/test_mod/ggg.py') eq_("this is ggg", ggg1.name) - ggg2 = self._my_import('tests.unit.lib.test_mod.ggg') + ggg2 = self._my_import('ryu.tests.unit.lib.test_mod.ggg') eq_("this is ggg", ggg2.name) diff --git a/tests/unit/lib/test_ip.py b/ryu/tests/unit/lib/test_ip.py similarity index 100% rename from tests/unit/lib/test_ip.py rename to ryu/tests/unit/lib/test_ip.py diff --git a/tests/unit/lib/test_mac.py b/ryu/tests/unit/lib/test_mac.py similarity index 100% rename from tests/unit/lib/test_mac.py rename to ryu/tests/unit/lib/test_mac.py diff --git a/tests/unit/lib/test_mod/__init__.py b/ryu/tests/unit/lib/test_mod/__init__.py similarity index 100% rename from tests/unit/lib/test_mod/__init__.py rename to ryu/tests/unit/lib/test_mod/__init__.py diff --git a/tests/unit/lib/test_mod/aaa/__init__.py b/ryu/tests/unit/lib/test_mod/aaa/__init__.py similarity index 100% rename from tests/unit/lib/test_mod/aaa/__init__.py rename to ryu/tests/unit/lib/test_mod/aaa/__init__.py diff --git a/tests/unit/lib/test_mod/aaa/mod.py b/ryu/tests/unit/lib/test_mod/aaa/mod.py similarity index 100% rename from tests/unit/lib/test_mod/aaa/mod.py rename to ryu/tests/unit/lib/test_mod/aaa/mod.py diff --git a/tests/unit/lib/test_mod/bbb/__init__.py b/ryu/tests/unit/lib/test_mod/bbb/__init__.py similarity index 100% rename from tests/unit/lib/test_mod/bbb/__init__.py rename to ryu/tests/unit/lib/test_mod/bbb/__init__.py diff --git a/tests/unit/lib/test_mod/bbb/mod.py b/ryu/tests/unit/lib/test_mod/bbb/mod.py similarity index 100% rename from tests/unit/lib/test_mod/bbb/mod.py rename to ryu/tests/unit/lib/test_mod/bbb/mod.py diff --git a/tests/unit/lib/test_mod/ccc/__init__.py b/ryu/tests/unit/lib/test_mod/ccc/__init__.py similarity index 100% rename from tests/unit/lib/test_mod/ccc/__init__.py rename to ryu/tests/unit/lib/test_mod/ccc/__init__.py diff --git a/tests/unit/lib/test_mod/ccc/mod.py b/ryu/tests/unit/lib/test_mod/ccc/mod.py similarity index 100% rename from tests/unit/lib/test_mod/ccc/mod.py rename to ryu/tests/unit/lib/test_mod/ccc/mod.py diff --git a/tests/unit/lib/test_mod/ddd/__init__.py b/ryu/tests/unit/lib/test_mod/ddd/__init__.py similarity index 100% rename from tests/unit/lib/test_mod/ddd/__init__.py rename to ryu/tests/unit/lib/test_mod/ddd/__init__.py diff --git a/tests/unit/lib/test_mod/ddd/mod.py b/ryu/tests/unit/lib/test_mod/ddd/mod.py similarity index 100% rename from tests/unit/lib/test_mod/ddd/mod.py rename to ryu/tests/unit/lib/test_mod/ddd/mod.py diff --git a/tests/unit/lib/test_mod/eee.py b/ryu/tests/unit/lib/test_mod/eee.py similarity index 100% rename from tests/unit/lib/test_mod/eee.py rename to ryu/tests/unit/lib/test_mod/eee.py diff --git a/tests/unit/lib/test_mod/fff.py b/ryu/tests/unit/lib/test_mod/fff.py similarity index 100% rename from tests/unit/lib/test_mod/fff.py rename to ryu/tests/unit/lib/test_mod/fff.py diff --git a/tests/unit/lib/test_mod/ggg.py b/ryu/tests/unit/lib/test_mod/ggg.py similarity index 100% rename from tests/unit/lib/test_mod/ggg.py rename to ryu/tests/unit/lib/test_mod/ggg.py diff --git a/tests/unit/lib/test_mrtlib.py b/ryu/tests/unit/lib/test_mrtlib.py similarity index 100% rename from tests/unit/lib/test_mrtlib.py rename to ryu/tests/unit/lib/test_mrtlib.py diff --git a/tests/unit/lib/test_of_config_classes.py b/ryu/tests/unit/lib/test_of_config_classes.py similarity index 100% rename from tests/unit/lib/test_of_config_classes.py rename to ryu/tests/unit/lib/test_of_config_classes.py diff --git a/tests/unit/lib/test_ofctl.py b/ryu/tests/unit/lib/test_ofctl.py similarity index 99% rename from tests/unit/lib/test_ofctl.py rename to ryu/tests/unit/lib/test_ofctl.py index 57fa8355..862ce1d3 100644 --- a/tests/unit/lib/test_ofctl.py +++ b/ryu/tests/unit/lib/test_ofctl.py @@ -28,8 +28,7 @@ from ryu.lib import ofctl_v1_4 from ryu.lib import ofctl_v1_5 from ryu.ofproto import ofproto_parser from ryu.ofproto.ofproto_protocol import ProtocolDesc - -from tests import test_lib +from ryu.tests import test_lib LOG = logging.getLogger(__name__) diff --git a/tests/unit/lib/test_ofctl_action_match.py b/ryu/tests/unit/lib/test_ofctl_action_match.py similarity index 99% rename from tests/unit/lib/test_ofctl_action_match.py rename to ryu/tests/unit/lib/test_ofctl_action_match.py index 2b8707cf..11e27f78 100644 --- a/tests/unit/lib/test_ofctl_action_match.py +++ b/ryu/tests/unit/lib/test_ofctl_action_match.py @@ -32,8 +32,7 @@ from ryu.lib import ofctl_v1_3 from ryu.ofproto import ofproto_v1_3, ofproto_v1_3_parser from ryu.ofproto import ofproto_protocol from ryu.ofproto import inet - -from tests import test_lib +from ryu.tests import test_lib LOG = logging.getLogger('test_ofctl_v1_2, v1_3') diff --git a/tests/unit/lib/test_ofctl_string.py b/ryu/tests/unit/lib/test_ofctl_string.py similarity index 100% rename from tests/unit/lib/test_ofctl_string.py rename to ryu/tests/unit/lib/test_ofctl_string.py diff --git a/tests/unit/lib/test_ofctl_utils.py b/ryu/tests/unit/lib/test_ofctl_utils.py similarity index 100% rename from tests/unit/lib/test_ofctl_utils.py rename to ryu/tests/unit/lib/test_ofctl_utils.py diff --git a/tests/unit/lib/test_ofctl_v1_3.py b/ryu/tests/unit/lib/test_ofctl_v1_3.py similarity index 100% rename from tests/unit/lib/test_ofctl_v1_3.py rename to ryu/tests/unit/lib/test_ofctl_v1_3.py diff --git a/tests/unit/lib/test_ofp_pktinfilter.py b/ryu/tests/unit/lib/test_ofp_pktinfilter.py similarity index 100% rename from tests/unit/lib/test_ofp_pktinfilter.py rename to ryu/tests/unit/lib/test_ofp_pktinfilter.py diff --git a/tests/unit/lib/test_pack_utils.py b/ryu/tests/unit/lib/test_pack_utils.py similarity index 100% rename from tests/unit/lib/test_pack_utils.py rename to ryu/tests/unit/lib/test_pack_utils.py diff --git a/tests/unit/lib/test_pcaplib.py b/ryu/tests/unit/lib/test_pcaplib.py similarity index 100% rename from tests/unit/lib/test_pcaplib.py rename to ryu/tests/unit/lib/test_pcaplib.py diff --git a/tests/unit/lib/test_rpc.py b/ryu/tests/unit/lib/test_rpc.py similarity index 100% rename from tests/unit/lib/test_rpc.py rename to ryu/tests/unit/lib/test_rpc.py diff --git a/tests/unit/lib/test_stringify.py b/ryu/tests/unit/lib/test_stringify.py similarity index 100% rename from tests/unit/lib/test_stringify.py rename to ryu/tests/unit/lib/test_stringify.py diff --git a/tests/unit/lib/ovs/__init__.py b/ryu/tests/unit/ofproto/__init__.py similarity index 100% rename from tests/unit/lib/ovs/__init__.py rename to ryu/tests/unit/ofproto/__init__.py diff --git a/tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json b/ryu/tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json similarity index 100% rename from tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json rename to ryu/tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json diff --git a/tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json similarity index 100% rename from tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json rename to ryu/tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json diff --git a/tests/unit/ofproto/json/of10/1-5-features_request.packet.json b/ryu/tests/unit/ofproto/json/of10/1-5-features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of10/1-5-features_request.packet.json rename to ryu/tests/unit/ofproto/json/of10/1-5-features_request.packet.json diff --git a/tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json b/ryu/tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json similarity index 100% rename from tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json rename to ryu/tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json diff --git a/tests/unit/ofproto/json/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet.json b/ryu/tests/unit/ofproto/json/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet.json similarity index 100% rename from tests/unit/ofproto/json/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet.json rename to ryu/tests/unit/ofproto/json/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet.json diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet.json similarity index 100% rename from tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet.json rename to ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet.json diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet.json similarity index 100% rename from tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet.json rename to ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet.json diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_pop_mpls.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_pop_mpls.packet.json similarity index 100% rename from tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_pop_mpls.packet.json rename to ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_pop_mpls.packet.json diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_push_mpls.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_push_mpls.packet.json similarity index 100% rename from tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_push_mpls.packet.json rename to ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_push_mpls.packet.json diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_label.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_label.packet.json similarity index 100% rename from tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_label.packet.json rename to ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_label.packet.json diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_tc.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_tc.packet.json similarity index 100% rename from tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_tc.packet.json rename to ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_tc.packet.json diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet.json similarity index 100% rename from tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet.json rename to ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet.json diff --git a/tests/unit/ofproto/json/of12/3-0-ofp_desc_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-0-ofp_desc_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-0-ofp_desc_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-0-ofp_desc_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json b/ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json diff --git a/tests/unit/ofproto/json/of12/3-10-ofp_hello.packet.json b/ryu/tests/unit/ofproto/json/of12/3-10-ofp_hello.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-10-ofp_hello.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-10-ofp_hello.packet.json diff --git a/tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-13-ofp_echo_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-13-ofp_echo_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-13-ofp_echo_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-13-ofp_echo_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-14-ofp_echo_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-14-ofp_echo_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-14-ofp_echo_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-14-ofp_echo_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-15-ofp_error_msg.packet.json b/ryu/tests/unit/ofproto/json/of12/3-15-ofp_error_msg.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-15-ofp_error_msg.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-15-ofp_error_msg.packet.json diff --git a/tests/unit/ofproto/json/of12/3-16-ofp_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of12/3-16-ofp_experimenter.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-16-ofp_experimenter.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-16-ofp_experimenter.packet.json diff --git a/tests/unit/ofproto/json/of12/3-17-ofp_barrier_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-17-ofp_barrier_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-17-ofp_barrier_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-17-ofp_barrier_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-18-ofp_barrier_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-18-ofp_barrier_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-18-ofp_barrier_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-18-ofp_barrier_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-19-ofp_role_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-19-ofp_role_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-19-ofp_role_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-19-ofp_role_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of12/3-20-ofp_role_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-20-ofp_role_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-20-ofp_role_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-20-ofp_role_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json diff --git a/tests/unit/ofproto/json/of12/3-22-ofp_port_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-22-ofp_port_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-22-ofp_port_mod.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-22-ofp_port_mod.packet.json diff --git a/tests/unit/ofproto/json/of12/3-23-ofp_table_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-23-ofp_table_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-23-ofp_table_mod.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-23-ofp_table_mod.packet.json diff --git a/tests/unit/ofproto/json/of12/3-24-ofp_desc_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-24-ofp_desc_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-24-ofp_desc_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-24-ofp_desc_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-26-ofp_aggregate_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-26-ofp_aggregate_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-26-ofp_aggregate_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-26-ofp_aggregate_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-27-ofp_table_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-27-ofp_table_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-27-ofp_table_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-27-ofp_table_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-28-ofp_table_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-28-ofp_table_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-28-ofp_table_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-28-ofp_table_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-29-ofp_port_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-29-ofp_port_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-29-ofp_port_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-29-ofp_port_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of12/3-30-ofp_port_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-30-ofp_port_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-30-ofp_port_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-30-ofp_port_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-31-ofp_group_features_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-31-ofp_group_features_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-31-ofp_group_features_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-31-ofp_group_features_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-32-ofp_group_features_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-32-ofp_group_features_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-32-ofp_group_features_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-32-ofp_group_features_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-33-ofp_group_desc_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-33-ofp_group_desc_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-33-ofp_group_desc_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-33-ofp_group_desc_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-35-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-35-ofp_queue_get_config_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-35-ofp_queue_get_config_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-35-ofp_queue_get_config_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-37-ofp_queue_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-37-ofp_queue_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-37-ofp_queue_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-37-ofp_queue_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-38-ofp_queue_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-38-ofp_queue_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-38-ofp_queue_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-38-ofp_queue_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-39-ofp_port_status.packet.json b/ryu/tests/unit/ofproto/json/of12/3-39-ofp_port_status.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-39-ofp_port_status.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-39-ofp_port_status.packet.json diff --git a/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json diff --git a/tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json b/ryu/tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json diff --git a/tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json diff --git a/tests/unit/ofproto/json/of12/3-5-ofp_features_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-5-ofp_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-5-ofp_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-5-ofp_features_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-59-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of12/3-59-ofp_packet_in.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-59-ofp_packet_in.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-59-ofp_packet_in.packet.json diff --git a/tests/unit/ofproto/json/of12/3-6-ofp_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-6-ofp_features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-6-ofp_features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-6-ofp_features_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-60-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-60-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-60-ofp_flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-60-ofp_flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of12/3-61-ofp_group_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-61-ofp_group_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-61-ofp_group_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-61-ofp_group_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-62-ofp_group_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-62-ofp_group_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-62-ofp_group_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-62-ofp_group_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/3-7-ofp_set_config.packet.json b/ryu/tests/unit/ofproto/json/of12/3-7-ofp_set_config.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-7-ofp_set_config.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-7-ofp_set_config.packet.json diff --git a/tests/unit/ofproto/json/of12/3-8-ofp_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-8-ofp_get_config_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-8-ofp_get_config_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-8-ofp_get_config_request.packet.json diff --git a/tests/unit/ofproto/json/of12/3-9-ofp_get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-9-ofp_get_config_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/3-9-ofp_get_config_reply.packet.json rename to ryu/tests/unit/ofproto/json/of12/3-9-ofp_get_config_reply.packet.json diff --git a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_group_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_group_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/lib-ofctl-ofp_group_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_group_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_port_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_port_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/lib-ofctl-ofp_port_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_port_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json rename to ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json diff --git a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json similarity index 100% rename from tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json rename to ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json diff --git a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json similarity index 100% rename from tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json rename to ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json diff --git a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json similarity index 100% rename from tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json rename to ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json diff --git a/tests/unit/ofproto/json/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet.json b/ryu/tests/unit/ofproto/json/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet.json similarity index 100% rename from tests/unit/ofproto/json/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet.json rename to ryu/tests/unit/ofproto/json/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet.json diff --git a/tests/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-1-ofp_packet_out.packet.json b/ryu/tests/unit/ofproto/json/of13/4-1-ofp_packet_out.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-1-ofp_packet_out.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-1-ofp_packet_out.packet.json diff --git a/tests/unit/ofproto/json/of13/4-10-ofp_hello.packet.json b/ryu/tests/unit/ofproto/json/of13/4-10-ofp_hello.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-10-ofp_hello.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-10-ofp_hello.packet.json diff --git a/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-13-ofp_echo_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-13-ofp_echo_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-13-ofp_echo_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-13-ofp_echo_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-14-ofp_echo_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-14-ofp_echo_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-14-ofp_echo_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-14-ofp_echo_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-15-ofp_error_msg.packet.json b/ryu/tests/unit/ofproto/json/of13/4-15-ofp_error_msg.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-15-ofp_error_msg.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-15-ofp_error_msg.packet.json diff --git a/tests/unit/ofproto/json/of13/4-16-ofp_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of13/4-16-ofp_experimenter.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-16-ofp_experimenter.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-16-ofp_experimenter.packet.json diff --git a/tests/unit/ofproto/json/of13/4-17-ofp_barrier_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-17-ofp_barrier_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-17-ofp_barrier_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-17-ofp_barrier_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-18-ofp_barrier_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-18-ofp_barrier_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-18-ofp_barrier_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-18-ofp_barrier_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-19-ofp_role_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-19-ofp_role_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-19-ofp_role_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-19-ofp_role_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of13/4-20-ofp_role_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-20-ofp_role_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-20-ofp_role_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-20-ofp_role_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-21-ofp_group_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-21-ofp_group_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-21-ofp_group_mod.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-21-ofp_group_mod.packet.json diff --git a/tests/unit/ofproto/json/of13/4-22-ofp_port_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-22-ofp_port_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-22-ofp_port_mod.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-22-ofp_port_mod.packet.json diff --git a/tests/unit/ofproto/json/of13/4-23-ofp_table_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-23-ofp_table_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-23-ofp_table_mod.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-23-ofp_table_mod.packet.json diff --git a/tests/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-35-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-35-ofp_queue_get_config_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-35-ofp_queue_get_config_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-35-ofp_queue_get_config_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-36-ofp_queue_get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-36-ofp_queue_get_config_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-36-ofp_queue_get_config_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-36-ofp_queue_get_config_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-39-ofp_port_status.packet.json b/ryu/tests/unit/ofproto/json/of13/4-39-ofp_port_status.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-39-ofp_port_status.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-39-ofp_port_status.packet.json diff --git a/tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json diff --git a/tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json b/ryu/tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json diff --git a/tests/unit/ofproto/json/of13/4-41-ofp_error_msg_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of13/4-41-ofp_error_msg_experimenter.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-41-ofp_error_msg_experimenter.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-41-ofp_error_msg_experimenter.packet.json diff --git a/tests/unit/ofproto/json/of13/4-42-ofp_get_async_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-42-ofp_get_async_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-42-ofp_get_async_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-42-ofp_get_async_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-43-ofp_get_async_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-43-ofp_get_async_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-43-ofp_get_async_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-43-ofp_get_async_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-44-ofp_set_async.packet.json b/ryu/tests/unit/ofproto/json/of13/4-44-ofp_set_async.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-44-ofp_set_async.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-44-ofp_set_async.packet.json diff --git a/tests/unit/ofproto/json/of13/4-45-ofp_meter_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-45-ofp_meter_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-45-ofp_meter_mod.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-45-ofp_meter_mod.packet.json diff --git a/tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-5-ofp_features_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-5-ofp_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-5-ofp_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-5-ofp_features_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-55-ofp_table_features_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-55-ofp_table_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-55-ofp_table_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-55-ofp_table_features_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-57-ofp_group_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-57-ofp_group_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-57-ofp_group_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-57-ofp_group_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-58-ofp_group_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-58-ofp_group_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-58-ofp_group_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-58-ofp_group_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json diff --git a/tests/unit/ofproto/json/of13/4-6-ofp_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-6-ofp_features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-6-ofp_features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-6-ofp_features_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of13/4-61-ofp_experimenter_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-61-ofp_experimenter_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-61-ofp_experimenter_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-61-ofp_experimenter_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-62-ofp_experimenter_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-62-ofp_experimenter_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-62-ofp_experimenter_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-62-ofp_experimenter_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-7-ofp_set_config.packet.json b/ryu/tests/unit/ofproto/json/of13/4-7-ofp_set_config.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-7-ofp_set_config.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-7-ofp_set_config.packet.json diff --git a/tests/unit/ofproto/json/of13/4-8-ofp_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-8-ofp_get_config_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-8-ofp_get_config_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-8-ofp_get_config_request.packet.json diff --git a/tests/unit/ofproto/json/of13/4-9-ofp_get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-9-ofp_get_config_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/4-9-ofp_get_config_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/4-9-ofp_get_config_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_group_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_group_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/lib-ofctl-ofp_group_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_group_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_config_request.packet.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_config_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_config_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_config_request.packet.json diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_port_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_port_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/lib-ofctl-ofp_port_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_port_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json similarity index 100% rename from tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json rename to ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json similarity index 100% rename from tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json rename to ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json similarity index 100% rename from tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json rename to ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_table_features_request.packet.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_table_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/lib-ofctl-ofp_table_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_table_features_request.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-echo_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_request.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-echo_request.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_request.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-error_msg.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-error_msg.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-error_msg.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-error_msg.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-features_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-features_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.truncated64.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.truncated64.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.truncated64.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.truncated64.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_removed.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_removed.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-flow_removed.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_removed.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-get_config_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-get_config_reply.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-get_config_reply.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-hello.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-hello.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-hello.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-hello.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-meter_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-meter_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-meter_mod.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-meter_mod.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-packet_in.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-packet_in.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-packet_in.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-packet_in.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-port_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-port_mod.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_mod.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-port_status.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_status.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-port_status.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_status.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-set_config.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-set_config.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-set_config.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-set_config.packet.json diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-table_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-table_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/libofproto-OFP13-table_mod.packet.json rename to ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-table_mod.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_conjunction.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_conjunction.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_conjunction.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_conjunction.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller2.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller2.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller2.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller2.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat_v6.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat_v6.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat_v6.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat_v6.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_fintimeout.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_fintimeout.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_fintimeout.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_fintimeout.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_note.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_note.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_note.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_note.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_output_trunc.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_output_trunc.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_output_trunc.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_output_trunc.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_resubmit.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_resubmit.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_resubmit.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_resubmit.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample2.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample2.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample2.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample2.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_pop.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_pop.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_pop.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_pop.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_push.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_push.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_push.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_push.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_conj.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_conj.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_conj.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_conj.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_load_nx_register.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_load_nx_register.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_load_nx_register.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_load_nx_register.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_move_nx_register.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_move_nx_register.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_move_nx_register.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_move_nx_register.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark.packet.json diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet.json similarity index 100% rename from tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet.json rename to ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet.json diff --git a/tests/unit/ofproto/json/of14/5-0-ofp_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-0-ofp_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-0-ofp_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-0-ofp_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-1-ofp_packet_out.packet.json b/ryu/tests/unit/ofproto/json/of14/5-1-ofp_packet_out.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-1-ofp_packet_out.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-1-ofp_packet_out.packet.json diff --git a/tests/unit/ofproto/json/of14/5-10-ofp_hello.packet.json b/ryu/tests/unit/ofproto/json/of14/5-10-ofp_hello.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-10-ofp_hello.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-10-ofp_hello.packet.json diff --git a/tests/unit/ofproto/json/of14/5-11-ofp_flow_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-11-ofp_flow_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-11-ofp_flow_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-11-ofp_flow_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-13-ofp_echo_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-13-ofp_echo_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-13-ofp_echo_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-13-ofp_echo_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-14-ofp_echo_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-14-ofp_echo_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-14-ofp_echo_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-14-ofp_echo_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-15-ofp_error_msg.packet.json b/ryu/tests/unit/ofproto/json/of14/5-15-ofp_error_msg.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-15-ofp_error_msg.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-15-ofp_error_msg.packet.json diff --git a/tests/unit/ofproto/json/of14/5-16-ofp_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of14/5-16-ofp_experimenter.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-16-ofp_experimenter.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-16-ofp_experimenter.packet.json diff --git a/tests/unit/ofproto/json/of14/5-17-ofp_barrier_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-17-ofp_barrier_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-17-ofp_barrier_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-17-ofp_barrier_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-18-ofp_barrier_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-18-ofp_barrier_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-18-ofp_barrier_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-18-ofp_barrier_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-19-ofp_role_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-19-ofp_role_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-19-ofp_role_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-19-ofp_role_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of14/5-20-ofp_role_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-20-ofp_role_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-20-ofp_role_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-20-ofp_role_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-21-ofp_group_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-21-ofp_group_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-21-ofp_group_mod.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-21-ofp_group_mod.packet.json diff --git a/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json diff --git a/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json diff --git a/tests/unit/ofproto/json/of14/5-24-ofp_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-24-ofp_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-24-ofp_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-24-ofp_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-25-ofp_aggregate_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-25-ofp_aggregate_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-25-ofp_aggregate_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-25-ofp_aggregate_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-26-ofp_aggregate_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-26-ofp_aggregate_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-26-ofp_aggregate_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-26-ofp_aggregate_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-27-ofp_table_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-27-ofp_table_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-27-ofp_table_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-27-ofp_table_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-28-ofp_table_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-28-ofp_table_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-28-ofp_table_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-28-ofp_table_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-29-ofp_port_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-29-ofp_port_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-29-ofp_port_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-29-ofp_port_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-3-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-3-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-3-ofp_flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-3-ofp_flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-31-ofp_group_features_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-31-ofp_group_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-31-ofp_group_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-31-ofp_group_features_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-32-ofp_group_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-32-ofp_group_features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-32-ofp_group_features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-32-ofp_group_features_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-33-ofp_group_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-33-ofp_group_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-33-ofp_group_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-33-ofp_group_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-34-ofp_group_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-34-ofp_group_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-34-ofp_group_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-34-ofp_group_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-35-ofp_queue_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-35-ofp_queue_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-35-ofp_queue_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-35-ofp_queue_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json b/ryu/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json diff --git a/tests/unit/ofproto/json/of14/5-38-ofp_flow_removed.packet.json b/ryu/tests/unit/ofproto/json/of14/5-38-ofp_flow_removed.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-38-ofp_flow_removed.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-38-ofp_flow_removed.packet.json diff --git a/tests/unit/ofproto/json/of14/5-39-ofp_error_msg_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of14/5-39-ofp_error_msg_experimenter.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-39-ofp_error_msg_experimenter.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-39-ofp_error_msg_experimenter.packet.json diff --git a/tests/unit/ofproto/json/of14/5-4-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of14/5-4-ofp_packet_in.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-4-ofp_packet_in.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-4-ofp_packet_in.packet.json diff --git a/tests/unit/ofproto/json/of14/5-40-ofp_get_async_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-40-ofp_get_async_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-40-ofp_get_async_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-40-ofp_get_async_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-41-ofp_get_async_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-41-ofp_get_async_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-41-ofp_get_async_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-41-ofp_get_async_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-42-ofp_set_async.packet.json b/ryu/tests/unit/ofproto/json/of14/5-42-ofp_set_async.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-42-ofp_set_async.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-42-ofp_set_async.packet.json diff --git a/tests/unit/ofproto/json/of14/5-43-ofp_meter_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-43-ofp_meter_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-43-ofp_meter_mod.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-43-ofp_meter_mod.packet.json diff --git a/tests/unit/ofproto/json/of14/5-44-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-44-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-44-ofp_flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-44-ofp_flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of14/5-45-ofp_meter_config_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-45-ofp_meter_config_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-45-ofp_meter_config_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-45-ofp_meter_config_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-46-ofp_meter_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-46-ofp_meter_config_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-46-ofp_meter_config_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-46-ofp_meter_config_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-47-ofp_meter_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-47-ofp_meter_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-47-ofp_meter_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-47-ofp_meter_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-48-ofp_meter_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-48-ofp_meter_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-48-ofp_meter_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-48-ofp_meter_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-49-ofp_meter_features_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-49-ofp_meter_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-49-ofp_meter_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-49-ofp_meter_features_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-5-ofp_features_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-5-ofp_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-5-ofp_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-5-ofp_features_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-51-ofp_port_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-51-ofp_port_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-51-ofp_port_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-51-ofp_port_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-55-ofp_group_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-55-ofp_group_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-55-ofp_group_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-55-ofp_group_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-56-ofp_group_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-56-ofp_group_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-56-ofp_group_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-56-ofp_group_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-57-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of14/5-57-ofp_packet_in.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-57-ofp_packet_in.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-57-ofp_packet_in.packet.json diff --git a/tests/unit/ofproto/json/of14/5-58-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-58-ofp_flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-58-ofp_flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-58-ofp_flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of14/5-59-ofp_experimenter_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-59-ofp_experimenter_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-59-ofp_experimenter_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-59-ofp_experimenter_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-6-ofp_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-6-ofp_features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-6-ofp_features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-6-ofp_features_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-60-ofp_experimenter_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-60-ofp_experimenter_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-60-ofp_experimenter_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-60-ofp_experimenter_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-61-ofp_table_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-61-ofp_table_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-61-ofp_table_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-61-ofp_table_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-63-ofp_queue_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-63-ofp_queue_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-63-ofp_queue_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-63-ofp_queue_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json b/ryu/tests/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json diff --git a/tests/unit/ofproto/json/of14/5-66-ofp_flow_monitor_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-66-ofp_flow_monitor_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-66-ofp_flow_monitor_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-66-ofp_flow_monitor_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/5-68-ofp_table_status.packet.json b/ryu/tests/unit/ofproto/json/of14/5-68-ofp_table_status.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-68-ofp_table_status.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-68-ofp_table_status.packet.json diff --git a/tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json b/ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json diff --git a/tests/unit/ofproto/json/of14/5-7-ofp_set_config.packet.json b/ryu/tests/unit/ofproto/json/of14/5-7-ofp_set_config.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-7-ofp_set_config.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-7-ofp_set_config.packet.json diff --git a/tests/unit/ofproto/json/of14/5-70-ofp_bundle_add_msg.packet.json b/ryu/tests/unit/ofproto/json/of14/5-70-ofp_bundle_add_msg.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-70-ofp_bundle_add_msg.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-70-ofp_bundle_add_msg.packet.json diff --git a/tests/unit/ofproto/json/of14/5-71-ofp_requestforward.packet.json b/ryu/tests/unit/ofproto/json/of14/5-71-ofp_requestforward.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-71-ofp_requestforward.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-71-ofp_requestforward.packet.json diff --git a/tests/unit/ofproto/json/of14/5-8-ofp_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-8-ofp_get_config_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-8-ofp_get_config_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-8-ofp_get_config_request.packet.json diff --git a/tests/unit/ofproto/json/of14/5-9-ofp_get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-9-ofp_get_config_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/5-9-ofp_get_config_reply.packet.json rename to ryu/tests/unit/ofproto/json/of14/5-9-ofp_get_config_reply.packet.json diff --git a/tests/unit/ofproto/json/of14/lib-ofctl-ofp_table_features_request.packet.json b/ryu/tests/unit/ofproto/json/of14/lib-ofctl-ofp_table_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/lib-ofctl-ofp_table_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of14/lib-ofctl-ofp_table_features_request.packet.json diff --git a/tests/unit/ofproto/json/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet.json b/ryu/tests/unit/ofproto/json/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet.json similarity index 100% rename from tests/unit/ofproto/json/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet.json rename to ryu/tests/unit/ofproto/json/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet.json diff --git a/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of15/lib-ofctl-ofp_queue_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-ofp_queue_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/lib-ofctl-ofp_queue_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/lib-ofctl-ofp_queue_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of15/lib-ofctl-ofp_table_features_request.packet.json b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-ofp_table_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/lib-ofctl-ofp_table_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/lib-ofctl-ofp_table_features_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_ctrl.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_ctrl.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_ctrl.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_ctrl.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-features_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-features_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-features_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-features_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-features_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_in.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_in.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-packet_in.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_in.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_out.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_out.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-packet_out.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_out.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-port_mod.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_mod.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_status.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_status.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-port_status.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_status.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-set_async.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-set_async.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-set_async.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-set_async.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-set_config.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-set_config.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-set_config.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-set_config.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_reply.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_reply.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_reply.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_request.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_request.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_request.packet.json diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_status.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_status.packet.json similarity index 100% rename from tests/unit/ofproto/json/of15/libofproto-OFP15-table_status.packet.json rename to ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_status.packet.json diff --git a/tests/unit/ofproto/test_ether.py b/ryu/tests/unit/ofproto/test_ether.py similarity index 100% rename from tests/unit/ofproto/test_ether.py rename to ryu/tests/unit/ofproto/test_ether.py diff --git a/tests/unit/ofproto/test_inet.py b/ryu/tests/unit/ofproto/test_inet.py similarity index 100% rename from tests/unit/ofproto/test_inet.py rename to ryu/tests/unit/ofproto/test_inet.py diff --git a/tests/unit/ofproto/test_nx_flow_spec.py b/ryu/tests/unit/ofproto/test_nx_flow_spec.py similarity index 100% rename from tests/unit/ofproto/test_nx_flow_spec.py rename to ryu/tests/unit/ofproto/test_nx_flow_spec.py diff --git a/tests/unit/ofproto/test_ofproto.py b/ryu/tests/unit/ofproto/test_ofproto.py similarity index 100% rename from tests/unit/ofproto/test_ofproto.py rename to ryu/tests/unit/ofproto/test_ofproto.py diff --git a/tests/unit/ofproto/test_ofproto_common.py b/ryu/tests/unit/ofproto/test_ofproto_common.py similarity index 100% rename from tests/unit/ofproto/test_ofproto_common.py rename to ryu/tests/unit/ofproto/test_ofproto_common.py diff --git a/tests/unit/ofproto/test_ofproto_parser.py b/ryu/tests/unit/ofproto/test_ofproto_parser.py similarity index 100% rename from tests/unit/ofproto/test_ofproto_parser.py rename to ryu/tests/unit/ofproto/test_ofproto_parser.py diff --git a/tests/unit/ofproto/test_ofproto_v12.py b/ryu/tests/unit/ofproto/test_ofproto_v12.py similarity index 100% rename from tests/unit/ofproto/test_ofproto_v12.py rename to ryu/tests/unit/ofproto/test_ofproto_v12.py diff --git a/tests/unit/ofproto/test_oxm.py b/ryu/tests/unit/ofproto/test_oxm.py similarity index 100% rename from tests/unit/ofproto/test_oxm.py rename to ryu/tests/unit/ofproto/test_oxm.py diff --git a/tests/unit/ofproto/test_oxs.py b/ryu/tests/unit/ofproto/test_oxs.py similarity index 100% rename from tests/unit/ofproto/test_oxs.py rename to ryu/tests/unit/ofproto/test_oxs.py diff --git a/tests/unit/ofproto/test_parser.py b/ryu/tests/unit/ofproto/test_parser.py similarity index 99% rename from tests/unit/ofproto/test_parser.py rename to ryu/tests/unit/ofproto/test_parser.py index 9e19fd8f..2f9061cc 100644 --- a/tests/unit/ofproto/test_parser.py +++ b/ryu/tests/unit/ofproto/test_parser.py @@ -16,14 +16,11 @@ from __future__ import print_function -import json +import six import sys import unittest - -import six from nose.tools import eq_ -from ryu import exception from ryu.ofproto import ofproto_parser from ryu.ofproto import ofproto_protocol from ryu.ofproto import ofproto_v1_0 @@ -31,8 +28,9 @@ from ryu.ofproto import ofproto_v1_2 from ryu.ofproto import ofproto_v1_3 from ryu.ofproto import ofproto_v1_4 from ryu.ofproto import ofproto_v1_5 - -from tests import test_lib +from ryu.tests import test_lib +from ryu import exception +import json # (has_parser, has_serializer) diff --git a/tests/unit/ofproto/test_parser_compat.py b/ryu/tests/unit/ofproto/test_parser_compat.py similarity index 98% rename from tests/unit/ofproto/test_parser_compat.py rename to ryu/tests/unit/ofproto/test_parser_compat.py index 8b98e27c..dcca56bd 100644 --- a/tests/unit/ofproto/test_parser_compat.py +++ b/ryu/tests/unit/ofproto/test_parser_compat.py @@ -16,19 +16,20 @@ from __future__ import print_function -from struct import unpack -import unittest - import six +import sys +import unittest from nose.tools import eq_ +from nose.tools import ok_ -from ryu.lib import addrconv from ryu.ofproto import ofproto_v1_2 from ryu.ofproto import ofproto_v1_3 from ryu.ofproto import ofproto_v1_2_parser from ryu.ofproto import ofproto_v1_3_parser -from tests import test_lib +from ryu.lib import addrconv +from ryu.tests import test_lib +from struct import unpack class Test_Parser_Compat(unittest.TestCase): diff --git a/tests/unit/ofproto/test_parser_ofpmatch.py b/ryu/tests/unit/ofproto/test_parser_ofpmatch.py similarity index 99% rename from tests/unit/ofproto/test_parser_ofpmatch.py rename to ryu/tests/unit/ofproto/test_parser_ofpmatch.py index 91da3d3d..d4dba9ea 100644 --- a/tests/unit/ofproto/test_parser_ofpmatch.py +++ b/ryu/tests/unit/ofproto/test_parser_ofpmatch.py @@ -23,9 +23,8 @@ except ImportError: # Python 2 pass -import unittest - import six +import unittest from nose.tools import eq_ from nose.tools import ok_ @@ -37,8 +36,7 @@ from ryu.ofproto import ofproto_v1_2_parser from ryu.ofproto import ofproto_v1_3_parser from ryu.ofproto import ofproto_v1_4_parser from ryu.ofproto import ofproto_v1_5_parser - -from tests import test_lib +from ryu.tests import test_lib class Test_Parser_OFPMatch(unittest.TestCase): diff --git a/tests/unit/ofproto/test_parser_ofpstats.py b/ryu/tests/unit/ofproto/test_parser_ofpstats.py similarity index 99% rename from tests/unit/ofproto/test_parser_ofpstats.py rename to ryu/tests/unit/ofproto/test_parser_ofpstats.py index 3f413a42..0ce428ab 100644 --- a/tests/unit/ofproto/test_parser_ofpstats.py +++ b/ryu/tests/unit/ofproto/test_parser_ofpstats.py @@ -20,16 +20,15 @@ except ImportError: # Python 2 pass -import unittest - import six +import sys +import unittest from nose.tools import eq_ from nose.tools import ok_ from ryu.ofproto import ofproto_v1_5 from ryu.ofproto import ofproto_v1_5_parser - -from tests import test_lib +from ryu.tests import test_lib class Test_Parser_OFPStats(unittest.TestCase): diff --git a/tests/unit/ofproto/test_parser_v10.py b/ryu/tests/unit/ofproto/test_parser_v10.py similarity index 100% rename from tests/unit/ofproto/test_parser_v10.py rename to ryu/tests/unit/ofproto/test_parser_v10.py diff --git a/tests/unit/ofproto/test_parser_v12.py b/ryu/tests/unit/ofproto/test_parser_v12.py similarity index 100% rename from tests/unit/ofproto/test_parser_v12.py rename to ryu/tests/unit/ofproto/test_parser_v12.py diff --git a/tests/unit/ofproto/test_parser_v13.py b/ryu/tests/unit/ofproto/test_parser_v13.py similarity index 100% rename from tests/unit/ofproto/test_parser_v13.py rename to ryu/tests/unit/ofproto/test_parser_v13.py diff --git a/tests/unit/ofproto/__init__.py b/ryu/tests/unit/packet/__init__.py similarity index 100% rename from tests/unit/ofproto/__init__.py rename to ryu/tests/unit/packet/__init__.py diff --git a/tests/unit/packet/test_arp.py b/ryu/tests/unit/packet/test_arp.py similarity index 100% rename from tests/unit/packet/test_arp.py rename to ryu/tests/unit/packet/test_arp.py diff --git a/tests/unit/packet/test_bfd.py b/ryu/tests/unit/packet/test_bfd.py similarity index 100% rename from tests/unit/packet/test_bfd.py rename to ryu/tests/unit/packet/test_bfd.py diff --git a/tests/unit/packet/test_bgp.py b/ryu/tests/unit/packet/test_bgp.py similarity index 100% rename from tests/unit/packet/test_bgp.py rename to ryu/tests/unit/packet/test_bgp.py diff --git a/tests/unit/packet/test_bmp.py b/ryu/tests/unit/packet/test_bmp.py similarity index 100% rename from tests/unit/packet/test_bmp.py rename to ryu/tests/unit/packet/test_bmp.py diff --git a/tests/unit/packet/test_bpdu.py b/ryu/tests/unit/packet/test_bpdu.py similarity index 100% rename from tests/unit/packet/test_bpdu.py rename to ryu/tests/unit/packet/test_bpdu.py diff --git a/tests/unit/packet/test_cfm.py b/ryu/tests/unit/packet/test_cfm.py similarity index 100% rename from tests/unit/packet/test_cfm.py rename to ryu/tests/unit/packet/test_cfm.py diff --git a/tests/unit/packet/test_dhcp.py b/ryu/tests/unit/packet/test_dhcp.py similarity index 100% rename from tests/unit/packet/test_dhcp.py rename to ryu/tests/unit/packet/test_dhcp.py diff --git a/tests/unit/packet/test_ethernet.py b/ryu/tests/unit/packet/test_ethernet.py similarity index 100% rename from tests/unit/packet/test_ethernet.py rename to ryu/tests/unit/packet/test_ethernet.py diff --git a/tests/unit/packet/test_geneve.py b/ryu/tests/unit/packet/test_geneve.py similarity index 100% rename from tests/unit/packet/test_geneve.py rename to ryu/tests/unit/packet/test_geneve.py diff --git a/tests/unit/packet/test_gre.py b/ryu/tests/unit/packet/test_gre.py similarity index 100% rename from tests/unit/packet/test_gre.py rename to ryu/tests/unit/packet/test_gre.py diff --git a/tests/unit/packet/test_icmp.py b/ryu/tests/unit/packet/test_icmp.py similarity index 100% rename from tests/unit/packet/test_icmp.py rename to ryu/tests/unit/packet/test_icmp.py diff --git a/tests/unit/packet/test_icmpv6.py b/ryu/tests/unit/packet/test_icmpv6.py similarity index 100% rename from tests/unit/packet/test_icmpv6.py rename to ryu/tests/unit/packet/test_icmpv6.py diff --git a/tests/unit/packet/test_igmp.py b/ryu/tests/unit/packet/test_igmp.py similarity index 100% rename from tests/unit/packet/test_igmp.py rename to ryu/tests/unit/packet/test_igmp.py diff --git a/tests/unit/packet/test_ipv4.py b/ryu/tests/unit/packet/test_ipv4.py similarity index 100% rename from tests/unit/packet/test_ipv4.py rename to ryu/tests/unit/packet/test_ipv4.py diff --git a/tests/unit/packet/test_ipv6.py b/ryu/tests/unit/packet/test_ipv6.py similarity index 100% rename from tests/unit/packet/test_ipv6.py rename to ryu/tests/unit/packet/test_ipv6.py diff --git a/tests/unit/packet/test_llc.py b/ryu/tests/unit/packet/test_llc.py similarity index 100% rename from tests/unit/packet/test_llc.py rename to ryu/tests/unit/packet/test_llc.py diff --git a/tests/unit/packet/test_lldp.py b/ryu/tests/unit/packet/test_lldp.py similarity index 100% rename from tests/unit/packet/test_lldp.py rename to ryu/tests/unit/packet/test_lldp.py diff --git a/tests/unit/packet/test_mpls.py b/ryu/tests/unit/packet/test_mpls.py similarity index 100% rename from tests/unit/packet/test_mpls.py rename to ryu/tests/unit/packet/test_mpls.py diff --git a/tests/unit/packet/test_openflow.py b/ryu/tests/unit/packet/test_openflow.py similarity index 100% rename from tests/unit/packet/test_openflow.py rename to ryu/tests/unit/packet/test_openflow.py diff --git a/tests/unit/packet/test_ospf.py b/ryu/tests/unit/packet/test_ospf.py similarity index 100% rename from tests/unit/packet/test_ospf.py rename to ryu/tests/unit/packet/test_ospf.py diff --git a/tests/unit/packet/test_packet.py b/ryu/tests/unit/packet/test_packet.py similarity index 100% rename from tests/unit/packet/test_packet.py rename to ryu/tests/unit/packet/test_packet.py diff --git a/tests/unit/packet/test_pbb.py b/ryu/tests/unit/packet/test_pbb.py similarity index 100% rename from tests/unit/packet/test_pbb.py rename to ryu/tests/unit/packet/test_pbb.py diff --git a/tests/unit/packet/test_sctp.py b/ryu/tests/unit/packet/test_sctp.py similarity index 100% rename from tests/unit/packet/test_sctp.py rename to ryu/tests/unit/packet/test_sctp.py diff --git a/tests/unit/packet/test_slow.py b/ryu/tests/unit/packet/test_slow.py similarity index 100% rename from tests/unit/packet/test_slow.py rename to ryu/tests/unit/packet/test_slow.py diff --git a/tests/unit/packet/test_tcp.py b/ryu/tests/unit/packet/test_tcp.py similarity index 100% rename from tests/unit/packet/test_tcp.py rename to ryu/tests/unit/packet/test_tcp.py diff --git a/tests/unit/packet/test_udp.py b/ryu/tests/unit/packet/test_udp.py similarity index 100% rename from tests/unit/packet/test_udp.py rename to ryu/tests/unit/packet/test_udp.py diff --git a/tests/unit/packet/test_vlan.py b/ryu/tests/unit/packet/test_vlan.py similarity index 100% rename from tests/unit/packet/test_vlan.py rename to ryu/tests/unit/packet/test_vlan.py diff --git a/tests/unit/packet/test_vrrp.py b/ryu/tests/unit/packet/test_vrrp.py similarity index 100% rename from tests/unit/packet/test_vrrp.py rename to ryu/tests/unit/packet/test_vrrp.py diff --git a/tests/unit/packet/test_vxlan.py b/ryu/tests/unit/packet/test_vxlan.py similarity index 100% rename from tests/unit/packet/test_vxlan.py rename to ryu/tests/unit/packet/test_vxlan.py diff --git a/tests/unit/packet/test_zebra.py b/ryu/tests/unit/packet/test_zebra.py similarity index 100% rename from tests/unit/packet/test_zebra.py rename to ryu/tests/unit/packet/test_zebra.py diff --git a/tests/unit/packet/__init__.py b/ryu/tests/unit/sample/__init__.py similarity index 100% rename from tests/unit/packet/__init__.py rename to ryu/tests/unit/sample/__init__.py diff --git a/tests/unit/sample/test_sample1.py b/ryu/tests/unit/sample/test_sample1.py similarity index 86% rename from tests/unit/sample/test_sample1.py rename to ryu/tests/unit/sample/test_sample1.py index b4963556..34f8f69a 100644 --- a/tests/unit/sample/test_sample1.py +++ b/ryu/tests/unit/sample/test_sample1.py @@ -7,7 +7,7 @@ from nose.tools import ok_, eq_ import logging -LOG = logging.getLogger('tests.test_sample1') +LOG = logging.getLogger('ryu.tests.test_sample1') class TestSample1(unittest.TestCase): diff --git a/tests/unit/sample/test_sample2.py b/ryu/tests/unit/sample/test_sample2.py similarity index 100% rename from tests/unit/sample/test_sample2.py rename to ryu/tests/unit/sample/test_sample2.py diff --git a/tests/unit/sample/__init__.py b/ryu/tests/unit/services/__init__.py similarity index 100% rename from tests/unit/sample/__init__.py rename to ryu/tests/unit/services/__init__.py diff --git a/tests/unit/services/__init__.py b/ryu/tests/unit/services/protocols/__init__.py similarity index 100% rename from tests/unit/services/__init__.py rename to ryu/tests/unit/services/protocols/__init__.py diff --git a/tests/unit/services/protocols/__init__.py b/ryu/tests/unit/services/protocols/bgp/__init__.py similarity index 100% rename from tests/unit/services/protocols/__init__.py rename to ryu/tests/unit/services/protocols/bgp/__init__.py diff --git a/tests/unit/services/protocols/bgp/__init__.py b/ryu/tests/unit/services/protocols/bgp/core_managers/__init__.py similarity index 100% rename from tests/unit/services/protocols/bgp/__init__.py rename to ryu/tests/unit/services/protocols/bgp/core_managers/__init__.py diff --git a/tests/unit/services/protocols/bgp/core_managers/test_table_manager.py b/ryu/tests/unit/services/protocols/bgp/core_managers/test_table_manager.py similarity index 100% rename from tests/unit/services/protocols/bgp/core_managers/test_table_manager.py rename to ryu/tests/unit/services/protocols/bgp/core_managers/test_table_manager.py diff --git a/tests/unit/services/protocols/bgp/test_bgpspeaker.py b/ryu/tests/unit/services/protocols/bgp/test_bgpspeaker.py similarity index 100% rename from tests/unit/services/protocols/bgp/test_bgpspeaker.py rename to ryu/tests/unit/services/protocols/bgp/test_bgpspeaker.py diff --git a/tests/unit/services/protocols/bgp/test_peer.py b/ryu/tests/unit/services/protocols/bgp/test_peer.py similarity index 100% rename from tests/unit/services/protocols/bgp/test_peer.py rename to ryu/tests/unit/services/protocols/bgp/test_peer.py diff --git a/tests/unit/services/protocols/bgp/core_managers/__init__.py b/ryu/tests/unit/services/protocols/bgp/utils/__init__.py similarity index 100% rename from tests/unit/services/protocols/bgp/core_managers/__init__.py rename to ryu/tests/unit/services/protocols/bgp/utils/__init__.py diff --git a/tests/unit/services/protocols/bgp/utils/test_bgp.py b/ryu/tests/unit/services/protocols/bgp/utils/test_bgp.py similarity index 100% rename from tests/unit/services/protocols/bgp/utils/test_bgp.py rename to ryu/tests/unit/services/protocols/bgp/utils/test_bgp.py diff --git a/tests/unit/services/protocols/bgp/utils/test_validation.py b/ryu/tests/unit/services/protocols/bgp/utils/test_validation.py similarity index 100% rename from tests/unit/services/protocols/bgp/utils/test_validation.py rename to ryu/tests/unit/services/protocols/bgp/utils/test_validation.py diff --git a/tests/unit/test_requirements.py b/ryu/tests/unit/test_requirements.py similarity index 97% rename from tests/unit/test_requirements.py rename to ryu/tests/unit/test_requirements.py index b31110b4..7bfbd3f4 100644 --- a/tests/unit/test_requirements.py +++ b/ryu/tests/unit/test_requirements.py @@ -30,8 +30,8 @@ LOG = logging.getLogger(__name__) MOD_DIR = os.path.dirname(sys.modules[__name__].__file__) _RYU_REQUIREMENTS_FILES = [ - '../../tools/pip-requires', - '../../tools/optional-requires', + '../../../tools/pip-requires', + '../../../tools/optional-requires', ] RYU_REQUIREMENTS_FILES = [ os.path.join(MOD_DIR, f) for f in _RYU_REQUIREMENTS_FILES] diff --git a/tests/unit/test_utils.py b/ryu/tests/unit/test_utils.py similarity index 100% rename from tests/unit/test_utils.py rename to ryu/tests/unit/test_utils.py diff --git a/tests/unit/services/protocols/bgp/utils/__init__.py b/tests/unit/services/protocols/bgp/utils/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tools/normalize_json.py b/tools/normalize_json.py index 7d7fddc9..48243584 100755 --- a/tools/normalize_json.py +++ b/tools/normalize_json.py @@ -17,7 +17,7 @@ # limitations under the License. # usage example: -# for x in ../tests/unit/ofproto/json/**/*.json;do echo $x;./normalize_json.py < $x > xx&& mv xx $x;done +# for x in ../ryu/tests/unit/ofproto/json/**/*.json;do echo $x;./normalize_json.py < $x > xx&& mv xx $x;done import json import sys diff --git a/tox.ini b/tox.ini index 5ffbc675..cb6df7f7 100644 --- a/tox.ini +++ b/tox.ini @@ -12,13 +12,13 @@ passenv= NOSE_VERBOSE # for running Ryu, the following runs ryu-manager berfore installing # the addtional requirements. commands = - ryu-manager tests/unit/cmd/dummy_openflow_app.py + ryu-manager ryu/tests/unit/cmd/dummy_openflow_app.py pip install -r{toxinidir}/tools/optional-requires -r{toxinidir}/tools/test-requires - coverage run --source=ryu tests/run_tests.py '{posargs}' + coverage run --source=ryu ryu/tests/run_tests.py '{posargs}' [testenv:scenario] commands = - python tests/integrated/run_test.py + python ryu/tests/integrated/run_test.py [testenv:py27] commands =