From 1bbd80d8c776f376508f382911e502b437148057 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 20 Nov 2025 16:38:55 +0100 Subject: [PATCH 1/4] test: drop leading ietf/infix prefix from directories Let's drop the leading IETF or Infix prefixes from tests. Initially the idea was to mimnic the YANG models, but it's difficult to navigate and does not provide any real benefit to developers or end-users. Signed-off-by: Joachim Wiberg --- doc/testing.md | 26 +++++++------- test/case/all.yaml | 36 +++++++++---------- .../Readme.adoc | 4 +-- .../{infix_containers => containers}/all.yaml | 0 .../usb => containers/basic}/Readme.adoc | 0 .../basic/test.adoc | 2 +- .../basic/test.py | 0 .../basic}/topology.dot | 0 .../basic}/topology.svg | 0 .../bridge}/Readme.adoc | 0 .../bridge/test.adoc | 2 +- .../bridge/test.py | 0 .../bridge/topology.dot | 0 .../bridge/topology.svg | 0 .../enabled}/Readme.adoc | 0 .../enabled/test.adoc | 2 +- .../enabled/test.py | 0 .../enabled/topology.dot | 0 .../usb => containers/enabled}/topology.svg | 0 .../environment}/Readme.adoc | 0 .../environment/test.adoc | 2 +- .../environment/test.py | 0 .../environment/topology.dot | 0 .../environment}/topology.svg | 0 .../firewall_basic}/Readme.adoc | 0 .../firewall_basic/test.adoc | 2 +- .../firewall_basic/test.py | 0 .../firewall_basic/topology.dot | 0 .../firewall_basic/topology.svg | 0 .../host_commands}/Readme.adoc | 0 .../host_commands/test.adoc | 9 ++--- .../host_commands/test.py | 0 .../host_commands}/topology.dot | 0 .../host_commands}/topology.svg | 0 .../phys}/Readme.adoc | 0 .../phys/test.adoc | 2 +- .../phys/test.py | 0 .../phys/topology.dot | 0 .../phys/topology.svg | 0 .../upgrade}/Readme.adoc | 0 .../upgrade/download.sh | 0 .../upgrade/test.adoc | 2 +- .../upgrade/test.py | 0 .../upgrade/topology.dot | 0 .../upgrade}/topology.svg | 0 .../veth}/Readme.adoc | 0 .../veth/network_diagram.svg | 0 .../veth/test.adoc | 2 +- .../veth/test.py | 0 .../veth/topology.dot | 0 .../veth/topology.svg | 0 .../volume}/Readme.adoc | 0 .../volume/test.adoc | 2 +- .../volume/test.py | 0 .../volume}/topology.dot | 0 .../volume}/topology.svg | 0 test/case/{infix_dhcp => dhcp}/Readme.adoc | 4 +-- test/case/{infix_dhcp => dhcp}/all.yaml | 0 .../client6_basic}/Readme.adoc | 0 .../client6_basic/test.py | 0 .../client6_basic/topology.dot | 0 .../client6_prefix_delegation}/Readme.adoc | 0 .../client6_prefix_delegation/test.py | 0 .../client6_prefix_delegation/topology.dot | 0 .../ifalias => dhcp/client_basic}/Readme.adoc | 0 .../client_basic/test.adoc | 2 +- .../{infix_dhcp => dhcp}/client_basic/test.py | 0 .../client_basic/topology.dot | 0 .../client_basic/topology.svg | 0 .../client_default_gw}/Readme.adoc | 0 .../client_default_gw/test.adoc | 2 +- .../client_default_gw/test.py | 0 .../client_default_gw/topology.dot | 0 .../client_default_gw/topology.svg | 0 .../client_hostname}/Readme.adoc | 0 .../client_hostname/test.adoc | 2 +- .../client_hostname/test.py | 0 .../client_hostname/topology.dot | 0 .../client_hostname/topology.svg | 0 .../client_routes}/Readme.adoc | 0 .../client_routes/test.adoc | 2 +- .../client_routes/test.py | 0 .../client_routes/topology.dot | 0 .../client_routes/topology.svg | 0 .../{infix_dhcp => dhcp}/dhcp_client.yaml | 0 .../{infix_dhcp => dhcp}/dhcp_server.yaml | 0 .../server_basic}/Readme.adoc | 0 .../server_basic/test.adoc | 2 +- .../{infix_dhcp => dhcp}/server_basic/test.py | 0 .../server_basic/topology.dot | 0 .../server_basic/topology.svg | 0 .../server_host}/Readme.adoc | 0 .../server_host/test.adoc | 2 +- .../{infix_dhcp => dhcp}/server_host/test.py | 0 .../server_host/topology.dot | 0 .../server_host/topology.svg | 0 .../server_subnets}/Readme.adoc | 0 .../server_subnets/dhcp-subnets.svg | 0 .../server_subnets/test.adoc | 2 +- .../server_subnets/test.py | 0 .../server_subnets/topology.dot | 0 .../server_subnets/topology.svg | 0 .../{infix_firewall => firewall}/Readme.adoc | 2 +- .../{infix_firewall => firewall}/all.yaml | 0 .../basic}/Readme.adoc | 0 .../basic/basic.svg | 0 .../basic/test.adoc | 2 +- .../basic/test.py | 0 .../basic/topology.dot | 0 .../basic/topology.svg | 0 .../ipv6-lan-wan}/Readme.adoc | 0 .../ipv6-lan-wan/lan-wan.svg | 0 .../ipv6-lan-wan/test.adoc | 2 +- .../ipv6-lan-wan/test.py | 0 .../ipv6-lan-wan/topology.dot | 0 .../ipv6-lan-wan/topology.svg | 0 .../ipv6-zone-migration}/Readme.adoc | 0 .../ipv6-zone-migration/test.adoc | 2 +- .../ipv6-zone-migration/test.py | 0 .../ipv6-zone-migration/topology.dot | 0 .../ipv6-zone-migration/topology.svg | 0 .../lan-wan}/Readme.adoc | 0 .../lan-wan/lan-wan.svg | 0 .../lan-wan/test.adoc | 2 +- .../lan-wan/test.py | 0 .../lan-wan/topology.dot | 0 .../lan-wan/topology.svg | 0 .../wan-dmz-lan}/Readme.adoc | 0 .../wan-dmz-lan/test.adoc | 2 +- .../wan-dmz-lan/test.py | 0 .../wan-dmz-lan/topology.dot | 0 .../wan-dmz-lan/topology.svg | 0 .../wan-dmz-lan/wan-dmz-lan.svg | 0 .../{ietf_hardware => hardware}/Readme.adoc | 4 +-- .../case/{ietf_hardware => hardware}/all.yaml | 0 .../veth_delete => hardware/usb}/Readme.adoc | 0 .../{ietf_hardware => hardware}/usb/test.adoc | 2 +- .../{ietf_hardware => hardware}/usb/test.py | 0 .../usb}/topology.dot | 0 .../usb}/topology.svg | 0 .../usb_two_ports}/Readme.adoc | 0 .../usb_two_ports/test.adoc | 2 +- .../usb_two_ports/test.py | 0 .../usb_two_ports}/topology.dot | 0 .../usb_two_ports}/topology.svg | 0 .../Readme.adoc | 4 +-- .../{ietf_interfaces => interfaces}/all.yaml | 0 .../bridge.yaml | 0 .../bridge_basic}/Readme.adoc | 0 .../bridge_basic/test.adoc | 2 +- .../bridge_basic/test.py | 0 .../bridge_basic/topology.dot | 0 .../bridge_basic/topology.svg | 0 .../bridge_fwd_dual_dut}/Readme.adoc | 0 .../bridge_fwd_dual_dut/test.adoc | 2 +- .../bridge_fwd_dual_dut/test.py | 0 .../bridge_fwd_dual_dut/topology.dot | 0 .../bridge_fwd_dual_dut/topology.svg | 0 .../bridge_fwd_sgl_dut}/Readme.adoc | 0 .../bridge_fwd_sgl_dut/test.adoc | 2 +- .../bridge_fwd_sgl_dut/test.py | 0 .../bridge_fwd_sgl_dut/topology.dot | 0 .../bridge_fwd_sgl_dut/topology.svg | 0 .../bridge_stp_basic}/Readme.adoc | 0 .../bridge_stp_basic/test.adoc | 2 +- .../bridge_stp_basic/test.py | 0 .../bridge_stp_basic/topology.dot | 0 .../bridge_stp_basic/topology.svg | 0 .../bridge_veth}/Readme.adoc | 0 .../bridge_veth/test.adoc | 2 +- .../bridge_veth/test.py | 0 .../bridge_veth/topology.dot | 0 .../bridge_veth/topology.svg | 0 .../bridge_vlan}/Readme.adoc | 0 .../bridge_vlan/bridge-vlan.svg | 0 .../bridge_vlan/test.adoc | 2 +- .../bridge_vlan/test.py | 0 .../bridge_vlan/topology.dot | 0 .../bridge_vlan/topology.svg | 0 .../bridge_vlan_separation}/Readme.adoc | 0 .../bridge_vlan_separation/test.adoc | 2 +- .../bridge_vlan_separation/test.py | 0 .../bridge_vlan_separation/topology.dot | 0 .../bridge_vlan_separation/topology.svg | 0 .../dual_bridge}/Readme.adoc | 0 .../dual_bridge/test.adoc | 2 +- .../dual_bridge/test.py | 0 .../dual_bridge}/topology.dot | 0 .../dual_bridge}/topology.svg | 0 .../iface_enable_disable}/Readme.adoc | 0 .../iface_enable_disable/test.adoc | 2 +- .../iface_enable_disable/test.py | 0 .../iface_enable_disable/topology.dot | 0 .../iface_enable_disable/topology.svg | 0 .../iface_phys_address}/Readme.adoc | 0 .../iface_phys_address/test.adoc | 2 +- .../iface_phys_address/test.py | 0 .../iface_phys_address}/topology.dot | 0 .../iface_phys_address}/topology.svg | 0 .../ifalias}/Readme.adoc | 0 .../ifalias/test.adoc | 2 +- .../ifalias/test.py | 0 .../ifalias}/topology.dot | 0 .../ifalias}/topology.svg | 0 .../{ietf_interfaces => interfaces}/igmp.yaml | 0 .../igmp_basic}/Readme.adoc | 0 .../igmp_basic/test.adoc | 2 +- .../igmp_basic/test.py | 0 .../igmp_basic/topology.dot | 0 .../igmp_basic/topology.svg | 0 .../igmp_vlan}/Readme.adoc | 0 .../igmp_vlan/test.adoc | 2 +- .../igmp_vlan/test.py | 0 .../igmp_vlan/topology.dot | 0 .../igmp_vlan/topology.svg | 0 .../ipv4_address}/Readme.adoc | 0 .../ipv4_address/test.adoc | 2 +- .../ipv4_address/test.py | 0 .../ipv4_address}/topology.dot | 0 .../ipv4_address}/topology.svg | 0 .../ipv4_autoconf}/Readme.adoc | 0 .../ipv4_autoconf/test.adoc | 2 +- .../ipv4_autoconf/test.py | 0 .../ipv4_autoconf}/topology.dot | 0 .../ipv4_autoconf}/topology.svg | 0 .../ipv6_address}/Readme.adoc | 0 .../ipv6_address/test.adoc | 2 +- .../ipv6_address/test.py | 0 .../ipv6_address}/topology.dot | 0 .../ipv6_address}/topology.svg | 0 .../{ietf_interfaces => interfaces}/lag.yaml | 0 .../lag_basic}/Readme.adoc | 0 .../lag_basic/lag-basic.svg | 0 .../lag_basic/test.adoc | 2 +- .../lag_basic/test.py | 0 .../lag_basic/topology.dot | 0 .../lag_basic/topology.svg | 0 .../lag_failure}/Readme.adoc | 0 .../lag_failure/lag-failure.svg | 0 .../lag_failure/test.adoc | 2 +- .../lag_failure/test.py | 0 .../lag_failure/topology.dot | 0 .../lag_failure/topology.svg | 0 .../routing_basic}/Readme.adoc | 0 .../routing_basic/test.adoc | 2 +- .../routing_basic/test.py | 0 .../routing_basic/topology.dot | 0 .../routing_basic/topology.svg | 0 .../speed_duplex_copper}/Readme.adoc | 0 .../speed_duplex_copper/test.adoc | 2 +- .../speed_duplex_copper/test.py | 0 .../speed_duplex_copper/topology.dot | 0 .../speed_duplex_copper}/topology.svg | 0 .../static_multicast_filters}/Readme.adoc | 0 .../static_multicast_filters/test.adoc | 2 +- .../static_multicast_filters/test.py | 0 .../static_multicast_filters/topology.dot | 0 .../static_multicast_filters/topology.svg | 0 .../tunnel_basic/Readme.adoc | 0 .../tunnel_basic/gre.adoc | 2 +- .../tunnel_basic/gre.py | 0 .../tunnel_basic/gretap.adoc | 2 +- .../tunnel_basic/gretap.py | 0 .../tunnel_basic/test.py | 0 .../tunnel_basic/test.yaml | 0 .../tunnel_basic/topology.dot | 0 .../tunnel_basic/topology.svg | 0 .../tunnel_basic/vxlan.adoc | 2 +- .../tunnel_basic/vxlan.py | 0 .../tunnel_bridged/Readme.adoc | 0 .../tunnel_bridged/gretap.adoc | 2 +- .../tunnel_bridged/gretap.py | 0 .../tunnel_bridged/test.py | 0 .../tunnel_bridged/test.yaml | 0 .../tunnel_bridged/topology.dot | 0 .../tunnel_bridged/topology.svg | 0 .../tunnel_bridged/vxlan.adoc | 2 +- .../tunnel_bridged/vxlan.py | 0 .../tunnel_ttl/Readme.adoc | 0 .../tunnel_ttl/gre.adoc | 2 +- .../tunnel_ttl/gre.py | 0 .../tunnel_ttl/test.py | 0 .../tunnel_ttl/test.yaml | 0 .../tunnel_ttl/topology.dot | 0 .../tunnel_ttl/topology.svg | 0 .../tunnel_ttl/vxlan.adoc | 2 +- .../tunnel_ttl/vxlan.py | 0 .../tunnels.yaml | 0 .../verify_all_interface_types}/Readme.adoc | 0 .../verify_all_interface_types/test.adoc | 2 +- .../verify_all_interface_types/test.py | 0 .../verify_all_interface_types/topology.dot | 0 .../verify_all_interface_types/topology.svg | 0 .../veth_delete}/Readme.adoc | 0 .../veth_delete/test.adoc | 2 +- .../veth_delete/test.py | 0 .../veth_delete/topology.dot | 0 .../veth_delete/topology.svg | 0 .../vlan_iface_termination}/Readme.adoc | 0 .../vlan_iface_termination/test.adoc | 2 +- .../vlan_iface_termination/test.py | 0 .../vlan_iface_termination/topology.dot | 0 .../vlan_iface_termination/topology.svg | 0 .../vlan_ping}/Readme.adoc | 0 .../vlan_ping/test.adoc | 2 +- .../vlan_ping/test.py | 0 .../vlan_ping/topology.dot | 0 .../vlan_ping/topology.svg | 0 .../vlan_qos}/Readme.adoc | 0 .../vlan_qos/test.adoc | 2 +- .../vlan_qos/test.py | 0 .../vlan_qos/topology.dot | 0 .../vlan_qos/topology.svg | 0 .../{ietf_routing => routing}/Readme.adoc | 4 +-- test/case/{ietf_routing => routing}/all.yaml | 0 .../ospf_basic}/Readme.adoc | 0 .../ospf_basic/test.adoc | 2 +- .../ospf_basic/test.py | 0 .../ospf_basic/topology.dot | 0 .../ospf_basic/topology.svg | 0 .../ospf_bfd}/Readme.adoc | 0 .../ospf_bfd/test.adoc | 2 +- .../ospf_bfd/test.py | 0 .../ospf_bfd/topology.dot | 0 .../ospf_bfd/topology.svg | 0 .../ospf_default_route_advertise}/Readme.adoc | 0 .../ospf_default_route_advertise/test.adoc | 2 +- .../ospf_default_route_advertise/test.py | 0 .../ospf_default_route_advertise/topology.dot | 0 .../ospf_default_route_advertise/topology.svg | 0 .../ospf_multiarea}/Readme.adoc | 0 .../ospf_multiarea/test.adoc | 2 +- .../ospf_multiarea/test.py | 0 .../ospf_multiarea/topology.dot | 0 .../ospf_multiarea/topology.svg | 0 .../ospf_unnumbered_interface}/Readme.adoc | 0 .../ospf_unnumbered_interface/test.adoc | 2 +- .../ospf_unnumbered_interface/test.py | 0 .../ospf_unnumbered_interface/topology.dot | 0 .../ospf_unnumbered_interface/topology.svg | 0 .../route_pref_255}/Readme.adoc | 0 .../route_pref_255/test.adoc | 2 +- .../route_pref_255/test.py | 0 .../route_pref_255/topology.dot | 0 .../route_pref_255/topology.svg | 0 .../route_pref_dhcp}/Readme.adoc | 0 .../route_pref_dhcp/test.adoc | 2 +- .../route_pref_dhcp/test.py | 0 .../route_pref_dhcp/topology.dot | 0 .../route_pref_dhcp/topology.svg | 0 .../route_pref_ospf}/Readme.adoc | 0 .../route_pref_ospf/test.adoc | 2 +- .../route_pref_ospf/test.py | 0 .../route_pref_ospf/topology.dot | 0 .../route_pref_ospf/topology.svg | 0 .../static_routing}/Readme.adoc | 0 .../static_routing/test.adoc | 2 +- .../static_routing/test.py | 0 .../static_routing/topology.dot | 0 .../static_routing/topology.svg | 0 .../{infix_services => services}/Readme.adoc | 4 +-- .../{infix_services => services}/all.yaml | 0 .../lldp/all.yaml | 0 .../lldp/lldp_admin_status}/Readme.adoc | 0 .../lldp/lldp_admin_status/test.adoc | 2 +- .../lldp/lldp_admin_status/test.py | 0 .../lldp/lldp_admin_status/topology.dot | 0 .../lldp/lldp_admin_status/topology.svg | 0 .../lldp/lldp_enable_disable}/Readme.adoc | 0 .../lldp/lldp_enable_disable/test.adoc | 2 +- .../lldp/lldp_enable_disable/test.py | 0 .../lldp/lldp_enable_disable/topology.dot | 0 .../lldp/lldp_enable_disable/topology.svg | 0 .../lldp/lldp_ieee_group_forward}/Readme.adoc | 0 .../lldp/lldp_ieee_group_forward/test.adoc | 2 +- .../lldp/lldp_ieee_group_forward/test.py | 0 .../lldp/lldp_ieee_group_forward/topology.dot | 0 .../lldp/lldp_ieee_group_forward/topology.svg | 0 .../mdns/all.yaml | 0 .../mdns/mdns_allow_deny}/Readme.adoc | 0 .../mdns/mdns_allow_deny/test.adoc | 2 +- .../mdns/mdns_allow_deny/test.py | 0 .../mdns/mdns_allow_deny/topology.dot | 0 .../mdns/mdns_allow_deny/topology.svg | 0 .../mdns/mdns_enable_disable}/Readme.adoc | 0 .../mdns/mdns_enable_disable/test.adoc | 2 +- .../mdns/mdns_enable_disable/test.py | 0 .../mdns/mdns_enable_disable/topology.dot | 0 .../mdns/mdns_enable_disable/topology.svg | 0 .../{infix_services => services}/ssh/all.yaml | 0 .../ssh/ssh_key_authentication}/Readme.adoc | 0 .../ssh/ssh_key_authentication/test.adoc | 2 +- .../ssh/ssh_key_authentication/test.py | 0 .../ssh/ssh_key_authentication/topology.dot | 0 .../ssh/ssh_key_authentication}/topology.svg | 0 .../ssh/ssh_server_config}/Readme.adoc | 0 .../ssh/ssh_server_config/test.adoc | 2 +- .../ssh/ssh_server_config/test.py | 0 .../ssh/ssh_server_config/topology.dot | 0 .../ssh/ssh_server_config/topology.svg | 0 test/case/{ietf_syslog => syslog}/Readme.adoc | 6 ++-- .../advanced_compare}/Readme.adoc | 0 .../advanced_compare/test.adoc | 2 +- .../advanced_compare/test.py | 0 .../advanced_compare}/topology.dot | 0 .../advanced_compare}/topology.svg | 0 test/case/{ietf_syslog => syslog}/all.yaml | 0 .../basic/Readme.adoc | 0 .../{ietf_syslog => syslog}/basic/test.adoc | 2 +- .../{ietf_syslog => syslog}/basic/test.py | 0 .../basic}/topology.dot | 0 .../basic}/topology.svg | 0 .../hostname_filter}/Readme.adoc | 0 .../hostname_filter/test.adoc | 2 +- .../hostname_filter/test.py | 0 .../hostname_filter/topology.dot | 0 .../hostname_filter/topology.svg | 0 .../pattern_match}/Readme.adoc | 0 .../pattern_match/test.adoc | 2 +- .../pattern_match/test.py | 0 .../pattern_match}/topology.dot | 0 .../pattern_match}/topology.svg | 0 .../property_filter}/Readme.adoc | 0 .../property_filter/test.adoc | 2 +- .../property_filter/test.py | 0 .../property_filter}/topology.dot | 0 .../property_filter}/topology.svg | 0 .../wan-dmz-lan => syslog/remote}/Readme.adoc | 0 .../{ietf_syslog => syslog}/remote/test.adoc | 2 +- .../{ietf_syslog => syslog}/remote/test.py | 0 .../remote/topology.dot | 0 .../remote/topology.svg | 0 test/case/{ietf_system => system}/Readme.adoc | 4 +-- .../add_delete_user}/Readme.adoc | 0 .../add_delete_user/test.adoc | 2 +- .../add_delete_user/test.py | 0 .../add_delete_user}/topology.dot | 0 .../add_delete_user}/topology.svg | 0 test/case/{ietf_system => system}/all.yaml | 0 .../hostname}/Readme.adoc | 0 .../hostname/test.adoc | 2 +- .../{ietf_system => system}/hostname/test.py | 0 .../timezone => system/hostname}/topology.dot | 0 .../hostname}/topology.svg | 0 .../ntp_client}/Readme.adoc | 0 .../ntp_client/test.adoc | 2 +- .../ntp_client/test.py | 0 .../ntp_client/topology.dot | 0 .../ntp_client/topology.svg | 0 .../timezone}/Readme.adoc | 0 .../timezone/test.adoc | 2 +- .../{ietf_system => system}/timezone/test.py | 0 .../timezone}/topology.dot | 0 .../enabled => system/timezone}/topology.svg | 0 .../timezone_utc_offset}/Readme.adoc | 0 .../timezone_utc_offset/test.adoc | 2 +- .../timezone_utc_offset/test.py | 0 .../timezone_utc_offset}/topology.dot | 0 .../timezone_utc_offset}/topology.svg | 0 .../upgrade}/Readme.adoc | 0 .../upgrade/bundles/.gitignore | 0 .../upgrade/bundles/not-a-bundle.pkg | 0 .../{ietf_system => system}/upgrade/test.adoc | 2 +- .../{ietf_system => system}/upgrade/test.py | 0 .../volume => system/upgrade}/topology.dot | 0 .../volume => system/upgrade}/topology.svg | 0 .../user_admin}/Readme.adoc | 0 .../user_admin/test.adoc | 2 +- .../user_admin/test.py | 0 .../user_admin}/topology.dot | 0 .../user_admin}/topology.svg | 0 test/case/use_case/Readme.adoc | 3 +- test/spec/Readme.adoc.in | 18 +++++----- 473 files changed, 150 insertions(+), 148 deletions(-) rename test/case/{infix_containers => containers}/Readme.adoc (91%) rename test/case/{infix_containers => containers}/all.yaml (100%) rename test/case/{ietf_hardware/usb => containers/basic}/Readme.adoc (100%) rename test/case/{infix_containers => containers}/basic/test.adoc (91%) rename test/case/{infix_containers => containers}/basic/test.py (100%) rename test/case/{ietf_interfaces/dual_bridge => containers/basic}/topology.dot (100%) rename test/case/{ietf_interfaces/dual_bridge => containers/basic}/topology.svg (100%) rename test/case/{ietf_hardware/usb_two_ports => containers/bridge}/Readme.adoc (100%) rename test/case/{infix_containers => containers}/bridge/test.adoc (90%) rename test/case/{infix_containers => containers}/bridge/test.py (100%) rename test/case/{infix_containers => containers}/bridge/topology.dot (100%) rename test/case/{infix_containers => containers}/bridge/topology.svg (100%) rename test/case/{ietf_interfaces/bridge_basic => containers/enabled}/Readme.adoc (100%) rename test/case/{infix_containers => containers}/enabled/test.adoc (91%) rename test/case/{infix_containers => containers}/enabled/test.py (100%) rename test/case/{infix_containers => containers}/enabled/topology.dot (100%) rename test/case/{ietf_hardware/usb => containers/enabled}/topology.svg (100%) rename test/case/{ietf_interfaces/bridge_fwd_dual_dut => containers/environment}/Readme.adoc (100%) rename test/case/{infix_containers => containers}/environment/test.adoc (90%) rename test/case/{infix_containers => containers}/environment/test.py (100%) rename test/case/{infix_containers => containers}/environment/topology.dot (100%) rename test/case/{ietf_interfaces/iface_phys_address => containers/environment}/topology.svg (100%) rename test/case/{ietf_interfaces/bridge_fwd_sgl_dut => containers/firewall_basic}/Readme.adoc (100%) rename test/case/{infix_containers => containers}/firewall_basic/test.adoc (95%) rename test/case/{infix_containers => containers}/firewall_basic/test.py (100%) rename test/case/{infix_containers => containers}/firewall_basic/topology.dot (100%) rename test/case/{infix_containers => containers}/firewall_basic/topology.svg (100%) rename test/case/{ietf_interfaces/bridge_stp_basic => containers/host_commands}/Readme.adoc (100%) rename test/case/{infix_containers => containers}/host_commands/test.adoc (59%) rename test/case/{infix_containers => containers}/host_commands/test.py (100%) rename test/case/{ietf_hardware/usb => containers/host_commands}/topology.dot (100%) rename test/case/{ietf_hardware/usb_two_ports => containers/host_commands}/topology.svg (100%) rename test/case/{ietf_interfaces/bridge_veth => containers/phys}/Readme.adoc (100%) rename test/case/{infix_containers => containers}/phys/test.adoc (89%) rename test/case/{infix_containers => containers}/phys/test.py (100%) rename test/case/{infix_containers => containers}/phys/topology.dot (100%) rename test/case/{infix_containers => containers}/phys/topology.svg (100%) rename test/case/{ietf_interfaces/bridge_vlan => containers/upgrade}/Readme.adoc (100%) rename test/case/{infix_containers => containers}/upgrade/download.sh (100%) rename test/case/{infix_containers => containers}/upgrade/test.adoc (93%) rename test/case/{infix_containers => containers}/upgrade/test.py (100%) rename test/case/{infix_containers => containers}/upgrade/topology.dot (100%) rename test/case/{ietf_interfaces/ifalias => containers/upgrade}/topology.svg (100%) rename test/case/{ietf_interfaces/bridge_vlan_separation => containers/veth}/Readme.adoc (100%) rename test/case/{infix_containers => containers}/veth/network_diagram.svg (100%) rename test/case/{infix_containers => containers}/veth/test.adoc (93%) rename test/case/{infix_containers => containers}/veth/test.py (100%) rename test/case/{infix_containers => containers}/veth/topology.dot (100%) rename test/case/{infix_containers => containers}/veth/topology.svg (100%) rename test/case/{ietf_interfaces/dual_bridge => containers/volume}/Readme.adoc (100%) rename test/case/{infix_containers => containers}/volume/test.adoc (89%) rename test/case/{infix_containers => containers}/volume/test.py (100%) rename test/case/{ietf_interfaces/iface_phys_address => containers/volume}/topology.dot (100%) rename test/case/{ietf_interfaces/ipv4_autoconf => containers/volume}/topology.svg (100%) rename test/case/{infix_dhcp => dhcp}/Readme.adoc (91%) rename test/case/{infix_dhcp => dhcp}/all.yaml (100%) rename test/case/{ietf_interfaces/iface_enable_disable => dhcp/client6_basic}/Readme.adoc (100%) rename test/case/{infix_dhcp => dhcp}/client6_basic/test.py (100%) rename test/case/{infix_dhcp => dhcp}/client6_basic/topology.dot (100%) rename test/case/{ietf_interfaces/iface_phys_address => dhcp/client6_prefix_delegation}/Readme.adoc (100%) rename test/case/{infix_dhcp => dhcp}/client6_prefix_delegation/test.py (100%) rename test/case/{infix_dhcp => dhcp}/client6_prefix_delegation/topology.dot (100%) rename test/case/{ietf_interfaces/ifalias => dhcp/client_basic}/Readme.adoc (100%) rename test/case/{infix_dhcp => dhcp}/client_basic/test.adoc (80%) rename test/case/{infix_dhcp => dhcp}/client_basic/test.py (100%) rename test/case/{infix_dhcp => dhcp}/client_basic/topology.dot (100%) rename test/case/{infix_dhcp => dhcp}/client_basic/topology.svg (100%) rename test/case/{ietf_interfaces/igmp_basic => dhcp/client_default_gw}/Readme.adoc (100%) rename test/case/{infix_dhcp => dhcp}/client_default_gw/test.adoc (86%) rename test/case/{infix_dhcp => dhcp}/client_default_gw/test.py (100%) rename test/case/{infix_dhcp => dhcp}/client_default_gw/topology.dot (100%) rename test/case/{infix_dhcp => dhcp}/client_default_gw/topology.svg (100%) rename test/case/{ietf_interfaces/igmp_vlan => dhcp/client_hostname}/Readme.adoc (100%) rename test/case/{infix_dhcp => dhcp}/client_hostname/test.adoc (89%) rename test/case/{infix_dhcp => dhcp}/client_hostname/test.py (100%) rename test/case/{infix_dhcp => dhcp}/client_hostname/topology.dot (100%) rename test/case/{infix_dhcp => dhcp}/client_hostname/topology.svg (100%) rename test/case/{ietf_interfaces/ipv4_address => dhcp/client_routes}/Readme.adoc (100%) rename test/case/{infix_dhcp => dhcp}/client_routes/test.adoc (93%) rename test/case/{infix_dhcp => dhcp}/client_routes/test.py (100%) rename test/case/{infix_dhcp => dhcp}/client_routes/topology.dot (100%) rename test/case/{infix_dhcp => dhcp}/client_routes/topology.svg (100%) rename test/case/{infix_dhcp => dhcp}/dhcp_client.yaml (100%) rename test/case/{infix_dhcp => dhcp}/dhcp_server.yaml (100%) rename test/case/{ietf_interfaces/ipv4_autoconf => dhcp/server_basic}/Readme.adoc (100%) rename test/case/{infix_dhcp => dhcp}/server_basic/test.adoc (90%) rename test/case/{infix_dhcp => dhcp}/server_basic/test.py (100%) rename test/case/{infix_dhcp => dhcp}/server_basic/topology.dot (100%) rename test/case/{infix_dhcp => dhcp}/server_basic/topology.svg (100%) rename test/case/{ietf_interfaces/ipv6_address => dhcp/server_host}/Readme.adoc (100%) rename test/case/{infix_dhcp => dhcp}/server_host/test.adoc (90%) rename test/case/{infix_dhcp => dhcp}/server_host/test.py (100%) rename test/case/{infix_dhcp => dhcp}/server_host/topology.dot (100%) rename test/case/{infix_dhcp => dhcp}/server_host/topology.svg (100%) rename test/case/{ietf_interfaces/lag_basic => dhcp/server_subnets}/Readme.adoc (100%) rename test/case/{infix_dhcp => dhcp}/server_subnets/dhcp-subnets.svg (100%) rename test/case/{infix_dhcp => dhcp}/server_subnets/test.adoc (95%) rename test/case/{infix_dhcp => dhcp}/server_subnets/test.py (100%) rename test/case/{infix_dhcp => dhcp}/server_subnets/topology.dot (100%) rename test/case/{infix_dhcp => dhcp}/server_subnets/topology.svg (100%) rename test/case/{infix_firewall => firewall}/Readme.adoc (92%) rename test/case/{infix_firewall => firewall}/all.yaml (100%) rename test/case/{ietf_interfaces/lag_failure => firewall/basic}/Readme.adoc (100%) rename test/case/{infix_firewall => firewall}/basic/basic.svg (100%) rename test/case/{infix_firewall => firewall}/basic/test.adoc (92%) rename test/case/{infix_firewall => firewall}/basic/test.py (100%) rename test/case/{infix_firewall => firewall}/basic/topology.dot (100%) rename test/case/{infix_firewall => firewall}/basic/topology.svg (100%) rename test/case/{ietf_interfaces/routing_basic => firewall/ipv6-lan-wan}/Readme.adoc (100%) rename test/case/{infix_firewall => firewall}/ipv6-lan-wan/lan-wan.svg (100%) rename test/case/{infix_firewall => firewall}/ipv6-lan-wan/test.adoc (91%) rename test/case/{infix_firewall => firewall}/ipv6-lan-wan/test.py (100%) rename test/case/{infix_firewall => firewall}/ipv6-lan-wan/topology.dot (100%) rename test/case/{infix_firewall => firewall}/ipv6-lan-wan/topology.svg (100%) rename test/case/{ietf_interfaces/speed_duplex_copper => firewall/ipv6-zone-migration}/Readme.adoc (100%) rename test/case/{infix_firewall => firewall}/ipv6-zone-migration/test.adoc (91%) rename test/case/{infix_firewall => firewall}/ipv6-zone-migration/test.py (100%) rename test/case/{infix_firewall => firewall}/ipv6-zone-migration/topology.dot (100%) rename test/case/{infix_firewall => firewall}/ipv6-zone-migration/topology.svg (100%) rename test/case/{ietf_interfaces/static_multicast_filters => firewall/lan-wan}/Readme.adoc (100%) rename test/case/{infix_firewall => firewall}/lan-wan/lan-wan.svg (100%) rename test/case/{infix_firewall => firewall}/lan-wan/test.adoc (92%) rename test/case/{infix_firewall => firewall}/lan-wan/test.py (100%) rename test/case/{infix_firewall => firewall}/lan-wan/topology.dot (100%) rename test/case/{infix_firewall => firewall}/lan-wan/topology.svg (100%) rename test/case/{ietf_interfaces/verify_all_interface_types => firewall/wan-dmz-lan}/Readme.adoc (100%) rename test/case/{infix_firewall => firewall}/wan-dmz-lan/test.adoc (92%) rename test/case/{infix_firewall => firewall}/wan-dmz-lan/test.py (100%) rename test/case/{infix_firewall => firewall}/wan-dmz-lan/topology.dot (100%) rename test/case/{infix_firewall => firewall}/wan-dmz-lan/topology.svg (100%) rename test/case/{infix_firewall => firewall}/wan-dmz-lan/wan-dmz-lan.svg (100%) rename test/case/{ietf_hardware => hardware}/Readme.adoc (67%) rename test/case/{ietf_hardware => hardware}/all.yaml (100%) rename test/case/{ietf_interfaces/veth_delete => hardware/usb}/Readme.adoc (100%) rename test/case/{ietf_hardware => hardware}/usb/test.adoc (93%) rename test/case/{ietf_hardware => hardware}/usb/test.py (100%) rename test/case/{ietf_hardware/usb_two_ports => hardware/usb}/topology.dot (100%) rename test/case/{ietf_interfaces/ipv4_address => hardware/usb}/topology.svg (100%) rename test/case/{ietf_interfaces/vlan_iface_termination => hardware/usb_two_ports}/Readme.adoc (100%) rename test/case/{ietf_hardware => hardware}/usb_two_ports/test.adoc (88%) rename test/case/{ietf_hardware => hardware}/usb_two_ports/test.py (100%) rename test/case/{ietf_interfaces/ipv4_address => hardware/usb_two_ports}/topology.dot (100%) rename test/case/{ietf_syslog/advanced_compare => hardware/usb_two_ports}/topology.svg (100%) rename test/case/{ietf_interfaces => interfaces}/Readme.adoc (95%) rename test/case/{ietf_interfaces => interfaces}/all.yaml (100%) rename test/case/{ietf_interfaces => interfaces}/bridge.yaml (100%) rename test/case/{ietf_interfaces/vlan_ping => interfaces/bridge_basic}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_basic/test.adoc (85%) rename test/case/{ietf_interfaces => interfaces}/bridge_basic/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_basic/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_basic/topology.svg (100%) rename test/case/{ietf_interfaces/vlan_qos => interfaces/bridge_fwd_dual_dut}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_fwd_dual_dut/test.adoc (93%) rename test/case/{ietf_interfaces => interfaces}/bridge_fwd_dual_dut/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_fwd_dual_dut/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_fwd_dual_dut/topology.svg (100%) rename test/case/{ietf_routing/ospf_basic => interfaces/bridge_fwd_sgl_dut}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_fwd_sgl_dut/test.adoc (92%) rename test/case/{ietf_interfaces => interfaces}/bridge_fwd_sgl_dut/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_fwd_sgl_dut/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_fwd_sgl_dut/topology.svg (100%) rename test/case/{ietf_routing/ospf_bfd => interfaces/bridge_stp_basic}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_stp_basic/test.adoc (92%) rename test/case/{ietf_interfaces => interfaces}/bridge_stp_basic/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_stp_basic/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_stp_basic/topology.svg (100%) rename test/case/{ietf_routing/ospf_default_route_advertise => interfaces/bridge_veth}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_veth/test.adoc (88%) rename test/case/{ietf_interfaces => interfaces}/bridge_veth/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_veth/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_veth/topology.svg (100%) rename test/case/{ietf_routing/ospf_multiarea => interfaces/bridge_vlan}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_vlan/bridge-vlan.svg (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_vlan/test.adoc (85%) rename test/case/{ietf_interfaces => interfaces}/bridge_vlan/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_vlan/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_vlan/topology.svg (100%) rename test/case/{ietf_routing/ospf_unnumbered_interface => interfaces/bridge_vlan_separation}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_vlan_separation/test.adoc (95%) rename test/case/{ietf_interfaces => interfaces}/bridge_vlan_separation/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_vlan_separation/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/bridge_vlan_separation/topology.svg (100%) rename test/case/{ietf_routing/route_pref_255 => interfaces/dual_bridge}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/dual_bridge/test.adoc (87%) rename test/case/{ietf_interfaces => interfaces}/dual_bridge/test.py (100%) rename test/case/{ietf_interfaces/ifalias => interfaces/dual_bridge}/topology.dot (100%) rename test/case/{ietf_interfaces/ipv6_address => interfaces/dual_bridge}/topology.svg (100%) rename test/case/{ietf_routing/route_pref_dhcp => interfaces/iface_enable_disable}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/iface_enable_disable/test.adoc (87%) rename test/case/{ietf_interfaces => interfaces}/iface_enable_disable/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/iface_enable_disable/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/iface_enable_disable/topology.svg (100%) rename test/case/{ietf_routing/route_pref_ospf => interfaces/iface_phys_address}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/iface_phys_address/test.adoc (90%) rename test/case/{ietf_interfaces => interfaces}/iface_phys_address/test.py (100%) rename test/case/{ietf_interfaces/ipv4_autoconf => interfaces/iface_phys_address}/topology.dot (100%) rename test/case/{ietf_interfaces/speed_duplex_copper => interfaces/iface_phys_address}/topology.svg (100%) rename test/case/{ietf_routing/static_routing => interfaces/ifalias}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/ifalias/test.adoc (85%) rename test/case/{ietf_interfaces => interfaces}/ifalias/test.py (100%) rename test/case/{ietf_interfaces/ipv6_address => interfaces/ifalias}/topology.dot (100%) rename test/case/{ietf_system/upgrade => interfaces/ifalias}/topology.svg (100%) rename test/case/{ietf_interfaces => interfaces}/igmp.yaml (100%) rename test/case/{ietf_syslog/advanced_compare => interfaces/igmp_basic}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/igmp_basic/test.adoc (92%) rename test/case/{ietf_interfaces => interfaces}/igmp_basic/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/igmp_basic/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/igmp_basic/topology.svg (100%) rename test/case/{ietf_syslog/basic => interfaces/igmp_vlan}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/igmp_vlan/test.adoc (95%) rename test/case/{ietf_interfaces => interfaces}/igmp_vlan/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/igmp_vlan/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/igmp_vlan/topology.svg (100%) rename test/case/{ietf_syslog/hostname_filter => interfaces/ipv4_address}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/ipv4_address/test.adoc (85%) rename test/case/{ietf_interfaces => interfaces}/ipv4_address/test.py (100%) rename test/case/{ietf_syslog/advanced_compare => interfaces/ipv4_address}/topology.dot (100%) rename test/case/{ietf_syslog/basic => interfaces/ipv4_address}/topology.svg (100%) rename test/case/{ietf_syslog/pattern_match => interfaces/ipv4_autoconf}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/ipv4_autoconf/test.adoc (89%) rename test/case/{ietf_interfaces => interfaces}/ipv4_autoconf/test.py (100%) rename test/case/{ietf_system/upgrade => interfaces/ipv4_autoconf}/topology.dot (100%) rename test/case/{infix_containers/basic => interfaces/ipv4_autoconf}/topology.svg (100%) rename test/case/{ietf_syslog/property_filter => interfaces/ipv6_address}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/ipv6_address/test.adoc (85%) rename test/case/{ietf_interfaces => interfaces}/ipv6_address/test.py (100%) rename test/case/{infix_containers/basic => interfaces/ipv6_address}/topology.dot (100%) rename test/case/{infix_containers/environment => interfaces/ipv6_address}/topology.svg (100%) rename test/case/{ietf_interfaces => interfaces}/lag.yaml (100%) rename test/case/{ietf_syslog/remote => interfaces/lag_basic}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/lag_basic/lag-basic.svg (100%) rename test/case/{ietf_interfaces => interfaces}/lag_basic/test.adoc (90%) rename test/case/{ietf_interfaces => interfaces}/lag_basic/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/lag_basic/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/lag_basic/topology.svg (100%) rename test/case/{ietf_system/add_delete_user => interfaces/lag_failure}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/lag_failure/lag-failure.svg (100%) rename test/case/{ietf_interfaces => interfaces}/lag_failure/test.adoc (90%) rename test/case/{ietf_interfaces => interfaces}/lag_failure/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/lag_failure/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/lag_failure/topology.svg (100%) rename test/case/{ietf_system/hostname => interfaces/routing_basic}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/routing_basic/test.adoc (88%) rename test/case/{ietf_interfaces => interfaces}/routing_basic/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/routing_basic/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/routing_basic/topology.svg (100%) rename test/case/{ietf_system/ntp_client => interfaces/speed_duplex_copper}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/speed_duplex_copper/test.adoc (92%) rename test/case/{ietf_interfaces => interfaces}/speed_duplex_copper/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/speed_duplex_copper/topology.dot (100%) rename test/case/{infix_containers/upgrade => interfaces/speed_duplex_copper}/topology.svg (100%) rename test/case/{ietf_system/timezone => interfaces/static_multicast_filters}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/static_multicast_filters/test.adoc (93%) rename test/case/{ietf_interfaces => interfaces}/static_multicast_filters/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/static_multicast_filters/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/static_multicast_filters/topology.svg (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_basic/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_basic/gre.adoc (89%) rename test/case/{ietf_interfaces => interfaces}/tunnel_basic/gre.py (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_basic/gretap.adoc (89%) rename test/case/{ietf_interfaces => interfaces}/tunnel_basic/gretap.py (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_basic/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_basic/test.yaml (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_basic/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_basic/topology.svg (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_basic/vxlan.adoc (89%) rename test/case/{ietf_interfaces => interfaces}/tunnel_basic/vxlan.py (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_bridged/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_bridged/gretap.adoc (88%) rename test/case/{ietf_interfaces => interfaces}/tunnel_bridged/gretap.py (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_bridged/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_bridged/test.yaml (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_bridged/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_bridged/topology.svg (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_bridged/vxlan.adoc (88%) rename test/case/{ietf_interfaces => interfaces}/tunnel_bridged/vxlan.py (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_ttl/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_ttl/gre.adoc (92%) rename test/case/{ietf_interfaces => interfaces}/tunnel_ttl/gre.py (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_ttl/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_ttl/test.yaml (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_ttl/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_ttl/topology.svg (100%) rename test/case/{ietf_interfaces => interfaces}/tunnel_ttl/vxlan.adoc (92%) rename test/case/{ietf_interfaces => interfaces}/tunnel_ttl/vxlan.py (100%) rename test/case/{ietf_interfaces => interfaces}/tunnels.yaml (100%) rename test/case/{ietf_system/timezone_utc_offset => interfaces/verify_all_interface_types}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/verify_all_interface_types/test.adoc (94%) rename test/case/{ietf_interfaces => interfaces}/verify_all_interface_types/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/verify_all_interface_types/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/verify_all_interface_types/topology.svg (100%) rename test/case/{ietf_system/upgrade => interfaces/veth_delete}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/veth_delete/test.adoc (90%) rename test/case/{ietf_interfaces => interfaces}/veth_delete/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/veth_delete/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/veth_delete/topology.svg (100%) rename test/case/{ietf_system/user_admin => interfaces/vlan_iface_termination}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/vlan_iface_termination/test.adoc (93%) rename test/case/{ietf_interfaces => interfaces}/vlan_iface_termination/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/vlan_iface_termination/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/vlan_iface_termination/topology.svg (100%) rename test/case/{infix_containers/basic => interfaces/vlan_ping}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/vlan_ping/test.adoc (87%) rename test/case/{ietf_interfaces => interfaces}/vlan_ping/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/vlan_ping/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/vlan_ping/topology.svg (100%) rename test/case/{infix_containers/bridge => interfaces/vlan_qos}/Readme.adoc (100%) rename test/case/{ietf_interfaces => interfaces}/vlan_qos/test.adoc (95%) rename test/case/{ietf_interfaces => interfaces}/vlan_qos/test.py (100%) rename test/case/{ietf_interfaces => interfaces}/vlan_qos/topology.dot (100%) rename test/case/{ietf_interfaces => interfaces}/vlan_qos/topology.svg (100%) rename test/case/{ietf_routing => routing}/Readme.adoc (91%) rename test/case/{ietf_routing => routing}/all.yaml (100%) rename test/case/{infix_containers/enabled => routing/ospf_basic}/Readme.adoc (100%) rename test/case/{ietf_routing => routing}/ospf_basic/test.adoc (90%) rename test/case/{ietf_routing => routing}/ospf_basic/test.py (100%) rename test/case/{ietf_routing => routing}/ospf_basic/topology.dot (100%) rename test/case/{ietf_routing => routing}/ospf_basic/topology.svg (100%) rename test/case/{infix_containers/environment => routing/ospf_bfd}/Readme.adoc (100%) rename test/case/{ietf_routing => routing}/ospf_bfd/test.adoc (92%) rename test/case/{ietf_routing => routing}/ospf_bfd/test.py (100%) rename test/case/{ietf_routing => routing}/ospf_bfd/topology.dot (100%) rename test/case/{ietf_routing => routing}/ospf_bfd/topology.svg (100%) rename test/case/{infix_containers/firewall_basic => routing/ospf_default_route_advertise}/Readme.adoc (100%) rename test/case/{ietf_routing => routing}/ospf_default_route_advertise/test.adoc (95%) rename test/case/{ietf_routing => routing}/ospf_default_route_advertise/test.py (100%) rename test/case/{ietf_routing => routing}/ospf_default_route_advertise/topology.dot (100%) rename test/case/{ietf_routing => routing}/ospf_default_route_advertise/topology.svg (100%) rename test/case/{infix_containers/host_commands => routing/ospf_multiarea}/Readme.adoc (100%) rename test/case/{ietf_routing => routing}/ospf_multiarea/test.adoc (95%) rename test/case/{ietf_routing => routing}/ospf_multiarea/test.py (100%) rename test/case/{ietf_routing => routing}/ospf_multiarea/topology.dot (100%) rename test/case/{ietf_routing => routing}/ospf_multiarea/topology.svg (100%) rename test/case/{infix_containers/phys => routing/ospf_unnumbered_interface}/Readme.adoc (100%) rename test/case/{ietf_routing => routing}/ospf_unnumbered_interface/test.adoc (88%) rename test/case/{ietf_routing => routing}/ospf_unnumbered_interface/test.py (100%) rename test/case/{ietf_routing => routing}/ospf_unnumbered_interface/topology.dot (100%) rename test/case/{ietf_routing => routing}/ospf_unnumbered_interface/topology.svg (100%) rename test/case/{infix_containers/upgrade => routing/route_pref_255}/Readme.adoc (100%) rename test/case/{ietf_routing => routing}/route_pref_255/test.adoc (90%) rename test/case/{ietf_routing => routing}/route_pref_255/test.py (100%) rename test/case/{ietf_routing => routing}/route_pref_255/topology.dot (100%) rename test/case/{ietf_routing => routing}/route_pref_255/topology.svg (100%) rename test/case/{infix_containers/veth => routing/route_pref_dhcp}/Readme.adoc (100%) rename test/case/{ietf_routing => routing}/route_pref_dhcp/test.adoc (90%) rename test/case/{ietf_routing => routing}/route_pref_dhcp/test.py (100%) rename test/case/{ietf_routing => routing}/route_pref_dhcp/topology.dot (100%) rename test/case/{ietf_routing => routing}/route_pref_dhcp/topology.svg (100%) rename test/case/{infix_containers/volume => routing/route_pref_ospf}/Readme.adoc (100%) rename test/case/{ietf_routing => routing}/route_pref_ospf/test.adoc (91%) rename test/case/{ietf_routing => routing}/route_pref_ospf/test.py (100%) rename test/case/{ietf_routing => routing}/route_pref_ospf/topology.dot (100%) rename test/case/{ietf_routing => routing}/route_pref_ospf/topology.svg (100%) rename test/case/{infix_dhcp/client6_basic => routing/static_routing}/Readme.adoc (100%) rename test/case/{ietf_routing => routing}/static_routing/test.adoc (89%) rename test/case/{ietf_routing => routing}/static_routing/test.py (100%) rename test/case/{ietf_routing => routing}/static_routing/topology.dot (100%) rename test/case/{ietf_routing => routing}/static_routing/topology.svg (100%) rename test/case/{infix_services => services}/Readme.adoc (89%) rename test/case/{infix_services => services}/all.yaml (100%) rename test/case/{infix_services => services}/lldp/all.yaml (100%) rename test/case/{infix_dhcp/client6_prefix_delegation => services/lldp/lldp_admin_status}/Readme.adoc (100%) rename test/case/{infix_services => services}/lldp/lldp_admin_status/test.adoc (82%) rename test/case/{infix_services => services}/lldp/lldp_admin_status/test.py (100%) rename test/case/{infix_services => services}/lldp/lldp_admin_status/topology.dot (100%) rename test/case/{infix_services => services}/lldp/lldp_admin_status/topology.svg (100%) rename test/case/{infix_dhcp/client_basic => services/lldp/lldp_enable_disable}/Readme.adoc (100%) rename test/case/{infix_services => services}/lldp/lldp_enable_disable/test.adoc (83%) rename test/case/{infix_services => services}/lldp/lldp_enable_disable/test.py (100%) rename test/case/{infix_services => services}/lldp/lldp_enable_disable/topology.dot (100%) rename test/case/{infix_services => services}/lldp/lldp_enable_disable/topology.svg (100%) rename test/case/{infix_dhcp/client_default_gw => services/lldp/lldp_ieee_group_forward}/Readme.adoc (100%) rename test/case/{infix_services => services}/lldp/lldp_ieee_group_forward/test.adoc (84%) rename test/case/{infix_services => services}/lldp/lldp_ieee_group_forward/test.py (100%) rename test/case/{infix_services => services}/lldp/lldp_ieee_group_forward/topology.dot (100%) rename test/case/{infix_services => services}/lldp/lldp_ieee_group_forward/topology.svg (100%) rename test/case/{infix_services => services}/mdns/all.yaml (100%) rename test/case/{infix_dhcp/client_hostname => services/mdns/mdns_allow_deny}/Readme.adoc (100%) rename test/case/{infix_services => services}/mdns/mdns_allow_deny/test.adoc (88%) rename test/case/{infix_services => services}/mdns/mdns_allow_deny/test.py (100%) rename test/case/{infix_services => services}/mdns/mdns_allow_deny/topology.dot (100%) rename test/case/{infix_services => services}/mdns/mdns_allow_deny/topology.svg (100%) rename test/case/{infix_dhcp/client_routes => services/mdns/mdns_enable_disable}/Readme.adoc (100%) rename test/case/{infix_services => services}/mdns/mdns_enable_disable/test.adoc (85%) rename test/case/{infix_services => services}/mdns/mdns_enable_disable/test.py (100%) rename test/case/{infix_services => services}/mdns/mdns_enable_disable/topology.dot (100%) rename test/case/{infix_services => services}/mdns/mdns_enable_disable/topology.svg (100%) rename test/case/{infix_services => services}/ssh/all.yaml (100%) rename test/case/{infix_dhcp/server_basic => services/ssh/ssh_key_authentication}/Readme.adoc (100%) rename test/case/{infix_services => services}/ssh/ssh_key_authentication/test.adoc (83%) rename test/case/{infix_services => services}/ssh/ssh_key_authentication/test.py (100%) rename test/case/{infix_services => services}/ssh/ssh_key_authentication/topology.dot (100%) rename test/case/{ietf_syslog/pattern_match => services/ssh/ssh_key_authentication}/topology.svg (100%) rename test/case/{infix_dhcp/server_host => services/ssh/ssh_server_config}/Readme.adoc (100%) rename test/case/{infix_services => services}/ssh/ssh_server_config/test.adoc (86%) rename test/case/{infix_services => services}/ssh/ssh_server_config/test.py (100%) rename test/case/{infix_services => services}/ssh/ssh_server_config/topology.dot (100%) rename test/case/{infix_services => services}/ssh/ssh_server_config/topology.svg (100%) rename test/case/{ietf_syslog => syslog}/Readme.adoc (77%) rename test/case/{infix_dhcp/server_subnets => syslog/advanced_compare}/Readme.adoc (100%) rename test/case/{ietf_syslog => syslog}/advanced_compare/test.adoc (89%) rename test/case/{ietf_syslog => syslog}/advanced_compare/test.py (100%) rename test/case/{ietf_syslog/basic => syslog/advanced_compare}/topology.dot (100%) rename test/case/{ietf_syslog/property_filter => syslog/advanced_compare}/topology.svg (100%) rename test/case/{ietf_syslog => syslog}/all.yaml (100%) rename test/case/{infix_firewall => syslog}/basic/Readme.adoc (100%) rename test/case/{ietf_syslog => syslog}/basic/test.adoc (88%) rename test/case/{ietf_syslog => syslog}/basic/test.py (100%) rename test/case/{ietf_syslog/pattern_match => syslog/basic}/topology.dot (100%) rename test/case/{ietf_system/add_delete_user => syslog/basic}/topology.svg (100%) rename test/case/{infix_firewall/ipv6-lan-wan => syslog/hostname_filter}/Readme.adoc (100%) rename test/case/{ietf_syslog => syslog}/hostname_filter/test.adoc (89%) rename test/case/{ietf_syslog => syslog}/hostname_filter/test.py (100%) rename test/case/{ietf_syslog => syslog}/hostname_filter/topology.dot (100%) rename test/case/{ietf_syslog => syslog}/hostname_filter/topology.svg (100%) rename test/case/{infix_firewall/ipv6-zone-migration => syslog/pattern_match}/Readme.adoc (100%) rename test/case/{ietf_syslog => syslog}/pattern_match/test.adoc (90%) rename test/case/{ietf_syslog => syslog}/pattern_match/test.py (100%) rename test/case/{ietf_syslog/property_filter => syslog/pattern_match}/topology.dot (100%) rename test/case/{ietf_system/hostname => syslog/pattern_match}/topology.svg (100%) rename test/case/{infix_firewall/lan-wan => syslog/property_filter}/Readme.adoc (100%) rename test/case/{ietf_syslog => syslog}/property_filter/test.adoc (89%) rename test/case/{ietf_syslog => syslog}/property_filter/test.py (100%) rename test/case/{ietf_system/add_delete_user => syslog/property_filter}/topology.dot (100%) rename test/case/{ietf_system/timezone => syslog/property_filter}/topology.svg (100%) rename test/case/{infix_firewall/wan-dmz-lan => syslog/remote}/Readme.adoc (100%) rename test/case/{ietf_syslog => syslog}/remote/test.adoc (87%) rename test/case/{ietf_syslog => syslog}/remote/test.py (100%) rename test/case/{ietf_syslog => syslog}/remote/topology.dot (100%) rename test/case/{ietf_syslog => syslog}/remote/topology.svg (100%) rename test/case/{ietf_system => system}/Readme.adoc (88%) rename test/case/{infix_services/lldp/lldp_admin_status => system/add_delete_user}/Readme.adoc (100%) rename test/case/{ietf_system => system}/add_delete_user/test.adoc (87%) rename test/case/{ietf_system => system}/add_delete_user/test.py (100%) rename test/case/{ietf_system/hostname => system/add_delete_user}/topology.dot (100%) rename test/case/{ietf_system/timezone_utc_offset => system/add_delete_user}/topology.svg (100%) rename test/case/{ietf_system => system}/all.yaml (100%) rename test/case/{infix_services/lldp/lldp_enable_disable => system/hostname}/Readme.adoc (100%) rename test/case/{ietf_system => system}/hostname/test.adoc (89%) rename test/case/{ietf_system => system}/hostname/test.py (100%) rename test/case/{ietf_system/timezone => system/hostname}/topology.dot (100%) rename test/case/{ietf_system/user_admin => system/hostname}/topology.svg (100%) rename test/case/{infix_services/lldp/lldp_ieee_group_forward => system/ntp_client}/Readme.adoc (100%) rename test/case/{ietf_system => system}/ntp_client/test.adoc (84%) rename test/case/{ietf_system => system}/ntp_client/test.py (100%) rename test/case/{ietf_system => system}/ntp_client/topology.dot (100%) rename test/case/{ietf_system => system}/ntp_client/topology.svg (100%) rename test/case/{infix_services/mdns/mdns_allow_deny => system/timezone}/Readme.adoc (100%) rename test/case/{ietf_system => system}/timezone/test.adoc (83%) rename test/case/{ietf_system => system}/timezone/test.py (100%) rename test/case/{ietf_system/timezone_utc_offset => system/timezone}/topology.dot (100%) rename test/case/{infix_containers/enabled => system/timezone}/topology.svg (100%) rename test/case/{infix_services/mdns/mdns_enable_disable => system/timezone_utc_offset}/Readme.adoc (100%) rename test/case/{ietf_system => system}/timezone_utc_offset/test.adoc (80%) rename test/case/{ietf_system => system}/timezone_utc_offset/test.py (100%) rename test/case/{ietf_system/user_admin => system/timezone_utc_offset}/topology.dot (100%) rename test/case/{infix_containers/host_commands => system/timezone_utc_offset}/topology.svg (100%) rename test/case/{infix_services/ssh/ssh_key_authentication => system/upgrade}/Readme.adoc (100%) rename test/case/{ietf_system => system}/upgrade/bundles/.gitignore (100%) rename test/case/{ietf_system => system}/upgrade/bundles/not-a-bundle.pkg (100%) rename test/case/{ietf_system => system}/upgrade/test.adoc (84%) rename test/case/{ietf_system => system}/upgrade/test.py (100%) rename test/case/{infix_containers/volume => system/upgrade}/topology.dot (100%) rename test/case/{infix_containers/volume => system/upgrade}/topology.svg (100%) rename test/case/{infix_services/ssh/ssh_server_config => system/user_admin}/Readme.adoc (100%) rename test/case/{ietf_system => system}/user_admin/test.adoc (91%) rename test/case/{ietf_system => system}/user_admin/test.py (100%) rename test/case/{infix_containers/host_commands => system/user_admin}/topology.dot (100%) rename test/case/{infix_services/ssh/ssh_key_authentication => system/user_admin}/topology.svg (100%) diff --git a/doc/testing.md b/doc/testing.md index 60303faa..a41d9e6a 100644 --- a/doc/testing.md +++ b/doc/testing.md @@ -93,14 +93,14 @@ Each test case is a separate executable, which can be run without arguments: ``` -11:42:53 infamy0:test # ./case/infix_dhcp/dhcp_basic.py +11:42:53 infamy0:test # ./case/dhcp/dhcp_basic.py ``` To run a suite of tests, e.g., only the DHCP client tests, pass the suite as an argument to [9PM][]: ``` -11:42:53 infamy0:test # ./9pm/9pm.py case/infix_dhcp/infix_dhcp.yaml +11:42:53 infamy0:test # ./9pm/9pm.py case/dhcp/dhcp.yaml ``` To run the suite of all tests: @@ -234,12 +234,12 @@ your test and run it as normal. Once Python executes the call, it will drop you into the Python debugger: ``` -11:42:58 infamy0:test # ./case/infix_dhcp/dhcp_basic.py +11:42:58 infamy0:test # ./case/dhcp/dhcp_basic.py # Starting (2024-02-10 11:42:59) # Probing dut1 on port d1a for IPv6LL mgmt address ... # Connecting to mgmt IP fe80::ff:fe00:0%d1a:830 ... ok 1 - Initialize -> /home/jocke/src/infix/test/case/infix_dhcp/dhcp_basic.py(44)() +> /home/jocke/src/infix/test/case/dhcp/dhcp_basic.py(44)() (Pdb) ``` @@ -252,7 +252,7 @@ want to setup breakpoints without modifying the source, or simply step through the code: ``` -11:42:58 infamy0:test # python -m pdb case/infix_dhcp/dhcp_basic.py +11:42:58 infamy0:test # python -m pdb case/dhcp/dhcp_basic.py ``` ### Deterministic Topology Mappings @@ -296,7 +296,7 @@ This is useful because this value can then be used to rerun a test (or the whole suite) with identical topology mappings: ``` -$ make PYTHONHASHSEED=3773822171 TESTS=case/ietf_system/hostname.py test +$ make PYTHONHASHSEED=3773822171 TESTS=case/system/hostname.py test ``` ### Deterministic Transport Protocol @@ -307,14 +307,14 @@ you get the same protocol used for that hash. But if you want to choose the protocol, add extra arguments to Infamy: ``` -$ make INFAMY_EXTRA_ARGS="--transport=restconf" TESTS=case/ietf_system/hostname.py test +$ make INFAMY_EXTRA_ARGS="--transport=restconf" TESTS=case/system/hostname.py test ``` or, when running interactively: ``` $ make test-sh -09:08:17 infamy0:test # ./9pm/9pm.py -o"--transport=restconf" case/ietf_system/hostname.py +09:08:17 infamy0:test # ./9pm/9pm.py -o"--transport=restconf" case/system/hostname.py ``` ### Test specification @@ -360,7 +360,7 @@ to start by reviewing an existing test case. All tests are located in the `infix/test/case` repository and are grouped by the features they verify. For example, -`infix/test/case/infix_services` contains tests for various Infix +`infix/test/case/services` contains tests for various Infix services, such as LLDP and mDNS. While test grouping is flexible, each test should be placed in a @@ -372,12 +372,12 @@ suite](#running-subsets-of-tests): ``` - name: infix-services - suite: infix_services/infix_services.yaml + suite: services/services.yaml ``` A new test (e.g., lldp_enable_disable) should be added to the corresponding test group .yaml file, such as -`infix/test/cases/infix_services.yaml`: +`infix/test/cases/services.yaml`: ``` - name: lldp_enable_disable @@ -385,7 +385,7 @@ corresponding test group .yaml file, such as ``` It is necessary to include the test in -`infix/test/case/infix_services/Readme.adoc` to ensure proper test +`infix/test/case/services/Readme.adoc` to ensure proper test specification generation: ``` @@ -393,7 +393,7 @@ include::lldp_enable_disable/Readme.adoc[] ``` Each test case should have its own directory under, -`infix/test/case/infix_services`, containing: +`infix/test/case/services`, containing: - `test.py` - the test script - `topology.dot` - the logical topology definition. diff --git a/test/case/all.yaml b/test/case/all.yaml index 40fbbb75..1f698711 100644 --- a/test/case/all.yaml +++ b/test/case/all.yaml @@ -18,37 +18,37 @@ suite: misc/all.yaml -- name: "IETF System" - suite: ietf_system/all.yaml +- name: "System" + suite: system/all.yaml # Upgrade may leave wrong boot order - case: meta/bootorder.py infamy: specification: False -- name: "IETF Syslog" - suite: ietf_syslog/all.yaml +- name: "Syslog" + suite: syslog/all.yaml -- name: "IETF Interfaces" - suite: ietf_interfaces/all.yaml +- name: "Interfaces" + suite: interfaces/all.yaml -- name: "IETF Routing" - suite: ietf_routing/all.yaml +- name: "Routing" + suite: routing/all.yaml -- name: "Infix Firewall" - suite: infix_firewall/all.yaml +- name: "Firewall" + suite: firewall/all.yaml -- name: "Infix Containers" - suite: infix_containers/all.yaml +- name: "Containers" + suite: containers/all.yaml -- name: "Infix DHCP" - suite: infix_dhcp/all.yaml +- name: "DHCP" + suite: dhcp/all.yaml -- name: "IETF Hardware" - suite: ietf_hardware/all.yaml +- name: "Hardware" + suite: hardware/all.yaml -- name: "Infix Services" - suite: infix_services/all.yaml +- name: "Services" + suite: services/all.yaml - name: "Use Case Tests" suite: use_case/all.yaml diff --git a/test/case/infix_containers/Readme.adoc b/test/case/containers/Readme.adoc similarity index 91% rename from test/case/infix_containers/Readme.adoc rename to test/case/containers/Readme.adoc index 6574e45a..a0e1fb32 100644 --- a/test/case/infix_containers/Readme.adoc +++ b/test/case/containers/Readme.adoc @@ -1,7 +1,7 @@ :testgroup: -== infix-containers +== Containers -Tests verifying Infix Docker container support: +Tests verifying link:https://opencontainers.org/[OCI container] support: - Basic web server container running in host network mode - Container enable/disable functionality via configuration diff --git a/test/case/infix_containers/all.yaml b/test/case/containers/all.yaml similarity index 100% rename from test/case/infix_containers/all.yaml rename to test/case/containers/all.yaml diff --git a/test/case/ietf_hardware/usb/Readme.adoc b/test/case/containers/basic/Readme.adoc similarity index 100% rename from test/case/ietf_hardware/usb/Readme.adoc rename to test/case/containers/basic/Readme.adoc diff --git a/test/case/infix_containers/basic/test.adoc b/test/case/containers/basic/test.adoc similarity index 91% rename from test/case/infix_containers/basic/test.adoc rename to test/case/containers/basic/test.adoc index e76cd18c..48ce26d7 100644 --- a/test/case/infix_containers/basic/test.adoc +++ b/test/case/containers/basic/test.adoc @@ -1,6 +1,6 @@ === Container basic -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_containers/basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/containers/basic] ==== Description diff --git a/test/case/infix_containers/basic/test.py b/test/case/containers/basic/test.py similarity index 100% rename from test/case/infix_containers/basic/test.py rename to test/case/containers/basic/test.py diff --git a/test/case/ietf_interfaces/dual_bridge/topology.dot b/test/case/containers/basic/topology.dot similarity index 100% rename from test/case/ietf_interfaces/dual_bridge/topology.dot rename to test/case/containers/basic/topology.dot diff --git a/test/case/ietf_interfaces/dual_bridge/topology.svg b/test/case/containers/basic/topology.svg similarity index 100% rename from test/case/ietf_interfaces/dual_bridge/topology.svg rename to test/case/containers/basic/topology.svg diff --git a/test/case/ietf_hardware/usb_two_ports/Readme.adoc b/test/case/containers/bridge/Readme.adoc similarity index 100% rename from test/case/ietf_hardware/usb_two_ports/Readme.adoc rename to test/case/containers/bridge/Readme.adoc diff --git a/test/case/infix_containers/bridge/test.adoc b/test/case/containers/bridge/test.adoc similarity index 90% rename from test/case/infix_containers/bridge/test.adoc rename to test/case/containers/bridge/test.adoc index c50ff86f..a99dc091 100644 --- a/test/case/infix_containers/bridge/test.adoc +++ b/test/case/containers/bridge/test.adoc @@ -1,6 +1,6 @@ === Container with bridge network -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_containers/bridge] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/containers/bridge] ==== Description diff --git a/test/case/infix_containers/bridge/test.py b/test/case/containers/bridge/test.py similarity index 100% rename from test/case/infix_containers/bridge/test.py rename to test/case/containers/bridge/test.py diff --git a/test/case/infix_containers/bridge/topology.dot b/test/case/containers/bridge/topology.dot similarity index 100% rename from test/case/infix_containers/bridge/topology.dot rename to test/case/containers/bridge/topology.dot diff --git a/test/case/infix_containers/bridge/topology.svg b/test/case/containers/bridge/topology.svg similarity index 100% rename from test/case/infix_containers/bridge/topology.svg rename to test/case/containers/bridge/topology.svg diff --git a/test/case/ietf_interfaces/bridge_basic/Readme.adoc b/test/case/containers/enabled/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/bridge_basic/Readme.adoc rename to test/case/containers/enabled/Readme.adoc diff --git a/test/case/infix_containers/enabled/test.adoc b/test/case/containers/enabled/test.adoc similarity index 91% rename from test/case/infix_containers/enabled/test.adoc rename to test/case/containers/enabled/test.adoc index ea10606a..574e2d93 100644 --- a/test/case/infix_containers/enabled/test.adoc +++ b/test/case/containers/enabled/test.adoc @@ -1,6 +1,6 @@ === Container enabled/disabled -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_containers/enabled] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/containers/enabled] ==== Description diff --git a/test/case/infix_containers/enabled/test.py b/test/case/containers/enabled/test.py similarity index 100% rename from test/case/infix_containers/enabled/test.py rename to test/case/containers/enabled/test.py diff --git a/test/case/infix_containers/enabled/topology.dot b/test/case/containers/enabled/topology.dot similarity index 100% rename from test/case/infix_containers/enabled/topology.dot rename to test/case/containers/enabled/topology.dot diff --git a/test/case/ietf_hardware/usb/topology.svg b/test/case/containers/enabled/topology.svg similarity index 100% rename from test/case/ietf_hardware/usb/topology.svg rename to test/case/containers/enabled/topology.svg diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc b/test/case/containers/environment/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc rename to test/case/containers/environment/Readme.adoc diff --git a/test/case/infix_containers/environment/test.adoc b/test/case/containers/environment/test.adoc similarity index 90% rename from test/case/infix_containers/environment/test.adoc rename to test/case/containers/environment/test.adoc index 2de6e5c4..4b300a6b 100644 --- a/test/case/infix_containers/environment/test.adoc +++ b/test/case/containers/environment/test.adoc @@ -1,6 +1,6 @@ === Container environment variables -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_containers/environment] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/containers/environment] ==== Description diff --git a/test/case/infix_containers/environment/test.py b/test/case/containers/environment/test.py similarity index 100% rename from test/case/infix_containers/environment/test.py rename to test/case/containers/environment/test.py diff --git a/test/case/infix_containers/environment/topology.dot b/test/case/containers/environment/topology.dot similarity index 100% rename from test/case/infix_containers/environment/topology.dot rename to test/case/containers/environment/topology.dot diff --git a/test/case/ietf_interfaces/iface_phys_address/topology.svg b/test/case/containers/environment/topology.svg similarity index 100% rename from test/case/ietf_interfaces/iface_phys_address/topology.svg rename to test/case/containers/environment/topology.svg diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc b/test/case/containers/firewall_basic/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc rename to test/case/containers/firewall_basic/Readme.adoc diff --git a/test/case/infix_containers/firewall_basic/test.adoc b/test/case/containers/firewall_basic/test.adoc similarity index 95% rename from test/case/infix_containers/firewall_basic/test.adoc rename to test/case/containers/firewall_basic/test.adoc index 3b1d8e33..ce31e4de 100644 --- a/test/case/infix_containers/firewall_basic/test.adoc +++ b/test/case/containers/firewall_basic/test.adoc @@ -1,6 +1,6 @@ === Basic Firewall Container -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_containers/firewall_basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/containers/firewall_basic] ==== Description diff --git a/test/case/infix_containers/firewall_basic/test.py b/test/case/containers/firewall_basic/test.py similarity index 100% rename from test/case/infix_containers/firewall_basic/test.py rename to test/case/containers/firewall_basic/test.py diff --git a/test/case/infix_containers/firewall_basic/topology.dot b/test/case/containers/firewall_basic/topology.dot similarity index 100% rename from test/case/infix_containers/firewall_basic/topology.dot rename to test/case/containers/firewall_basic/topology.dot diff --git a/test/case/infix_containers/firewall_basic/topology.svg b/test/case/containers/firewall_basic/topology.svg similarity index 100% rename from test/case/infix_containers/firewall_basic/topology.svg rename to test/case/containers/firewall_basic/topology.svg diff --git a/test/case/ietf_interfaces/bridge_stp_basic/Readme.adoc b/test/case/containers/host_commands/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/bridge_stp_basic/Readme.adoc rename to test/case/containers/host_commands/Readme.adoc diff --git a/test/case/infix_containers/host_commands/test.adoc b/test/case/containers/host_commands/test.adoc similarity index 59% rename from test/case/infix_containers/host_commands/test.adoc rename to test/case/containers/host_commands/test.adoc index ac74d43e..4f0489f3 100644 --- a/test/case/infix_containers/host_commands/test.adoc +++ b/test/case/containers/host_commands/test.adoc @@ -1,12 +1,13 @@ === Host Command Execution from Container -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_containers/host_commands] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/containers/host_commands] ==== Description -This test verifies that a container running on Infix can execute commands -that affect the host system. Specifically, it confirms that the container -can change the hostname of the host. +This test verifies that a container in privileged mode can break out of +the container to execute commands that affect the host system. +Specifically, it confirms that the container can change the hostname of +the host. ==== Topology diff --git a/test/case/infix_containers/host_commands/test.py b/test/case/containers/host_commands/test.py similarity index 100% rename from test/case/infix_containers/host_commands/test.py rename to test/case/containers/host_commands/test.py diff --git a/test/case/ietf_hardware/usb/topology.dot b/test/case/containers/host_commands/topology.dot similarity index 100% rename from test/case/ietf_hardware/usb/topology.dot rename to test/case/containers/host_commands/topology.dot diff --git a/test/case/ietf_hardware/usb_two_ports/topology.svg b/test/case/containers/host_commands/topology.svg similarity index 100% rename from test/case/ietf_hardware/usb_two_ports/topology.svg rename to test/case/containers/host_commands/topology.svg diff --git a/test/case/ietf_interfaces/bridge_veth/Readme.adoc b/test/case/containers/phys/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/bridge_veth/Readme.adoc rename to test/case/containers/phys/Readme.adoc diff --git a/test/case/infix_containers/phys/test.adoc b/test/case/containers/phys/test.adoc similarity index 89% rename from test/case/infix_containers/phys/test.adoc rename to test/case/containers/phys/test.adoc index 6d0390f2..4a221454 100644 --- a/test/case/infix_containers/phys/test.adoc +++ b/test/case/containers/phys/test.adoc @@ -1,6 +1,6 @@ === Container with physical interface -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_containers/phys] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/containers/phys] ==== Description diff --git a/test/case/infix_containers/phys/test.py b/test/case/containers/phys/test.py similarity index 100% rename from test/case/infix_containers/phys/test.py rename to test/case/containers/phys/test.py diff --git a/test/case/infix_containers/phys/topology.dot b/test/case/containers/phys/topology.dot similarity index 100% rename from test/case/infix_containers/phys/topology.dot rename to test/case/containers/phys/topology.dot diff --git a/test/case/infix_containers/phys/topology.svg b/test/case/containers/phys/topology.svg similarity index 100% rename from test/case/infix_containers/phys/topology.svg rename to test/case/containers/phys/topology.svg diff --git a/test/case/ietf_interfaces/bridge_vlan/Readme.adoc b/test/case/containers/upgrade/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/bridge_vlan/Readme.adoc rename to test/case/containers/upgrade/Readme.adoc diff --git a/test/case/infix_containers/upgrade/download.sh b/test/case/containers/upgrade/download.sh similarity index 100% rename from test/case/infix_containers/upgrade/download.sh rename to test/case/containers/upgrade/download.sh diff --git a/test/case/infix_containers/upgrade/test.adoc b/test/case/containers/upgrade/test.adoc similarity index 93% rename from test/case/infix_containers/upgrade/test.adoc rename to test/case/containers/upgrade/test.adoc index 59c24940..e841e53b 100644 --- a/test/case/infix_containers/upgrade/test.adoc +++ b/test/case/containers/upgrade/test.adoc @@ -1,6 +1,6 @@ === Container Upgrade -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_containers/upgrade] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/containers/upgrade] ==== Description diff --git a/test/case/infix_containers/upgrade/test.py b/test/case/containers/upgrade/test.py similarity index 100% rename from test/case/infix_containers/upgrade/test.py rename to test/case/containers/upgrade/test.py diff --git a/test/case/infix_containers/upgrade/topology.dot b/test/case/containers/upgrade/topology.dot similarity index 100% rename from test/case/infix_containers/upgrade/topology.dot rename to test/case/containers/upgrade/topology.dot diff --git a/test/case/ietf_interfaces/ifalias/topology.svg b/test/case/containers/upgrade/topology.svg similarity index 100% rename from test/case/ietf_interfaces/ifalias/topology.svg rename to test/case/containers/upgrade/topology.svg diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/Readme.adoc b/test/case/containers/veth/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/bridge_vlan_separation/Readme.adoc rename to test/case/containers/veth/Readme.adoc diff --git a/test/case/infix_containers/veth/network_diagram.svg b/test/case/containers/veth/network_diagram.svg similarity index 100% rename from test/case/infix_containers/veth/network_diagram.svg rename to test/case/containers/veth/network_diagram.svg diff --git a/test/case/infix_containers/veth/test.adoc b/test/case/containers/veth/test.adoc similarity index 93% rename from test/case/infix_containers/veth/test.adoc rename to test/case/containers/veth/test.adoc index c5de9312..dd557d04 100644 --- a/test/case/infix_containers/veth/test.adoc +++ b/test/case/containers/veth/test.adoc @@ -1,6 +1,6 @@ === Container with VETH pair -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_containers/veth] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/containers/veth] ==== Description diff --git a/test/case/infix_containers/veth/test.py b/test/case/containers/veth/test.py similarity index 100% rename from test/case/infix_containers/veth/test.py rename to test/case/containers/veth/test.py diff --git a/test/case/infix_containers/veth/topology.dot b/test/case/containers/veth/topology.dot similarity index 100% rename from test/case/infix_containers/veth/topology.dot rename to test/case/containers/veth/topology.dot diff --git a/test/case/infix_containers/veth/topology.svg b/test/case/containers/veth/topology.svg similarity index 100% rename from test/case/infix_containers/veth/topology.svg rename to test/case/containers/veth/topology.svg diff --git a/test/case/ietf_interfaces/dual_bridge/Readme.adoc b/test/case/containers/volume/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/dual_bridge/Readme.adoc rename to test/case/containers/volume/Readme.adoc diff --git a/test/case/infix_containers/volume/test.adoc b/test/case/containers/volume/test.adoc similarity index 89% rename from test/case/infix_containers/volume/test.adoc rename to test/case/containers/volume/test.adoc index b5be4eda..6123f017 100644 --- a/test/case/infix_containers/volume/test.adoc +++ b/test/case/containers/volume/test.adoc @@ -1,6 +1,6 @@ === Container Volume Persistence -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_containers/volume] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/containers/volume] ==== Description diff --git a/test/case/infix_containers/volume/test.py b/test/case/containers/volume/test.py similarity index 100% rename from test/case/infix_containers/volume/test.py rename to test/case/containers/volume/test.py diff --git a/test/case/ietf_interfaces/iface_phys_address/topology.dot b/test/case/containers/volume/topology.dot similarity index 100% rename from test/case/ietf_interfaces/iface_phys_address/topology.dot rename to test/case/containers/volume/topology.dot diff --git a/test/case/ietf_interfaces/ipv4_autoconf/topology.svg b/test/case/containers/volume/topology.svg similarity index 100% rename from test/case/ietf_interfaces/ipv4_autoconf/topology.svg rename to test/case/containers/volume/topology.svg diff --git a/test/case/infix_dhcp/Readme.adoc b/test/case/dhcp/Readme.adoc similarity index 91% rename from test/case/infix_dhcp/Readme.adoc rename to test/case/dhcp/Readme.adoc index 3ba34b26..8f21546a 100644 --- a/test/case/infix_dhcp/Readme.adoc +++ b/test/case/dhcp/Readme.adoc @@ -1,7 +1,7 @@ :testgroup: -== infix-dhcp +== DHCP -Tests verifying DHCPv4/DHCPv6 client and server functionality in Infix: +Tests verifying DHCPv4/DHCPv6 client and server functionality: - Basic DHCPv4 client lease acquisition and configuration - DHCPv4 client with default gateway assignment diff --git a/test/case/infix_dhcp/all.yaml b/test/case/dhcp/all.yaml similarity index 100% rename from test/case/infix_dhcp/all.yaml rename to test/case/dhcp/all.yaml diff --git a/test/case/ietf_interfaces/iface_enable_disable/Readme.adoc b/test/case/dhcp/client6_basic/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/iface_enable_disable/Readme.adoc rename to test/case/dhcp/client6_basic/Readme.adoc diff --git a/test/case/infix_dhcp/client6_basic/test.py b/test/case/dhcp/client6_basic/test.py similarity index 100% rename from test/case/infix_dhcp/client6_basic/test.py rename to test/case/dhcp/client6_basic/test.py diff --git a/test/case/infix_dhcp/client6_basic/topology.dot b/test/case/dhcp/client6_basic/topology.dot similarity index 100% rename from test/case/infix_dhcp/client6_basic/topology.dot rename to test/case/dhcp/client6_basic/topology.dot diff --git a/test/case/ietf_interfaces/iface_phys_address/Readme.adoc b/test/case/dhcp/client6_prefix_delegation/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/iface_phys_address/Readme.adoc rename to test/case/dhcp/client6_prefix_delegation/Readme.adoc diff --git a/test/case/infix_dhcp/client6_prefix_delegation/test.py b/test/case/dhcp/client6_prefix_delegation/test.py similarity index 100% rename from test/case/infix_dhcp/client6_prefix_delegation/test.py rename to test/case/dhcp/client6_prefix_delegation/test.py diff --git a/test/case/infix_dhcp/client6_prefix_delegation/topology.dot b/test/case/dhcp/client6_prefix_delegation/topology.dot similarity index 100% rename from test/case/infix_dhcp/client6_prefix_delegation/topology.dot rename to test/case/dhcp/client6_prefix_delegation/topology.dot diff --git a/test/case/ietf_interfaces/ifalias/Readme.adoc b/test/case/dhcp/client_basic/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/ifalias/Readme.adoc rename to test/case/dhcp/client_basic/Readme.adoc diff --git a/test/case/infix_dhcp/client_basic/test.adoc b/test/case/dhcp/client_basic/test.adoc similarity index 80% rename from test/case/infix_dhcp/client_basic/test.adoc rename to test/case/dhcp/client_basic/test.adoc index 439c6ad6..ea9efd0f 100644 --- a/test/case/infix_dhcp/client_basic/test.adoc +++ b/test/case/dhcp/client_basic/test.adoc @@ -1,6 +1,6 @@ === DHCP Basic -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_dhcp/client_basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/dhcp/client_basic] ==== Description diff --git a/test/case/infix_dhcp/client_basic/test.py b/test/case/dhcp/client_basic/test.py similarity index 100% rename from test/case/infix_dhcp/client_basic/test.py rename to test/case/dhcp/client_basic/test.py diff --git a/test/case/infix_dhcp/client_basic/topology.dot b/test/case/dhcp/client_basic/topology.dot similarity index 100% rename from test/case/infix_dhcp/client_basic/topology.dot rename to test/case/dhcp/client_basic/topology.dot diff --git a/test/case/infix_dhcp/client_basic/topology.svg b/test/case/dhcp/client_basic/topology.svg similarity index 100% rename from test/case/infix_dhcp/client_basic/topology.svg rename to test/case/dhcp/client_basic/topology.svg diff --git a/test/case/ietf_interfaces/igmp_basic/Readme.adoc b/test/case/dhcp/client_default_gw/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/igmp_basic/Readme.adoc rename to test/case/dhcp/client_default_gw/Readme.adoc diff --git a/test/case/infix_dhcp/client_default_gw/test.adoc b/test/case/dhcp/client_default_gw/test.adoc similarity index 86% rename from test/case/infix_dhcp/client_default_gw/test.adoc rename to test/case/dhcp/client_default_gw/test.adoc index 1174f16c..5032cba1 100644 --- a/test/case/infix_dhcp/client_default_gw/test.adoc +++ b/test/case/dhcp/client_default_gw/test.adoc @@ -1,6 +1,6 @@ === DHCP Router -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_dhcp/client_default_gw] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/dhcp/client_default_gw] ==== Description diff --git a/test/case/infix_dhcp/client_default_gw/test.py b/test/case/dhcp/client_default_gw/test.py similarity index 100% rename from test/case/infix_dhcp/client_default_gw/test.py rename to test/case/dhcp/client_default_gw/test.py diff --git a/test/case/infix_dhcp/client_default_gw/topology.dot b/test/case/dhcp/client_default_gw/topology.dot similarity index 100% rename from test/case/infix_dhcp/client_default_gw/topology.dot rename to test/case/dhcp/client_default_gw/topology.dot diff --git a/test/case/infix_dhcp/client_default_gw/topology.svg b/test/case/dhcp/client_default_gw/topology.svg similarity index 100% rename from test/case/infix_dhcp/client_default_gw/topology.svg rename to test/case/dhcp/client_default_gw/topology.svg diff --git a/test/case/ietf_interfaces/igmp_vlan/Readme.adoc b/test/case/dhcp/client_hostname/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/igmp_vlan/Readme.adoc rename to test/case/dhcp/client_hostname/Readme.adoc diff --git a/test/case/infix_dhcp/client_hostname/test.adoc b/test/case/dhcp/client_hostname/test.adoc similarity index 89% rename from test/case/infix_dhcp/client_hostname/test.adoc rename to test/case/dhcp/client_hostname/test.adoc index 55756a6c..407800ff 100644 --- a/test/case/infix_dhcp/client_hostname/test.adoc +++ b/test/case/dhcp/client_hostname/test.adoc @@ -1,6 +1,6 @@ === DHCP Hostname Priority -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_dhcp/client_hostname] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/dhcp/client_hostname] ==== Description diff --git a/test/case/infix_dhcp/client_hostname/test.py b/test/case/dhcp/client_hostname/test.py similarity index 100% rename from test/case/infix_dhcp/client_hostname/test.py rename to test/case/dhcp/client_hostname/test.py diff --git a/test/case/infix_dhcp/client_hostname/topology.dot b/test/case/dhcp/client_hostname/topology.dot similarity index 100% rename from test/case/infix_dhcp/client_hostname/topology.dot rename to test/case/dhcp/client_hostname/topology.dot diff --git a/test/case/infix_dhcp/client_hostname/topology.svg b/test/case/dhcp/client_hostname/topology.svg similarity index 100% rename from test/case/infix_dhcp/client_hostname/topology.svg rename to test/case/dhcp/client_hostname/topology.svg diff --git a/test/case/ietf_interfaces/ipv4_address/Readme.adoc b/test/case/dhcp/client_routes/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/ipv4_address/Readme.adoc rename to test/case/dhcp/client_routes/Readme.adoc diff --git a/test/case/infix_dhcp/client_routes/test.adoc b/test/case/dhcp/client_routes/test.adoc similarity index 93% rename from test/case/infix_dhcp/client_routes/test.adoc rename to test/case/dhcp/client_routes/test.adoc index a4f288e1..5a35e4f4 100644 --- a/test/case/infix_dhcp/client_routes/test.adoc +++ b/test/case/dhcp/client_routes/test.adoc @@ -1,6 +1,6 @@ === DHCP option 121 vs option 3 -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_dhcp/client_routes] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/dhcp/client_routes] ==== Description diff --git a/test/case/infix_dhcp/client_routes/test.py b/test/case/dhcp/client_routes/test.py similarity index 100% rename from test/case/infix_dhcp/client_routes/test.py rename to test/case/dhcp/client_routes/test.py diff --git a/test/case/infix_dhcp/client_routes/topology.dot b/test/case/dhcp/client_routes/topology.dot similarity index 100% rename from test/case/infix_dhcp/client_routes/topology.dot rename to test/case/dhcp/client_routes/topology.dot diff --git a/test/case/infix_dhcp/client_routes/topology.svg b/test/case/dhcp/client_routes/topology.svg similarity index 100% rename from test/case/infix_dhcp/client_routes/topology.svg rename to test/case/dhcp/client_routes/topology.svg diff --git a/test/case/infix_dhcp/dhcp_client.yaml b/test/case/dhcp/dhcp_client.yaml similarity index 100% rename from test/case/infix_dhcp/dhcp_client.yaml rename to test/case/dhcp/dhcp_client.yaml diff --git a/test/case/infix_dhcp/dhcp_server.yaml b/test/case/dhcp/dhcp_server.yaml similarity index 100% rename from test/case/infix_dhcp/dhcp_server.yaml rename to test/case/dhcp/dhcp_server.yaml diff --git a/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc b/test/case/dhcp/server_basic/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc rename to test/case/dhcp/server_basic/Readme.adoc diff --git a/test/case/infix_dhcp/server_basic/test.adoc b/test/case/dhcp/server_basic/test.adoc similarity index 90% rename from test/case/infix_dhcp/server_basic/test.adoc rename to test/case/dhcp/server_basic/test.adoc index e4a82c7e..d0b55b73 100644 --- a/test/case/infix_dhcp/server_basic/test.adoc +++ b/test/case/dhcp/server_basic/test.adoc @@ -1,6 +1,6 @@ === DHCP Server -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_dhcp/server_basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/dhcp/server_basic] ==== Description diff --git a/test/case/infix_dhcp/server_basic/test.py b/test/case/dhcp/server_basic/test.py similarity index 100% rename from test/case/infix_dhcp/server_basic/test.py rename to test/case/dhcp/server_basic/test.py diff --git a/test/case/infix_dhcp/server_basic/topology.dot b/test/case/dhcp/server_basic/topology.dot similarity index 100% rename from test/case/infix_dhcp/server_basic/topology.dot rename to test/case/dhcp/server_basic/topology.dot diff --git a/test/case/infix_dhcp/server_basic/topology.svg b/test/case/dhcp/server_basic/topology.svg similarity index 100% rename from test/case/infix_dhcp/server_basic/topology.svg rename to test/case/dhcp/server_basic/topology.svg diff --git a/test/case/ietf_interfaces/ipv6_address/Readme.adoc b/test/case/dhcp/server_host/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/ipv6_address/Readme.adoc rename to test/case/dhcp/server_host/Readme.adoc diff --git a/test/case/infix_dhcp/server_host/test.adoc b/test/case/dhcp/server_host/test.adoc similarity index 90% rename from test/case/infix_dhcp/server_host/test.adoc rename to test/case/dhcp/server_host/test.adoc index f2f699f7..2e636e0a 100644 --- a/test/case/infix_dhcp/server_host/test.adoc +++ b/test/case/dhcp/server_host/test.adoc @@ -1,6 +1,6 @@ === DHCP Server Static Host -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_dhcp/server_host] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/dhcp/server_host] ==== Description diff --git a/test/case/infix_dhcp/server_host/test.py b/test/case/dhcp/server_host/test.py similarity index 100% rename from test/case/infix_dhcp/server_host/test.py rename to test/case/dhcp/server_host/test.py diff --git a/test/case/infix_dhcp/server_host/topology.dot b/test/case/dhcp/server_host/topology.dot similarity index 100% rename from test/case/infix_dhcp/server_host/topology.dot rename to test/case/dhcp/server_host/topology.dot diff --git a/test/case/infix_dhcp/server_host/topology.svg b/test/case/dhcp/server_host/topology.svg similarity index 100% rename from test/case/infix_dhcp/server_host/topology.svg rename to test/case/dhcp/server_host/topology.svg diff --git a/test/case/ietf_interfaces/lag_basic/Readme.adoc b/test/case/dhcp/server_subnets/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/lag_basic/Readme.adoc rename to test/case/dhcp/server_subnets/Readme.adoc diff --git a/test/case/infix_dhcp/server_subnets/dhcp-subnets.svg b/test/case/dhcp/server_subnets/dhcp-subnets.svg similarity index 100% rename from test/case/infix_dhcp/server_subnets/dhcp-subnets.svg rename to test/case/dhcp/server_subnets/dhcp-subnets.svg diff --git a/test/case/infix_dhcp/server_subnets/test.adoc b/test/case/dhcp/server_subnets/test.adoc similarity index 95% rename from test/case/infix_dhcp/server_subnets/test.adoc rename to test/case/dhcp/server_subnets/test.adoc index b545553d..c5086704 100644 --- a/test/case/infix_dhcp/server_subnets/test.adoc +++ b/test/case/dhcp/server_subnets/test.adoc @@ -1,6 +1,6 @@ === DHCP Server Multiple Subnets -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_dhcp/server_subnets] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/dhcp/server_subnets] ==== Description diff --git a/test/case/infix_dhcp/server_subnets/test.py b/test/case/dhcp/server_subnets/test.py similarity index 100% rename from test/case/infix_dhcp/server_subnets/test.py rename to test/case/dhcp/server_subnets/test.py diff --git a/test/case/infix_dhcp/server_subnets/topology.dot b/test/case/dhcp/server_subnets/topology.dot similarity index 100% rename from test/case/infix_dhcp/server_subnets/topology.dot rename to test/case/dhcp/server_subnets/topology.dot diff --git a/test/case/infix_dhcp/server_subnets/topology.svg b/test/case/dhcp/server_subnets/topology.svg similarity index 100% rename from test/case/infix_dhcp/server_subnets/topology.svg rename to test/case/dhcp/server_subnets/topology.svg diff --git a/test/case/infix_firewall/Readme.adoc b/test/case/firewall/Readme.adoc similarity index 92% rename from test/case/infix_firewall/Readme.adoc rename to test/case/firewall/Readme.adoc index fd3e888c..5b9d9092 100644 --- a/test/case/infix_firewall/Readme.adoc +++ b/test/case/firewall/Readme.adoc @@ -1,5 +1,5 @@ :testgroup: -== infix-firewall +== Firewall <<< diff --git a/test/case/infix_firewall/all.yaml b/test/case/firewall/all.yaml similarity index 100% rename from test/case/infix_firewall/all.yaml rename to test/case/firewall/all.yaml diff --git a/test/case/ietf_interfaces/lag_failure/Readme.adoc b/test/case/firewall/basic/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/lag_failure/Readme.adoc rename to test/case/firewall/basic/Readme.adoc diff --git a/test/case/infix_firewall/basic/basic.svg b/test/case/firewall/basic/basic.svg similarity index 100% rename from test/case/infix_firewall/basic/basic.svg rename to test/case/firewall/basic/basic.svg diff --git a/test/case/infix_firewall/basic/test.adoc b/test/case/firewall/basic/test.adoc similarity index 92% rename from test/case/infix_firewall/basic/test.adoc rename to test/case/firewall/basic/test.adoc index 015e9a4c..78ec4c4a 100644 --- a/test/case/infix_firewall/basic/test.adoc +++ b/test/case/firewall/basic/test.adoc @@ -1,6 +1,6 @@ === Basic Firewall for End Devices -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_firewall/basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/firewall/basic] ==== Description diff --git a/test/case/infix_firewall/basic/test.py b/test/case/firewall/basic/test.py similarity index 100% rename from test/case/infix_firewall/basic/test.py rename to test/case/firewall/basic/test.py diff --git a/test/case/infix_firewall/basic/topology.dot b/test/case/firewall/basic/topology.dot similarity index 100% rename from test/case/infix_firewall/basic/topology.dot rename to test/case/firewall/basic/topology.dot diff --git a/test/case/infix_firewall/basic/topology.svg b/test/case/firewall/basic/topology.svg similarity index 100% rename from test/case/infix_firewall/basic/topology.svg rename to test/case/firewall/basic/topology.svg diff --git a/test/case/ietf_interfaces/routing_basic/Readme.adoc b/test/case/firewall/ipv6-lan-wan/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/routing_basic/Readme.adoc rename to test/case/firewall/ipv6-lan-wan/Readme.adoc diff --git a/test/case/infix_firewall/ipv6-lan-wan/lan-wan.svg b/test/case/firewall/ipv6-lan-wan/lan-wan.svg similarity index 100% rename from test/case/infix_firewall/ipv6-lan-wan/lan-wan.svg rename to test/case/firewall/ipv6-lan-wan/lan-wan.svg diff --git a/test/case/infix_firewall/ipv6-lan-wan/test.adoc b/test/case/firewall/ipv6-lan-wan/test.adoc similarity index 91% rename from test/case/infix_firewall/ipv6-lan-wan/test.adoc rename to test/case/firewall/ipv6-lan-wan/test.adoc index daf54e3d..8abe7413 100644 --- a/test/case/infix_firewall/ipv6-lan-wan/test.adoc +++ b/test/case/firewall/ipv6-lan-wan/test.adoc @@ -1,6 +1,6 @@ === IPv6 LAN-WAN Firewall -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_firewall/ipv6-lan-wan] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/firewall/ipv6-lan-wan] ==== Description diff --git a/test/case/infix_firewall/ipv6-lan-wan/test.py b/test/case/firewall/ipv6-lan-wan/test.py similarity index 100% rename from test/case/infix_firewall/ipv6-lan-wan/test.py rename to test/case/firewall/ipv6-lan-wan/test.py diff --git a/test/case/infix_firewall/ipv6-lan-wan/topology.dot b/test/case/firewall/ipv6-lan-wan/topology.dot similarity index 100% rename from test/case/infix_firewall/ipv6-lan-wan/topology.dot rename to test/case/firewall/ipv6-lan-wan/topology.dot diff --git a/test/case/infix_firewall/ipv6-lan-wan/topology.svg b/test/case/firewall/ipv6-lan-wan/topology.svg similarity index 100% rename from test/case/infix_firewall/ipv6-lan-wan/topology.svg rename to test/case/firewall/ipv6-lan-wan/topology.svg diff --git a/test/case/ietf_interfaces/speed_duplex_copper/Readme.adoc b/test/case/firewall/ipv6-zone-migration/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/speed_duplex_copper/Readme.adoc rename to test/case/firewall/ipv6-zone-migration/Readme.adoc diff --git a/test/case/infix_firewall/ipv6-zone-migration/test.adoc b/test/case/firewall/ipv6-zone-migration/test.adoc similarity index 91% rename from test/case/infix_firewall/ipv6-zone-migration/test.adoc rename to test/case/firewall/ipv6-zone-migration/test.adoc index a39387d2..e6a0e6f5 100644 --- a/test/case/infix_firewall/ipv6-zone-migration/test.adoc +++ b/test/case/firewall/ipv6-zone-migration/test.adoc @@ -1,6 +1,6 @@ === IPv6 Zone Migration with Custom Services -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_firewall/ipv6-zone-migration] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/firewall/ipv6-zone-migration] ==== Description diff --git a/test/case/infix_firewall/ipv6-zone-migration/test.py b/test/case/firewall/ipv6-zone-migration/test.py similarity index 100% rename from test/case/infix_firewall/ipv6-zone-migration/test.py rename to test/case/firewall/ipv6-zone-migration/test.py diff --git a/test/case/infix_firewall/ipv6-zone-migration/topology.dot b/test/case/firewall/ipv6-zone-migration/topology.dot similarity index 100% rename from test/case/infix_firewall/ipv6-zone-migration/topology.dot rename to test/case/firewall/ipv6-zone-migration/topology.dot diff --git a/test/case/infix_firewall/ipv6-zone-migration/topology.svg b/test/case/firewall/ipv6-zone-migration/topology.svg similarity index 100% rename from test/case/infix_firewall/ipv6-zone-migration/topology.svg rename to test/case/firewall/ipv6-zone-migration/topology.svg diff --git a/test/case/ietf_interfaces/static_multicast_filters/Readme.adoc b/test/case/firewall/lan-wan/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/static_multicast_filters/Readme.adoc rename to test/case/firewall/lan-wan/Readme.adoc diff --git a/test/case/infix_firewall/lan-wan/lan-wan.svg b/test/case/firewall/lan-wan/lan-wan.svg similarity index 100% rename from test/case/infix_firewall/lan-wan/lan-wan.svg rename to test/case/firewall/lan-wan/lan-wan.svg diff --git a/test/case/infix_firewall/lan-wan/test.adoc b/test/case/firewall/lan-wan/test.adoc similarity index 92% rename from test/case/infix_firewall/lan-wan/test.adoc rename to test/case/firewall/lan-wan/test.adoc index 666cd496..714e90a4 100644 --- a/test/case/infix_firewall/lan-wan/test.adoc +++ b/test/case/firewall/lan-wan/test.adoc @@ -1,6 +1,6 @@ === LAN-WAN Firewall with Masquerading -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_firewall/lan-wan] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/firewall/lan-wan] ==== Description diff --git a/test/case/infix_firewall/lan-wan/test.py b/test/case/firewall/lan-wan/test.py similarity index 100% rename from test/case/infix_firewall/lan-wan/test.py rename to test/case/firewall/lan-wan/test.py diff --git a/test/case/infix_firewall/lan-wan/topology.dot b/test/case/firewall/lan-wan/topology.dot similarity index 100% rename from test/case/infix_firewall/lan-wan/topology.dot rename to test/case/firewall/lan-wan/topology.dot diff --git a/test/case/infix_firewall/lan-wan/topology.svg b/test/case/firewall/lan-wan/topology.svg similarity index 100% rename from test/case/infix_firewall/lan-wan/topology.svg rename to test/case/firewall/lan-wan/topology.svg diff --git a/test/case/ietf_interfaces/verify_all_interface_types/Readme.adoc b/test/case/firewall/wan-dmz-lan/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/verify_all_interface_types/Readme.adoc rename to test/case/firewall/wan-dmz-lan/Readme.adoc diff --git a/test/case/infix_firewall/wan-dmz-lan/test.adoc b/test/case/firewall/wan-dmz-lan/test.adoc similarity index 92% rename from test/case/infix_firewall/wan-dmz-lan/test.adoc rename to test/case/firewall/wan-dmz-lan/test.adoc index 1b533a11..dc525556 100644 --- a/test/case/infix_firewall/wan-dmz-lan/test.adoc +++ b/test/case/firewall/wan-dmz-lan/test.adoc @@ -1,6 +1,6 @@ === WAN-DMZ-LAN Firewall with Port Forwarding -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_firewall/wan-dmz-lan] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/firewall/wan-dmz-lan] ==== Description diff --git a/test/case/infix_firewall/wan-dmz-lan/test.py b/test/case/firewall/wan-dmz-lan/test.py similarity index 100% rename from test/case/infix_firewall/wan-dmz-lan/test.py rename to test/case/firewall/wan-dmz-lan/test.py diff --git a/test/case/infix_firewall/wan-dmz-lan/topology.dot b/test/case/firewall/wan-dmz-lan/topology.dot similarity index 100% rename from test/case/infix_firewall/wan-dmz-lan/topology.dot rename to test/case/firewall/wan-dmz-lan/topology.dot diff --git a/test/case/infix_firewall/wan-dmz-lan/topology.svg b/test/case/firewall/wan-dmz-lan/topology.svg similarity index 100% rename from test/case/infix_firewall/wan-dmz-lan/topology.svg rename to test/case/firewall/wan-dmz-lan/topology.svg diff --git a/test/case/infix_firewall/wan-dmz-lan/wan-dmz-lan.svg b/test/case/firewall/wan-dmz-lan/wan-dmz-lan.svg similarity index 100% rename from test/case/infix_firewall/wan-dmz-lan/wan-dmz-lan.svg rename to test/case/firewall/wan-dmz-lan/wan-dmz-lan.svg diff --git a/test/case/ietf_hardware/Readme.adoc b/test/case/hardware/Readme.adoc similarity index 67% rename from test/case/ietf_hardware/Readme.adoc rename to test/case/hardware/Readme.adoc index 9f6199cb..088069b1 100644 --- a/test/case/ietf_hardware/Readme.adoc +++ b/test/case/hardware/Readme.adoc @@ -1,7 +1,7 @@ :testgroup: -== ietf-hardware +== Hardware -Tests verifying IETF standard hardware monitoring and management: +Tests verifying hardware monitoring and management: - USB device detection and enumeration - Multiple USB port management and device handling diff --git a/test/case/ietf_hardware/all.yaml b/test/case/hardware/all.yaml similarity index 100% rename from test/case/ietf_hardware/all.yaml rename to test/case/hardware/all.yaml diff --git a/test/case/ietf_interfaces/veth_delete/Readme.adoc b/test/case/hardware/usb/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/veth_delete/Readme.adoc rename to test/case/hardware/usb/Readme.adoc diff --git a/test/case/ietf_hardware/usb/test.adoc b/test/case/hardware/usb/test.adoc similarity index 93% rename from test/case/ietf_hardware/usb/test.adoc rename to test/case/hardware/usb/test.adoc index 991aaa50..69d0c01f 100644 --- a/test/case/ietf_hardware/usb/test.adoc +++ b/test/case/hardware/usb/test.adoc @@ -1,6 +1,6 @@ === USB configuration -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_hardware/usb] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/hardware/usb] ==== Description diff --git a/test/case/ietf_hardware/usb/test.py b/test/case/hardware/usb/test.py similarity index 100% rename from test/case/ietf_hardware/usb/test.py rename to test/case/hardware/usb/test.py diff --git a/test/case/ietf_hardware/usb_two_ports/topology.dot b/test/case/hardware/usb/topology.dot similarity index 100% rename from test/case/ietf_hardware/usb_two_ports/topology.dot rename to test/case/hardware/usb/topology.dot diff --git a/test/case/ietf_interfaces/ipv4_address/topology.svg b/test/case/hardware/usb/topology.svg similarity index 100% rename from test/case/ietf_interfaces/ipv4_address/topology.svg rename to test/case/hardware/usb/topology.svg diff --git a/test/case/ietf_interfaces/vlan_iface_termination/Readme.adoc b/test/case/hardware/usb_two_ports/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/vlan_iface_termination/Readme.adoc rename to test/case/hardware/usb_two_ports/Readme.adoc diff --git a/test/case/ietf_hardware/usb_two_ports/test.adoc b/test/case/hardware/usb_two_ports/test.adoc similarity index 88% rename from test/case/ietf_hardware/usb_two_ports/test.adoc rename to test/case/hardware/usb_two_ports/test.adoc index b9579f37..98d10f66 100644 --- a/test/case/ietf_hardware/usb_two_ports/test.adoc +++ b/test/case/hardware/usb_two_ports/test.adoc @@ -1,6 +1,6 @@ === USB configuration with two USB ports -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_hardware/usb_two_ports] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/hardware/usb_two_ports] ==== Description diff --git a/test/case/ietf_hardware/usb_two_ports/test.py b/test/case/hardware/usb_two_ports/test.py similarity index 100% rename from test/case/ietf_hardware/usb_two_ports/test.py rename to test/case/hardware/usb_two_ports/test.py diff --git a/test/case/ietf_interfaces/ipv4_address/topology.dot b/test/case/hardware/usb_two_ports/topology.dot similarity index 100% rename from test/case/ietf_interfaces/ipv4_address/topology.dot rename to test/case/hardware/usb_two_ports/topology.dot diff --git a/test/case/ietf_syslog/advanced_compare/topology.svg b/test/case/hardware/usb_two_ports/topology.svg similarity index 100% rename from test/case/ietf_syslog/advanced_compare/topology.svg rename to test/case/hardware/usb_two_ports/topology.svg diff --git a/test/case/ietf_interfaces/Readme.adoc b/test/case/interfaces/Readme.adoc similarity index 95% rename from test/case/ietf_interfaces/Readme.adoc rename to test/case/interfaces/Readme.adoc index 34dbcc57..ad2d20f8 100644 --- a/test/case/ietf_interfaces/Readme.adoc +++ b/test/case/interfaces/Readme.adoc @@ -1,7 +1,7 @@ :testgroup: -== ietf-interfaces +== Interfaces -Tests verifying IETF standard interface configuration and management: +Tests verifying interface configuration and management: - VLAN interface configuration and connectivity - IPv4 and IPv6 address assignment and management diff --git a/test/case/ietf_interfaces/all.yaml b/test/case/interfaces/all.yaml similarity index 100% rename from test/case/ietf_interfaces/all.yaml rename to test/case/interfaces/all.yaml diff --git a/test/case/ietf_interfaces/bridge.yaml b/test/case/interfaces/bridge.yaml similarity index 100% rename from test/case/ietf_interfaces/bridge.yaml rename to test/case/interfaces/bridge.yaml diff --git a/test/case/ietf_interfaces/vlan_ping/Readme.adoc b/test/case/interfaces/bridge_basic/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/vlan_ping/Readme.adoc rename to test/case/interfaces/bridge_basic/Readme.adoc diff --git a/test/case/ietf_interfaces/bridge_basic/test.adoc b/test/case/interfaces/bridge_basic/test.adoc similarity index 85% rename from test/case/ietf_interfaces/bridge_basic/test.adoc rename to test/case/interfaces/bridge_basic/test.adoc index 89c130a2..58ee1c23 100644 --- a/test/case/ietf_interfaces/bridge_basic/test.adoc +++ b/test/case/interfaces/bridge_basic/test.adoc @@ -1,6 +1,6 @@ === Bridge basic -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/bridge_basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/bridge_basic] ==== Description diff --git a/test/case/ietf_interfaces/bridge_basic/test.py b/test/case/interfaces/bridge_basic/test.py similarity index 100% rename from test/case/ietf_interfaces/bridge_basic/test.py rename to test/case/interfaces/bridge_basic/test.py diff --git a/test/case/ietf_interfaces/bridge_basic/topology.dot b/test/case/interfaces/bridge_basic/topology.dot similarity index 100% rename from test/case/ietf_interfaces/bridge_basic/topology.dot rename to test/case/interfaces/bridge_basic/topology.dot diff --git a/test/case/ietf_interfaces/bridge_basic/topology.svg b/test/case/interfaces/bridge_basic/topology.svg similarity index 100% rename from test/case/ietf_interfaces/bridge_basic/topology.svg rename to test/case/interfaces/bridge_basic/topology.svg diff --git a/test/case/ietf_interfaces/vlan_qos/Readme.adoc b/test/case/interfaces/bridge_fwd_dual_dut/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/vlan_qos/Readme.adoc rename to test/case/interfaces/bridge_fwd_dual_dut/Readme.adoc diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/test.adoc b/test/case/interfaces/bridge_fwd_dual_dut/test.adoc similarity index 93% rename from test/case/ietf_interfaces/bridge_fwd_dual_dut/test.adoc rename to test/case/interfaces/bridge_fwd_dual_dut/test.adoc index a597fd0a..aa6f1e77 100644 --- a/test/case/ietf_interfaces/bridge_fwd_dual_dut/test.adoc +++ b/test/case/interfaces/bridge_fwd_dual_dut/test.adoc @@ -1,6 +1,6 @@ === Bridge forwarding dual DUTs -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/bridge_fwd_dual_dut] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/bridge_fwd_dual_dut] ==== Description diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/test.py b/test/case/interfaces/bridge_fwd_dual_dut/test.py similarity index 100% rename from test/case/ietf_interfaces/bridge_fwd_dual_dut/test.py rename to test/case/interfaces/bridge_fwd_dual_dut/test.py diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.dot b/test/case/interfaces/bridge_fwd_dual_dut/topology.dot similarity index 100% rename from test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.dot rename to test/case/interfaces/bridge_fwd_dual_dut/topology.dot diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.svg b/test/case/interfaces/bridge_fwd_dual_dut/topology.svg similarity index 100% rename from test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.svg rename to test/case/interfaces/bridge_fwd_dual_dut/topology.svg diff --git a/test/case/ietf_routing/ospf_basic/Readme.adoc b/test/case/interfaces/bridge_fwd_sgl_dut/Readme.adoc similarity index 100% rename from test/case/ietf_routing/ospf_basic/Readme.adoc rename to test/case/interfaces/bridge_fwd_sgl_dut/Readme.adoc diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/test.adoc b/test/case/interfaces/bridge_fwd_sgl_dut/test.adoc similarity index 92% rename from test/case/ietf_interfaces/bridge_fwd_sgl_dut/test.adoc rename to test/case/interfaces/bridge_fwd_sgl_dut/test.adoc index a7092895..3469e71e 100644 --- a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/test.adoc +++ b/test/case/interfaces/bridge_fwd_sgl_dut/test.adoc @@ -1,6 +1,6 @@ === Bridge forwarding single DUTs -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/bridge_fwd_sgl_dut] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/bridge_fwd_sgl_dut] ==== Description diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/test.py b/test/case/interfaces/bridge_fwd_sgl_dut/test.py similarity index 100% rename from test/case/ietf_interfaces/bridge_fwd_sgl_dut/test.py rename to test/case/interfaces/bridge_fwd_sgl_dut/test.py diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.dot b/test/case/interfaces/bridge_fwd_sgl_dut/topology.dot similarity index 100% rename from test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.dot rename to test/case/interfaces/bridge_fwd_sgl_dut/topology.dot diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.svg b/test/case/interfaces/bridge_fwd_sgl_dut/topology.svg similarity index 100% rename from test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.svg rename to test/case/interfaces/bridge_fwd_sgl_dut/topology.svg diff --git a/test/case/ietf_routing/ospf_bfd/Readme.adoc b/test/case/interfaces/bridge_stp_basic/Readme.adoc similarity index 100% rename from test/case/ietf_routing/ospf_bfd/Readme.adoc rename to test/case/interfaces/bridge_stp_basic/Readme.adoc diff --git a/test/case/ietf_interfaces/bridge_stp_basic/test.adoc b/test/case/interfaces/bridge_stp_basic/test.adoc similarity index 92% rename from test/case/ietf_interfaces/bridge_stp_basic/test.adoc rename to test/case/interfaces/bridge_stp_basic/test.adoc index 8ef9ecaa..b51e2b84 100644 --- a/test/case/ietf_interfaces/bridge_stp_basic/test.adoc +++ b/test/case/interfaces/bridge_stp_basic/test.adoc @@ -1,6 +1,6 @@ === Bridge STP Basic -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/bridge_stp_basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/bridge_stp_basic] ==== Description diff --git a/test/case/ietf_interfaces/bridge_stp_basic/test.py b/test/case/interfaces/bridge_stp_basic/test.py similarity index 100% rename from test/case/ietf_interfaces/bridge_stp_basic/test.py rename to test/case/interfaces/bridge_stp_basic/test.py diff --git a/test/case/ietf_interfaces/bridge_stp_basic/topology.dot b/test/case/interfaces/bridge_stp_basic/topology.dot similarity index 100% rename from test/case/ietf_interfaces/bridge_stp_basic/topology.dot rename to test/case/interfaces/bridge_stp_basic/topology.dot diff --git a/test/case/ietf_interfaces/bridge_stp_basic/topology.svg b/test/case/interfaces/bridge_stp_basic/topology.svg similarity index 100% rename from test/case/ietf_interfaces/bridge_stp_basic/topology.svg rename to test/case/interfaces/bridge_stp_basic/topology.svg diff --git a/test/case/ietf_routing/ospf_default_route_advertise/Readme.adoc b/test/case/interfaces/bridge_veth/Readme.adoc similarity index 100% rename from test/case/ietf_routing/ospf_default_route_advertise/Readme.adoc rename to test/case/interfaces/bridge_veth/Readme.adoc diff --git a/test/case/ietf_interfaces/bridge_veth/test.adoc b/test/case/interfaces/bridge_veth/test.adoc similarity index 88% rename from test/case/ietf_interfaces/bridge_veth/test.adoc rename to test/case/interfaces/bridge_veth/test.adoc index 4625012b..b3826e90 100644 --- a/test/case/ietf_interfaces/bridge_veth/test.adoc +++ b/test/case/interfaces/bridge_veth/test.adoc @@ -1,6 +1,6 @@ === Bridge with a physical port and a veth -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/bridge_veth] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/bridge_veth] ==== Description diff --git a/test/case/ietf_interfaces/bridge_veth/test.py b/test/case/interfaces/bridge_veth/test.py similarity index 100% rename from test/case/ietf_interfaces/bridge_veth/test.py rename to test/case/interfaces/bridge_veth/test.py diff --git a/test/case/ietf_interfaces/bridge_veth/topology.dot b/test/case/interfaces/bridge_veth/topology.dot similarity index 100% rename from test/case/ietf_interfaces/bridge_veth/topology.dot rename to test/case/interfaces/bridge_veth/topology.dot diff --git a/test/case/ietf_interfaces/bridge_veth/topology.svg b/test/case/interfaces/bridge_veth/topology.svg similarity index 100% rename from test/case/ietf_interfaces/bridge_veth/topology.svg rename to test/case/interfaces/bridge_veth/topology.svg diff --git a/test/case/ietf_routing/ospf_multiarea/Readme.adoc b/test/case/interfaces/bridge_vlan/Readme.adoc similarity index 100% rename from test/case/ietf_routing/ospf_multiarea/Readme.adoc rename to test/case/interfaces/bridge_vlan/Readme.adoc diff --git a/test/case/ietf_interfaces/bridge_vlan/bridge-vlan.svg b/test/case/interfaces/bridge_vlan/bridge-vlan.svg similarity index 100% rename from test/case/ietf_interfaces/bridge_vlan/bridge-vlan.svg rename to test/case/interfaces/bridge_vlan/bridge-vlan.svg diff --git a/test/case/ietf_interfaces/bridge_vlan/test.adoc b/test/case/interfaces/bridge_vlan/test.adoc similarity index 85% rename from test/case/ietf_interfaces/bridge_vlan/test.adoc rename to test/case/interfaces/bridge_vlan/test.adoc index a6deb7cb..dc19a724 100644 --- a/test/case/ietf_interfaces/bridge_vlan/test.adoc +++ b/test/case/interfaces/bridge_vlan/test.adoc @@ -1,6 +1,6 @@ === Bridge VLAN -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/bridge_vlan] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/bridge_vlan] ==== Description diff --git a/test/case/ietf_interfaces/bridge_vlan/test.py b/test/case/interfaces/bridge_vlan/test.py similarity index 100% rename from test/case/ietf_interfaces/bridge_vlan/test.py rename to test/case/interfaces/bridge_vlan/test.py diff --git a/test/case/ietf_interfaces/bridge_vlan/topology.dot b/test/case/interfaces/bridge_vlan/topology.dot similarity index 100% rename from test/case/ietf_interfaces/bridge_vlan/topology.dot rename to test/case/interfaces/bridge_vlan/topology.dot diff --git a/test/case/ietf_interfaces/bridge_vlan/topology.svg b/test/case/interfaces/bridge_vlan/topology.svg similarity index 100% rename from test/case/ietf_interfaces/bridge_vlan/topology.svg rename to test/case/interfaces/bridge_vlan/topology.svg diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc b/test/case/interfaces/bridge_vlan_separation/Readme.adoc similarity index 100% rename from test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc rename to test/case/interfaces/bridge_vlan_separation/Readme.adoc diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/test.adoc b/test/case/interfaces/bridge_vlan_separation/test.adoc similarity index 95% rename from test/case/ietf_interfaces/bridge_vlan_separation/test.adoc rename to test/case/interfaces/bridge_vlan_separation/test.adoc index 12d6aab7..ae06a6e1 100644 --- a/test/case/ietf_interfaces/bridge_vlan_separation/test.adoc +++ b/test/case/interfaces/bridge_vlan_separation/test.adoc @@ -1,6 +1,6 @@ === Bridge VLAN separation -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/bridge_vlan_separation] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/bridge_vlan_separation] ==== Description diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/test.py b/test/case/interfaces/bridge_vlan_separation/test.py similarity index 100% rename from test/case/ietf_interfaces/bridge_vlan_separation/test.py rename to test/case/interfaces/bridge_vlan_separation/test.py diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/topology.dot b/test/case/interfaces/bridge_vlan_separation/topology.dot similarity index 100% rename from test/case/ietf_interfaces/bridge_vlan_separation/topology.dot rename to test/case/interfaces/bridge_vlan_separation/topology.dot diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/topology.svg b/test/case/interfaces/bridge_vlan_separation/topology.svg similarity index 100% rename from test/case/ietf_interfaces/bridge_vlan_separation/topology.svg rename to test/case/interfaces/bridge_vlan_separation/topology.svg diff --git a/test/case/ietf_routing/route_pref_255/Readme.adoc b/test/case/interfaces/dual_bridge/Readme.adoc similarity index 100% rename from test/case/ietf_routing/route_pref_255/Readme.adoc rename to test/case/interfaces/dual_bridge/Readme.adoc diff --git a/test/case/ietf_interfaces/dual_bridge/test.adoc b/test/case/interfaces/dual_bridge/test.adoc similarity index 87% rename from test/case/ietf_interfaces/dual_bridge/test.adoc rename to test/case/interfaces/dual_bridge/test.adoc index 3e9f03e1..440e6b11 100644 --- a/test/case/ietf_interfaces/dual_bridge/test.adoc +++ b/test/case/interfaces/dual_bridge/test.adoc @@ -1,6 +1,6 @@ === Dual bridges on one device -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/dual_bridge] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/dual_bridge] ==== Description diff --git a/test/case/ietf_interfaces/dual_bridge/test.py b/test/case/interfaces/dual_bridge/test.py similarity index 100% rename from test/case/ietf_interfaces/dual_bridge/test.py rename to test/case/interfaces/dual_bridge/test.py diff --git a/test/case/ietf_interfaces/ifalias/topology.dot b/test/case/interfaces/dual_bridge/topology.dot similarity index 100% rename from test/case/ietf_interfaces/ifalias/topology.dot rename to test/case/interfaces/dual_bridge/topology.dot diff --git a/test/case/ietf_interfaces/ipv6_address/topology.svg b/test/case/interfaces/dual_bridge/topology.svg similarity index 100% rename from test/case/ietf_interfaces/ipv6_address/topology.svg rename to test/case/interfaces/dual_bridge/topology.svg diff --git a/test/case/ietf_routing/route_pref_dhcp/Readme.adoc b/test/case/interfaces/iface_enable_disable/Readme.adoc similarity index 100% rename from test/case/ietf_routing/route_pref_dhcp/Readme.adoc rename to test/case/interfaces/iface_enable_disable/Readme.adoc diff --git a/test/case/ietf_interfaces/iface_enable_disable/test.adoc b/test/case/interfaces/iface_enable_disable/test.adoc similarity index 87% rename from test/case/ietf_interfaces/iface_enable_disable/test.adoc rename to test/case/interfaces/iface_enable_disable/test.adoc index da3fff3e..ba0abf80 100644 --- a/test/case/ietf_interfaces/iface_enable_disable/test.adoc +++ b/test/case/interfaces/iface_enable_disable/test.adoc @@ -1,6 +1,6 @@ === Interface status -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/iface_enable_disable] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/iface_enable_disable] ==== Description diff --git a/test/case/ietf_interfaces/iface_enable_disable/test.py b/test/case/interfaces/iface_enable_disable/test.py similarity index 100% rename from test/case/ietf_interfaces/iface_enable_disable/test.py rename to test/case/interfaces/iface_enable_disable/test.py diff --git a/test/case/ietf_interfaces/iface_enable_disable/topology.dot b/test/case/interfaces/iface_enable_disable/topology.dot similarity index 100% rename from test/case/ietf_interfaces/iface_enable_disable/topology.dot rename to test/case/interfaces/iface_enable_disable/topology.dot diff --git a/test/case/ietf_interfaces/iface_enable_disable/topology.svg b/test/case/interfaces/iface_enable_disable/topology.svg similarity index 100% rename from test/case/ietf_interfaces/iface_enable_disable/topology.svg rename to test/case/interfaces/iface_enable_disable/topology.svg diff --git a/test/case/ietf_routing/route_pref_ospf/Readme.adoc b/test/case/interfaces/iface_phys_address/Readme.adoc similarity index 100% rename from test/case/ietf_routing/route_pref_ospf/Readme.adoc rename to test/case/interfaces/iface_phys_address/Readme.adoc diff --git a/test/case/ietf_interfaces/iface_phys_address/test.adoc b/test/case/interfaces/iface_phys_address/test.adoc similarity index 90% rename from test/case/ietf_interfaces/iface_phys_address/test.adoc rename to test/case/interfaces/iface_phys_address/test.adoc index 31101b38..a78817a9 100644 --- a/test/case/ietf_interfaces/iface_phys_address/test.adoc +++ b/test/case/interfaces/iface_phys_address/test.adoc @@ -1,6 +1,6 @@ === Custom MAC address on interface -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/iface_phys_address] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/iface_phys_address] ==== Description diff --git a/test/case/ietf_interfaces/iface_phys_address/test.py b/test/case/interfaces/iface_phys_address/test.py similarity index 100% rename from test/case/ietf_interfaces/iface_phys_address/test.py rename to test/case/interfaces/iface_phys_address/test.py diff --git a/test/case/ietf_interfaces/ipv4_autoconf/topology.dot b/test/case/interfaces/iface_phys_address/topology.dot similarity index 100% rename from test/case/ietf_interfaces/ipv4_autoconf/topology.dot rename to test/case/interfaces/iface_phys_address/topology.dot diff --git a/test/case/ietf_interfaces/speed_duplex_copper/topology.svg b/test/case/interfaces/iface_phys_address/topology.svg similarity index 100% rename from test/case/ietf_interfaces/speed_duplex_copper/topology.svg rename to test/case/interfaces/iface_phys_address/topology.svg diff --git a/test/case/ietf_routing/static_routing/Readme.adoc b/test/case/interfaces/ifalias/Readme.adoc similarity index 100% rename from test/case/ietf_routing/static_routing/Readme.adoc rename to test/case/interfaces/ifalias/Readme.adoc diff --git a/test/case/ietf_interfaces/ifalias/test.adoc b/test/case/interfaces/ifalias/test.adoc similarity index 85% rename from test/case/ietf_interfaces/ifalias/test.adoc rename to test/case/interfaces/ifalias/test.adoc index 0f8062a7..a46ccbb3 100644 --- a/test/case/ietf_interfaces/ifalias/test.adoc +++ b/test/case/interfaces/ifalias/test.adoc @@ -1,6 +1,6 @@ === Interface Description (ifAlias) -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/ifalias] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/ifalias] ==== Description diff --git a/test/case/ietf_interfaces/ifalias/test.py b/test/case/interfaces/ifalias/test.py similarity index 100% rename from test/case/ietf_interfaces/ifalias/test.py rename to test/case/interfaces/ifalias/test.py diff --git a/test/case/ietf_interfaces/ipv6_address/topology.dot b/test/case/interfaces/ifalias/topology.dot similarity index 100% rename from test/case/ietf_interfaces/ipv6_address/topology.dot rename to test/case/interfaces/ifalias/topology.dot diff --git a/test/case/ietf_system/upgrade/topology.svg b/test/case/interfaces/ifalias/topology.svg similarity index 100% rename from test/case/ietf_system/upgrade/topology.svg rename to test/case/interfaces/ifalias/topology.svg diff --git a/test/case/ietf_interfaces/igmp.yaml b/test/case/interfaces/igmp.yaml similarity index 100% rename from test/case/ietf_interfaces/igmp.yaml rename to test/case/interfaces/igmp.yaml diff --git a/test/case/ietf_syslog/advanced_compare/Readme.adoc b/test/case/interfaces/igmp_basic/Readme.adoc similarity index 100% rename from test/case/ietf_syslog/advanced_compare/Readme.adoc rename to test/case/interfaces/igmp_basic/Readme.adoc diff --git a/test/case/ietf_interfaces/igmp_basic/test.adoc b/test/case/interfaces/igmp_basic/test.adoc similarity index 92% rename from test/case/ietf_interfaces/igmp_basic/test.adoc rename to test/case/interfaces/igmp_basic/test.adoc index 976c110e..502aaa42 100644 --- a/test/case/ietf_interfaces/igmp_basic/test.adoc +++ b/test/case/interfaces/igmp_basic/test.adoc @@ -1,6 +1,6 @@ === IGMP basic -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/igmp_basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/igmp_basic] ==== Description diff --git a/test/case/ietf_interfaces/igmp_basic/test.py b/test/case/interfaces/igmp_basic/test.py similarity index 100% rename from test/case/ietf_interfaces/igmp_basic/test.py rename to test/case/interfaces/igmp_basic/test.py diff --git a/test/case/ietf_interfaces/igmp_basic/topology.dot b/test/case/interfaces/igmp_basic/topology.dot similarity index 100% rename from test/case/ietf_interfaces/igmp_basic/topology.dot rename to test/case/interfaces/igmp_basic/topology.dot diff --git a/test/case/ietf_interfaces/igmp_basic/topology.svg b/test/case/interfaces/igmp_basic/topology.svg similarity index 100% rename from test/case/ietf_interfaces/igmp_basic/topology.svg rename to test/case/interfaces/igmp_basic/topology.svg diff --git a/test/case/ietf_syslog/basic/Readme.adoc b/test/case/interfaces/igmp_vlan/Readme.adoc similarity index 100% rename from test/case/ietf_syslog/basic/Readme.adoc rename to test/case/interfaces/igmp_vlan/Readme.adoc diff --git a/test/case/ietf_interfaces/igmp_vlan/test.adoc b/test/case/interfaces/igmp_vlan/test.adoc similarity index 95% rename from test/case/ietf_interfaces/igmp_vlan/test.adoc rename to test/case/interfaces/igmp_vlan/test.adoc index 4b8bc856..eb81bd8c 100644 --- a/test/case/ietf_interfaces/igmp_vlan/test.adoc +++ b/test/case/interfaces/igmp_vlan/test.adoc @@ -1,6 +1,6 @@ === IGMP VLAN -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/igmp_vlan] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/igmp_vlan] ==== Description diff --git a/test/case/ietf_interfaces/igmp_vlan/test.py b/test/case/interfaces/igmp_vlan/test.py similarity index 100% rename from test/case/ietf_interfaces/igmp_vlan/test.py rename to test/case/interfaces/igmp_vlan/test.py diff --git a/test/case/ietf_interfaces/igmp_vlan/topology.dot b/test/case/interfaces/igmp_vlan/topology.dot similarity index 100% rename from test/case/ietf_interfaces/igmp_vlan/topology.dot rename to test/case/interfaces/igmp_vlan/topology.dot diff --git a/test/case/ietf_interfaces/igmp_vlan/topology.svg b/test/case/interfaces/igmp_vlan/topology.svg similarity index 100% rename from test/case/ietf_interfaces/igmp_vlan/topology.svg rename to test/case/interfaces/igmp_vlan/topology.svg diff --git a/test/case/ietf_syslog/hostname_filter/Readme.adoc b/test/case/interfaces/ipv4_address/Readme.adoc similarity index 100% rename from test/case/ietf_syslog/hostname_filter/Readme.adoc rename to test/case/interfaces/ipv4_address/Readme.adoc diff --git a/test/case/ietf_interfaces/ipv4_address/test.adoc b/test/case/interfaces/ipv4_address/test.adoc similarity index 85% rename from test/case/ietf_interfaces/ipv4_address/test.adoc rename to test/case/interfaces/ipv4_address/test.adoc index 5d9ed8b3..da1b2857 100644 --- a/test/case/ietf_interfaces/ipv4_address/test.adoc +++ b/test/case/interfaces/ipv4_address/test.adoc @@ -1,6 +1,6 @@ === Interface with IPv4 -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/ipv4_address] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/ipv4_address] ==== Description diff --git a/test/case/ietf_interfaces/ipv4_address/test.py b/test/case/interfaces/ipv4_address/test.py similarity index 100% rename from test/case/ietf_interfaces/ipv4_address/test.py rename to test/case/interfaces/ipv4_address/test.py diff --git a/test/case/ietf_syslog/advanced_compare/topology.dot b/test/case/interfaces/ipv4_address/topology.dot similarity index 100% rename from test/case/ietf_syslog/advanced_compare/topology.dot rename to test/case/interfaces/ipv4_address/topology.dot diff --git a/test/case/ietf_syslog/basic/topology.svg b/test/case/interfaces/ipv4_address/topology.svg similarity index 100% rename from test/case/ietf_syslog/basic/topology.svg rename to test/case/interfaces/ipv4_address/topology.svg diff --git a/test/case/ietf_syslog/pattern_match/Readme.adoc b/test/case/interfaces/ipv4_autoconf/Readme.adoc similarity index 100% rename from test/case/ietf_syslog/pattern_match/Readme.adoc rename to test/case/interfaces/ipv4_autoconf/Readme.adoc diff --git a/test/case/ietf_interfaces/ipv4_autoconf/test.adoc b/test/case/interfaces/ipv4_autoconf/test.adoc similarity index 89% rename from test/case/ietf_interfaces/ipv4_autoconf/test.adoc rename to test/case/interfaces/ipv4_autoconf/test.adoc index 32943a63..f63a71c4 100644 --- a/test/case/ietf_interfaces/ipv4_autoconf/test.adoc +++ b/test/case/interfaces/ipv4_autoconf/test.adoc @@ -1,6 +1,6 @@ === IPv4 link-local -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/ipv4_autoconf] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/ipv4_autoconf] ==== Description diff --git a/test/case/ietf_interfaces/ipv4_autoconf/test.py b/test/case/interfaces/ipv4_autoconf/test.py similarity index 100% rename from test/case/ietf_interfaces/ipv4_autoconf/test.py rename to test/case/interfaces/ipv4_autoconf/test.py diff --git a/test/case/ietf_system/upgrade/topology.dot b/test/case/interfaces/ipv4_autoconf/topology.dot similarity index 100% rename from test/case/ietf_system/upgrade/topology.dot rename to test/case/interfaces/ipv4_autoconf/topology.dot diff --git a/test/case/infix_containers/basic/topology.svg b/test/case/interfaces/ipv4_autoconf/topology.svg similarity index 100% rename from test/case/infix_containers/basic/topology.svg rename to test/case/interfaces/ipv4_autoconf/topology.svg diff --git a/test/case/ietf_syslog/property_filter/Readme.adoc b/test/case/interfaces/ipv6_address/Readme.adoc similarity index 100% rename from test/case/ietf_syslog/property_filter/Readme.adoc rename to test/case/interfaces/ipv6_address/Readme.adoc diff --git a/test/case/ietf_interfaces/ipv6_address/test.adoc b/test/case/interfaces/ipv6_address/test.adoc similarity index 85% rename from test/case/ietf_interfaces/ipv6_address/test.adoc rename to test/case/interfaces/ipv6_address/test.adoc index de19c0ef..048e1c39 100644 --- a/test/case/ietf_interfaces/ipv6_address/test.adoc +++ b/test/case/interfaces/ipv6_address/test.adoc @@ -1,6 +1,6 @@ === Interface IPv6 autoconf for bridges -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/ipv6_address] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/ipv6_address] ==== Description diff --git a/test/case/ietf_interfaces/ipv6_address/test.py b/test/case/interfaces/ipv6_address/test.py similarity index 100% rename from test/case/ietf_interfaces/ipv6_address/test.py rename to test/case/interfaces/ipv6_address/test.py diff --git a/test/case/infix_containers/basic/topology.dot b/test/case/interfaces/ipv6_address/topology.dot similarity index 100% rename from test/case/infix_containers/basic/topology.dot rename to test/case/interfaces/ipv6_address/topology.dot diff --git a/test/case/infix_containers/environment/topology.svg b/test/case/interfaces/ipv6_address/topology.svg similarity index 100% rename from test/case/infix_containers/environment/topology.svg rename to test/case/interfaces/ipv6_address/topology.svg diff --git a/test/case/ietf_interfaces/lag.yaml b/test/case/interfaces/lag.yaml similarity index 100% rename from test/case/ietf_interfaces/lag.yaml rename to test/case/interfaces/lag.yaml diff --git a/test/case/ietf_syslog/remote/Readme.adoc b/test/case/interfaces/lag_basic/Readme.adoc similarity index 100% rename from test/case/ietf_syslog/remote/Readme.adoc rename to test/case/interfaces/lag_basic/Readme.adoc diff --git a/test/case/ietf_interfaces/lag_basic/lag-basic.svg b/test/case/interfaces/lag_basic/lag-basic.svg similarity index 100% rename from test/case/ietf_interfaces/lag_basic/lag-basic.svg rename to test/case/interfaces/lag_basic/lag-basic.svg diff --git a/test/case/ietf_interfaces/lag_basic/test.adoc b/test/case/interfaces/lag_basic/test.adoc similarity index 90% rename from test/case/ietf_interfaces/lag_basic/test.adoc rename to test/case/interfaces/lag_basic/test.adoc index 9985f2a3..443928d8 100644 --- a/test/case/ietf_interfaces/lag_basic/test.adoc +++ b/test/case/interfaces/lag_basic/test.adoc @@ -1,6 +1,6 @@ === Ling Aggregation Basic -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/lag_basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/lag_basic] ==== Description diff --git a/test/case/ietf_interfaces/lag_basic/test.py b/test/case/interfaces/lag_basic/test.py similarity index 100% rename from test/case/ietf_interfaces/lag_basic/test.py rename to test/case/interfaces/lag_basic/test.py diff --git a/test/case/ietf_interfaces/lag_basic/topology.dot b/test/case/interfaces/lag_basic/topology.dot similarity index 100% rename from test/case/ietf_interfaces/lag_basic/topology.dot rename to test/case/interfaces/lag_basic/topology.dot diff --git a/test/case/ietf_interfaces/lag_basic/topology.svg b/test/case/interfaces/lag_basic/topology.svg similarity index 100% rename from test/case/ietf_interfaces/lag_basic/topology.svg rename to test/case/interfaces/lag_basic/topology.svg diff --git a/test/case/ietf_system/add_delete_user/Readme.adoc b/test/case/interfaces/lag_failure/Readme.adoc similarity index 100% rename from test/case/ietf_system/add_delete_user/Readme.adoc rename to test/case/interfaces/lag_failure/Readme.adoc diff --git a/test/case/ietf_interfaces/lag_failure/lag-failure.svg b/test/case/interfaces/lag_failure/lag-failure.svg similarity index 100% rename from test/case/ietf_interfaces/lag_failure/lag-failure.svg rename to test/case/interfaces/lag_failure/lag-failure.svg diff --git a/test/case/ietf_interfaces/lag_failure/test.adoc b/test/case/interfaces/lag_failure/test.adoc similarity index 90% rename from test/case/ietf_interfaces/lag_failure/test.adoc rename to test/case/interfaces/lag_failure/test.adoc index d50a375a..eed97320 100644 --- a/test/case/ietf_interfaces/lag_failure/test.adoc +++ b/test/case/interfaces/lag_failure/test.adoc @@ -1,6 +1,6 @@ === LACP Aggregate w/ Degraded Link -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/lag_failure] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/lag_failure] ==== Description diff --git a/test/case/ietf_interfaces/lag_failure/test.py b/test/case/interfaces/lag_failure/test.py similarity index 100% rename from test/case/ietf_interfaces/lag_failure/test.py rename to test/case/interfaces/lag_failure/test.py diff --git a/test/case/ietf_interfaces/lag_failure/topology.dot b/test/case/interfaces/lag_failure/topology.dot similarity index 100% rename from test/case/ietf_interfaces/lag_failure/topology.dot rename to test/case/interfaces/lag_failure/topology.dot diff --git a/test/case/ietf_interfaces/lag_failure/topology.svg b/test/case/interfaces/lag_failure/topology.svg similarity index 100% rename from test/case/ietf_interfaces/lag_failure/topology.svg rename to test/case/interfaces/lag_failure/topology.svg diff --git a/test/case/ietf_system/hostname/Readme.adoc b/test/case/interfaces/routing_basic/Readme.adoc similarity index 100% rename from test/case/ietf_system/hostname/Readme.adoc rename to test/case/interfaces/routing_basic/Readme.adoc diff --git a/test/case/ietf_interfaces/routing_basic/test.adoc b/test/case/interfaces/routing_basic/test.adoc similarity index 88% rename from test/case/ietf_interfaces/routing_basic/test.adoc rename to test/case/interfaces/routing_basic/test.adoc index facaab42..fb1ce7aa 100644 --- a/test/case/ietf_interfaces/routing_basic/test.adoc +++ b/test/case/interfaces/routing_basic/test.adoc @@ -1,6 +1,6 @@ === Routing basic -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/routing_basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/routing_basic] ==== Description diff --git a/test/case/ietf_interfaces/routing_basic/test.py b/test/case/interfaces/routing_basic/test.py similarity index 100% rename from test/case/ietf_interfaces/routing_basic/test.py rename to test/case/interfaces/routing_basic/test.py diff --git a/test/case/ietf_interfaces/routing_basic/topology.dot b/test/case/interfaces/routing_basic/topology.dot similarity index 100% rename from test/case/ietf_interfaces/routing_basic/topology.dot rename to test/case/interfaces/routing_basic/topology.dot diff --git a/test/case/ietf_interfaces/routing_basic/topology.svg b/test/case/interfaces/routing_basic/topology.svg similarity index 100% rename from test/case/ietf_interfaces/routing_basic/topology.svg rename to test/case/interfaces/routing_basic/topology.svg diff --git a/test/case/ietf_system/ntp_client/Readme.adoc b/test/case/interfaces/speed_duplex_copper/Readme.adoc similarity index 100% rename from test/case/ietf_system/ntp_client/Readme.adoc rename to test/case/interfaces/speed_duplex_copper/Readme.adoc diff --git a/test/case/ietf_interfaces/speed_duplex_copper/test.adoc b/test/case/interfaces/speed_duplex_copper/test.adoc similarity index 92% rename from test/case/ietf_interfaces/speed_duplex_copper/test.adoc rename to test/case/interfaces/speed_duplex_copper/test.adoc index c4fbbd9b..8e8848d7 100644 --- a/test/case/ietf_interfaces/speed_duplex_copper/test.adoc +++ b/test/case/interfaces/speed_duplex_copper/test.adoc @@ -1,6 +1,6 @@ === Interface Speed Duplex (Copper) -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/speed_duplex_copper] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/speed_duplex_copper] ==== Description diff --git a/test/case/ietf_interfaces/speed_duplex_copper/test.py b/test/case/interfaces/speed_duplex_copper/test.py similarity index 100% rename from test/case/ietf_interfaces/speed_duplex_copper/test.py rename to test/case/interfaces/speed_duplex_copper/test.py diff --git a/test/case/ietf_interfaces/speed_duplex_copper/topology.dot b/test/case/interfaces/speed_duplex_copper/topology.dot similarity index 100% rename from test/case/ietf_interfaces/speed_duplex_copper/topology.dot rename to test/case/interfaces/speed_duplex_copper/topology.dot diff --git a/test/case/infix_containers/upgrade/topology.svg b/test/case/interfaces/speed_duplex_copper/topology.svg similarity index 100% rename from test/case/infix_containers/upgrade/topology.svg rename to test/case/interfaces/speed_duplex_copper/topology.svg diff --git a/test/case/ietf_system/timezone/Readme.adoc b/test/case/interfaces/static_multicast_filters/Readme.adoc similarity index 100% rename from test/case/ietf_system/timezone/Readme.adoc rename to test/case/interfaces/static_multicast_filters/Readme.adoc diff --git a/test/case/ietf_interfaces/static_multicast_filters/test.adoc b/test/case/interfaces/static_multicast_filters/test.adoc similarity index 93% rename from test/case/ietf_interfaces/static_multicast_filters/test.adoc rename to test/case/interfaces/static_multicast_filters/test.adoc index 9ffa6c28..e36f9156 100644 --- a/test/case/ietf_interfaces/static_multicast_filters/test.adoc +++ b/test/case/interfaces/static_multicast_filters/test.adoc @@ -1,6 +1,6 @@ === Static multicast filters -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/static_multicast_filters] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/static_multicast_filters] ==== Description diff --git a/test/case/ietf_interfaces/static_multicast_filters/test.py b/test/case/interfaces/static_multicast_filters/test.py similarity index 100% rename from test/case/ietf_interfaces/static_multicast_filters/test.py rename to test/case/interfaces/static_multicast_filters/test.py diff --git a/test/case/ietf_interfaces/static_multicast_filters/topology.dot b/test/case/interfaces/static_multicast_filters/topology.dot similarity index 100% rename from test/case/ietf_interfaces/static_multicast_filters/topology.dot rename to test/case/interfaces/static_multicast_filters/topology.dot diff --git a/test/case/ietf_interfaces/static_multicast_filters/topology.svg b/test/case/interfaces/static_multicast_filters/topology.svg similarity index 100% rename from test/case/ietf_interfaces/static_multicast_filters/topology.svg rename to test/case/interfaces/static_multicast_filters/topology.svg diff --git a/test/case/ietf_interfaces/tunnel_basic/Readme.adoc b/test/case/interfaces/tunnel_basic/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/tunnel_basic/Readme.adoc rename to test/case/interfaces/tunnel_basic/Readme.adoc diff --git a/test/case/ietf_interfaces/tunnel_basic/gre.adoc b/test/case/interfaces/tunnel_basic/gre.adoc similarity index 89% rename from test/case/ietf_interfaces/tunnel_basic/gre.adoc rename to test/case/interfaces/tunnel_basic/gre.adoc index 96fcbbbe..745f8ec9 100644 --- a/test/case/ietf_interfaces/tunnel_basic/gre.adoc +++ b/test/case/interfaces/tunnel_basic/gre.adoc @@ -1,6 +1,6 @@ === GRE point-to-point -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/tunnel_basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/tunnel_basic] ==== Description diff --git a/test/case/ietf_interfaces/tunnel_basic/gre.py b/test/case/interfaces/tunnel_basic/gre.py similarity index 100% rename from test/case/ietf_interfaces/tunnel_basic/gre.py rename to test/case/interfaces/tunnel_basic/gre.py diff --git a/test/case/ietf_interfaces/tunnel_basic/gretap.adoc b/test/case/interfaces/tunnel_basic/gretap.adoc similarity index 89% rename from test/case/ietf_interfaces/tunnel_basic/gretap.adoc rename to test/case/interfaces/tunnel_basic/gretap.adoc index d08dfeb1..b358f766 100644 --- a/test/case/ietf_interfaces/tunnel_basic/gretap.adoc +++ b/test/case/interfaces/tunnel_basic/gretap.adoc @@ -1,6 +1,6 @@ === GRETAP point-to-point -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/tunnel_basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/tunnel_basic] ==== Description diff --git a/test/case/ietf_interfaces/tunnel_basic/gretap.py b/test/case/interfaces/tunnel_basic/gretap.py similarity index 100% rename from test/case/ietf_interfaces/tunnel_basic/gretap.py rename to test/case/interfaces/tunnel_basic/gretap.py diff --git a/test/case/ietf_interfaces/tunnel_basic/test.py b/test/case/interfaces/tunnel_basic/test.py similarity index 100% rename from test/case/ietf_interfaces/tunnel_basic/test.py rename to test/case/interfaces/tunnel_basic/test.py diff --git a/test/case/ietf_interfaces/tunnel_basic/test.yaml b/test/case/interfaces/tunnel_basic/test.yaml similarity index 100% rename from test/case/ietf_interfaces/tunnel_basic/test.yaml rename to test/case/interfaces/tunnel_basic/test.yaml diff --git a/test/case/ietf_interfaces/tunnel_basic/topology.dot b/test/case/interfaces/tunnel_basic/topology.dot similarity index 100% rename from test/case/ietf_interfaces/tunnel_basic/topology.dot rename to test/case/interfaces/tunnel_basic/topology.dot diff --git a/test/case/ietf_interfaces/tunnel_basic/topology.svg b/test/case/interfaces/tunnel_basic/topology.svg similarity index 100% rename from test/case/ietf_interfaces/tunnel_basic/topology.svg rename to test/case/interfaces/tunnel_basic/topology.svg diff --git a/test/case/ietf_interfaces/tunnel_basic/vxlan.adoc b/test/case/interfaces/tunnel_basic/vxlan.adoc similarity index 89% rename from test/case/ietf_interfaces/tunnel_basic/vxlan.adoc rename to test/case/interfaces/tunnel_basic/vxlan.adoc index 900f08a0..3b4cba0f 100644 --- a/test/case/ietf_interfaces/tunnel_basic/vxlan.adoc +++ b/test/case/interfaces/tunnel_basic/vxlan.adoc @@ -1,6 +1,6 @@ === VXLAN point-to-point -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/tunnel_basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/tunnel_basic] ==== Description diff --git a/test/case/ietf_interfaces/tunnel_basic/vxlan.py b/test/case/interfaces/tunnel_basic/vxlan.py similarity index 100% rename from test/case/ietf_interfaces/tunnel_basic/vxlan.py rename to test/case/interfaces/tunnel_basic/vxlan.py diff --git a/test/case/ietf_interfaces/tunnel_bridged/Readme.adoc b/test/case/interfaces/tunnel_bridged/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/tunnel_bridged/Readme.adoc rename to test/case/interfaces/tunnel_bridged/Readme.adoc diff --git a/test/case/ietf_interfaces/tunnel_bridged/gretap.adoc b/test/case/interfaces/tunnel_bridged/gretap.adoc similarity index 88% rename from test/case/ietf_interfaces/tunnel_bridged/gretap.adoc rename to test/case/interfaces/tunnel_bridged/gretap.adoc index 3c0f984d..e664f3f8 100644 --- a/test/case/ietf_interfaces/tunnel_bridged/gretap.adoc +++ b/test/case/interfaces/tunnel_bridged/gretap.adoc @@ -1,6 +1,6 @@ === GRETAP bridged with physical interface -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/tunnel_bridged] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/tunnel_bridged] ==== Description diff --git a/test/case/ietf_interfaces/tunnel_bridged/gretap.py b/test/case/interfaces/tunnel_bridged/gretap.py similarity index 100% rename from test/case/ietf_interfaces/tunnel_bridged/gretap.py rename to test/case/interfaces/tunnel_bridged/gretap.py diff --git a/test/case/ietf_interfaces/tunnel_bridged/test.py b/test/case/interfaces/tunnel_bridged/test.py similarity index 100% rename from test/case/ietf_interfaces/tunnel_bridged/test.py rename to test/case/interfaces/tunnel_bridged/test.py diff --git a/test/case/ietf_interfaces/tunnel_bridged/test.yaml b/test/case/interfaces/tunnel_bridged/test.yaml similarity index 100% rename from test/case/ietf_interfaces/tunnel_bridged/test.yaml rename to test/case/interfaces/tunnel_bridged/test.yaml diff --git a/test/case/ietf_interfaces/tunnel_bridged/topology.dot b/test/case/interfaces/tunnel_bridged/topology.dot similarity index 100% rename from test/case/ietf_interfaces/tunnel_bridged/topology.dot rename to test/case/interfaces/tunnel_bridged/topology.dot diff --git a/test/case/ietf_interfaces/tunnel_bridged/topology.svg b/test/case/interfaces/tunnel_bridged/topology.svg similarity index 100% rename from test/case/ietf_interfaces/tunnel_bridged/topology.svg rename to test/case/interfaces/tunnel_bridged/topology.svg diff --git a/test/case/ietf_interfaces/tunnel_bridged/vxlan.adoc b/test/case/interfaces/tunnel_bridged/vxlan.adoc similarity index 88% rename from test/case/ietf_interfaces/tunnel_bridged/vxlan.adoc rename to test/case/interfaces/tunnel_bridged/vxlan.adoc index 7f6c8a25..d6a463d6 100644 --- a/test/case/ietf_interfaces/tunnel_bridged/vxlan.adoc +++ b/test/case/interfaces/tunnel_bridged/vxlan.adoc @@ -1,6 +1,6 @@ === VXLAN bridged with physical interface -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/tunnel_bridged] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/tunnel_bridged] ==== Description diff --git a/test/case/ietf_interfaces/tunnel_bridged/vxlan.py b/test/case/interfaces/tunnel_bridged/vxlan.py similarity index 100% rename from test/case/ietf_interfaces/tunnel_bridged/vxlan.py rename to test/case/interfaces/tunnel_bridged/vxlan.py diff --git a/test/case/ietf_interfaces/tunnel_ttl/Readme.adoc b/test/case/interfaces/tunnel_ttl/Readme.adoc similarity index 100% rename from test/case/ietf_interfaces/tunnel_ttl/Readme.adoc rename to test/case/interfaces/tunnel_ttl/Readme.adoc diff --git a/test/case/ietf_interfaces/tunnel_ttl/gre.adoc b/test/case/interfaces/tunnel_ttl/gre.adoc similarity index 92% rename from test/case/ietf_interfaces/tunnel_ttl/gre.adoc rename to test/case/interfaces/tunnel_ttl/gre.adoc index 6b42cc0a..fcbfa296 100644 --- a/test/case/ietf_interfaces/tunnel_ttl/gre.adoc +++ b/test/case/interfaces/tunnel_ttl/gre.adoc @@ -1,6 +1,6 @@ === GRE Tunnel TTL verification -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/tunnel_ttl] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/tunnel_ttl] ==== Description diff --git a/test/case/ietf_interfaces/tunnel_ttl/gre.py b/test/case/interfaces/tunnel_ttl/gre.py similarity index 100% rename from test/case/ietf_interfaces/tunnel_ttl/gre.py rename to test/case/interfaces/tunnel_ttl/gre.py diff --git a/test/case/ietf_interfaces/tunnel_ttl/test.py b/test/case/interfaces/tunnel_ttl/test.py similarity index 100% rename from test/case/ietf_interfaces/tunnel_ttl/test.py rename to test/case/interfaces/tunnel_ttl/test.py diff --git a/test/case/ietf_interfaces/tunnel_ttl/test.yaml b/test/case/interfaces/tunnel_ttl/test.yaml similarity index 100% rename from test/case/ietf_interfaces/tunnel_ttl/test.yaml rename to test/case/interfaces/tunnel_ttl/test.yaml diff --git a/test/case/ietf_interfaces/tunnel_ttl/topology.dot b/test/case/interfaces/tunnel_ttl/topology.dot similarity index 100% rename from test/case/ietf_interfaces/tunnel_ttl/topology.dot rename to test/case/interfaces/tunnel_ttl/topology.dot diff --git a/test/case/ietf_interfaces/tunnel_ttl/topology.svg b/test/case/interfaces/tunnel_ttl/topology.svg similarity index 100% rename from test/case/ietf_interfaces/tunnel_ttl/topology.svg rename to test/case/interfaces/tunnel_ttl/topology.svg diff --git a/test/case/ietf_interfaces/tunnel_ttl/vxlan.adoc b/test/case/interfaces/tunnel_ttl/vxlan.adoc similarity index 92% rename from test/case/ietf_interfaces/tunnel_ttl/vxlan.adoc rename to test/case/interfaces/tunnel_ttl/vxlan.adoc index 5e89c57e..022df7c7 100644 --- a/test/case/ietf_interfaces/tunnel_ttl/vxlan.adoc +++ b/test/case/interfaces/tunnel_ttl/vxlan.adoc @@ -1,6 +1,6 @@ === VXLAN Tunnel TTL verification -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/tunnel_ttl] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/tunnel_ttl] ==== Description diff --git a/test/case/ietf_interfaces/tunnel_ttl/vxlan.py b/test/case/interfaces/tunnel_ttl/vxlan.py similarity index 100% rename from test/case/ietf_interfaces/tunnel_ttl/vxlan.py rename to test/case/interfaces/tunnel_ttl/vxlan.py diff --git a/test/case/ietf_interfaces/tunnels.yaml b/test/case/interfaces/tunnels.yaml similarity index 100% rename from test/case/ietf_interfaces/tunnels.yaml rename to test/case/interfaces/tunnels.yaml diff --git a/test/case/ietf_system/timezone_utc_offset/Readme.adoc b/test/case/interfaces/verify_all_interface_types/Readme.adoc similarity index 100% rename from test/case/ietf_system/timezone_utc_offset/Readme.adoc rename to test/case/interfaces/verify_all_interface_types/Readme.adoc diff --git a/test/case/ietf_interfaces/verify_all_interface_types/test.adoc b/test/case/interfaces/verify_all_interface_types/test.adoc similarity index 94% rename from test/case/ietf_interfaces/verify_all_interface_types/test.adoc rename to test/case/interfaces/verify_all_interface_types/test.adoc index 5392a3bb..fc15c7d0 100644 --- a/test/case/ietf_interfaces/verify_all_interface_types/test.adoc +++ b/test/case/interfaces/verify_all_interface_types/test.adoc @@ -1,6 +1,6 @@ === Verify that all interface types can be created -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/verify_all_interface_types] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/verify_all_interface_types] ==== Description diff --git a/test/case/ietf_interfaces/verify_all_interface_types/test.py b/test/case/interfaces/verify_all_interface_types/test.py similarity index 100% rename from test/case/ietf_interfaces/verify_all_interface_types/test.py rename to test/case/interfaces/verify_all_interface_types/test.py diff --git a/test/case/ietf_interfaces/verify_all_interface_types/topology.dot b/test/case/interfaces/verify_all_interface_types/topology.dot similarity index 100% rename from test/case/ietf_interfaces/verify_all_interface_types/topology.dot rename to test/case/interfaces/verify_all_interface_types/topology.dot diff --git a/test/case/ietf_interfaces/verify_all_interface_types/topology.svg b/test/case/interfaces/verify_all_interface_types/topology.svg similarity index 100% rename from test/case/ietf_interfaces/verify_all_interface_types/topology.svg rename to test/case/interfaces/verify_all_interface_types/topology.svg diff --git a/test/case/ietf_system/upgrade/Readme.adoc b/test/case/interfaces/veth_delete/Readme.adoc similarity index 100% rename from test/case/ietf_system/upgrade/Readme.adoc rename to test/case/interfaces/veth_delete/Readme.adoc diff --git a/test/case/ietf_interfaces/veth_delete/test.adoc b/test/case/interfaces/veth_delete/test.adoc similarity index 90% rename from test/case/ietf_interfaces/veth_delete/test.adoc rename to test/case/interfaces/veth_delete/test.adoc index 0053ae6a..95b9992e 100644 --- a/test/case/ietf_interfaces/veth_delete/test.adoc +++ b/test/case/interfaces/veth_delete/test.adoc @@ -1,6 +1,6 @@ === Verify that VETH pairs can be deleted -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/veth_delete] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/veth_delete] ==== Description diff --git a/test/case/ietf_interfaces/veth_delete/test.py b/test/case/interfaces/veth_delete/test.py similarity index 100% rename from test/case/ietf_interfaces/veth_delete/test.py rename to test/case/interfaces/veth_delete/test.py diff --git a/test/case/ietf_interfaces/veth_delete/topology.dot b/test/case/interfaces/veth_delete/topology.dot similarity index 100% rename from test/case/ietf_interfaces/veth_delete/topology.dot rename to test/case/interfaces/veth_delete/topology.dot diff --git a/test/case/ietf_interfaces/veth_delete/topology.svg b/test/case/interfaces/veth_delete/topology.svg similarity index 100% rename from test/case/ietf_interfaces/veth_delete/topology.svg rename to test/case/interfaces/veth_delete/topology.svg diff --git a/test/case/ietf_system/user_admin/Readme.adoc b/test/case/interfaces/vlan_iface_termination/Readme.adoc similarity index 100% rename from test/case/ietf_system/user_admin/Readme.adoc rename to test/case/interfaces/vlan_iface_termination/Readme.adoc diff --git a/test/case/ietf_interfaces/vlan_iface_termination/test.adoc b/test/case/interfaces/vlan_iface_termination/test.adoc similarity index 93% rename from test/case/ietf_interfaces/vlan_iface_termination/test.adoc rename to test/case/interfaces/vlan_iface_termination/test.adoc index ed1a8939..18e2da1b 100644 --- a/test/case/ietf_interfaces/vlan_iface_termination/test.adoc +++ b/test/case/interfaces/vlan_iface_termination/test.adoc @@ -1,6 +1,6 @@ === VLAN Interface Termination -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/vlan_iface_termination] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/vlan_iface_termination] ==== Description diff --git a/test/case/ietf_interfaces/vlan_iface_termination/test.py b/test/case/interfaces/vlan_iface_termination/test.py similarity index 100% rename from test/case/ietf_interfaces/vlan_iface_termination/test.py rename to test/case/interfaces/vlan_iface_termination/test.py diff --git a/test/case/ietf_interfaces/vlan_iface_termination/topology.dot b/test/case/interfaces/vlan_iface_termination/topology.dot similarity index 100% rename from test/case/ietf_interfaces/vlan_iface_termination/topology.dot rename to test/case/interfaces/vlan_iface_termination/topology.dot diff --git a/test/case/ietf_interfaces/vlan_iface_termination/topology.svg b/test/case/interfaces/vlan_iface_termination/topology.svg similarity index 100% rename from test/case/ietf_interfaces/vlan_iface_termination/topology.svg rename to test/case/interfaces/vlan_iface_termination/topology.svg diff --git a/test/case/infix_containers/basic/Readme.adoc b/test/case/interfaces/vlan_ping/Readme.adoc similarity index 100% rename from test/case/infix_containers/basic/Readme.adoc rename to test/case/interfaces/vlan_ping/Readme.adoc diff --git a/test/case/ietf_interfaces/vlan_ping/test.adoc b/test/case/interfaces/vlan_ping/test.adoc similarity index 87% rename from test/case/ietf_interfaces/vlan_ping/test.adoc rename to test/case/interfaces/vlan_ping/test.adoc index fb2f10e6..2b4a211b 100644 --- a/test/case/ietf_interfaces/vlan_ping/test.adoc +++ b/test/case/interfaces/vlan_ping/test.adoc @@ -1,6 +1,6 @@ === VLAN ping connectivity -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/vlan_ping] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/vlan_ping] ==== Description diff --git a/test/case/ietf_interfaces/vlan_ping/test.py b/test/case/interfaces/vlan_ping/test.py similarity index 100% rename from test/case/ietf_interfaces/vlan_ping/test.py rename to test/case/interfaces/vlan_ping/test.py diff --git a/test/case/ietf_interfaces/vlan_ping/topology.dot b/test/case/interfaces/vlan_ping/topology.dot similarity index 100% rename from test/case/ietf_interfaces/vlan_ping/topology.dot rename to test/case/interfaces/vlan_ping/topology.dot diff --git a/test/case/ietf_interfaces/vlan_ping/topology.svg b/test/case/interfaces/vlan_ping/topology.svg similarity index 100% rename from test/case/ietf_interfaces/vlan_ping/topology.svg rename to test/case/interfaces/vlan_ping/topology.svg diff --git a/test/case/infix_containers/bridge/Readme.adoc b/test/case/interfaces/vlan_qos/Readme.adoc similarity index 100% rename from test/case/infix_containers/bridge/Readme.adoc rename to test/case/interfaces/vlan_qos/Readme.adoc diff --git a/test/case/ietf_interfaces/vlan_qos/test.adoc b/test/case/interfaces/vlan_qos/test.adoc similarity index 95% rename from test/case/ietf_interfaces/vlan_qos/test.adoc rename to test/case/interfaces/vlan_qos/test.adoc index e8993e4d..a40962b7 100644 --- a/test/case/ietf_interfaces/vlan_qos/test.adoc +++ b/test/case/interfaces/vlan_qos/test.adoc @@ -1,6 +1,6 @@ === VLAN Interface Ingress/Egress QoS -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/vlan_qos] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/interfaces/vlan_qos] ==== Description diff --git a/test/case/ietf_interfaces/vlan_qos/test.py b/test/case/interfaces/vlan_qos/test.py similarity index 100% rename from test/case/ietf_interfaces/vlan_qos/test.py rename to test/case/interfaces/vlan_qos/test.py diff --git a/test/case/ietf_interfaces/vlan_qos/topology.dot b/test/case/interfaces/vlan_qos/topology.dot similarity index 100% rename from test/case/ietf_interfaces/vlan_qos/topology.dot rename to test/case/interfaces/vlan_qos/topology.dot diff --git a/test/case/ietf_interfaces/vlan_qos/topology.svg b/test/case/interfaces/vlan_qos/topology.svg similarity index 100% rename from test/case/ietf_interfaces/vlan_qos/topology.svg rename to test/case/interfaces/vlan_qos/topology.svg diff --git a/test/case/ietf_routing/Readme.adoc b/test/case/routing/Readme.adoc similarity index 91% rename from test/case/ietf_routing/Readme.adoc rename to test/case/routing/Readme.adoc index 20a01aa7..9554ede4 100644 --- a/test/case/ietf_routing/Readme.adoc +++ b/test/case/routing/Readme.adoc @@ -1,7 +1,7 @@ :testgroup: -== ietf-routing +== Routing -Tests verifying IETF standard routing protocols and configuration: +Tests verifying standard routing protocols and configuration: - Static routing configuration and forwarding behavior - OSPF basic neighbor discovery and LSA exchange diff --git a/test/case/ietf_routing/all.yaml b/test/case/routing/all.yaml similarity index 100% rename from test/case/ietf_routing/all.yaml rename to test/case/routing/all.yaml diff --git a/test/case/infix_containers/enabled/Readme.adoc b/test/case/routing/ospf_basic/Readme.adoc similarity index 100% rename from test/case/infix_containers/enabled/Readme.adoc rename to test/case/routing/ospf_basic/Readme.adoc diff --git a/test/case/ietf_routing/ospf_basic/test.adoc b/test/case/routing/ospf_basic/test.adoc similarity index 90% rename from test/case/ietf_routing/ospf_basic/test.adoc rename to test/case/routing/ospf_basic/test.adoc index d6f760c0..d868a634 100644 --- a/test/case/ietf_routing/ospf_basic/test.adoc +++ b/test/case/routing/ospf_basic/test.adoc @@ -1,6 +1,6 @@ === OSPF Basic -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_routing/ospf_basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/routing/ospf_basic] ==== Description diff --git a/test/case/ietf_routing/ospf_basic/test.py b/test/case/routing/ospf_basic/test.py similarity index 100% rename from test/case/ietf_routing/ospf_basic/test.py rename to test/case/routing/ospf_basic/test.py diff --git a/test/case/ietf_routing/ospf_basic/topology.dot b/test/case/routing/ospf_basic/topology.dot similarity index 100% rename from test/case/ietf_routing/ospf_basic/topology.dot rename to test/case/routing/ospf_basic/topology.dot diff --git a/test/case/ietf_routing/ospf_basic/topology.svg b/test/case/routing/ospf_basic/topology.svg similarity index 100% rename from test/case/ietf_routing/ospf_basic/topology.svg rename to test/case/routing/ospf_basic/topology.svg diff --git a/test/case/infix_containers/environment/Readme.adoc b/test/case/routing/ospf_bfd/Readme.adoc similarity index 100% rename from test/case/infix_containers/environment/Readme.adoc rename to test/case/routing/ospf_bfd/Readme.adoc diff --git a/test/case/ietf_routing/ospf_bfd/test.adoc b/test/case/routing/ospf_bfd/test.adoc similarity index 92% rename from test/case/ietf_routing/ospf_bfd/test.adoc rename to test/case/routing/ospf_bfd/test.adoc index d55bae3b..ed7f82cd 100644 --- a/test/case/ietf_routing/ospf_bfd/test.adoc +++ b/test/case/routing/ospf_bfd/test.adoc @@ -1,6 +1,6 @@ === OSPF BFD -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_routing/ospf_bfd] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/routing/ospf_bfd] ==== Description diff --git a/test/case/ietf_routing/ospf_bfd/test.py b/test/case/routing/ospf_bfd/test.py similarity index 100% rename from test/case/ietf_routing/ospf_bfd/test.py rename to test/case/routing/ospf_bfd/test.py diff --git a/test/case/ietf_routing/ospf_bfd/topology.dot b/test/case/routing/ospf_bfd/topology.dot similarity index 100% rename from test/case/ietf_routing/ospf_bfd/topology.dot rename to test/case/routing/ospf_bfd/topology.dot diff --git a/test/case/ietf_routing/ospf_bfd/topology.svg b/test/case/routing/ospf_bfd/topology.svg similarity index 100% rename from test/case/ietf_routing/ospf_bfd/topology.svg rename to test/case/routing/ospf_bfd/topology.svg diff --git a/test/case/infix_containers/firewall_basic/Readme.adoc b/test/case/routing/ospf_default_route_advertise/Readme.adoc similarity index 100% rename from test/case/infix_containers/firewall_basic/Readme.adoc rename to test/case/routing/ospf_default_route_advertise/Readme.adoc diff --git a/test/case/ietf_routing/ospf_default_route_advertise/test.adoc b/test/case/routing/ospf_default_route_advertise/test.adoc similarity index 95% rename from test/case/ietf_routing/ospf_default_route_advertise/test.adoc rename to test/case/routing/ospf_default_route_advertise/test.adoc index 4e92ae63..c3d24e59 100644 --- a/test/case/ietf_routing/ospf_default_route_advertise/test.adoc +++ b/test/case/routing/ospf_default_route_advertise/test.adoc @@ -1,6 +1,6 @@ === OSPF Default route advertise -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_routing/ospf_default_route_advertise] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/routing/ospf_default_route_advertise] ==== Description diff --git a/test/case/ietf_routing/ospf_default_route_advertise/test.py b/test/case/routing/ospf_default_route_advertise/test.py similarity index 100% rename from test/case/ietf_routing/ospf_default_route_advertise/test.py rename to test/case/routing/ospf_default_route_advertise/test.py diff --git a/test/case/ietf_routing/ospf_default_route_advertise/topology.dot b/test/case/routing/ospf_default_route_advertise/topology.dot similarity index 100% rename from test/case/ietf_routing/ospf_default_route_advertise/topology.dot rename to test/case/routing/ospf_default_route_advertise/topology.dot diff --git a/test/case/ietf_routing/ospf_default_route_advertise/topology.svg b/test/case/routing/ospf_default_route_advertise/topology.svg similarity index 100% rename from test/case/ietf_routing/ospf_default_route_advertise/topology.svg rename to test/case/routing/ospf_default_route_advertise/topology.svg diff --git a/test/case/infix_containers/host_commands/Readme.adoc b/test/case/routing/ospf_multiarea/Readme.adoc similarity index 100% rename from test/case/infix_containers/host_commands/Readme.adoc rename to test/case/routing/ospf_multiarea/Readme.adoc diff --git a/test/case/ietf_routing/ospf_multiarea/test.adoc b/test/case/routing/ospf_multiarea/test.adoc similarity index 95% rename from test/case/ietf_routing/ospf_multiarea/test.adoc rename to test/case/routing/ospf_multiarea/test.adoc index e1ed2945..21919152 100644 --- a/test/case/ietf_routing/ospf_multiarea/test.adoc +++ b/test/case/routing/ospf_multiarea/test.adoc @@ -1,6 +1,6 @@ === OSPF with multiple areas -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_routing/ospf_multiarea] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/routing/ospf_multiarea] ==== Description diff --git a/test/case/ietf_routing/ospf_multiarea/test.py b/test/case/routing/ospf_multiarea/test.py similarity index 100% rename from test/case/ietf_routing/ospf_multiarea/test.py rename to test/case/routing/ospf_multiarea/test.py diff --git a/test/case/ietf_routing/ospf_multiarea/topology.dot b/test/case/routing/ospf_multiarea/topology.dot similarity index 100% rename from test/case/ietf_routing/ospf_multiarea/topology.dot rename to test/case/routing/ospf_multiarea/topology.dot diff --git a/test/case/ietf_routing/ospf_multiarea/topology.svg b/test/case/routing/ospf_multiarea/topology.svg similarity index 100% rename from test/case/ietf_routing/ospf_multiarea/topology.svg rename to test/case/routing/ospf_multiarea/topology.svg diff --git a/test/case/infix_containers/phys/Readme.adoc b/test/case/routing/ospf_unnumbered_interface/Readme.adoc similarity index 100% rename from test/case/infix_containers/phys/Readme.adoc rename to test/case/routing/ospf_unnumbered_interface/Readme.adoc diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/test.adoc b/test/case/routing/ospf_unnumbered_interface/test.adoc similarity index 88% rename from test/case/ietf_routing/ospf_unnumbered_interface/test.adoc rename to test/case/routing/ospf_unnumbered_interface/test.adoc index 26b0f7cd..d066026a 100644 --- a/test/case/ietf_routing/ospf_unnumbered_interface/test.adoc +++ b/test/case/routing/ospf_unnumbered_interface/test.adoc @@ -1,6 +1,6 @@ === OSPF unnumbered interfaces -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_routing/ospf_unnumbered_interface] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/routing/ospf_unnumbered_interface] ==== Description diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/test.py b/test/case/routing/ospf_unnumbered_interface/test.py similarity index 100% rename from test/case/ietf_routing/ospf_unnumbered_interface/test.py rename to test/case/routing/ospf_unnumbered_interface/test.py diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/topology.dot b/test/case/routing/ospf_unnumbered_interface/topology.dot similarity index 100% rename from test/case/ietf_routing/ospf_unnumbered_interface/topology.dot rename to test/case/routing/ospf_unnumbered_interface/topology.dot diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/topology.svg b/test/case/routing/ospf_unnumbered_interface/topology.svg similarity index 100% rename from test/case/ietf_routing/ospf_unnumbered_interface/topology.svg rename to test/case/routing/ospf_unnumbered_interface/topology.svg diff --git a/test/case/infix_containers/upgrade/Readme.adoc b/test/case/routing/route_pref_255/Readme.adoc similarity index 100% rename from test/case/infix_containers/upgrade/Readme.adoc rename to test/case/routing/route_pref_255/Readme.adoc diff --git a/test/case/ietf_routing/route_pref_255/test.adoc b/test/case/routing/route_pref_255/test.adoc similarity index 90% rename from test/case/ietf_routing/route_pref_255/test.adoc rename to test/case/routing/route_pref_255/test.adoc index 076e3678..8264ebe5 100644 --- a/test/case/ietf_routing/route_pref_255/test.adoc +++ b/test/case/routing/route_pref_255/test.adoc @@ -1,6 +1,6 @@ === Route preference: Static Route Activation and Maximum Distance -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_routing/route_pref_255] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/routing/route_pref_255] ==== Description diff --git a/test/case/ietf_routing/route_pref_255/test.py b/test/case/routing/route_pref_255/test.py similarity index 100% rename from test/case/ietf_routing/route_pref_255/test.py rename to test/case/routing/route_pref_255/test.py diff --git a/test/case/ietf_routing/route_pref_255/topology.dot b/test/case/routing/route_pref_255/topology.dot similarity index 100% rename from test/case/ietf_routing/route_pref_255/topology.dot rename to test/case/routing/route_pref_255/topology.dot diff --git a/test/case/ietf_routing/route_pref_255/topology.svg b/test/case/routing/route_pref_255/topology.svg similarity index 100% rename from test/case/ietf_routing/route_pref_255/topology.svg rename to test/case/routing/route_pref_255/topology.svg diff --git a/test/case/infix_containers/veth/Readme.adoc b/test/case/routing/route_pref_dhcp/Readme.adoc similarity index 100% rename from test/case/infix_containers/veth/Readme.adoc rename to test/case/routing/route_pref_dhcp/Readme.adoc diff --git a/test/case/ietf_routing/route_pref_dhcp/test.adoc b/test/case/routing/route_pref_dhcp/test.adoc similarity index 90% rename from test/case/ietf_routing/route_pref_dhcp/test.adoc rename to test/case/routing/route_pref_dhcp/test.adoc index 20b3add8..45807373 100644 --- a/test/case/ietf_routing/route_pref_dhcp/test.adoc +++ b/test/case/routing/route_pref_dhcp/test.adoc @@ -1,6 +1,6 @@ === Route preference: DHCP vs Static -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_routing/route_pref_dhcp] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/routing/route_pref_dhcp] ==== Description diff --git a/test/case/ietf_routing/route_pref_dhcp/test.py b/test/case/routing/route_pref_dhcp/test.py similarity index 100% rename from test/case/ietf_routing/route_pref_dhcp/test.py rename to test/case/routing/route_pref_dhcp/test.py diff --git a/test/case/ietf_routing/route_pref_dhcp/topology.dot b/test/case/routing/route_pref_dhcp/topology.dot similarity index 100% rename from test/case/ietf_routing/route_pref_dhcp/topology.dot rename to test/case/routing/route_pref_dhcp/topology.dot diff --git a/test/case/ietf_routing/route_pref_dhcp/topology.svg b/test/case/routing/route_pref_dhcp/topology.svg similarity index 100% rename from test/case/ietf_routing/route_pref_dhcp/topology.svg rename to test/case/routing/route_pref_dhcp/topology.svg diff --git a/test/case/infix_containers/volume/Readme.adoc b/test/case/routing/route_pref_ospf/Readme.adoc similarity index 100% rename from test/case/infix_containers/volume/Readme.adoc rename to test/case/routing/route_pref_ospf/Readme.adoc diff --git a/test/case/ietf_routing/route_pref_ospf/test.adoc b/test/case/routing/route_pref_ospf/test.adoc similarity index 91% rename from test/case/ietf_routing/route_pref_ospf/test.adoc rename to test/case/routing/route_pref_ospf/test.adoc index 78cb7ccf..15e67722 100644 --- a/test/case/ietf_routing/route_pref_ospf/test.adoc +++ b/test/case/routing/route_pref_ospf/test.adoc @@ -1,6 +1,6 @@ === Route preference: OSPF vs Static -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_routing/route_pref_ospf] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/routing/route_pref_ospf] ==== Description diff --git a/test/case/ietf_routing/route_pref_ospf/test.py b/test/case/routing/route_pref_ospf/test.py similarity index 100% rename from test/case/ietf_routing/route_pref_ospf/test.py rename to test/case/routing/route_pref_ospf/test.py diff --git a/test/case/ietf_routing/route_pref_ospf/topology.dot b/test/case/routing/route_pref_ospf/topology.dot similarity index 100% rename from test/case/ietf_routing/route_pref_ospf/topology.dot rename to test/case/routing/route_pref_ospf/topology.dot diff --git a/test/case/ietf_routing/route_pref_ospf/topology.svg b/test/case/routing/route_pref_ospf/topology.svg similarity index 100% rename from test/case/ietf_routing/route_pref_ospf/topology.svg rename to test/case/routing/route_pref_ospf/topology.svg diff --git a/test/case/infix_dhcp/client6_basic/Readme.adoc b/test/case/routing/static_routing/Readme.adoc similarity index 100% rename from test/case/infix_dhcp/client6_basic/Readme.adoc rename to test/case/routing/static_routing/Readme.adoc diff --git a/test/case/ietf_routing/static_routing/test.adoc b/test/case/routing/static_routing/test.adoc similarity index 89% rename from test/case/ietf_routing/static_routing/test.adoc rename to test/case/routing/static_routing/test.adoc index c3f83258..70782fc7 100644 --- a/test/case/ietf_routing/static_routing/test.adoc +++ b/test/case/routing/static_routing/test.adoc @@ -1,6 +1,6 @@ === Static routing -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_routing/static_routing] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/routing/static_routing] ==== Description diff --git a/test/case/ietf_routing/static_routing/test.py b/test/case/routing/static_routing/test.py similarity index 100% rename from test/case/ietf_routing/static_routing/test.py rename to test/case/routing/static_routing/test.py diff --git a/test/case/ietf_routing/static_routing/topology.dot b/test/case/routing/static_routing/topology.dot similarity index 100% rename from test/case/ietf_routing/static_routing/topology.dot rename to test/case/routing/static_routing/topology.dot diff --git a/test/case/ietf_routing/static_routing/topology.svg b/test/case/routing/static_routing/topology.svg similarity index 100% rename from test/case/ietf_routing/static_routing/topology.svg rename to test/case/routing/static_routing/topology.svg diff --git a/test/case/infix_services/Readme.adoc b/test/case/services/Readme.adoc similarity index 89% rename from test/case/infix_services/Readme.adoc rename to test/case/services/Readme.adoc index 7842e212..ea49192a 100644 --- a/test/case/infix_services/Readme.adoc +++ b/test/case/services/Readme.adoc @@ -1,7 +1,7 @@ :testgroup: -== infix-services +== Services -Tests verifying Infix network services configuration and operation: +Tests verifying network services configuration and operation: - mDNS (Multicast DNS) service enable/disable functionality - mDNS interface allow/deny access control diff --git a/test/case/infix_services/all.yaml b/test/case/services/all.yaml similarity index 100% rename from test/case/infix_services/all.yaml rename to test/case/services/all.yaml diff --git a/test/case/infix_services/lldp/all.yaml b/test/case/services/lldp/all.yaml similarity index 100% rename from test/case/infix_services/lldp/all.yaml rename to test/case/services/lldp/all.yaml diff --git a/test/case/infix_dhcp/client6_prefix_delegation/Readme.adoc b/test/case/services/lldp/lldp_admin_status/Readme.adoc similarity index 100% rename from test/case/infix_dhcp/client6_prefix_delegation/Readme.adoc rename to test/case/services/lldp/lldp_admin_status/Readme.adoc diff --git a/test/case/infix_services/lldp/lldp_admin_status/test.adoc b/test/case/services/lldp/lldp_admin_status/test.adoc similarity index 82% rename from test/case/infix_services/lldp/lldp_admin_status/test.adoc rename to test/case/services/lldp/lldp_admin_status/test.adoc index 68c0a76f..58ad98a0 100644 --- a/test/case/infix_services/lldp/lldp_admin_status/test.adoc +++ b/test/case/services/lldp/lldp_admin_status/test.adoc @@ -1,6 +1,6 @@ === LLDP admin status -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_services/lldp/lldp_admin_status] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/services/lldp/lldp_admin_status] ==== Description diff --git a/test/case/infix_services/lldp/lldp_admin_status/test.py b/test/case/services/lldp/lldp_admin_status/test.py similarity index 100% rename from test/case/infix_services/lldp/lldp_admin_status/test.py rename to test/case/services/lldp/lldp_admin_status/test.py diff --git a/test/case/infix_services/lldp/lldp_admin_status/topology.dot b/test/case/services/lldp/lldp_admin_status/topology.dot similarity index 100% rename from test/case/infix_services/lldp/lldp_admin_status/topology.dot rename to test/case/services/lldp/lldp_admin_status/topology.dot diff --git a/test/case/infix_services/lldp/lldp_admin_status/topology.svg b/test/case/services/lldp/lldp_admin_status/topology.svg similarity index 100% rename from test/case/infix_services/lldp/lldp_admin_status/topology.svg rename to test/case/services/lldp/lldp_admin_status/topology.svg diff --git a/test/case/infix_dhcp/client_basic/Readme.adoc b/test/case/services/lldp/lldp_enable_disable/Readme.adoc similarity index 100% rename from test/case/infix_dhcp/client_basic/Readme.adoc rename to test/case/services/lldp/lldp_enable_disable/Readme.adoc diff --git a/test/case/infix_services/lldp/lldp_enable_disable/test.adoc b/test/case/services/lldp/lldp_enable_disable/test.adoc similarity index 83% rename from test/case/infix_services/lldp/lldp_enable_disable/test.adoc rename to test/case/services/lldp/lldp_enable_disable/test.adoc index 7d547b20..5f8a0235 100644 --- a/test/case/infix_services/lldp/lldp_enable_disable/test.adoc +++ b/test/case/services/lldp/lldp_enable_disable/test.adoc @@ -1,6 +1,6 @@ === LLDP enable/disable -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_services/lldp/lldp_enable_disable] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/services/lldp/lldp_enable_disable] ==== Description diff --git a/test/case/infix_services/lldp/lldp_enable_disable/test.py b/test/case/services/lldp/lldp_enable_disable/test.py similarity index 100% rename from test/case/infix_services/lldp/lldp_enable_disable/test.py rename to test/case/services/lldp/lldp_enable_disable/test.py diff --git a/test/case/infix_services/lldp/lldp_enable_disable/topology.dot b/test/case/services/lldp/lldp_enable_disable/topology.dot similarity index 100% rename from test/case/infix_services/lldp/lldp_enable_disable/topology.dot rename to test/case/services/lldp/lldp_enable_disable/topology.dot diff --git a/test/case/infix_services/lldp/lldp_enable_disable/topology.svg b/test/case/services/lldp/lldp_enable_disable/topology.svg similarity index 100% rename from test/case/infix_services/lldp/lldp_enable_disable/topology.svg rename to test/case/services/lldp/lldp_enable_disable/topology.svg diff --git a/test/case/infix_dhcp/client_default_gw/Readme.adoc b/test/case/services/lldp/lldp_ieee_group_forward/Readme.adoc similarity index 100% rename from test/case/infix_dhcp/client_default_gw/Readme.adoc rename to test/case/services/lldp/lldp_ieee_group_forward/Readme.adoc diff --git a/test/case/infix_services/lldp/lldp_ieee_group_forward/test.adoc b/test/case/services/lldp/lldp_ieee_group_forward/test.adoc similarity index 84% rename from test/case/infix_services/lldp/lldp_ieee_group_forward/test.adoc rename to test/case/services/lldp/lldp_ieee_group_forward/test.adoc index 33e3585b..174cd7e5 100644 --- a/test/case/infix_services/lldp/lldp_ieee_group_forward/test.adoc +++ b/test/case/services/lldp/lldp_ieee_group_forward/test.adoc @@ -1,6 +1,6 @@ === LLDP IEEE Group Forward -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_services/lldp/lldp_ieee_group_forward] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/services/lldp/lldp_ieee_group_forward] ==== Description diff --git a/test/case/infix_services/lldp/lldp_ieee_group_forward/test.py b/test/case/services/lldp/lldp_ieee_group_forward/test.py similarity index 100% rename from test/case/infix_services/lldp/lldp_ieee_group_forward/test.py rename to test/case/services/lldp/lldp_ieee_group_forward/test.py diff --git a/test/case/infix_services/lldp/lldp_ieee_group_forward/topology.dot b/test/case/services/lldp/lldp_ieee_group_forward/topology.dot similarity index 100% rename from test/case/infix_services/lldp/lldp_ieee_group_forward/topology.dot rename to test/case/services/lldp/lldp_ieee_group_forward/topology.dot diff --git a/test/case/infix_services/lldp/lldp_ieee_group_forward/topology.svg b/test/case/services/lldp/lldp_ieee_group_forward/topology.svg similarity index 100% rename from test/case/infix_services/lldp/lldp_ieee_group_forward/topology.svg rename to test/case/services/lldp/lldp_ieee_group_forward/topology.svg diff --git a/test/case/infix_services/mdns/all.yaml b/test/case/services/mdns/all.yaml similarity index 100% rename from test/case/infix_services/mdns/all.yaml rename to test/case/services/mdns/all.yaml diff --git a/test/case/infix_dhcp/client_hostname/Readme.adoc b/test/case/services/mdns/mdns_allow_deny/Readme.adoc similarity index 100% rename from test/case/infix_dhcp/client_hostname/Readme.adoc rename to test/case/services/mdns/mdns_allow_deny/Readme.adoc diff --git a/test/case/infix_services/mdns/mdns_allow_deny/test.adoc b/test/case/services/mdns/mdns_allow_deny/test.adoc similarity index 88% rename from test/case/infix_services/mdns/mdns_allow_deny/test.adoc rename to test/case/services/mdns/mdns_allow_deny/test.adoc index 6c63b8b2..2045daca 100644 --- a/test/case/infix_services/mdns/mdns_allow_deny/test.adoc +++ b/test/case/services/mdns/mdns_allow_deny/test.adoc @@ -1,6 +1,6 @@ === mDNS allow/deny interfaces -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_services/mdns/mdns_allow_deny] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/services/mdns/mdns_allow_deny] ==== Description diff --git a/test/case/infix_services/mdns/mdns_allow_deny/test.py b/test/case/services/mdns/mdns_allow_deny/test.py similarity index 100% rename from test/case/infix_services/mdns/mdns_allow_deny/test.py rename to test/case/services/mdns/mdns_allow_deny/test.py diff --git a/test/case/infix_services/mdns/mdns_allow_deny/topology.dot b/test/case/services/mdns/mdns_allow_deny/topology.dot similarity index 100% rename from test/case/infix_services/mdns/mdns_allow_deny/topology.dot rename to test/case/services/mdns/mdns_allow_deny/topology.dot diff --git a/test/case/infix_services/mdns/mdns_allow_deny/topology.svg b/test/case/services/mdns/mdns_allow_deny/topology.svg similarity index 100% rename from test/case/infix_services/mdns/mdns_allow_deny/topology.svg rename to test/case/services/mdns/mdns_allow_deny/topology.svg diff --git a/test/case/infix_dhcp/client_routes/Readme.adoc b/test/case/services/mdns/mdns_enable_disable/Readme.adoc similarity index 100% rename from test/case/infix_dhcp/client_routes/Readme.adoc rename to test/case/services/mdns/mdns_enable_disable/Readme.adoc diff --git a/test/case/infix_services/mdns/mdns_enable_disable/test.adoc b/test/case/services/mdns/mdns_enable_disable/test.adoc similarity index 85% rename from test/case/infix_services/mdns/mdns_enable_disable/test.adoc rename to test/case/services/mdns/mdns_enable_disable/test.adoc index b0eee10c..aea23bce 100644 --- a/test/case/infix_services/mdns/mdns_enable_disable/test.adoc +++ b/test/case/services/mdns/mdns_enable_disable/test.adoc @@ -1,6 +1,6 @@ === mDNS enable/disable -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_services/mdns/mdns_enable_disable] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/services/mdns/mdns_enable_disable] ==== Description diff --git a/test/case/infix_services/mdns/mdns_enable_disable/test.py b/test/case/services/mdns/mdns_enable_disable/test.py similarity index 100% rename from test/case/infix_services/mdns/mdns_enable_disable/test.py rename to test/case/services/mdns/mdns_enable_disable/test.py diff --git a/test/case/infix_services/mdns/mdns_enable_disable/topology.dot b/test/case/services/mdns/mdns_enable_disable/topology.dot similarity index 100% rename from test/case/infix_services/mdns/mdns_enable_disable/topology.dot rename to test/case/services/mdns/mdns_enable_disable/topology.dot diff --git a/test/case/infix_services/mdns/mdns_enable_disable/topology.svg b/test/case/services/mdns/mdns_enable_disable/topology.svg similarity index 100% rename from test/case/infix_services/mdns/mdns_enable_disable/topology.svg rename to test/case/services/mdns/mdns_enable_disable/topology.svg diff --git a/test/case/infix_services/ssh/all.yaml b/test/case/services/ssh/all.yaml similarity index 100% rename from test/case/infix_services/ssh/all.yaml rename to test/case/services/ssh/all.yaml diff --git a/test/case/infix_dhcp/server_basic/Readme.adoc b/test/case/services/ssh/ssh_key_authentication/Readme.adoc similarity index 100% rename from test/case/infix_dhcp/server_basic/Readme.adoc rename to test/case/services/ssh/ssh_key_authentication/Readme.adoc diff --git a/test/case/infix_services/ssh/ssh_key_authentication/test.adoc b/test/case/services/ssh/ssh_key_authentication/test.adoc similarity index 83% rename from test/case/infix_services/ssh/ssh_key_authentication/test.adoc rename to test/case/services/ssh/ssh_key_authentication/test.adoc index 09e59b22..6d48b524 100644 --- a/test/case/infix_services/ssh/ssh_key_authentication/test.adoc +++ b/test/case/services/ssh/ssh_key_authentication/test.adoc @@ -1,6 +1,6 @@ === Generate ssh key pair -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_services/ssh/ssh_key_authentication] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/services/ssh/ssh_key_authentication] ==== Description diff --git a/test/case/infix_services/ssh/ssh_key_authentication/test.py b/test/case/services/ssh/ssh_key_authentication/test.py similarity index 100% rename from test/case/infix_services/ssh/ssh_key_authentication/test.py rename to test/case/services/ssh/ssh_key_authentication/test.py diff --git a/test/case/infix_services/ssh/ssh_key_authentication/topology.dot b/test/case/services/ssh/ssh_key_authentication/topology.dot similarity index 100% rename from test/case/infix_services/ssh/ssh_key_authentication/topology.dot rename to test/case/services/ssh/ssh_key_authentication/topology.dot diff --git a/test/case/ietf_syslog/pattern_match/topology.svg b/test/case/services/ssh/ssh_key_authentication/topology.svg similarity index 100% rename from test/case/ietf_syslog/pattern_match/topology.svg rename to test/case/services/ssh/ssh_key_authentication/topology.svg diff --git a/test/case/infix_dhcp/server_host/Readme.adoc b/test/case/services/ssh/ssh_server_config/Readme.adoc similarity index 100% rename from test/case/infix_dhcp/server_host/Readme.adoc rename to test/case/services/ssh/ssh_server_config/Readme.adoc diff --git a/test/case/infix_services/ssh/ssh_server_config/test.adoc b/test/case/services/ssh/ssh_server_config/test.adoc similarity index 86% rename from test/case/infix_services/ssh/ssh_server_config/test.adoc rename to test/case/services/ssh/ssh_server_config/test.adoc index 0e41b1f1..801a16b9 100644 --- a/test/case/infix_services/ssh/ssh_server_config/test.adoc +++ b/test/case/services/ssh/ssh_server_config/test.adoc @@ -1,6 +1,6 @@ === SSH server configuration -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_services/ssh/ssh_server_config] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/services/ssh/ssh_server_config] ==== Description diff --git a/test/case/infix_services/ssh/ssh_server_config/test.py b/test/case/services/ssh/ssh_server_config/test.py similarity index 100% rename from test/case/infix_services/ssh/ssh_server_config/test.py rename to test/case/services/ssh/ssh_server_config/test.py diff --git a/test/case/infix_services/ssh/ssh_server_config/topology.dot b/test/case/services/ssh/ssh_server_config/topology.dot similarity index 100% rename from test/case/infix_services/ssh/ssh_server_config/topology.dot rename to test/case/services/ssh/ssh_server_config/topology.dot diff --git a/test/case/infix_services/ssh/ssh_server_config/topology.svg b/test/case/services/ssh/ssh_server_config/topology.svg similarity index 100% rename from test/case/infix_services/ssh/ssh_server_config/topology.svg rename to test/case/services/ssh/ssh_server_config/topology.svg diff --git a/test/case/ietf_syslog/Readme.adoc b/test/case/syslog/Readme.adoc similarity index 77% rename from test/case/ietf_syslog/Readme.adoc rename to test/case/syslog/Readme.adoc index 698f51a0..25192962 100644 --- a/test/case/ietf_syslog/Readme.adoc +++ b/test/case/syslog/Readme.adoc @@ -1,12 +1,12 @@ :testgroup: -== ietf-syslog +== Syslog -Tests verifying IETF standard syslog configuration and operation: +Tests verifying syslog configuration and operation: - Basic local syslog functionality and log generation - Remote syslog forwarding and network logging - Pattern matching using POSIX regex on message content - - Advanced comparison operators and actions (equals vs equals-or-higher) + - Advanced comparison operators and actions - Hostname-based filtering for incoming messages - Property-based filtering with operators and negation diff --git a/test/case/infix_dhcp/server_subnets/Readme.adoc b/test/case/syslog/advanced_compare/Readme.adoc similarity index 100% rename from test/case/infix_dhcp/server_subnets/Readme.adoc rename to test/case/syslog/advanced_compare/Readme.adoc diff --git a/test/case/ietf_syslog/advanced_compare/test.adoc b/test/case/syslog/advanced_compare/test.adoc similarity index 89% rename from test/case/ietf_syslog/advanced_compare/test.adoc rename to test/case/syslog/advanced_compare/test.adoc index 709c2596..5d74ccc0 100644 --- a/test/case/ietf_syslog/advanced_compare/test.adoc +++ b/test/case/syslog/advanced_compare/test.adoc @@ -1,6 +1,6 @@ === Syslog Advanced Compare -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_syslog/advanced_compare] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/syslog/advanced_compare] ==== Description diff --git a/test/case/ietf_syslog/advanced_compare/test.py b/test/case/syslog/advanced_compare/test.py similarity index 100% rename from test/case/ietf_syslog/advanced_compare/test.py rename to test/case/syslog/advanced_compare/test.py diff --git a/test/case/ietf_syslog/basic/topology.dot b/test/case/syslog/advanced_compare/topology.dot similarity index 100% rename from test/case/ietf_syslog/basic/topology.dot rename to test/case/syslog/advanced_compare/topology.dot diff --git a/test/case/ietf_syslog/property_filter/topology.svg b/test/case/syslog/advanced_compare/topology.svg similarity index 100% rename from test/case/ietf_syslog/property_filter/topology.svg rename to test/case/syslog/advanced_compare/topology.svg diff --git a/test/case/ietf_syslog/all.yaml b/test/case/syslog/all.yaml similarity index 100% rename from test/case/ietf_syslog/all.yaml rename to test/case/syslog/all.yaml diff --git a/test/case/infix_firewall/basic/Readme.adoc b/test/case/syslog/basic/Readme.adoc similarity index 100% rename from test/case/infix_firewall/basic/Readme.adoc rename to test/case/syslog/basic/Readme.adoc diff --git a/test/case/ietf_syslog/basic/test.adoc b/test/case/syslog/basic/test.adoc similarity index 88% rename from test/case/ietf_syslog/basic/test.adoc rename to test/case/syslog/basic/test.adoc index 9bfa70a3..791126e7 100644 --- a/test/case/ietf_syslog/basic/test.adoc +++ b/test/case/syslog/basic/test.adoc @@ -1,6 +1,6 @@ === Syslog Basic -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_syslog/basic] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/syslog/basic] ==== Description diff --git a/test/case/ietf_syslog/basic/test.py b/test/case/syslog/basic/test.py similarity index 100% rename from test/case/ietf_syslog/basic/test.py rename to test/case/syslog/basic/test.py diff --git a/test/case/ietf_syslog/pattern_match/topology.dot b/test/case/syslog/basic/topology.dot similarity index 100% rename from test/case/ietf_syslog/pattern_match/topology.dot rename to test/case/syslog/basic/topology.dot diff --git a/test/case/ietf_system/add_delete_user/topology.svg b/test/case/syslog/basic/topology.svg similarity index 100% rename from test/case/ietf_system/add_delete_user/topology.svg rename to test/case/syslog/basic/topology.svg diff --git a/test/case/infix_firewall/ipv6-lan-wan/Readme.adoc b/test/case/syslog/hostname_filter/Readme.adoc similarity index 100% rename from test/case/infix_firewall/ipv6-lan-wan/Readme.adoc rename to test/case/syslog/hostname_filter/Readme.adoc diff --git a/test/case/ietf_syslog/hostname_filter/test.adoc b/test/case/syslog/hostname_filter/test.adoc similarity index 89% rename from test/case/ietf_syslog/hostname_filter/test.adoc rename to test/case/syslog/hostname_filter/test.adoc index e134d6ab..df488d84 100644 --- a/test/case/ietf_syslog/hostname_filter/test.adoc +++ b/test/case/syslog/hostname_filter/test.adoc @@ -1,6 +1,6 @@ === Syslog Hostname Filtering -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_syslog/hostname_filter] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/syslog/hostname_filter] ==== Description diff --git a/test/case/ietf_syslog/hostname_filter/test.py b/test/case/syslog/hostname_filter/test.py similarity index 100% rename from test/case/ietf_syslog/hostname_filter/test.py rename to test/case/syslog/hostname_filter/test.py diff --git a/test/case/ietf_syslog/hostname_filter/topology.dot b/test/case/syslog/hostname_filter/topology.dot similarity index 100% rename from test/case/ietf_syslog/hostname_filter/topology.dot rename to test/case/syslog/hostname_filter/topology.dot diff --git a/test/case/ietf_syslog/hostname_filter/topology.svg b/test/case/syslog/hostname_filter/topology.svg similarity index 100% rename from test/case/ietf_syslog/hostname_filter/topology.svg rename to test/case/syslog/hostname_filter/topology.svg diff --git a/test/case/infix_firewall/ipv6-zone-migration/Readme.adoc b/test/case/syslog/pattern_match/Readme.adoc similarity index 100% rename from test/case/infix_firewall/ipv6-zone-migration/Readme.adoc rename to test/case/syslog/pattern_match/Readme.adoc diff --git a/test/case/ietf_syslog/pattern_match/test.adoc b/test/case/syslog/pattern_match/test.adoc similarity index 90% rename from test/case/ietf_syslog/pattern_match/test.adoc rename to test/case/syslog/pattern_match/test.adoc index 4424968f..1ba3fe30 100644 --- a/test/case/ietf_syslog/pattern_match/test.adoc +++ b/test/case/syslog/pattern_match/test.adoc @@ -1,6 +1,6 @@ === Syslog Pattern Matching -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_syslog/pattern_match] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/syslog/pattern_match] ==== Description diff --git a/test/case/ietf_syslog/pattern_match/test.py b/test/case/syslog/pattern_match/test.py similarity index 100% rename from test/case/ietf_syslog/pattern_match/test.py rename to test/case/syslog/pattern_match/test.py diff --git a/test/case/ietf_syslog/property_filter/topology.dot b/test/case/syslog/pattern_match/topology.dot similarity index 100% rename from test/case/ietf_syslog/property_filter/topology.dot rename to test/case/syslog/pattern_match/topology.dot diff --git a/test/case/ietf_system/hostname/topology.svg b/test/case/syslog/pattern_match/topology.svg similarity index 100% rename from test/case/ietf_system/hostname/topology.svg rename to test/case/syslog/pattern_match/topology.svg diff --git a/test/case/infix_firewall/lan-wan/Readme.adoc b/test/case/syslog/property_filter/Readme.adoc similarity index 100% rename from test/case/infix_firewall/lan-wan/Readme.adoc rename to test/case/syslog/property_filter/Readme.adoc diff --git a/test/case/ietf_syslog/property_filter/test.adoc b/test/case/syslog/property_filter/test.adoc similarity index 89% rename from test/case/ietf_syslog/property_filter/test.adoc rename to test/case/syslog/property_filter/test.adoc index 0a5bd5ee..2baef42e 100644 --- a/test/case/ietf_syslog/property_filter/test.adoc +++ b/test/case/syslog/property_filter/test.adoc @@ -1,6 +1,6 @@ === Syslog Property Filtering -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_syslog/property_filter] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/syslog/property_filter] ==== Description diff --git a/test/case/ietf_syslog/property_filter/test.py b/test/case/syslog/property_filter/test.py similarity index 100% rename from test/case/ietf_syslog/property_filter/test.py rename to test/case/syslog/property_filter/test.py diff --git a/test/case/ietf_system/add_delete_user/topology.dot b/test/case/syslog/property_filter/topology.dot similarity index 100% rename from test/case/ietf_system/add_delete_user/topology.dot rename to test/case/syslog/property_filter/topology.dot diff --git a/test/case/ietf_system/timezone/topology.svg b/test/case/syslog/property_filter/topology.svg similarity index 100% rename from test/case/ietf_system/timezone/topology.svg rename to test/case/syslog/property_filter/topology.svg diff --git a/test/case/infix_firewall/wan-dmz-lan/Readme.adoc b/test/case/syslog/remote/Readme.adoc similarity index 100% rename from test/case/infix_firewall/wan-dmz-lan/Readme.adoc rename to test/case/syslog/remote/Readme.adoc diff --git a/test/case/ietf_syslog/remote/test.adoc b/test/case/syslog/remote/test.adoc similarity index 87% rename from test/case/ietf_syslog/remote/test.adoc rename to test/case/syslog/remote/test.adoc index 602f7812..5535ac10 100644 --- a/test/case/ietf_syslog/remote/test.adoc +++ b/test/case/syslog/remote/test.adoc @@ -1,6 +1,6 @@ === Remote syslog -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_syslog/remote] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/syslog/remote] ==== Description diff --git a/test/case/ietf_syslog/remote/test.py b/test/case/syslog/remote/test.py similarity index 100% rename from test/case/ietf_syslog/remote/test.py rename to test/case/syslog/remote/test.py diff --git a/test/case/ietf_syslog/remote/topology.dot b/test/case/syslog/remote/topology.dot similarity index 100% rename from test/case/ietf_syslog/remote/topology.dot rename to test/case/syslog/remote/topology.dot diff --git a/test/case/ietf_syslog/remote/topology.svg b/test/case/syslog/remote/topology.svg similarity index 100% rename from test/case/ietf_syslog/remote/topology.svg rename to test/case/syslog/remote/topology.svg diff --git a/test/case/ietf_system/Readme.adoc b/test/case/system/Readme.adoc similarity index 88% rename from test/case/ietf_system/Readme.adoc rename to test/case/system/Readme.adoc index e0371c95..49309412 100644 --- a/test/case/ietf_system/Readme.adoc +++ b/test/case/system/Readme.adoc @@ -1,7 +1,7 @@ :testgroup: -== ietf-system +== System -Tests verifying IETF standard system configuration and management: +Tests verifying system configuration and management: - System hostname configuration and persistence - User account creation, modification, and deletion diff --git a/test/case/infix_services/lldp/lldp_admin_status/Readme.adoc b/test/case/system/add_delete_user/Readme.adoc similarity index 100% rename from test/case/infix_services/lldp/lldp_admin_status/Readme.adoc rename to test/case/system/add_delete_user/Readme.adoc diff --git a/test/case/ietf_system/add_delete_user/test.adoc b/test/case/system/add_delete_user/test.adoc similarity index 87% rename from test/case/ietf_system/add_delete_user/test.adoc rename to test/case/system/add_delete_user/test.adoc index 0d63e98f..ebbed34a 100644 --- a/test/case/ietf_system/add_delete_user/test.adoc +++ b/test/case/system/add_delete_user/test.adoc @@ -1,6 +1,6 @@ === Add/delete user -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_system/add_delete_user] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/system/add_delete_user] ==== Description diff --git a/test/case/ietf_system/add_delete_user/test.py b/test/case/system/add_delete_user/test.py similarity index 100% rename from test/case/ietf_system/add_delete_user/test.py rename to test/case/system/add_delete_user/test.py diff --git a/test/case/ietf_system/hostname/topology.dot b/test/case/system/add_delete_user/topology.dot similarity index 100% rename from test/case/ietf_system/hostname/topology.dot rename to test/case/system/add_delete_user/topology.dot diff --git a/test/case/ietf_system/timezone_utc_offset/topology.svg b/test/case/system/add_delete_user/topology.svg similarity index 100% rename from test/case/ietf_system/timezone_utc_offset/topology.svg rename to test/case/system/add_delete_user/topology.svg diff --git a/test/case/ietf_system/all.yaml b/test/case/system/all.yaml similarity index 100% rename from test/case/ietf_system/all.yaml rename to test/case/system/all.yaml diff --git a/test/case/infix_services/lldp/lldp_enable_disable/Readme.adoc b/test/case/system/hostname/Readme.adoc similarity index 100% rename from test/case/infix_services/lldp/lldp_enable_disable/Readme.adoc rename to test/case/system/hostname/Readme.adoc diff --git a/test/case/ietf_system/hostname/test.adoc b/test/case/system/hostname/test.adoc similarity index 89% rename from test/case/ietf_system/hostname/test.adoc rename to test/case/system/hostname/test.adoc index f0f28699..7a71726b 100644 --- a/test/case/ietf_system/hostname/test.adoc +++ b/test/case/system/hostname/test.adoc @@ -1,6 +1,6 @@ === Set hostname -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_system/hostname] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/system/hostname] ==== Description diff --git a/test/case/ietf_system/hostname/test.py b/test/case/system/hostname/test.py similarity index 100% rename from test/case/ietf_system/hostname/test.py rename to test/case/system/hostname/test.py diff --git a/test/case/ietf_system/timezone/topology.dot b/test/case/system/hostname/topology.dot similarity index 100% rename from test/case/ietf_system/timezone/topology.dot rename to test/case/system/hostname/topology.dot diff --git a/test/case/ietf_system/user_admin/topology.svg b/test/case/system/hostname/topology.svg similarity index 100% rename from test/case/ietf_system/user_admin/topology.svg rename to test/case/system/hostname/topology.svg diff --git a/test/case/infix_services/lldp/lldp_ieee_group_forward/Readme.adoc b/test/case/system/ntp_client/Readme.adoc similarity index 100% rename from test/case/infix_services/lldp/lldp_ieee_group_forward/Readme.adoc rename to test/case/system/ntp_client/Readme.adoc diff --git a/test/case/ietf_system/ntp_client/test.adoc b/test/case/system/ntp_client/test.adoc similarity index 84% rename from test/case/ietf_system/ntp_client/test.adoc rename to test/case/system/ntp_client/test.adoc index 1bb4c3ec..6bd64e3e 100644 --- a/test/case/ietf_system/ntp_client/test.adoc +++ b/test/case/system/ntp_client/test.adoc @@ -1,6 +1,6 @@ === Basic NTP client test -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_system/ntp_client] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/system/ntp_client] ==== Description diff --git a/test/case/ietf_system/ntp_client/test.py b/test/case/system/ntp_client/test.py similarity index 100% rename from test/case/ietf_system/ntp_client/test.py rename to test/case/system/ntp_client/test.py diff --git a/test/case/ietf_system/ntp_client/topology.dot b/test/case/system/ntp_client/topology.dot similarity index 100% rename from test/case/ietf_system/ntp_client/topology.dot rename to test/case/system/ntp_client/topology.dot diff --git a/test/case/ietf_system/ntp_client/topology.svg b/test/case/system/ntp_client/topology.svg similarity index 100% rename from test/case/ietf_system/ntp_client/topology.svg rename to test/case/system/ntp_client/topology.svg diff --git a/test/case/infix_services/mdns/mdns_allow_deny/Readme.adoc b/test/case/system/timezone/Readme.adoc similarity index 100% rename from test/case/infix_services/mdns/mdns_allow_deny/Readme.adoc rename to test/case/system/timezone/Readme.adoc diff --git a/test/case/ietf_system/timezone/test.adoc b/test/case/system/timezone/test.adoc similarity index 83% rename from test/case/ietf_system/timezone/test.adoc rename to test/case/system/timezone/test.adoc index ecc5c692..d266feab 100644 --- a/test/case/ietf_system/timezone/test.adoc +++ b/test/case/system/timezone/test.adoc @@ -1,6 +1,6 @@ === Set timezone using timezone name -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_system/timezone] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/system/timezone] ==== Description diff --git a/test/case/ietf_system/timezone/test.py b/test/case/system/timezone/test.py similarity index 100% rename from test/case/ietf_system/timezone/test.py rename to test/case/system/timezone/test.py diff --git a/test/case/ietf_system/timezone_utc_offset/topology.dot b/test/case/system/timezone/topology.dot similarity index 100% rename from test/case/ietf_system/timezone_utc_offset/topology.dot rename to test/case/system/timezone/topology.dot diff --git a/test/case/infix_containers/enabled/topology.svg b/test/case/system/timezone/topology.svg similarity index 100% rename from test/case/infix_containers/enabled/topology.svg rename to test/case/system/timezone/topology.svg diff --git a/test/case/infix_services/mdns/mdns_enable_disable/Readme.adoc b/test/case/system/timezone_utc_offset/Readme.adoc similarity index 100% rename from test/case/infix_services/mdns/mdns_enable_disable/Readme.adoc rename to test/case/system/timezone_utc_offset/Readme.adoc diff --git a/test/case/ietf_system/timezone_utc_offset/test.adoc b/test/case/system/timezone_utc_offset/test.adoc similarity index 80% rename from test/case/ietf_system/timezone_utc_offset/test.adoc rename to test/case/system/timezone_utc_offset/test.adoc index f2048815..a043e0ae 100644 --- a/test/case/ietf_system/timezone_utc_offset/test.adoc +++ b/test/case/system/timezone_utc_offset/test.adoc @@ -1,6 +1,6 @@ === Set timezone with UTC offset -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_system/timezone_utc_offset] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/system/timezone_utc_offset] ==== Description diff --git a/test/case/ietf_system/timezone_utc_offset/test.py b/test/case/system/timezone_utc_offset/test.py similarity index 100% rename from test/case/ietf_system/timezone_utc_offset/test.py rename to test/case/system/timezone_utc_offset/test.py diff --git a/test/case/ietf_system/user_admin/topology.dot b/test/case/system/timezone_utc_offset/topology.dot similarity index 100% rename from test/case/ietf_system/user_admin/topology.dot rename to test/case/system/timezone_utc_offset/topology.dot diff --git a/test/case/infix_containers/host_commands/topology.svg b/test/case/system/timezone_utc_offset/topology.svg similarity index 100% rename from test/case/infix_containers/host_commands/topology.svg rename to test/case/system/timezone_utc_offset/topology.svg diff --git a/test/case/infix_services/ssh/ssh_key_authentication/Readme.adoc b/test/case/system/upgrade/Readme.adoc similarity index 100% rename from test/case/infix_services/ssh/ssh_key_authentication/Readme.adoc rename to test/case/system/upgrade/Readme.adoc diff --git a/test/case/ietf_system/upgrade/bundles/.gitignore b/test/case/system/upgrade/bundles/.gitignore similarity index 100% rename from test/case/ietf_system/upgrade/bundles/.gitignore rename to test/case/system/upgrade/bundles/.gitignore diff --git a/test/case/ietf_system/upgrade/bundles/not-a-bundle.pkg b/test/case/system/upgrade/bundles/not-a-bundle.pkg similarity index 100% rename from test/case/ietf_system/upgrade/bundles/not-a-bundle.pkg rename to test/case/system/upgrade/bundles/not-a-bundle.pkg diff --git a/test/case/ietf_system/upgrade/test.adoc b/test/case/system/upgrade/test.adoc similarity index 84% rename from test/case/ietf_system/upgrade/test.adoc rename to test/case/system/upgrade/test.adoc index 81ab81db..de3058e7 100644 --- a/test/case/ietf_system/upgrade/test.adoc +++ b/test/case/system/upgrade/test.adoc @@ -1,6 +1,6 @@ === System upgrade -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_system/upgrade] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/system/upgrade] ==== Description diff --git a/test/case/ietf_system/upgrade/test.py b/test/case/system/upgrade/test.py similarity index 100% rename from test/case/ietf_system/upgrade/test.py rename to test/case/system/upgrade/test.py diff --git a/test/case/infix_containers/volume/topology.dot b/test/case/system/upgrade/topology.dot similarity index 100% rename from test/case/infix_containers/volume/topology.dot rename to test/case/system/upgrade/topology.dot diff --git a/test/case/infix_containers/volume/topology.svg b/test/case/system/upgrade/topology.svg similarity index 100% rename from test/case/infix_containers/volume/topology.svg rename to test/case/system/upgrade/topology.svg diff --git a/test/case/infix_services/ssh/ssh_server_config/Readme.adoc b/test/case/system/user_admin/Readme.adoc similarity index 100% rename from test/case/infix_services/ssh/ssh_server_config/Readme.adoc rename to test/case/system/user_admin/Readme.adoc diff --git a/test/case/ietf_system/user_admin/test.adoc b/test/case/system/user_admin/test.adoc similarity index 91% rename from test/case/ietf_system/user_admin/test.adoc rename to test/case/system/user_admin/test.adoc index 148f2b2e..d8ffc370 100644 --- a/test/case/ietf_system/user_admin/test.adoc +++ b/test/case/system/user_admin/test.adoc @@ -1,6 +1,6 @@ === Add admin user -ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_system/user_admin] +ifdef::topdoc[:imagesdir: {topdoc}../../test/case/system/user_admin] ==== Description diff --git a/test/case/ietf_system/user_admin/test.py b/test/case/system/user_admin/test.py similarity index 100% rename from test/case/ietf_system/user_admin/test.py rename to test/case/system/user_admin/test.py diff --git a/test/case/infix_containers/host_commands/topology.dot b/test/case/system/user_admin/topology.dot similarity index 100% rename from test/case/infix_containers/host_commands/topology.dot rename to test/case/system/user_admin/topology.dot diff --git a/test/case/infix_services/ssh/ssh_key_authentication/topology.svg b/test/case/system/user_admin/topology.svg similarity index 100% rename from test/case/infix_services/ssh/ssh_key_authentication/topology.svg rename to test/case/system/user_admin/topology.svg diff --git a/test/case/use_case/Readme.adoc b/test/case/use_case/Readme.adoc index 1367e0c3..b6f04b19 100644 --- a/test/case/use_case/Readme.adoc +++ b/test/case/use_case/Readme.adoc @@ -1,7 +1,8 @@ :testgroup: == Use Case Tests -Integration tests verifying multiple Infix components working together: +Integration tests verifying multiple software components working +together: - OSPF routing with containerized applications and network segmentation diff --git a/test/spec/Readme.adoc.in b/test/spec/Readme.adoc.in index c1c1d9cf..4b0748e6 100644 --- a/test/spec/Readme.adoc.in +++ b/test/spec/Readme.adoc.in @@ -24,39 +24,39 @@ include::../case/misc/Readme.adoc[] <<< -include::../case/ietf_system/Readme.adoc[] +include::../case/system/Readme.adoc[] <<< -include::../case/ietf_syslog/Readme.adoc[] +include::../case/syslog/Readme.adoc[] <<< -include::../case/ietf_interfaces/Readme.adoc[] +include::../case/interfaces/Readme.adoc[] <<< -include::../case/ietf_routing/Readme.adoc[] +include::../case/routing/Readme.adoc[] <<< -include::../case/infix_firewall/Readme.adoc[] +include::../case/firewall/Readme.adoc[] <<< -include::../case/infix_containers/Readme.adoc[] +include::../case/containers/Readme.adoc[] <<< -include::../case/infix_dhcp/Readme.adoc[] +include::../case/dhcp/Readme.adoc[] <<< -include::../case/ietf_hardware/Readme.adoc[] +include::../case/hardware/Readme.adoc[] <<< -include::../case/infix_services/Readme.adoc[] +include::../case/services/Readme.adoc[] <<< From b40c605ac503e6cbdd48cbe615825634143488dd Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 20 Nov 2025 19:14:13 +0100 Subject: [PATCH 2/4] test/case: simplify and add load-bearing sleep(2) This (new) test sometimes fail on HW, so let's hold off a while before sending our log messages. Ths should allow the DUTs to settle. Signed-off-by: Joachim Wiberg --- test/case/syslog/advanced_compare/test.py | 83 +++++++++++++---------- test/case/syslog/pattern_match/test.py | 76 +++++++++++---------- 2 files changed, 89 insertions(+), 70 deletions(-) diff --git a/test/case/syslog/advanced_compare/test.py b/test/case/syslog/advanced_compare/test.py index a5634034..7449b7a2 100755 --- a/test/case/syslog/advanced_compare/test.py +++ b/test/case/syslog/advanced_compare/test.py @@ -10,6 +10,17 @@ actions (log vs block/stop). import infamy import time +TEST_MESSAGES = [ + ("daemon.emerg", "Emergency: system is unusable"), + ("daemon.alert", "Alert: immediate action required"), + ("daemon.crit", "Critical: critical condition"), + ("daemon.err", "Error: error condition"), + ("daemon.warning", "Warning: warning condition"), + ("daemon.notice", "Notice: normal but significant"), + ("daemon.info", "Info: informational message"), + ("daemon.debug", "Debug: debug-level message"), +] + with infamy.Test() as test: with test.step("Set up topology and attach to target DUT"): env = infamy.Env() @@ -62,51 +73,53 @@ with infamy.Test() as test: } }) + time.sleep(2) + with test.step("Send test messages at all severity levels"): - tgtssh.runsh("logger -t advtest -p daemon.emerg 'Emergency: system is unusable'") - tgtssh.runsh("logger -t advtest -p daemon.alert 'Alert: immediate action required'") - tgtssh.runsh("logger -t advtest -p daemon.crit 'Critical: critical condition'") - tgtssh.runsh("logger -t advtest -p daemon.err 'Error: error condition'") - tgtssh.runsh("logger -t advtest -p daemon.warning 'Warning: warning condition'") - tgtssh.runsh("logger -t advtest -p daemon.notice 'Notice: normal but significant'") - tgtssh.runsh("logger -t advtest -p daemon.info 'Info: informational message'") - tgtssh.runsh("logger -t advtest -p daemon.debug 'Debug: debug-level message'") - time.sleep(1) + for priority, message in TEST_MESSAGES: + tgtssh.runsh(f"logger -t advtest -p {priority} '{message}'") + time.sleep(2) with test.step("Verify exact-errors log contains only error messages"): - rc = tgtssh.runsh("grep -c 'advtest' /var/log/exact-errors 2>/dev/null") - count = int(rc.stdout.strip()) if rc.returncode == 0 else 0 - if count != 1: - test.fail(f"Expected 1 message in /var/log/exact-errors (error only), got {count}") + rc = tgtssh.runsh("cat /var/log/exact-errors 2>/dev/null") + log_content = rc.stdout if rc.returncode == 0 else "" - rc = tgtssh.runsh("grep -q 'Error: error condition' /var/log/exact-errors 2>/dev/null") - if rc.returncode != 0: - test.fail("Expected error message in /var/log/exact-errors") + # Should contain only the error message + error_messages = [msg for prio, msg in TEST_MESSAGES if "err" in prio] + missing = [msg for msg in error_messages if msg not in log_content] + if missing: + test.fail(f"Missing error messages in /var/log/exact-errors: {missing}") - rc = tgtssh.runsh("grep -c 'Emergency\\|Alert\\|Critical' /var/log/exact-errors 2>/dev/null") - count = int(rc.stdout.strip()) if rc.returncode == 0 else 0 - if count != 0: - test.fail(f"Expected 0 higher severity messages in /var/log/exact-errors, got {count}") + # Should NOT contain higher severity (emerg, alert, crit) or lower + unwanted_messages = [msg for prio, msg in TEST_MESSAGES if "err" not in prio] + found = [msg for msg in unwanted_messages if msg in log_content] + if found: + test.fail(f"Found unwanted messages in /var/log/exact-errors: {found}") with test.step("Verify no-debug log blocks all messages"): - rc = tgtssh.runsh("grep -c 'advtest' /var/log/no-debug 2>/dev/null") - count = int(rc.stdout.strip()) if rc.returncode == 0 else 0 - if count != 0: - test.fail(f"Expected 0 messages in /var/log/no-debug (all blocked), got {count}") + rc = tgtssh.runsh("cat /var/log/no-debug 2>/dev/null") + log_content = rc.stdout if rc.returncode == 0 else "" + + # Should be empty (all messages blocked) + all_messages = [msg for _, msg in TEST_MESSAGES] + found = [msg for msg in all_messages if msg in log_content] + if found: + test.fail(f"Expected empty log, found messages in /var/log/no-debug: {found}") with test.step("Verify baseline log contains info and higher"): - rc = tgtssh.runsh("grep -c 'advtest' /var/log/baseline 2>/dev/null") - count = int(rc.stdout.strip()) if rc.returncode == 0 else 0 - if count != 7: - test.fail(f"Expected 7 messages in /var/log/baseline (info and higher), got {count}") + rc = tgtssh.runsh("cat /var/log/baseline 2>/dev/null") + log_content = rc.stdout if rc.returncode == 0 else "" - rc = tgtssh.runsh("grep -c 'Debug: debug-level' /var/log/baseline 2>/dev/null") - count = int(rc.stdout.strip()) if rc.returncode == 0 else 0 - if count != 0: - test.fail(f"Expected 0 debug messages in /var/log/baseline, got {count}") + # Should contain info and higher (all except debug) + expected_messages = [msg for prio, msg in TEST_MESSAGES if "debug" not in prio] + missing = [msg for msg in expected_messages if msg not in log_content] + if missing: + test.fail(f"Missing messages in /var/log/baseline: {missing}") - rc = tgtssh.runsh("grep -q 'Info: informational' /var/log/baseline 2>/dev/null") - if rc.returncode != 0: - test.fail("Expected info message in /var/log/baseline") + # Should NOT contain debug + debug_messages = [msg for prio, msg in TEST_MESSAGES if "debug" in prio] + found = [msg for msg in debug_messages if msg in log_content] + if found: + test.fail(f"Found debug messages in /var/log/baseline: {found}") test.succeed() diff --git a/test/case/syslog/pattern_match/test.py b/test/case/syslog/pattern_match/test.py index 5b517dd4..4291951e 100755 --- a/test/case/syslog/pattern_match/test.py +++ b/test/case/syslog/pattern_match/test.py @@ -10,6 +10,15 @@ substring matching and complex regex patterns. import infamy import time +TEST_MESSAGES = [ + "ERROR: Connection failed on interface eth0", + "CRITICAL: System temperature high", + "Status update from router1: link up", + "Status update from router42: link down", + "INFO: Normal operation message", + "DEBUG: Verbose logging enabled", +] + with infamy.Test() as test: with test.step("Set up topology and attach to target DUT"): env = infamy.Env() @@ -52,52 +61,49 @@ with infamy.Test() as test: } }) + time.sleep(2) + with test.step("Send test messages with various patterns"): - tgtssh.runsh("logger -t test -p daemon.info 'ERROR: Connection failed on interface eth0'") - tgtssh.runsh("logger -t test -p daemon.info 'CRITICAL: System temperature high'") - tgtssh.runsh("logger -t test -p daemon.info 'Status update from router1: link up'") - tgtssh.runsh("logger -t test -p daemon.info 'Status update from router42: link down'") - tgtssh.runsh("logger -t test -p daemon.info 'INFO: Normal operation message'") - tgtssh.runsh("logger -t test -p daemon.info 'DEBUG: Verbose logging enabled'") - time.sleep(1) + for message in TEST_MESSAGES: + tgtssh.runsh(f"logger -t test -p daemon.info '{message}'") + time.sleep(2) with test.step("Verify errors log contains ERROR and CRITICAL messages"): - rc = tgtssh.runsh("grep -c 'ERROR\\|CRITICAL' /var/log/errors 2>/dev/null") - count = int(rc.stdout.strip()) if rc.returncode == 0 else 0 - if count != 2: - test.fail(f"Expected 2 ERROR/CRITICAL messages in /var/log/errors, got {count}") + rc = tgtssh.runsh("cat /var/log/errors 2>/dev/null") + log_content = rc.stdout if rc.returncode == 0 else "" + + error_messages = [msg for msg in TEST_MESSAGES if "ERROR" in msg or "CRITICAL" in msg] + missing = [msg for msg in error_messages if msg not in log_content] + if missing: + test.fail(f"Missing error messages in /var/log/errors: {missing}") # Verify it does NOT contain other messages - rc = tgtssh.runsh("grep -c 'router1\\|Normal operation\\|Verbose' /var/log/errors 2>/dev/null") - count = int(rc.stdout.strip()) if rc.returncode == 0 else 0 - if count != 0: - test.fail(f"Expected 0 non-error messages in /var/log/errors, got {count}") + non_error_messages = [msg for msg in TEST_MESSAGES if "ERROR" not in msg and "CRITICAL" not in msg] + found = [msg for msg in non_error_messages if msg in log_content] + if found: + test.fail(f"Found unwanted messages in /var/log/errors: {found}") with test.step("Verify routers log contains matching router[0-9]+ pattern"): - rc = tgtssh.runsh("grep -c 'router[0-9]\\+' /var/log/routers 2>/dev/null") - count = int(rc.stdout.strip()) if rc.returncode == 0 else 0 - if count != 2: - test.fail(f"Expected 2 router messages in /var/log/routers, got {count}") + rc = tgtssh.runsh("cat /var/log/routers 2>/dev/null") + log_content = rc.stdout if rc.returncode == 0 else "" - # Verify both router1 and router42 are present - rc = tgtssh.runsh("grep -q 'router1' /var/log/routers 2>/dev/null") - if rc.returncode != 0: - test.fail("Expected router1 message in /var/log/routers") - - rc = tgtssh.runsh("grep -q 'router42' /var/log/routers 2>/dev/null") - if rc.returncode != 0: - test.fail("Expected router42 message in /var/log/routers") + router_messages = [msg for msg in TEST_MESSAGES if "router1" in msg or "router42" in msg] + missing = [msg for msg in router_messages if msg not in log_content] + if missing: + test.fail(f"Missing router messages in /var/log/routers: {missing}") # Verify it does NOT contain error or normal messages - rc = tgtssh.runsh("grep -c 'ERROR\\|CRITICAL\\|Normal operation\\|Verbose' /var/log/routers 2>/dev/null") - count = int(rc.stdout.strip()) if rc.returncode == 0 else 0 - if count != 0: - test.fail(f"Expected 0 non-router messages in /var/log/routers, got {count}") + non_router_messages = [msg for msg in TEST_MESSAGES if "router" not in msg] + found = [msg for msg in non_router_messages if msg in log_content] + if found: + test.fail(f"Found unwanted messages in /var/log/routers: {found}") with test.step("Verify all-messages log contains all test messages"): - rc = tgtssh.runsh("grep -c 'test' /var/log/all-messages 2>/dev/null") - count = int(rc.stdout.strip()) if rc.returncode == 0 else 0 - if count != 6: - test.fail(f"Expected 6 total messages in /var/log/all-messages, got {count}") + rc = tgtssh.runsh("cat /var/log/all-messages 2>/dev/null") + log_content = rc.stdout if rc.returncode == 0 else "" + + missing = [msg for msg in TEST_MESSAGES if msg not in log_content] + if missing: + test.fail(f"Missing messages in /var/log/all-messages: {missing}") test.succeed() From c398e42ca9d4bf0e966f86d94cf0da4e40ece265 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 20 Nov 2025 16:51:44 +0100 Subject: [PATCH 3/4] confd: drop leading ietf/infix prefix in source files Signed-off-by: Joachim Wiberg --- src/confd/src/Makefile.am | 54 +++--- src/confd/src/cni.c | 2 +- .../src/{infix-containers.c => containers.c} | 0 src/confd/src/core.h | 28 ++-- .../{infix-dhcp-client.c => dhcp-client.c} | 2 +- .../{infix-dhcp-common.c => dhcp-common.c} | 4 +- .../{infix-dhcp-common.h => dhcp-common.h} | 0 .../{infix-dhcp-server.c => dhcp-server.c} | 2 +- ...{infix-dhcpv6-client.c => dhcpv6-client.c} | 2 +- ...tf-factory-default.c => factory-default.c} | 0 src/confd/src/{infix-factory.c => factory.c} | 0 .../src/{infix-firewall.c => firewall.c} | 2 +- src/confd/src/{ietf-hardware.c => hardware.c} | 0 src/confd/src/ieee802-ethernet-interface.c | 2 +- ...{infix-if-bridge-mcd.c => if-bridge-mcd.c} | 2 +- ...nfix-if-bridge-port.c => if-bridge-port.c} | 2 +- .../src/{infix-if-bridge.c => if-bridge.c} | 2 +- src/confd/src/{infix-if-gre.c => if-gre.c} | 2 +- src/confd/src/{infix-if-lag.c => if-lag.c} | 2 +- src/confd/src/{infix-if-veth.c => if-veth.c} | 2 +- src/confd/src/{infix-if-vlan.c => if-vlan.c} | 2 +- .../src/{infix-if-vxlan.c => if-vxlan.c} | 2 +- src/confd/src/{infix-if-wifi.c => if-wifi.c} | 2 +- .../src/{ietf-interfaces.c => interfaces.c} | 2 +- .../src/{ietf-interfaces.h => interfaces.h} | 24 +-- src/confd/src/{ietf-ip.c => ip.c} | 2 +- src/confd/src/{ietf-keystore.c => keystore.c} | 0 src/confd/src/{infix-meta.c => meta.c} | 0 src/confd/src/netlink.c | 156 ++++++++++++++++++ src/confd/src/{ietf-routing.c => routing.c} | 0 .../src/{infix-services.c => services.c} | 0 src/confd/src/{ietf-syslog.c => syslog.c} | 0 ...ix-system-software.c => system-software.c} | 0 src/confd/src/{ietf-system.c => system.c} | 0 34 files changed, 228 insertions(+), 72 deletions(-) rename src/confd/src/{infix-containers.c => containers.c} (100%) rename src/confd/src/{infix-dhcp-client.c => dhcp-client.c} (99%) rename src/confd/src/{infix-dhcp-common.c => dhcp-common.c} (98%) rename src/confd/src/{infix-dhcp-common.h => dhcp-common.h} (100%) rename src/confd/src/{infix-dhcp-server.c => dhcp-server.c} (99%) rename src/confd/src/{infix-dhcpv6-client.c => dhcpv6-client.c} (99%) rename src/confd/src/{ietf-factory-default.c => factory-default.c} (100%) rename src/confd/src/{infix-factory.c => factory.c} (100%) rename src/confd/src/{infix-firewall.c => firewall.c} (99%) rename src/confd/src/{ietf-hardware.c => hardware.c} (100%) rename src/confd/src/{infix-if-bridge-mcd.c => if-bridge-mcd.c} (99%) rename src/confd/src/{infix-if-bridge-port.c => if-bridge-port.c} (99%) rename src/confd/src/{infix-if-bridge.c => if-bridge.c} (99%) rename src/confd/src/{infix-if-gre.c => if-gre.c} (97%) rename src/confd/src/{infix-if-lag.c => if-lag.c} (99%) rename src/confd/src/{infix-if-veth.c => if-veth.c} (99%) rename src/confd/src/{infix-if-vlan.c => if-vlan.c} (99%) rename src/confd/src/{infix-if-vxlan.c => if-vxlan.c} (96%) rename src/confd/src/{infix-if-wifi.c => if-wifi.c} (99%) rename src/confd/src/{ietf-interfaces.c => interfaces.c} (99%) rename src/confd/src/{ietf-interfaces.h => interfaces.h} (93%) rename src/confd/src/{ietf-ip.c => ip.c} (99%) rename src/confd/src/{ietf-keystore.c => keystore.c} (100%) rename src/confd/src/{infix-meta.c => meta.c} (100%) create mode 100644 src/confd/src/netlink.c rename src/confd/src/{ietf-routing.c => routing.c} (100%) rename src/confd/src/{infix-services.c => services.c} (100%) rename src/confd/src/{ietf-syslog.c => syslog.c} (100%) rename src/confd/src/{infix-system-software.c => system-software.c} (100%) rename src/confd/src/{ietf-system.c => system.c} (100%) diff --git a/src/confd/src/Makefile.am b/src/confd/src/Makefile.am index 3692de39..8db05041 100644 --- a/src/confd/src/Makefile.am +++ b/src/confd/src/Makefile.am @@ -26,36 +26,36 @@ confd_plugin_la_SOURCES = \ base64.c base64.h \ core.c core.h \ dagger.c dagger.h \ - ietf-interfaces.c ietf-interfaces.h \ + interfaces.c interfaces.h \ ieee802-ethernet-interface.c \ - ietf-ip.c \ - infix-if-bridge.c \ - infix-if-lag.c \ - infix-if-bridge-mcd.c \ - infix-if-bridge-port.c \ - infix-if-veth.c \ - infix-if-vlan.c \ - infix-if-gre.c \ - infix-if-vxlan.c \ - infix-if-wifi.c \ - ietf-keystore.c \ - ietf-system.c \ - ietf-syslog.c \ - ietf-factory-default.c \ - ietf-routing.c \ - infix-dhcp-common.c \ - infix-dhcp-client.c \ - infix-dhcpv6-client.c \ - infix-dhcp-server.c \ - infix-factory.c \ - infix-firewall.c \ - infix-meta.c \ - infix-services.c \ - infix-system-software.c \ - ietf-hardware.c + ip.c \ + if-bridge.c \ + if-lag.c \ + if-bridge-mcd.c \ + if-bridge-port.c \ + if-veth.c \ + if-vlan.c \ + if-gre.c \ + if-vxlan.c \ + if-wifi.c \ + keystore.c \ + system.c \ + syslog.c \ + factory-default.c \ + routing.c \ + dhcp-common.c \ + dhcp-client.c \ + dhcpv6-client.c \ + dhcp-server.c \ + factory.c \ + firewall.c \ + meta.c \ + services.c \ + system-software.c \ + hardware.c if CONTAINERS -confd_plugin_la_SOURCES += infix-containers.c cni.c cni.h +confd_plugin_la_SOURCES += containers.c cni.c cni.h endif rauc_installer_sources = \ diff --git a/src/confd/src/cni.c b/src/confd/src/cni.c index 436a43fc..d70a863a 100644 --- a/src/confd/src/cni.c +++ b/src/confd/src/cni.c @@ -6,7 +6,7 @@ #include "core.h" #include "cni.h" -#include "ietf-interfaces.h" +#include "interfaces.h" #define CNI_NAME "/etc/cni/net.d/%s.conflist" diff --git a/src/confd/src/infix-containers.c b/src/confd/src/containers.c similarity index 100% rename from src/confd/src/infix-containers.c rename to src/confd/src/containers.c diff --git a/src/confd/src/core.h b/src/confd/src/core.h index fc0e62d8..95f451b9 100644 --- a/src/confd/src/core.h +++ b/src/confd/src/core.h @@ -183,19 +183,19 @@ static inline int register_rpc(sr_session_ctx_t *session, const char *xpath, } -/* ietf-interfaces.c */ +/* interfaces.c */ int ietf_interfaces_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); int ietf_interfaces_cand_init(struct confd *confd); -/* ietf-syslog.c */ +/* syslog.c */ int ietf_syslog_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); -/* ietf-system.c */ +/* system.c */ int ietf_system_rpc_init (struct confd *confd); int hostnamefmt (struct confd *confd, const char *fmt, char *hostnm, size_t hostlen, char *domain, size_t domlen); int ietf_system_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); -/* infix-containers.c */ +/* containers.c */ #ifdef CONTAINERS int infix_containers_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); int infix_containers_rpc_init(struct confd *confd); @@ -204,13 +204,13 @@ static inline int infix_containers_rpc_init(struct confd *confd) { return 0; } static inline int infix_containers_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { return 0; } #endif -/* infix-dhcp-client.c */ +/* dhcp-client.c */ int infix_dhcp_client_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); -/* infix-dhcpv6-client.c */ +/* dhcpv6-client.c */ int infix_dhcpv6_client_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); -/* infix-dhcp-server.c */ +/* dhcp-server.c */ int infix_dhcp_server_candidate_init(struct confd *confd); int infix_dhcp_server_rpc_init(struct confd *confd); int infix_dhcp_server_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); @@ -218,31 +218,31 @@ int infix_dhcp_server_change(sr_session_ctx_t *session, struct lyd_node *config, /* ietf-routing */ int ietf_routing_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); -/* infix-factory.c */ +/* factory.c */ int infix_factory_rpc_init(struct confd *confd); /* ietf-factory-default */ int ietf_factory_default_rpc_init(struct confd *confd); -/* infix-meta.c */ +/* meta.c */ int infix_meta_change_cb(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); -/* infix-system-software.c */ +/* system-software.c */ int infix_system_sw_rpc_init(struct confd *confd); -/* infix-services.c */ +/* services.c */ int infix_services_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); -/* ietf-hardware.c */ +/* hardware.c */ int ietf_hardware_candidate_init(struct confd *confd); int ietf_hardware_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); -/* ietf-keystore.c */ +/* keystore.c */ #define SSH_HOSTKEYS "/etc/ssh/hostkeys" #define SSH_HOSTKEYS_NEXT SSH_HOSTKEYS"+" int ietf_keystore_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); -/* infix-firewall.c */ +/* firewall.c */ int infix_firewall_rpc_init(struct confd *confd); int infix_firewall_candidate_init(struct confd *confd); int infix_firewall_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); diff --git a/src/confd/src/infix-dhcp-client.c b/src/confd/src/dhcp-client.c similarity index 99% rename from src/confd/src/infix-dhcp-client.c rename to src/confd/src/dhcp-client.c index 8209577c..5b1a4611 100644 --- a/src/confd/src/infix-dhcp-client.c +++ b/src/confd/src/dhcp-client.c @@ -12,7 +12,7 @@ #include #include "core.h" -#include "infix-dhcp-common.h" +#include "dhcp-common.h" #define ARPING_MSEC 1000 #define MODULE "infix-dhcp-client" diff --git a/src/confd/src/infix-dhcp-common.c b/src/confd/src/dhcp-common.c similarity index 98% rename from src/confd/src/infix-dhcp-common.c rename to src/confd/src/dhcp-common.c index e796254b..d364ae59 100644 --- a/src/confd/src/infix-dhcp-common.c +++ b/src/confd/src/dhcp-common.c @@ -12,7 +12,7 @@ #include #include "core.h" -#include "infix-dhcp-common.h" +#include "dhcp-common.h" int dhcp_option_lookup(const struct lyd_node *id) { @@ -230,7 +230,7 @@ static void infer_options_v6(sr_session_ctx_t *session, const char *xpath) } /* - * Called from ietf-interfaces.c ifchange_cand() to infer DHCP options + * Called from interfaces.c ifchange_cand() to infer DHCP options * for both DHCPv4 and DHCPv6 client configurations */ int ifchange_cand_infer_dhcp(sr_session_ctx_t *session, const char *xpath) diff --git a/src/confd/src/infix-dhcp-common.h b/src/confd/src/dhcp-common.h similarity index 100% rename from src/confd/src/infix-dhcp-common.h rename to src/confd/src/dhcp-common.h diff --git a/src/confd/src/infix-dhcp-server.c b/src/confd/src/dhcp-server.c similarity index 99% rename from src/confd/src/infix-dhcp-server.c rename to src/confd/src/dhcp-server.c index 0e6bf373..86ce1a2f 100644 --- a/src/confd/src/infix-dhcp-server.c +++ b/src/confd/src/dhcp-server.c @@ -9,7 +9,7 @@ #include #include "core.h" -#include "infix-dhcp-common.h" +#include "dhcp-common.h" #define MODULE "infix-dhcp-server" #define ROOT_XPATH "/infix-dhcp-server:" diff --git a/src/confd/src/infix-dhcpv6-client.c b/src/confd/src/dhcpv6-client.c similarity index 99% rename from src/confd/src/infix-dhcpv6-client.c rename to src/confd/src/dhcpv6-client.c index a5c8807d..e8509c55 100644 --- a/src/confd/src/infix-dhcpv6-client.c +++ b/src/confd/src/dhcpv6-client.c @@ -12,7 +12,7 @@ #include #include "core.h" -#include "infix-dhcp-common.h" +#include "dhcp-common.h" #define MODULE "infix-dhcpv6-client" #define XPATH "/ietf-interfaces:interfaces/interface/ietf-ip:ipv6/infix-dhcpv6-client:dhcp" diff --git a/src/confd/src/ietf-factory-default.c b/src/confd/src/factory-default.c similarity index 100% rename from src/confd/src/ietf-factory-default.c rename to src/confd/src/factory-default.c diff --git a/src/confd/src/infix-factory.c b/src/confd/src/factory.c similarity index 100% rename from src/confd/src/infix-factory.c rename to src/confd/src/factory.c diff --git a/src/confd/src/infix-firewall.c b/src/confd/src/firewall.c similarity index 99% rename from src/confd/src/infix-firewall.c rename to src/confd/src/firewall.c index b46dbec7..1f88d4a7 100644 --- a/src/confd/src/infix-firewall.c +++ b/src/confd/src/firewall.c @@ -13,7 +13,7 @@ #include #include "core.h" -#include "ietf-interfaces.h" +#include "interfaces.h" #define MODULE "infix-firewall" #define XPATH "/infix-firewall:firewall" diff --git a/src/confd/src/ietf-hardware.c b/src/confd/src/hardware.c similarity index 100% rename from src/confd/src/ietf-hardware.c rename to src/confd/src/hardware.c diff --git a/src/confd/src/ieee802-ethernet-interface.c b/src/confd/src/ieee802-ethernet-interface.c index 754e1446..53f156eb 100644 --- a/src/confd/src/ieee802-ethernet-interface.c +++ b/src/confd/src/ieee802-ethernet-interface.c @@ -10,7 +10,7 @@ #include #include -#include "ietf-interfaces.h" +#include "interfaces.h" static bool iface_uses_autoneg(struct lyd_node *cif) { diff --git a/src/confd/src/infix-if-bridge-mcd.c b/src/confd/src/if-bridge-mcd.c similarity index 99% rename from src/confd/src/infix-if-bridge-mcd.c rename to src/confd/src/if-bridge-mcd.c index 8c3f0bd6..7ea3e92a 100644 --- a/src/confd/src/infix-if-bridge-mcd.c +++ b/src/confd/src/if-bridge-mcd.c @@ -10,7 +10,7 @@ #include #include -#include "ietf-interfaces.h" +#include "interfaces.h" static int gen_vlan(struct lyd_node *cif, struct lyd_node *vlan, FILE *conf) { diff --git a/src/confd/src/infix-if-bridge-port.c b/src/confd/src/if-bridge-port.c similarity index 99% rename from src/confd/src/infix-if-bridge-port.c rename to src/confd/src/if-bridge-port.c index ffb24d5e..d5445c11 100644 --- a/src/confd/src/infix-if-bridge-port.c +++ b/src/confd/src/if-bridge-port.c @@ -10,7 +10,7 @@ #include #include -#include "ietf-interfaces.h" +#include "interfaces.h" static const char *mstpd_cost_str(struct lyd_node *cost) { diff --git a/src/confd/src/infix-if-bridge.c b/src/confd/src/if-bridge.c similarity index 99% rename from src/confd/src/infix-if-bridge.c rename to src/confd/src/if-bridge.c index 55ffaf85..4244a6ad 100644 --- a/src/confd/src/infix-if-bridge.c +++ b/src/confd/src/if-bridge.c @@ -10,7 +10,7 @@ #include #include -#include "ietf-interfaces.h" +#include "interfaces.h" struct ixif_br { const char *name; diff --git a/src/confd/src/infix-if-gre.c b/src/confd/src/if-gre.c similarity index 97% rename from src/confd/src/infix-if-gre.c rename to src/confd/src/if-gre.c index dbb96224..bdaccd67 100644 --- a/src/confd/src/infix-if-gre.c +++ b/src/confd/src/if-gre.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause */ #include -#include "ietf-interfaces.h" +#include "interfaces.h" int gre_gen(struct lyd_node *dif, struct lyd_node *cif, FILE *ip) { diff --git a/src/confd/src/infix-if-lag.c b/src/confd/src/if-lag.c similarity index 99% rename from src/confd/src/infix-if-lag.c rename to src/confd/src/if-lag.c index 54667a0a..7a4d9418 100644 --- a/src/confd/src/infix-if-lag.c +++ b/src/confd/src/if-lag.c @@ -10,7 +10,7 @@ #include #include -#include "ietf-interfaces.h" +#include "interfaces.h" /* * The lag-port noode is only in the dif at initial creation, or removal. diff --git a/src/confd/src/infix-if-veth.c b/src/confd/src/if-veth.c similarity index 99% rename from src/confd/src/infix-if-veth.c rename to src/confd/src/if-veth.c index 584ca76a..306c61f2 100644 --- a/src/confd/src/infix-if-veth.c +++ b/src/confd/src/if-veth.c @@ -10,7 +10,7 @@ #include #include -#include "ietf-interfaces.h" +#include "interfaces.h" /* * While the kernel atomically creates/destroys the pair, in `running` diff --git a/src/confd/src/infix-if-vlan.c b/src/confd/src/if-vlan.c similarity index 99% rename from src/confd/src/infix-if-vlan.c rename to src/confd/src/if-vlan.c index 06097a08..0a79c6ba 100644 --- a/src/confd/src/infix-if-vlan.c +++ b/src/confd/src/if-vlan.c @@ -10,7 +10,7 @@ #include #include -#include "ietf-interfaces.h" +#include "interfaces.h" int ifchange_cand_infer_vlan(sr_session_ctx_t *session, const char *path) { diff --git a/src/confd/src/infix-if-vxlan.c b/src/confd/src/if-vxlan.c similarity index 96% rename from src/confd/src/infix-if-vxlan.c rename to src/confd/src/if-vxlan.c index f4e6ae98..bb8dacb2 100644 --- a/src/confd/src/infix-if-vxlan.c +++ b/src/confd/src/if-vxlan.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause */ #include -#include "ietf-interfaces.h" +#include "interfaces.h" int vxlan_gen(struct lyd_node *dif, struct lyd_node *cif, FILE *ip) { diff --git a/src/confd/src/infix-if-wifi.c b/src/confd/src/if-wifi.c similarity index 99% rename from src/confd/src/infix-if-wifi.c rename to src/confd/src/if-wifi.c index 2ef7bfd2..ab934a84 100644 --- a/src/confd/src/infix-if-wifi.c +++ b/src/confd/src/if-wifi.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause */ #include -#include "ietf-interfaces.h" +#include "interfaces.h" #define WPA_SUPPLICANT_FINIT_CONF "/etc/finit.d/available/wpa_supplicant-%s.conf" #define WPA_SUPPLICANT_CONF "/etc/wpa_supplicant-%s.conf" diff --git a/src/confd/src/ietf-interfaces.c b/src/confd/src/interfaces.c similarity index 99% rename from src/confd/src/ietf-interfaces.c rename to src/confd/src/interfaces.c index ee42a6a7..d1e3bcaf 100644 --- a/src/confd/src/ietf-interfaces.c +++ b/src/confd/src/interfaces.c @@ -11,7 +11,7 @@ #include #include -#include "ietf-interfaces.h" +#include "interfaces.h" #define IFACE_PROBE_TIMEOUT 40 diff --git a/src/confd/src/ietf-interfaces.h b/src/confd/src/interfaces.h similarity index 93% rename from src/confd/src/ietf-interfaces.h rename to src/confd/src/interfaces.h index a34accad..9367ec51 100644 --- a/src/confd/src/ietf-interfaces.h +++ b/src/confd/src/interfaces.h @@ -99,12 +99,12 @@ bool iface_has_quirk(const char *ifname, const char *quirkname); /* ieee802-ethernet-interface.c */ int netdag_gen_ethtool(struct dagger *net, struct lyd_node *cif, struct lyd_node *dif); -/* ietf-interfaces.c */ +/* interfaces.c */ const char *get_chassis_addr(void); int link_gen_address(struct lyd_node *cif, FILE *ip); int ietf_interfaces_get_all_l3(const struct lyd_node *tree, char ***ifaces); -/* ietf-ip.c */ +/* ip.c */ int netdag_gen_ipv6_autoconf(struct dagger *net, struct lyd_node *cif, struct lyd_node *dif, FILE *ip); int netdag_gen_ipv4_autoconf(struct dagger *net, struct lyd_node *cif, @@ -112,42 +112,42 @@ int netdag_gen_ipv4_autoconf(struct dagger *net, struct lyd_node *cif, int netdag_gen_ip_addrs(struct dagger *net, FILE *ip, const char *proto, struct lyd_node *cif, struct lyd_node *dif); -/* infix-if-bridge.c */ +/* if-bridge.c */ int bridge_mstpd_gen(struct lyd_node *cifs); int bridge_gen(struct lyd_node *dif, struct lyd_node *cif, FILE *ip, int add); int bridge_add_deps(struct lyd_node *cif); -/* infix-if-bridge-mcd.c */ +/* if-bridge-mcd.c */ int bridge_mcd_gen(struct lyd_node *cifs); -/* infix-if-bridge-port.c */ +/* if-bridge-port.c */ int bridge_port_gen(struct lyd_node *dif, struct lyd_node *cif, FILE *ip); -/* infix-if-wifi.c */ +/* if-wifi.c */ int wifi_gen(struct lyd_node *dif, struct lyd_node *cif, struct dagger *net); int wifi_gen_del(struct lyd_node *dif, struct dagger *net); -/* infix-if-gre.c */ +/* if-gre.c */ int gre_gen(struct lyd_node *dif, struct lyd_node *cif, FILE *ip); -/* infix-if-lag.c */ +/* if-lag.c */ int lag_port_gen(struct lyd_node *dif, struct lyd_node *cif); int lag_gen(struct lyd_node *dif, struct lyd_node *cif, FILE *ip, int add); int lag_add_deps(struct lyd_node *cif); -/* infix-if-veth.c */ +/* if-veth.c */ bool veth_is_primary(struct lyd_node *cif); int ifchange_cand_infer_veth(sr_session_ctx_t *session, const char *path); int veth_gen(struct lyd_node *dif, struct lyd_node *cif, FILE *ip); int veth_add_deps(struct lyd_node *cif); -/* infix-if-vlan.c */ +/* if-vlan.c */ int ifchange_cand_infer_vlan(sr_session_ctx_t *session, const char *path); int vlan_gen(struct lyd_node *dif, struct lyd_node *cif, FILE *ip); int vlan_add_deps(struct lyd_node *cif); -/* infix-dhcp-common.c */ +/* dhcp-common.c */ int ifchange_cand_infer_dhcp(sr_session_ctx_t *session, const char *path); -/* infix-if-vxlan.c */ +/* if-vxlan.c */ int vxlan_gen(struct lyd_node *dif, struct lyd_node *cif, FILE *ip); #endif /* CONFD_IETF_INTERFACES_H_ */ diff --git a/src/confd/src/ietf-ip.c b/src/confd/src/ip.c similarity index 99% rename from src/confd/src/ietf-ip.c rename to src/confd/src/ip.c index adcf9cb8..1c843195 100644 --- a/src/confd/src/ietf-ip.c +++ b/src/confd/src/ip.c @@ -10,7 +10,7 @@ #include #include -#include "ietf-interfaces.h" +#include "interfaces.h" int netdag_gen_ipv6_autoconf(struct dagger *net, struct lyd_node *cif, struct lyd_node *dif, FILE *ip) diff --git a/src/confd/src/ietf-keystore.c b/src/confd/src/keystore.c similarity index 100% rename from src/confd/src/ietf-keystore.c rename to src/confd/src/keystore.c diff --git a/src/confd/src/infix-meta.c b/src/confd/src/meta.c similarity index 100% rename from src/confd/src/infix-meta.c rename to src/confd/src/meta.c diff --git a/src/confd/src/netlink.c b/src/confd/src/netlink.c new file mode 100644 index 00000000..e72b4a31 --- /dev/null +++ b/src/confd/src/netlink.c @@ -0,0 +1,156 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +#include +#include +#include +#include +#include /* IFNAMSIZ */ +#include +#include +#include +#include +#include +#include +#include +#include + +#define NL_BUFSZ 4096 + +#define dbg(fmt, args...) if (nl_debug) warnx(fmt, ##args) +#define log(fmt, args...) warnx(fmt, ##args) + +static int nl_debug; +static char *nl_buf; + +static void scpy(char *dst, const char *src, size_t len) +{ + size_t i; + + for (i = 0; i < len; i++) { + if (src[i] == 0) + break; + dst[i] = src[i]; + } + + if (i < len) + dst[i] = 0; + else + dst[len - 1] = 0; +} + +static int nlmsg_validate(struct nlmsghdr *nlmsg, ssize_t len) +{ + ssize_t la; + + if (nlmsg->nlmsg_len < NLMSG_LENGTH(sizeof(struct ifinfomsg))) + return - 1; /* Packet too small or truncated! */ + + la = NLMSG_PAYLOAD(nlmsg, sizeof(struct ifinfomsg)); + if (la >= len) + return -1; /* Packet too large! */ + + return 0; +} + +static int nl_link(struct nlmsghdr *nlmsg, ssize_t len) +{ + char ifname[IFNAMSIZ]; + struct ifinfomsg *i; + struct rtattr *a; + ssize_t la; + + i = NLMSG_DATA(nlmsg); + a = (struct rtattr *)((char *)i + NLMSG_ALIGN(sizeof(struct ifinfomsg))); + la = NLMSG_PAYLOAD(nlmsg, sizeof(struct ifinfomsg)); + + for (; RTA_OK(a, la); a = RTA_NEXT(a, la)) { + if (a->rta_type != IFLA_IFNAME) + continue; + + scpy(ifname, RTA_DATA(a), sizeof(ifname)); + + switch (nlmsg->nlmsg_type) { + case RTM_NEWLINK: + dbg("%s: new link or IFF change, flags 0x%x, change 0x%x", ifname, i->ifi_flags, i->ifi_change); + return 1; + case RTM_DELLINK: + dbg("%s: delete link", ifname); + return 1; + default: + break; + } + } + + return 0; +} + +int nl_callback(int sd) +{ + while (1) { + struct nlmsghdr *nh; + ssize_t len; + size_t l; + + while ((len = recv(sd, nl_buf, NL_BUFSZ, 0)) < 0) { + if (errno == EINTR) + continue; + + return 0; + } + + l = (size_t)len; + for (nh = (struct nlmsghdr *)nl_buf; NLMSG_OK(nh, l); nh = NLMSG_NEXT(nh, l)) { + switch (nh->nlmsg_type) { + case RTM_NEWLINK: + case RTM_DELLINK: + if (nlmsg_validate(nh, len)) + continue; + return nl_link(nh, len); + case NLMSG_DONE: + case NLMSG_ERROR: + return 0; + default: + break; + } + } + } + + return 0; +} + +int main(void) +{ + struct sockaddr_nl sa = { 0 }; + struct pollfd pfd; + int sd; + + sd = socket(AF_NETLINK, SOCK_RAW | SOCK_NONBLOCK | SOCK_CLOEXEC, NETLINK_ROUTE); + if (sd < 0) + err(1, "socket()"); + + sa.nl_family = AF_NETLINK; + sa.nl_groups = RTMGRP_IPV4_ROUTE | RTMGRP_LINK; + sa.nl_pid = getpid(); + + if (bind(sd, (struct sockaddr *)&sa, sizeof(sa)) < 0) + err(1, "bind()"); + + nl_buf = malloc(NL_BUFSZ); + if (!nl_buf) + err(1, "malloc()"); + + pfd.fd = sd; + pfd.events = POLLIN; + while (1) { + int rc; + + rc = poll(&pfd, 1, -1); + if (rc == -1) + break; + + if (nl_callback(sd)) + log("link change"); + } + + return !!close(sd); +} diff --git a/src/confd/src/ietf-routing.c b/src/confd/src/routing.c similarity index 100% rename from src/confd/src/ietf-routing.c rename to src/confd/src/routing.c diff --git a/src/confd/src/infix-services.c b/src/confd/src/services.c similarity index 100% rename from src/confd/src/infix-services.c rename to src/confd/src/services.c diff --git a/src/confd/src/ietf-syslog.c b/src/confd/src/syslog.c similarity index 100% rename from src/confd/src/ietf-syslog.c rename to src/confd/src/syslog.c diff --git a/src/confd/src/infix-system-software.c b/src/confd/src/system-software.c similarity index 100% rename from src/confd/src/infix-system-software.c rename to src/confd/src/system-software.c diff --git a/src/confd/src/ietf-system.c b/src/confd/src/system.c similarity index 100% rename from src/confd/src/ietf-system.c rename to src/confd/src/system.c From b9a56924ace4c2f0be0e14acc53f57a7a3541593 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 20 Nov 2025 17:15:47 +0100 Subject: [PATCH 4/4] confd: drop ietf/infix prefix from function names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SIMPLIFY, Simplify, simplify ... as my uni English professor always said. > “Perfection is achieved not when there is nothing more to add, but when > there is nothing left to take away.” -- Antoine de Saint-Exupéry Signed-off-by: Joachim Wiberg --- src/confd/src/containers.c | 4 +-- src/confd/src/core.c | 48 +++++++++++++++--------------- src/confd/src/core.h | 52 ++++++++++++++++----------------- src/confd/src/dhcp-client.c | 2 +- src/confd/src/dhcp-common.h | 6 ++-- src/confd/src/dhcp-server.c | 6 ++-- src/confd/src/dhcpv6-client.c | 2 +- src/confd/src/factory-default.c | 2 +- src/confd/src/factory.c | 2 +- src/confd/src/firewall.c | 8 ++--- src/confd/src/hardware.c | 4 +-- src/confd/src/interfaces.c | 6 ++-- src/confd/src/interfaces.h | 8 ++--- src/confd/src/keystore.c | 2 +- src/confd/src/meta.c | 2 +- src/confd/src/routing.c | 2 +- src/confd/src/services.c | 2 +- src/confd/src/syslog.c | 2 +- src/confd/src/system-software.c | 2 +- src/confd/src/system.c | 4 +-- 20 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/confd/src/containers.c b/src/confd/src/containers.c index 359ef320..57cb7f34 100644 --- a/src/confd/src/containers.c +++ b/src/confd/src/containers.c @@ -349,7 +349,7 @@ static int del(const char *name) return SR_ERR_OK; } -int infix_containers_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) +int containers_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { struct lyd_node *cifs, *difs, *cif, *dif; sr_error_t err = 0; @@ -465,7 +465,7 @@ static int oci_load(sr_session_ctx_t *session, uint32_t sub_id, const char *xpat return SR_ERR_OK; } -int infix_containers_rpc_init(struct confd *confd) +int containers_rpc_init(struct confd *confd) { int rc; diff --git a/src/confd/src/core.c b/src/confd/src/core.c index dc3f270d..e24dca9e 100644 --- a/src/confd/src/core.c +++ b/src/confd/src/core.c @@ -191,57 +191,57 @@ static int change_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *mod } /* ietf-interfaces */ - if ((rc = ietf_interfaces_change(session, config, diff, event, confd))) + if ((rc = interfaces_change(session, config, diff, event, confd))) goto free_diff; /* infix-dhcp-client*/ - if ((rc = infix_dhcp_client_change(session, config, diff, event, confd))) + if ((rc = dhcp_client_change(session, config, diff, event, confd))) goto free_diff; /* infix-dhcpv6-client*/ - if ((rc = infix_dhcpv6_client_change(session, config, diff, event, confd))) + if ((rc = dhcpv6_client_change(session, config, diff, event, confd))) goto free_diff; /* ietf-keystore */ - if ((rc = ietf_keystore_change(session, config, diff, event, confd))) + if ((rc = keystore_change(session, config, diff, event, confd))) goto free_diff; /* infix-services */ - if ((rc = infix_services_change(session, config, diff, event, confd))) + if ((rc = services_change(session, config, diff, event, confd))) goto free_diff; /* ietf-syslog*/ - if ((rc = ietf_syslog_change(session, config, diff, event, confd))) + if ((rc = syslog_change(session, config, diff, event, confd))) goto free_diff; /* ietf-system */ - if ((rc = ietf_system_change(session, config, diff, event, confd))) + if ((rc = system_change(session, config, diff, event, confd))) goto free_diff; /* infix-containers */ #ifdef CONTAINERS - if ((rc = infix_containers_change(session, config, diff, event, confd))) + if ((rc = containers_change(session, config, diff, event, confd))) goto free_diff; #endif /* ietf-hardware */ - if ((rc = ietf_hardware_change(session, config, diff, event, confd))) + if ((rc = hardware_change(session, config, diff, event, confd))) goto free_diff; /* ietf-routing */ - if ((rc = ietf_routing_change(session, config, diff, event, confd))) + if ((rc = routing_change(session, config, diff, event, confd))) goto free_diff; /* infix-dhcp-server */ - if ((rc = infix_dhcp_server_change(session, config, diff, event, confd))) + if ((rc = dhcp_server_change(session, config, diff, event, confd))) goto free_diff; /* infix-firewall */ - if ((rc = infix_firewall_change(session, config, diff, event, confd))) + if ((rc = firewall_change(session, config, diff, event, confd))) goto free_diff; /* infix-meta */ - if ((rc = infix_meta_change_cb(session, config, diff, event, confd))) + if ((rc = meta_change_cb(session, config, diff, event, confd))) goto free_diff; if (cfg) @@ -390,48 +390,48 @@ int sr_plugin_init_cb(sr_session_ctx_t *session, void **priv) goto err; } - rc = ietf_system_rpc_init(&confd); + rc = system_rpc_init(&confd); if (rc) goto err; #ifdef CONTAINERS - rc = infix_containers_rpc_init(&confd); + rc = containers_rpc_init(&confd); if (rc) goto err; #endif - rc = infix_dhcp_server_rpc_init(&confd); + rc = dhcp_server_rpc_init(&confd); if (rc) goto err; - rc = infix_factory_rpc_init(&confd); + rc = factory_rpc_init(&confd); if (rc) goto err; - rc = ietf_factory_default_rpc_init(&confd); + rc = factory_default_rpc_init(&confd); if (rc) goto err; - rc = infix_firewall_rpc_init(&confd); + rc = firewall_rpc_init(&confd); if (rc) goto err; - rc = infix_system_sw_rpc_init(&confd); + rc = system_sw_rpc_init(&confd); if (rc) goto err; /* Candidate infer configurations */ - rc = ietf_interfaces_cand_init(&confd); + rc = interfaces_cand_init(&confd); if (rc) goto err; - rc = ietf_hardware_candidate_init(&confd); + rc = hardware_candidate_init(&confd); if (rc) goto err; - rc = infix_firewall_candidate_init(&confd); + rc = firewall_candidate_init(&confd); if (rc) goto err; - rc = infix_dhcp_server_candidate_init(&confd); + rc = dhcp_server_candidate_init(&confd); if (rc) goto err; /* YOUR_INIT GOES HERE */ diff --git a/src/confd/src/core.h b/src/confd/src/core.h index 95f451b9..d376aa49 100644 --- a/src/confd/src/core.h +++ b/src/confd/src/core.h @@ -184,67 +184,67 @@ static inline int register_rpc(sr_session_ctx_t *session, const char *xpath, /* interfaces.c */ -int ietf_interfaces_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); -int ietf_interfaces_cand_init(struct confd *confd); +int interfaces_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); +int interfaces_cand_init(struct confd *confd); /* syslog.c */ -int ietf_syslog_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); +int syslog_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); /* system.c */ -int ietf_system_rpc_init (struct confd *confd); +int system_rpc_init (struct confd *confd); int hostnamefmt (struct confd *confd, const char *fmt, char *hostnm, size_t hostlen, char *domain, size_t domlen); -int ietf_system_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); +int system_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); /* containers.c */ #ifdef CONTAINERS -int infix_containers_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); -int infix_containers_rpc_init(struct confd *confd); +int containers_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); +int containers_rpc_init(struct confd *confd); #else -static inline int infix_containers_rpc_init(struct confd *confd) { return 0; } -static inline int infix_containers_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { return 0; } +static inline int containers_rpc_init(struct confd *confd) { return 0; } +static inline int containers_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { return 0; } #endif /* dhcp-client.c */ -int infix_dhcp_client_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); +int dhcp_client_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); /* dhcpv6-client.c */ -int infix_dhcpv6_client_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); +int dhcpv6_client_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); /* dhcp-server.c */ -int infix_dhcp_server_candidate_init(struct confd *confd); -int infix_dhcp_server_rpc_init(struct confd *confd); -int infix_dhcp_server_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); +int dhcp_server_candidate_init(struct confd *confd); +int dhcp_server_rpc_init(struct confd *confd); +int dhcp_server_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); /* ietf-routing */ -int ietf_routing_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); +int routing_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); /* factory.c */ -int infix_factory_rpc_init(struct confd *confd); +int factory_rpc_init(struct confd *confd); /* ietf-factory-default */ -int ietf_factory_default_rpc_init(struct confd *confd); +int factory_default_rpc_init(struct confd *confd); /* meta.c */ -int infix_meta_change_cb(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); +int meta_change_cb(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); /* system-software.c */ -int infix_system_sw_rpc_init(struct confd *confd); +int system_sw_rpc_init(struct confd *confd); /* services.c */ -int infix_services_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); +int services_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); /* hardware.c */ -int ietf_hardware_candidate_init(struct confd *confd); -int ietf_hardware_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); +int hardware_candidate_init(struct confd *confd); +int hardware_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); /* keystore.c */ #define SSH_HOSTKEYS "/etc/ssh/hostkeys" #define SSH_HOSTKEYS_NEXT SSH_HOSTKEYS"+" -int ietf_keystore_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); +int keystore_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); /* firewall.c */ -int infix_firewall_rpc_init(struct confd *confd); -int infix_firewall_candidate_init(struct confd *confd); -int infix_firewall_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); +int firewall_rpc_init(struct confd *confd); +int firewall_candidate_init(struct confd *confd); +int firewall_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd); #endif /* CONFD_CORE_H_ */ diff --git a/src/confd/src/dhcp-client.c b/src/confd/src/dhcp-client.c index 5b1a4611..ba40193a 100644 --- a/src/confd/src/dhcp-client.c +++ b/src/confd/src/dhcp-client.c @@ -167,7 +167,7 @@ static void del(const char *ifname) systemf("initctl -bfq delete dhcp-client-%s", ifname); } -int infix_dhcp_client_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, +int dhcp_client_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { struct lyd_node *ifaces, *difaces, *iface, *diface, *ipv4, *dhcp, *ddhcp; diff --git a/src/confd/src/dhcp-common.h b/src/confd/src/dhcp-common.h index c1886522..127cf798 100644 --- a/src/confd/src/dhcp-common.h +++ b/src/confd/src/dhcp-common.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -#ifndef INFIX_DHCP_COMMON_H_ -#define INFIX_DHCP_COMMON_H_ +#ifndef DHCP_COMMON_H_ +#define DHCP_COMMON_H_ #include @@ -16,4 +16,4 @@ char *dhcp_compose_options(struct lyd_node *cfg, const char *ifname, char **opti struct lyd_node *id, const char *val, const char *hex, char *(*ip_cache_cb)(const char *, char *, size_t)); -#endif /* INFIX_DHCP_COMMON_H_ */ +#endif /* DHCP_COMMON_H_ */ diff --git a/src/confd/src/dhcp-server.c b/src/confd/src/dhcp-server.c index 86ce1a2f..beed3595 100644 --- a/src/confd/src/dhcp-server.c +++ b/src/confd/src/dhcp-server.c @@ -295,7 +295,7 @@ static void del(const char *subnet, struct lyd_node *cfg) ERRNO("Failed switching to new %s", DNSMASQ_LEASES); } -int infix_dhcp_server_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) +int dhcp_server_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { struct lyd_node *global, *cifs, *difs, *cif, *dif; int enabled = 0, added = 0, deleted = 0; @@ -450,7 +450,7 @@ static int clear_stats(sr_session_ctx_t *session, uint32_t sub_id, const char *x return SR_ERR_OK; } -int infix_dhcp_server_candidate_init(struct confd *confd) +int dhcp_server_candidate_init(struct confd *confd) { int rc; @@ -462,7 +462,7 @@ fail: return rc; } -int infix_dhcp_server_rpc_init(struct confd *confd) +int dhcp_server_rpc_init(struct confd *confd) { int rc; diff --git a/src/confd/src/dhcpv6-client.c b/src/confd/src/dhcpv6-client.c index e8509c55..e7bbebdd 100644 --- a/src/confd/src/dhcpv6-client.c +++ b/src/confd/src/dhcpv6-client.c @@ -112,7 +112,7 @@ static void del_v6(const char *ifname) systemf("initctl -bfq delete dhcpv6-client-%s", ifname); } -int infix_dhcpv6_client_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, +int dhcpv6_client_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { struct lyd_node *ifaces, *difaces, *iface, *diface, *ipv6, *dhcp, *ddhcp; diff --git a/src/confd/src/factory-default.c b/src/confd/src/factory-default.c index 398419ea..a78e83f0 100644 --- a/src/confd/src/factory-default.c +++ b/src/confd/src/factory-default.c @@ -16,7 +16,7 @@ static int factory_reset(sr_session_ctx_t *session, uint32_t sub_id, const char return 0; } -int ietf_factory_default_rpc_init(struct confd *confd) +int factory_default_rpc_init(struct confd *confd) { int rc; diff --git a/src/confd/src/factory.c b/src/confd/src/factory.c index 1c564579..283aa1dc 100644 --- a/src/confd/src/factory.c +++ b/src/confd/src/factory.c @@ -33,7 +33,7 @@ static int rpc(sr_session_ctx_t *session, uint32_t sub_id, const char *xpath, return rc; } -int infix_factory_rpc_init(struct confd *confd) +int factory_rpc_init(struct confd *confd) { int rc; REGISTER_RPC(confd->session, "/infix-factory-default:factory-default", rpc, NULL, &confd->fsub); diff --git a/src/confd/src/firewall.c b/src/confd/src/firewall.c index 1f88d4a7..a11416f3 100644 --- a/src/confd/src/firewall.c +++ b/src/confd/src/firewall.c @@ -480,7 +480,7 @@ static int infer_policy(sr_session_ctx_t *session, const char *name, const char } #endif -int infix_firewall_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) +int firewall_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { struct lyd_node *tree, *global; struct lyd_node *clist, *cnode; @@ -534,7 +534,7 @@ int infix_firewall_change(sr_session_ctx_t *session, struct lyd_node *config, st } /* Get L3 interfaces for default zone assignment */ - if (ietf_interfaces_get_all_l3(tree, &ifaces) != 0) { + if (interfaces_get_all_l3(tree, &ifaces) != 0) { ERROR("Failed to get L3 interfaces"); ifaces = NULL; } @@ -711,7 +711,7 @@ static int lockdown(sr_session_ctx_t *session, uint32_t sub_id, const char *xpat return SR_ERR_OK; } -int infix_firewall_rpc_init(struct confd *confd) +int firewall_rpc_init(struct confd *confd) { int rc; @@ -724,7 +724,7 @@ fail: } -int infix_firewall_candidate_init(struct confd *confd) +int firewall_candidate_init(struct confd *confd) { int rc; diff --git a/src/confd/src/hardware.c b/src/confd/src/hardware.c index 4cee2337..83e52bfc 100644 --- a/src/confd/src/hardware.c +++ b/src/confd/src/hardware.c @@ -185,7 +185,7 @@ static int hardware_cand(sr_session_ctx_t *session, uint32_t sub_id, const char return err; } -int ietf_hardware_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) +int hardware_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { struct lyd_node *difs = NULL, *dif = NULL, *cifs = NULL, *cif = NULL; int rc = SR_ERR_OK; @@ -232,7 +232,7 @@ int ietf_hardware_change(sr_session_ctx_t *session, struct lyd_node *config, str err: return rc; } -int ietf_hardware_candidate_init(struct confd *confd) +int hardware_candidate_init(struct confd *confd) { int rc = 0; diff --git a/src/confd/src/interfaces.c b/src/confd/src/interfaces.c index d1e3bcaf..0a0cc032 100644 --- a/src/confd/src/interfaces.c +++ b/src/confd/src/interfaces.c @@ -791,7 +791,7 @@ static sr_error_t ifchange_post(sr_session_ctx_t *session, struct dagger *net, return err ? SR_ERR_INTERNAL : SR_ERR_OK; } -int ietf_interfaces_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) +int interfaces_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { struct lyd_node *cifs, *difs, *cif, *dif; sr_error_t err; @@ -839,7 +839,7 @@ err_out: return err; } -int ietf_interfaces_get_all_l3(const struct lyd_node *tree, char ***ifaces) +int interfaces_get_all_l3(const struct lyd_node *tree, char ***ifaces) { struct lyd_node *interfaces, *cif; char **names = NULL; @@ -905,7 +905,7 @@ int ietf_interfaces_get_all_l3(const struct lyd_node *tree, char ***ifaces) return 0; } -int ietf_interfaces_cand_init(struct confd *confd) +int interfaces_cand_init(struct confd *confd) { int rc = SR_ERR_OK; diff --git a/src/confd/src/interfaces.h b/src/confd/src/interfaces.h index 9367ec51..aaa58368 100644 --- a/src/confd/src/interfaces.h +++ b/src/confd/src/interfaces.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -#ifndef CONFD_IETF_INTERFACES_H_ -#define CONFD_IETF_INTERFACES_H_ +#ifndef CONFD_INTERFACES_H_ +#define CONFD_INTERFACES_H_ #include "core.h" #include "cni.h" @@ -102,7 +102,7 @@ int netdag_gen_ethtool(struct dagger *net, struct lyd_node *cif, struct lyd_node /* interfaces.c */ const char *get_chassis_addr(void); int link_gen_address(struct lyd_node *cif, FILE *ip); -int ietf_interfaces_get_all_l3(const struct lyd_node *tree, char ***ifaces); +int interfaces_get_all_l3(const struct lyd_node *tree, char ***ifaces); /* ip.c */ int netdag_gen_ipv6_autoconf(struct dagger *net, struct lyd_node *cif, @@ -150,4 +150,4 @@ int ifchange_cand_infer_dhcp(sr_session_ctx_t *session, const char *path); /* if-vxlan.c */ int vxlan_gen(struct lyd_node *dif, struct lyd_node *cif, FILE *ip); -#endif /* CONFD_IETF_INTERFACES_H_ */ +#endif /* CONFD_INTERFACES_H_ */ diff --git a/src/confd/src/keystore.c b/src/confd/src/keystore.c index fa1d786f..e0df2360 100644 --- a/src/confd/src/keystore.c +++ b/src/confd/src/keystore.c @@ -155,7 +155,7 @@ static int keystore_update(sr_session_ctx_t *session, struct lyd_node *config, s return 0; } -int ietf_keystore_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, +int keystore_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { struct lyd_node *changes, *change; diff --git a/src/confd/src/meta.c b/src/confd/src/meta.c index d460b82e..abacb60a 100644 --- a/src/confd/src/meta.c +++ b/src/confd/src/meta.c @@ -18,7 +18,7 @@ static int set_version(sr_session_ctx_t *session) return SR_ERR_OK; } -int infix_meta_change_cb(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) +int meta_change_cb(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { if (event == SR_EV_UPDATE) return set_version(session); diff --git a/src/confd/src/routing.c b/src/confd/src/routing.c index 66402072..f1400d6c 100644 --- a/src/confd/src/routing.c +++ b/src/confd/src/routing.c @@ -247,7 +247,7 @@ static int parse_static_routes(sr_session_ctx_t *session, struct lyd_node *paren return num_routes; } -int ietf_routing_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) +int routing_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { int staticd_enabled = 0, ospfd_enabled = 0, bfdd_enabled = 0; struct lyd_node *cplane, *cplanes; diff --git a/src/confd/src/services.c b/src/confd/src/services.c index 153d7d75..79b0458e 100644 --- a/src/confd/src/services.c +++ b/src/confd/src/services.c @@ -515,7 +515,7 @@ static int web_change(sr_session_ctx_t *session, struct lyd_node *config, struct return put(cfg); } -int infix_services_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) +int services_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { int rc; diff --git a/src/confd/src/syslog.c b/src/confd/src/syslog.c index 09d52f70..af8921fb 100644 --- a/src/confd/src/syslog.c +++ b/src/confd/src/syslog.c @@ -463,7 +463,7 @@ done: return SR_ERR_OK; } -int ietf_syslog_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) +int syslog_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { int rc = SR_ERR_OK; diff --git a/src/confd/src/system-software.c b/src/confd/src/system-software.c index 783121ae..47c73548 100644 --- a/src/confd/src/system-software.c +++ b/src/confd/src/system-software.c @@ -89,7 +89,7 @@ static int infix_system_sw_set_boot_order(sr_session_ctx_t *session, uint32_t su return SR_ERR_OK; } -int infix_system_sw_rpc_init(struct confd *confd) +int system_sw_rpc_init(struct confd *confd) { int rc = 0; diff --git a/src/confd/src/system.c b/src/confd/src/system.c index dab8439a..05ddc3ea 100644 --- a/src/confd/src/system.c +++ b/src/confd/src/system.c @@ -1602,7 +1602,7 @@ static int change_hostname(sr_session_ctx_t *session, struct lyd_node *config, s } -int ietf_system_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) +int system_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { int rc = SR_ERR_OK; @@ -1628,7 +1628,7 @@ int ietf_system_change(sr_session_ctx_t *session, struct lyd_node *config, struc return SR_ERR_OK; } -int ietf_system_rpc_init(struct confd *confd) +int system_rpc_init(struct confd *confd) { int rc;