From 6029cbb071c3722c717eebbafaf1b373f3edaadc Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 25 May 2023 18:10:14 +0200 Subject: [PATCH] separate packaging and source build system like almost all of our repos do nowadays, modern git can detect such things on rebase so in development stuff should be hopefully not too much affected by this. Signed-off-by: Thomas Lamprecht --- Makefile | 21 ++++++------------- src/Makefile | 15 +++++++++++++ {PVE => src/PVE}/API2/Makefile | 0 {PVE => src/PVE}/API2/Network/Makefile | 0 {PVE => src/PVE}/API2/Network/SDN.pm | 0 .../PVE}/API2/Network/SDN/Controllers.pm | 0 {PVE => src/PVE}/API2/Network/SDN/Dns.pm | 0 {PVE => src/PVE}/API2/Network/SDN/Ipams.pm | 0 {PVE => src/PVE}/API2/Network/SDN/Makefile | 0 {PVE => src/PVE}/API2/Network/SDN/Subnets.pm | 0 {PVE => src/PVE}/API2/Network/SDN/Vnets.pm | 0 {PVE => src/PVE}/API2/Network/SDN/Zones.pm | 0 .../PVE}/API2/Network/SDN/Zones/Content.pm | 0 .../PVE}/API2/Network/SDN/Zones/Makefile | 0 .../PVE}/API2/Network/SDN/Zones/Status.pm | 0 {PVE => src/PVE}/Makefile | 2 ++ {PVE => src/PVE}/Network/Makefile | 0 {PVE => src/PVE}/Network/SDN.pm | 0 {PVE => src/PVE}/Network/SDN/Controllers.pm | 0 .../PVE}/Network/SDN/Controllers/BgpPlugin.pm | 0 .../Network/SDN/Controllers/EvpnPlugin.pm | 0 .../Network/SDN/Controllers/FaucetPlugin.pm | 0 .../PVE}/Network/SDN/Controllers/Makefile | 0 .../PVE}/Network/SDN/Controllers/Plugin.pm | 0 {PVE => src/PVE}/Network/SDN/Dns.pm | 0 {PVE => src/PVE}/Network/SDN/Dns/Makefile | 0 {PVE => src/PVE}/Network/SDN/Dns/Plugin.pm | 0 .../PVE}/Network/SDN/Dns/PowerdnsPlugin.pm | 0 {PVE => src/PVE}/Network/SDN/Ipams.pm | 0 {PVE => src/PVE}/Network/SDN/Ipams/Makefile | 0 .../PVE}/Network/SDN/Ipams/NetboxPlugin.pm | 0 .../PVE}/Network/SDN/Ipams/PVEPlugin.pm | 0 .../PVE}/Network/SDN/Ipams/PhpIpamPlugin.pm | 0 {PVE => src/PVE}/Network/SDN/Ipams/Plugin.pm | 0 {PVE => src/PVE}/Network/SDN/Makefile | 0 {PVE => src/PVE}/Network/SDN/SubnetPlugin.pm | 0 {PVE => src/PVE}/Network/SDN/Subnets.pm | 0 {PVE => src/PVE}/Network/SDN/VnetPlugin.pm | 0 {PVE => src/PVE}/Network/SDN/Vnets.pm | 0 {PVE => src/PVE}/Network/SDN/Zones.pm | 0 .../PVE}/Network/SDN/Zones/EvpnPlugin.pm | 0 .../PVE}/Network/SDN/Zones/FaucetPlugin.pm | 0 {PVE => src/PVE}/Network/SDN/Zones/Makefile | 0 {PVE => src/PVE}/Network/SDN/Zones/Plugin.pm | 0 .../PVE}/Network/SDN/Zones/QinQPlugin.pm | 0 .../PVE}/Network/SDN/Zones/SimplePlugin.pm | 0 .../PVE}/Network/SDN/Zones/VlanPlugin.pm | 0 .../PVE}/Network/SDN/Zones/VxlanPlugin.pm | 0 {test => src/test}/Makefile | 2 ++ {test => src/test}/debug/documentation.txt | 0 {test => src/test}/debug/generateconfig.pl | 0 {test => src/test}/debug/statuscheck.pl | 0 {test => src/test}/dns/powerdns/dns_config | 0 .../expected.add_a_multiple_record.ipv4 | 0 .../expected.add_a_multiple_record.ipv6 | 0 .../dns/powerdns/expected.add_a_record.ipv4 | 0 .../dns/powerdns/expected.add_a_record.ipv6 | 0 .../dns/powerdns/expected.add_ptr_record.ipv4 | 0 .../dns/powerdns/expected.add_ptr_record.ipv6 | 0 .../expected.del_a_multiple_record.ipv4 | 0 .../expected.del_a_multiple_record.ipv6 | 0 .../dns/powerdns/expected.del_a_record.ipv4 | 0 .../dns/powerdns/expected.del_a_record.ipv6 | 0 .../dns/powerdns/expected.del_ptr_record.ipv4 | 0 .../dns/powerdns/expected.del_ptr_record.ipv6 | 0 .../test}/dns/powerdns/expected.verify_zone | 0 {test => src/test}/dns/powerdns/sdn_config | 0 .../test}/ipams/netbox/expected.add_ip | 0 .../ipams/netbox/expected.add_ip_notgateway | 0 .../ipams/netbox/expected.add_next_freeip | 0 .../test}/ipams/netbox/expected.add_subnet | 0 .../test}/ipams/netbox/expected.del_ip | 0 .../test}/ipams/netbox/expected.del_subnet | 0 .../test}/ipams/netbox/expected.update_ip | 0 {test => src/test}/ipams/netbox/ipam_config | 0 {test => src/test}/ipams/netbox/sdn_config | 0 .../test}/ipams/phpipam/expected.add_ip | 0 .../ipams/phpipam/expected.add_ip_notgateway | 0 .../ipams/phpipam/expected.add_next_freeip | 0 .../test}/ipams/phpipam/expected.add_subnet | 0 .../test}/ipams/phpipam/expected.del_ip | 0 .../test}/ipams/phpipam/expected.del_subnet | 0 .../test}/ipams/phpipam/expected.update_ip | 0 {test => src/test}/ipams/phpipam/ipam_config | 0 {test => src/test}/ipams/phpipam/sdn_config | 0 {test => src/test}/run_test_dns.pl | 0 {test => src/test}/run_test_ipams.pl | 0 {test => src/test}/run_test_subnets.pl | 0 {test => src/test}/run_test_vnets.pl | 0 {test => src/test}/run_test_zones.pl | 0 {test => src/test}/subnets/ipv4/ipam_config | 0 {test => src/test}/subnets/ipv4/sdn_config | 0 {test => src/test}/subnets/ipv6/ipam_config | 0 {test => src/test}/subnets/ipv6/sdn_config | 0 {test => src/test}/subnets/noipam/ipam_config | 0 {test => src/test}/subnets/noipam/sdn_config | 0 {test => src/test}/vnets/ipv4/ipam.db | 0 {test => src/test}/vnets/ipv4/ipam_config | 0 {test => src/test}/vnets/ipv4/sdn_config | 0 {test => src/test}/vnets/ipv4noipam/ipam.db | 0 .../test}/vnets/ipv4noipam/ipam_config | 0 .../test}/vnets/ipv4noipam/sdn_config | 0 {test => src/test}/vnets/ipv6/ipam.db | 0 {test => src/test}/vnets/ipv6/ipam_config | 0 {test => src/test}/vnets/ipv6/sdn_config | 0 .../expected_controller_config | 0 .../advertise_subnets/expected_sdn_interfaces | 0 .../zones/evpn/advertise_subnets/interfaces | 0 .../zones/evpn/advertise_subnets/sdn_config | 0 .../expected_controller_config | 0 .../expected_sdn_interfaces | 0 .../disable_arp_nd_suppression/interfaces | 0 .../disable_arp_nd_suppression/sdn_config | 0 .../evpn/ebgp/expected_controller_config | 0 .../zones/evpn/ebgp/expected_sdn_interfaces | 0 {test => src/test}/zones/evpn/ebgp/interfaces | 0 {test => src/test}/zones/evpn/ebgp/sdn_config | 0 .../ebgp_loopback/expected_controller_config | 0 .../ebgp_loopback/expected_sdn_interfaces | 0 .../test}/zones/evpn/ebgp_loopback/interfaces | 0 .../test}/zones/evpn/ebgp_loopback/sdn_config | 0 .../evpn/exitnode/expected_controller_config | 0 .../evpn/exitnode/expected_sdn_interfaces | 0 .../test}/zones/evpn/exitnode/interfaces | 0 .../test}/zones/evpn/exitnode/sdn_config | 0 .../expected_controller_config | 0 .../expected_sdn_interfaces | 0 .../evpn/exitnode_local_routing/interfaces | 0 .../evpn/exitnode_local_routing/sdn_config | 0 .../expected_controller_config | 0 .../exitnode_primary/expected_sdn_interfaces | 0 .../zones/evpn/exitnode_primary/interfaces | 0 .../zones/evpn/exitnode_primary/sdn_config | 0 .../exitnode_snat/expected_controller_config | 0 .../exitnode_snat/expected_sdn_interfaces | 0 .../test}/zones/evpn/exitnode_snat/interfaces | 0 .../test}/zones/evpn/exitnode_snat/sdn_config | 0 .../evpn/ipv4/expected_controller_config | 0 .../zones/evpn/ipv4/expected_sdn_interfaces | 0 {test => src/test}/zones/evpn/ipv4/interfaces | 0 {test => src/test}/zones/evpn/ipv4/sdn_config | 0 .../evpn/ipv4ipv6/expected_controller_config | 0 .../evpn/ipv4ipv6/expected_sdn_interfaces | 0 .../test}/zones/evpn/ipv4ipv6/interfaces | 0 .../test}/zones/evpn/ipv4ipv6/sdn_config | 0 .../expected_controller_config | 0 .../ipv4ipv6nogateway/expected_sdn_interfaces | 0 .../zones/evpn/ipv4ipv6nogateway/interfaces | 0 .../zones/evpn/ipv4ipv6nogateway/sdn_config | 0 .../evpn/ipv6/expected_controller_config | 0 .../zones/evpn/ipv6/expected_sdn_interfaces | 0 {test => src/test}/zones/evpn/ipv6/interfaces | 0 {test => src/test}/zones/evpn/ipv6/sdn_config | 0 .../expected_controller_config | 0 .../multipath_relax/expected_sdn_interfaces | 0 .../zones/evpn/multipath_relax/interfaces | 0 .../zones/evpn/multipath_relax/sdn_config | 0 .../evpn/rt_import/expected_controller_config | 0 .../evpn/rt_import/expected_sdn_interfaces | 0 .../test}/zones/evpn/rt_import/interfaces | 0 .../test}/zones/evpn/rt_import/sdn_config | 0 .../zones/qinq/bridge/expected_sdn_interfaces | 0 .../test}/zones/qinq/bridge/interfaces | 0 .../test}/zones/qinq/bridge/sdn_config | 0 .../bridge_notagvnet/expected_sdn_interfaces | 0 .../zones/qinq/bridge_notagvnet/interfaces | 0 .../zones/qinq/bridge_notagvnet/sdn_config | 0 .../bridge_vlanaware/expected_sdn_interfaces | 0 .../zones/qinq/bridge_vlanaware/interfaces | 0 .../zones/qinq/bridge_vlanaware/sdn_config | 0 .../expected_sdn_interfaces | 0 .../bridge_vlanaware_notagvnet/interfaces | 0 .../bridge_vlanaware_notagvnet/sdn_config | 0 .../expected_sdn_interfaces | 0 .../bridge_vlanaware_vlanawarevnet/interfaces | 0 .../bridge_vlanaware_vlanawarevnet/sdn_config | 0 .../expected_sdn_interfaces | 0 .../bridge_vlanaware_vlanprotocol/interfaces | 0 .../bridge_vlanaware_vlanprotocol/sdn_config | 0 .../expected_sdn_interfaces | 0 .../qinq/bridge_vlanawarevnet/interfaces | 0 .../qinq/bridge_vlanawarevnet/sdn_config | 0 .../expected_sdn_interfaces | 0 .../zones/qinq/bridge_vlanprotocol/interfaces | 0 .../zones/qinq/bridge_vlanprotocol/sdn_config | 0 .../zones/qinq/ovs/expected_sdn_interfaces | 0 {test => src/test}/zones/qinq/ovs/interfaces | 0 {test => src/test}/zones/qinq/ovs/sdn_config | 0 .../ovs_notagvnet/expected_sdn_interfaces | 0 .../test}/zones/qinq/ovs_notagvnet/interfaces | 0 .../test}/zones/qinq/ovs_notagvnet/sdn_config | 0 .../ovs_vlanawarevnet/expected_sdn_interfaces | 0 .../zones/qinq/ovs_vlanawarevnet/interfaces | 0 .../zones/qinq/ovs_vlanawarevnet/sdn_config | 0 .../ovs_vlanprotocol/expected_sdn_interfaces | 0 .../zones/qinq/ovs_vlanprotocol/interfaces | 0 .../zones/qinq/ovs_vlanprotocol/sdn_config | 0 .../simple/basic/expected_sdn_interfaces | 0 .../test}/zones/simple/basic/interfaces | 0 .../test}/zones/simple/basic/sdn_config | 0 .../simple/hetzner/expected_sdn_interfaces | 0 .../test}/zones/simple/hetzner/interfaces | 0 .../test}/zones/simple/hetzner/sdn_config | 0 .../zones/simple/ipv4/expected_sdn_interfaces | 0 .../test}/zones/simple/ipv4/interfaces | 0 .../test}/zones/simple/ipv4/sdn_config | 0 .../simple/ipv4snat/expected_sdn_interfaces | 0 .../test}/zones/simple/ipv4snat/interfaces | 0 .../test}/zones/simple/ipv4snat/sdn_config | 0 .../simple/ipv4v6/expected_sdn_interfaces | 0 .../test}/zones/simple/ipv4v6/interfaces | 0 .../test}/zones/simple/ipv4v6/sdn_config | 0 .../ipv4v6nogateway/expected_sdn_interfaces | 0 .../zones/simple/ipv4v6nogateway/interfaces | 0 .../zones/simple/ipv4v6nogateway/sdn_config | 0 .../simple/ipv6snat/expected_sdn_interfaces | 0 .../test}/zones/simple/ipv6snat/interfaces | 0 .../test}/zones/simple/ipv6snat/sdn_config | 0 .../zones/vlan/bridge/expected_sdn_interfaces | 0 .../test}/zones/vlan/bridge/interfaces | 0 .../test}/zones/vlan/bridge/sdn_config | 0 .../bridge_vlanaware/expected_sdn_interfaces | 0 .../zones/vlan/bridge_vlanaware/interfaces | 0 .../zones/vlan/bridge_vlanaware/sdn_config | 0 .../expected_sdn_interfaces | 0 .../bridge_vlanaware_vlanawarevnet/interfaces | 0 .../bridge_vlanaware_vlanawarevnet/sdn_config | 0 .../zones/vlan/ovs/expected_sdn_interfaces | 0 {test => src/test}/zones/vlan/ovs/interfaces | 0 {test => src/test}/zones/vlan/ovs/sdn_config | 0 .../ovs_vlanware_vnet/expected_sdn_interfaces | 0 .../zones/vlan/ovs_vlanware_vnet/interfaces | 0 .../zones/vlan/ovs_vlanware_vnet/sdn_config | 0 .../zones/vxlan/basic/expected_sdn_interfaces | 0 .../test}/zones/vxlan/basic/interfaces | 0 .../test}/zones/vxlan/basic/sdn_config | 0 .../vlanawarevnet/expected_sdn_interfaces | 0 .../zones/vxlan/vlanawarevnet/interfaces | 0 .../zones/vxlan/vlanawarevnet/sdn_config | 0 239 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 src/Makefile rename {PVE => src/PVE}/API2/Makefile (100%) rename {PVE => src/PVE}/API2/Network/Makefile (100%) rename {PVE => src/PVE}/API2/Network/SDN.pm (100%) rename {PVE => src/PVE}/API2/Network/SDN/Controllers.pm (100%) rename {PVE => src/PVE}/API2/Network/SDN/Dns.pm (100%) rename {PVE => src/PVE}/API2/Network/SDN/Ipams.pm (100%) rename {PVE => src/PVE}/API2/Network/SDN/Makefile (100%) rename {PVE => src/PVE}/API2/Network/SDN/Subnets.pm (100%) rename {PVE => src/PVE}/API2/Network/SDN/Vnets.pm (100%) rename {PVE => src/PVE}/API2/Network/SDN/Zones.pm (100%) rename {PVE => src/PVE}/API2/Network/SDN/Zones/Content.pm (100%) rename {PVE => src/PVE}/API2/Network/SDN/Zones/Makefile (100%) rename {PVE => src/PVE}/API2/Network/SDN/Zones/Status.pm (100%) rename {PVE => src/PVE}/Makefile (90%) rename {PVE => src/PVE}/Network/Makefile (100%) rename {PVE => src/PVE}/Network/SDN.pm (100%) rename {PVE => src/PVE}/Network/SDN/Controllers.pm (100%) rename {PVE => src/PVE}/Network/SDN/Controllers/BgpPlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Controllers/EvpnPlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Controllers/FaucetPlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Controllers/Makefile (100%) rename {PVE => src/PVE}/Network/SDN/Controllers/Plugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Dns.pm (100%) rename {PVE => src/PVE}/Network/SDN/Dns/Makefile (100%) rename {PVE => src/PVE}/Network/SDN/Dns/Plugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Dns/PowerdnsPlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Ipams.pm (100%) rename {PVE => src/PVE}/Network/SDN/Ipams/Makefile (100%) rename {PVE => src/PVE}/Network/SDN/Ipams/NetboxPlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Ipams/PVEPlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Ipams/PhpIpamPlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Ipams/Plugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Makefile (100%) rename {PVE => src/PVE}/Network/SDN/SubnetPlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Subnets.pm (100%) rename {PVE => src/PVE}/Network/SDN/VnetPlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Vnets.pm (100%) rename {PVE => src/PVE}/Network/SDN/Zones.pm (100%) rename {PVE => src/PVE}/Network/SDN/Zones/EvpnPlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Zones/FaucetPlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Zones/Makefile (100%) rename {PVE => src/PVE}/Network/SDN/Zones/Plugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Zones/QinQPlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Zones/SimplePlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Zones/VlanPlugin.pm (100%) rename {PVE => src/PVE}/Network/SDN/Zones/VxlanPlugin.pm (100%) rename {test => src/test}/Makefile (97%) rename {test => src/test}/debug/documentation.txt (100%) rename {test => src/test}/debug/generateconfig.pl (100%) rename {test => src/test}/debug/statuscheck.pl (100%) rename {test => src/test}/dns/powerdns/dns_config (100%) rename {test => src/test}/dns/powerdns/expected.add_a_multiple_record.ipv4 (100%) rename {test => src/test}/dns/powerdns/expected.add_a_multiple_record.ipv6 (100%) rename {test => src/test}/dns/powerdns/expected.add_a_record.ipv4 (100%) rename {test => src/test}/dns/powerdns/expected.add_a_record.ipv6 (100%) rename {test => src/test}/dns/powerdns/expected.add_ptr_record.ipv4 (100%) rename {test => src/test}/dns/powerdns/expected.add_ptr_record.ipv6 (100%) rename {test => src/test}/dns/powerdns/expected.del_a_multiple_record.ipv4 (100%) rename {test => src/test}/dns/powerdns/expected.del_a_multiple_record.ipv6 (100%) rename {test => src/test}/dns/powerdns/expected.del_a_record.ipv4 (100%) rename {test => src/test}/dns/powerdns/expected.del_a_record.ipv6 (100%) rename {test => src/test}/dns/powerdns/expected.del_ptr_record.ipv4 (100%) rename {test => src/test}/dns/powerdns/expected.del_ptr_record.ipv6 (100%) rename {test => src/test}/dns/powerdns/expected.verify_zone (100%) rename {test => src/test}/dns/powerdns/sdn_config (100%) rename {test => src/test}/ipams/netbox/expected.add_ip (100%) rename {test => src/test}/ipams/netbox/expected.add_ip_notgateway (100%) rename {test => src/test}/ipams/netbox/expected.add_next_freeip (100%) rename {test => src/test}/ipams/netbox/expected.add_subnet (100%) rename {test => src/test}/ipams/netbox/expected.del_ip (100%) rename {test => src/test}/ipams/netbox/expected.del_subnet (100%) rename {test => src/test}/ipams/netbox/expected.update_ip (100%) rename {test => src/test}/ipams/netbox/ipam_config (100%) rename {test => src/test}/ipams/netbox/sdn_config (100%) rename {test => src/test}/ipams/phpipam/expected.add_ip (100%) rename {test => src/test}/ipams/phpipam/expected.add_ip_notgateway (100%) rename {test => src/test}/ipams/phpipam/expected.add_next_freeip (100%) rename {test => src/test}/ipams/phpipam/expected.add_subnet (100%) rename {test => src/test}/ipams/phpipam/expected.del_ip (100%) rename {test => src/test}/ipams/phpipam/expected.del_subnet (100%) rename {test => src/test}/ipams/phpipam/expected.update_ip (100%) rename {test => src/test}/ipams/phpipam/ipam_config (100%) rename {test => src/test}/ipams/phpipam/sdn_config (100%) rename {test => src/test}/run_test_dns.pl (100%) rename {test => src/test}/run_test_ipams.pl (100%) rename {test => src/test}/run_test_subnets.pl (100%) rename {test => src/test}/run_test_vnets.pl (100%) rename {test => src/test}/run_test_zones.pl (100%) rename {test => src/test}/subnets/ipv4/ipam_config (100%) rename {test => src/test}/subnets/ipv4/sdn_config (100%) rename {test => src/test}/subnets/ipv6/ipam_config (100%) rename {test => src/test}/subnets/ipv6/sdn_config (100%) rename {test => src/test}/subnets/noipam/ipam_config (100%) rename {test => src/test}/subnets/noipam/sdn_config (100%) rename {test => src/test}/vnets/ipv4/ipam.db (100%) rename {test => src/test}/vnets/ipv4/ipam_config (100%) rename {test => src/test}/vnets/ipv4/sdn_config (100%) rename {test => src/test}/vnets/ipv4noipam/ipam.db (100%) rename {test => src/test}/vnets/ipv4noipam/ipam_config (100%) rename {test => src/test}/vnets/ipv4noipam/sdn_config (100%) rename {test => src/test}/vnets/ipv6/ipam.db (100%) rename {test => src/test}/vnets/ipv6/ipam_config (100%) rename {test => src/test}/vnets/ipv6/sdn_config (100%) rename {test => src/test}/zones/evpn/advertise_subnets/expected_controller_config (100%) rename {test => src/test}/zones/evpn/advertise_subnets/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/advertise_subnets/interfaces (100%) rename {test => src/test}/zones/evpn/advertise_subnets/sdn_config (100%) rename {test => src/test}/zones/evpn/disable_arp_nd_suppression/expected_controller_config (100%) rename {test => src/test}/zones/evpn/disable_arp_nd_suppression/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/disable_arp_nd_suppression/interfaces (100%) rename {test => src/test}/zones/evpn/disable_arp_nd_suppression/sdn_config (100%) rename {test => src/test}/zones/evpn/ebgp/expected_controller_config (100%) rename {test => src/test}/zones/evpn/ebgp/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/ebgp/interfaces (100%) rename {test => src/test}/zones/evpn/ebgp/sdn_config (100%) rename {test => src/test}/zones/evpn/ebgp_loopback/expected_controller_config (100%) rename {test => src/test}/zones/evpn/ebgp_loopback/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/ebgp_loopback/interfaces (100%) rename {test => src/test}/zones/evpn/ebgp_loopback/sdn_config (100%) rename {test => src/test}/zones/evpn/exitnode/expected_controller_config (100%) rename {test => src/test}/zones/evpn/exitnode/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/exitnode/interfaces (100%) rename {test => src/test}/zones/evpn/exitnode/sdn_config (100%) rename {test => src/test}/zones/evpn/exitnode_local_routing/expected_controller_config (100%) rename {test => src/test}/zones/evpn/exitnode_local_routing/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/exitnode_local_routing/interfaces (100%) rename {test => src/test}/zones/evpn/exitnode_local_routing/sdn_config (100%) rename {test => src/test}/zones/evpn/exitnode_primary/expected_controller_config (100%) rename {test => src/test}/zones/evpn/exitnode_primary/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/exitnode_primary/interfaces (100%) rename {test => src/test}/zones/evpn/exitnode_primary/sdn_config (100%) rename {test => src/test}/zones/evpn/exitnode_snat/expected_controller_config (100%) rename {test => src/test}/zones/evpn/exitnode_snat/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/exitnode_snat/interfaces (100%) rename {test => src/test}/zones/evpn/exitnode_snat/sdn_config (100%) rename {test => src/test}/zones/evpn/ipv4/expected_controller_config (100%) rename {test => src/test}/zones/evpn/ipv4/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/ipv4/interfaces (100%) rename {test => src/test}/zones/evpn/ipv4/sdn_config (100%) rename {test => src/test}/zones/evpn/ipv4ipv6/expected_controller_config (100%) rename {test => src/test}/zones/evpn/ipv4ipv6/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/ipv4ipv6/interfaces (100%) rename {test => src/test}/zones/evpn/ipv4ipv6/sdn_config (100%) rename {test => src/test}/zones/evpn/ipv4ipv6nogateway/expected_controller_config (100%) rename {test => src/test}/zones/evpn/ipv4ipv6nogateway/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/ipv4ipv6nogateway/interfaces (100%) rename {test => src/test}/zones/evpn/ipv4ipv6nogateway/sdn_config (100%) rename {test => src/test}/zones/evpn/ipv6/expected_controller_config (100%) rename {test => src/test}/zones/evpn/ipv6/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/ipv6/interfaces (100%) rename {test => src/test}/zones/evpn/ipv6/sdn_config (100%) rename {test => src/test}/zones/evpn/multipath_relax/expected_controller_config (100%) rename {test => src/test}/zones/evpn/multipath_relax/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/multipath_relax/interfaces (100%) rename {test => src/test}/zones/evpn/multipath_relax/sdn_config (100%) rename {test => src/test}/zones/evpn/rt_import/expected_controller_config (100%) rename {test => src/test}/zones/evpn/rt_import/expected_sdn_interfaces (100%) rename {test => src/test}/zones/evpn/rt_import/interfaces (100%) rename {test => src/test}/zones/evpn/rt_import/sdn_config (100%) rename {test => src/test}/zones/qinq/bridge/expected_sdn_interfaces (100%) rename {test => src/test}/zones/qinq/bridge/interfaces (100%) rename {test => src/test}/zones/qinq/bridge/sdn_config (100%) rename {test => src/test}/zones/qinq/bridge_notagvnet/expected_sdn_interfaces (100%) rename {test => src/test}/zones/qinq/bridge_notagvnet/interfaces (100%) rename {test => src/test}/zones/qinq/bridge_notagvnet/sdn_config (100%) rename {test => src/test}/zones/qinq/bridge_vlanaware/expected_sdn_interfaces (100%) rename {test => src/test}/zones/qinq/bridge_vlanaware/interfaces (100%) rename {test => src/test}/zones/qinq/bridge_vlanaware/sdn_config (100%) rename {test => src/test}/zones/qinq/bridge_vlanaware_notagvnet/expected_sdn_interfaces (100%) rename {test => src/test}/zones/qinq/bridge_vlanaware_notagvnet/interfaces (100%) rename {test => src/test}/zones/qinq/bridge_vlanaware_notagvnet/sdn_config (100%) rename {test => src/test}/zones/qinq/bridge_vlanaware_vlanawarevnet/expected_sdn_interfaces (100%) rename {test => src/test}/zones/qinq/bridge_vlanaware_vlanawarevnet/interfaces (100%) rename {test => src/test}/zones/qinq/bridge_vlanaware_vlanawarevnet/sdn_config (100%) rename {test => src/test}/zones/qinq/bridge_vlanaware_vlanprotocol/expected_sdn_interfaces (100%) rename {test => src/test}/zones/qinq/bridge_vlanaware_vlanprotocol/interfaces (100%) rename {test => src/test}/zones/qinq/bridge_vlanaware_vlanprotocol/sdn_config (100%) rename {test => src/test}/zones/qinq/bridge_vlanawarevnet/expected_sdn_interfaces (100%) rename {test => src/test}/zones/qinq/bridge_vlanawarevnet/interfaces (100%) rename {test => src/test}/zones/qinq/bridge_vlanawarevnet/sdn_config (100%) rename {test => src/test}/zones/qinq/bridge_vlanprotocol/expected_sdn_interfaces (100%) rename {test => src/test}/zones/qinq/bridge_vlanprotocol/interfaces (100%) rename {test => src/test}/zones/qinq/bridge_vlanprotocol/sdn_config (100%) rename {test => src/test}/zones/qinq/ovs/expected_sdn_interfaces (100%) rename {test => src/test}/zones/qinq/ovs/interfaces (100%) rename {test => src/test}/zones/qinq/ovs/sdn_config (100%) rename {test => src/test}/zones/qinq/ovs_notagvnet/expected_sdn_interfaces (100%) rename {test => src/test}/zones/qinq/ovs_notagvnet/interfaces (100%) rename {test => src/test}/zones/qinq/ovs_notagvnet/sdn_config (100%) rename {test => src/test}/zones/qinq/ovs_vlanawarevnet/expected_sdn_interfaces (100%) rename {test => src/test}/zones/qinq/ovs_vlanawarevnet/interfaces (100%) rename {test => src/test}/zones/qinq/ovs_vlanawarevnet/sdn_config (100%) rename {test => src/test}/zones/qinq/ovs_vlanprotocol/expected_sdn_interfaces (100%) rename {test => src/test}/zones/qinq/ovs_vlanprotocol/interfaces (100%) rename {test => src/test}/zones/qinq/ovs_vlanprotocol/sdn_config (100%) rename {test => src/test}/zones/simple/basic/expected_sdn_interfaces (100%) rename {test => src/test}/zones/simple/basic/interfaces (100%) rename {test => src/test}/zones/simple/basic/sdn_config (100%) rename {test => src/test}/zones/simple/hetzner/expected_sdn_interfaces (100%) rename {test => src/test}/zones/simple/hetzner/interfaces (100%) rename {test => src/test}/zones/simple/hetzner/sdn_config (100%) rename {test => src/test}/zones/simple/ipv4/expected_sdn_interfaces (100%) rename {test => src/test}/zones/simple/ipv4/interfaces (100%) rename {test => src/test}/zones/simple/ipv4/sdn_config (100%) rename {test => src/test}/zones/simple/ipv4snat/expected_sdn_interfaces (100%) rename {test => src/test}/zones/simple/ipv4snat/interfaces (100%) rename {test => src/test}/zones/simple/ipv4snat/sdn_config (100%) rename {test => src/test}/zones/simple/ipv4v6/expected_sdn_interfaces (100%) rename {test => src/test}/zones/simple/ipv4v6/interfaces (100%) rename {test => src/test}/zones/simple/ipv4v6/sdn_config (100%) rename {test => src/test}/zones/simple/ipv4v6nogateway/expected_sdn_interfaces (100%) rename {test => src/test}/zones/simple/ipv4v6nogateway/interfaces (100%) rename {test => src/test}/zones/simple/ipv4v6nogateway/sdn_config (100%) rename {test => src/test}/zones/simple/ipv6snat/expected_sdn_interfaces (100%) rename {test => src/test}/zones/simple/ipv6snat/interfaces (100%) rename {test => src/test}/zones/simple/ipv6snat/sdn_config (100%) rename {test => src/test}/zones/vlan/bridge/expected_sdn_interfaces (100%) rename {test => src/test}/zones/vlan/bridge/interfaces (100%) rename {test => src/test}/zones/vlan/bridge/sdn_config (100%) rename {test => src/test}/zones/vlan/bridge_vlanaware/expected_sdn_interfaces (100%) rename {test => src/test}/zones/vlan/bridge_vlanaware/interfaces (100%) rename {test => src/test}/zones/vlan/bridge_vlanaware/sdn_config (100%) rename {test => src/test}/zones/vlan/bridge_vlanaware_vlanawarevnet/expected_sdn_interfaces (100%) rename {test => src/test}/zones/vlan/bridge_vlanaware_vlanawarevnet/interfaces (100%) rename {test => src/test}/zones/vlan/bridge_vlanaware_vlanawarevnet/sdn_config (100%) rename {test => src/test}/zones/vlan/ovs/expected_sdn_interfaces (100%) rename {test => src/test}/zones/vlan/ovs/interfaces (100%) rename {test => src/test}/zones/vlan/ovs/sdn_config (100%) rename {test => src/test}/zones/vlan/ovs_vlanware_vnet/expected_sdn_interfaces (100%) rename {test => src/test}/zones/vlan/ovs_vlanware_vnet/interfaces (100%) rename {test => src/test}/zones/vlan/ovs_vlanware_vnet/sdn_config (100%) rename {test => src/test}/zones/vxlan/basic/expected_sdn_interfaces (100%) rename {test => src/test}/zones/vxlan/basic/interfaces (100%) rename {test => src/test}/zones/vxlan/basic/sdn_config (100%) rename {test => src/test}/zones/vxlan/vlanawarevnet/expected_sdn_interfaces (100%) rename {test => src/test}/zones/vxlan/vlanawarevnet/interfaces (100%) rename {test => src/test}/zones/vxlan/vlanawarevnet/sdn_config (100%) diff --git a/Makefile b/Makefile index b4980de..d381be7 100644 --- a/Makefile +++ b/Makefile @@ -7,17 +7,16 @@ BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM) DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc -all: - $(MAKE) -C PVE - .PHONY: dinstall dinstall: deb dpkg -i $(DEB) -$(BUILDDIR): PVE debian - rm -rf $(BUILDDIR) - rsync -a * $(BUILDDIR) - echo "git clone git://git.proxmox.com/git/pve-network.git\\ngit checkout $(shell git rev-parse HEAD)" > $(BUILDDIR)/debian/SOURCE +$(BUILDDIR): src debian + rm -rf $@ $@.tmp + cp -a src $@.tmp + cp -a debian $@.tmp/ + echo "git clone git://git.proxmox.com/git/pve-network.git\\ngit checkout $(shell git rev-parse HEAD)" > $@.tmp/debian/SOURCE + mv $@.tmp $@ .PHONY: deb deb: $(DEB) @@ -41,14 +40,6 @@ distclean: clean clean: rm -rf *~ *.deb *.changes $(PACKAGE)-[0-9]*/ $(PACKAGE)*.tar* *.build *.buildinfo *.dsc -.PHONY: test -test: - $(MAKE) -C test - -.PHONY: install -install: - $(MAKE) -C PVE install - .PHONY: upload upload: $(DEB) tar cf - $(DEB)|ssh -X repoman@repo.proxmox.com -- upload --product pve --dist bullseye diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 0000000..1529c87 --- /dev/null +++ b/src/Makefile @@ -0,0 +1,15 @@ +all: + $(MAKE) -C PVE + +.PHONY: clean +clean: + $(MAKE) -C test $@ + $(MAKE) -C PVE $@ + +.PHONY: test +test: + $(MAKE) -C $@ + +.PHONY: install +install: + $(MAKE) -C PVE $@ diff --git a/PVE/API2/Makefile b/src/PVE/API2/Makefile similarity index 100% rename from PVE/API2/Makefile rename to src/PVE/API2/Makefile diff --git a/PVE/API2/Network/Makefile b/src/PVE/API2/Network/Makefile similarity index 100% rename from PVE/API2/Network/Makefile rename to src/PVE/API2/Network/Makefile diff --git a/PVE/API2/Network/SDN.pm b/src/PVE/API2/Network/SDN.pm similarity index 100% rename from PVE/API2/Network/SDN.pm rename to src/PVE/API2/Network/SDN.pm diff --git a/PVE/API2/Network/SDN/Controllers.pm b/src/PVE/API2/Network/SDN/Controllers.pm similarity index 100% rename from PVE/API2/Network/SDN/Controllers.pm rename to src/PVE/API2/Network/SDN/Controllers.pm diff --git a/PVE/API2/Network/SDN/Dns.pm b/src/PVE/API2/Network/SDN/Dns.pm similarity index 100% rename from PVE/API2/Network/SDN/Dns.pm rename to src/PVE/API2/Network/SDN/Dns.pm diff --git a/PVE/API2/Network/SDN/Ipams.pm b/src/PVE/API2/Network/SDN/Ipams.pm similarity index 100% rename from PVE/API2/Network/SDN/Ipams.pm rename to src/PVE/API2/Network/SDN/Ipams.pm diff --git a/PVE/API2/Network/SDN/Makefile b/src/PVE/API2/Network/SDN/Makefile similarity index 100% rename from PVE/API2/Network/SDN/Makefile rename to src/PVE/API2/Network/SDN/Makefile diff --git a/PVE/API2/Network/SDN/Subnets.pm b/src/PVE/API2/Network/SDN/Subnets.pm similarity index 100% rename from PVE/API2/Network/SDN/Subnets.pm rename to src/PVE/API2/Network/SDN/Subnets.pm diff --git a/PVE/API2/Network/SDN/Vnets.pm b/src/PVE/API2/Network/SDN/Vnets.pm similarity index 100% rename from PVE/API2/Network/SDN/Vnets.pm rename to src/PVE/API2/Network/SDN/Vnets.pm diff --git a/PVE/API2/Network/SDN/Zones.pm b/src/PVE/API2/Network/SDN/Zones.pm similarity index 100% rename from PVE/API2/Network/SDN/Zones.pm rename to src/PVE/API2/Network/SDN/Zones.pm diff --git a/PVE/API2/Network/SDN/Zones/Content.pm b/src/PVE/API2/Network/SDN/Zones/Content.pm similarity index 100% rename from PVE/API2/Network/SDN/Zones/Content.pm rename to src/PVE/API2/Network/SDN/Zones/Content.pm diff --git a/PVE/API2/Network/SDN/Zones/Makefile b/src/PVE/API2/Network/SDN/Zones/Makefile similarity index 100% rename from PVE/API2/Network/SDN/Zones/Makefile rename to src/PVE/API2/Network/SDN/Zones/Makefile diff --git a/PVE/API2/Network/SDN/Zones/Status.pm b/src/PVE/API2/Network/SDN/Zones/Status.pm similarity index 100% rename from PVE/API2/Network/SDN/Zones/Status.pm rename to src/PVE/API2/Network/SDN/Zones/Status.pm diff --git a/PVE/Makefile b/src/PVE/Makefile similarity index 90% rename from PVE/Makefile rename to src/PVE/Makefile index 26e01a4..7f1cf98 100644 --- a/PVE/Makefile +++ b/src/PVE/Makefile @@ -4,3 +4,5 @@ all: install: make -C Network install make -C API2 install + +clean: diff --git a/PVE/Network/Makefile b/src/PVE/Network/Makefile similarity index 100% rename from PVE/Network/Makefile rename to src/PVE/Network/Makefile diff --git a/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm similarity index 100% rename from PVE/Network/SDN.pm rename to src/PVE/Network/SDN.pm diff --git a/PVE/Network/SDN/Controllers.pm b/src/PVE/Network/SDN/Controllers.pm similarity index 100% rename from PVE/Network/SDN/Controllers.pm rename to src/PVE/Network/SDN/Controllers.pm diff --git a/PVE/Network/SDN/Controllers/BgpPlugin.pm b/src/PVE/Network/SDN/Controllers/BgpPlugin.pm similarity index 100% rename from PVE/Network/SDN/Controllers/BgpPlugin.pm rename to src/PVE/Network/SDN/Controllers/BgpPlugin.pm diff --git a/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm similarity index 100% rename from PVE/Network/SDN/Controllers/EvpnPlugin.pm rename to src/PVE/Network/SDN/Controllers/EvpnPlugin.pm diff --git a/PVE/Network/SDN/Controllers/FaucetPlugin.pm b/src/PVE/Network/SDN/Controllers/FaucetPlugin.pm similarity index 100% rename from PVE/Network/SDN/Controllers/FaucetPlugin.pm rename to src/PVE/Network/SDN/Controllers/FaucetPlugin.pm diff --git a/PVE/Network/SDN/Controllers/Makefile b/src/PVE/Network/SDN/Controllers/Makefile similarity index 100% rename from PVE/Network/SDN/Controllers/Makefile rename to src/PVE/Network/SDN/Controllers/Makefile diff --git a/PVE/Network/SDN/Controllers/Plugin.pm b/src/PVE/Network/SDN/Controllers/Plugin.pm similarity index 100% rename from PVE/Network/SDN/Controllers/Plugin.pm rename to src/PVE/Network/SDN/Controllers/Plugin.pm diff --git a/PVE/Network/SDN/Dns.pm b/src/PVE/Network/SDN/Dns.pm similarity index 100% rename from PVE/Network/SDN/Dns.pm rename to src/PVE/Network/SDN/Dns.pm diff --git a/PVE/Network/SDN/Dns/Makefile b/src/PVE/Network/SDN/Dns/Makefile similarity index 100% rename from PVE/Network/SDN/Dns/Makefile rename to src/PVE/Network/SDN/Dns/Makefile diff --git a/PVE/Network/SDN/Dns/Plugin.pm b/src/PVE/Network/SDN/Dns/Plugin.pm similarity index 100% rename from PVE/Network/SDN/Dns/Plugin.pm rename to src/PVE/Network/SDN/Dns/Plugin.pm diff --git a/PVE/Network/SDN/Dns/PowerdnsPlugin.pm b/src/PVE/Network/SDN/Dns/PowerdnsPlugin.pm similarity index 100% rename from PVE/Network/SDN/Dns/PowerdnsPlugin.pm rename to src/PVE/Network/SDN/Dns/PowerdnsPlugin.pm diff --git a/PVE/Network/SDN/Ipams.pm b/src/PVE/Network/SDN/Ipams.pm similarity index 100% rename from PVE/Network/SDN/Ipams.pm rename to src/PVE/Network/SDN/Ipams.pm diff --git a/PVE/Network/SDN/Ipams/Makefile b/src/PVE/Network/SDN/Ipams/Makefile similarity index 100% rename from PVE/Network/SDN/Ipams/Makefile rename to src/PVE/Network/SDN/Ipams/Makefile diff --git a/PVE/Network/SDN/Ipams/NetboxPlugin.pm b/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm similarity index 100% rename from PVE/Network/SDN/Ipams/NetboxPlugin.pm rename to src/PVE/Network/SDN/Ipams/NetboxPlugin.pm diff --git a/PVE/Network/SDN/Ipams/PVEPlugin.pm b/src/PVE/Network/SDN/Ipams/PVEPlugin.pm similarity index 100% rename from PVE/Network/SDN/Ipams/PVEPlugin.pm rename to src/PVE/Network/SDN/Ipams/PVEPlugin.pm diff --git a/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm b/src/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm similarity index 100% rename from PVE/Network/SDN/Ipams/PhpIpamPlugin.pm rename to src/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm diff --git a/PVE/Network/SDN/Ipams/Plugin.pm b/src/PVE/Network/SDN/Ipams/Plugin.pm similarity index 100% rename from PVE/Network/SDN/Ipams/Plugin.pm rename to src/PVE/Network/SDN/Ipams/Plugin.pm diff --git a/PVE/Network/SDN/Makefile b/src/PVE/Network/SDN/Makefile similarity index 100% rename from PVE/Network/SDN/Makefile rename to src/PVE/Network/SDN/Makefile diff --git a/PVE/Network/SDN/SubnetPlugin.pm b/src/PVE/Network/SDN/SubnetPlugin.pm similarity index 100% rename from PVE/Network/SDN/SubnetPlugin.pm rename to src/PVE/Network/SDN/SubnetPlugin.pm diff --git a/PVE/Network/SDN/Subnets.pm b/src/PVE/Network/SDN/Subnets.pm similarity index 100% rename from PVE/Network/SDN/Subnets.pm rename to src/PVE/Network/SDN/Subnets.pm diff --git a/PVE/Network/SDN/VnetPlugin.pm b/src/PVE/Network/SDN/VnetPlugin.pm similarity index 100% rename from PVE/Network/SDN/VnetPlugin.pm rename to src/PVE/Network/SDN/VnetPlugin.pm diff --git a/PVE/Network/SDN/Vnets.pm b/src/PVE/Network/SDN/Vnets.pm similarity index 100% rename from PVE/Network/SDN/Vnets.pm rename to src/PVE/Network/SDN/Vnets.pm diff --git a/PVE/Network/SDN/Zones.pm b/src/PVE/Network/SDN/Zones.pm similarity index 100% rename from PVE/Network/SDN/Zones.pm rename to src/PVE/Network/SDN/Zones.pm diff --git a/PVE/Network/SDN/Zones/EvpnPlugin.pm b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm similarity index 100% rename from PVE/Network/SDN/Zones/EvpnPlugin.pm rename to src/PVE/Network/SDN/Zones/EvpnPlugin.pm diff --git a/PVE/Network/SDN/Zones/FaucetPlugin.pm b/src/PVE/Network/SDN/Zones/FaucetPlugin.pm similarity index 100% rename from PVE/Network/SDN/Zones/FaucetPlugin.pm rename to src/PVE/Network/SDN/Zones/FaucetPlugin.pm diff --git a/PVE/Network/SDN/Zones/Makefile b/src/PVE/Network/SDN/Zones/Makefile similarity index 100% rename from PVE/Network/SDN/Zones/Makefile rename to src/PVE/Network/SDN/Zones/Makefile diff --git a/PVE/Network/SDN/Zones/Plugin.pm b/src/PVE/Network/SDN/Zones/Plugin.pm similarity index 100% rename from PVE/Network/SDN/Zones/Plugin.pm rename to src/PVE/Network/SDN/Zones/Plugin.pm diff --git a/PVE/Network/SDN/Zones/QinQPlugin.pm b/src/PVE/Network/SDN/Zones/QinQPlugin.pm similarity index 100% rename from PVE/Network/SDN/Zones/QinQPlugin.pm rename to src/PVE/Network/SDN/Zones/QinQPlugin.pm diff --git a/PVE/Network/SDN/Zones/SimplePlugin.pm b/src/PVE/Network/SDN/Zones/SimplePlugin.pm similarity index 100% rename from PVE/Network/SDN/Zones/SimplePlugin.pm rename to src/PVE/Network/SDN/Zones/SimplePlugin.pm diff --git a/PVE/Network/SDN/Zones/VlanPlugin.pm b/src/PVE/Network/SDN/Zones/VlanPlugin.pm similarity index 100% rename from PVE/Network/SDN/Zones/VlanPlugin.pm rename to src/PVE/Network/SDN/Zones/VlanPlugin.pm diff --git a/PVE/Network/SDN/Zones/VxlanPlugin.pm b/src/PVE/Network/SDN/Zones/VxlanPlugin.pm similarity index 100% rename from PVE/Network/SDN/Zones/VxlanPlugin.pm rename to src/PVE/Network/SDN/Zones/VxlanPlugin.pm diff --git a/test/Makefile b/src/test/Makefile similarity index 97% rename from test/Makefile rename to src/test/Makefile index eedc4e0..eb59d5f 100644 --- a/test/Makefile +++ b/src/test/Makefile @@ -13,3 +13,5 @@ test_dns: run_test_dns.pl test_subnets: run_test_subnets.pl ./run_test_subnets.pl + +clean: diff --git a/test/debug/documentation.txt b/src/test/debug/documentation.txt similarity index 100% rename from test/debug/documentation.txt rename to src/test/debug/documentation.txt diff --git a/test/debug/generateconfig.pl b/src/test/debug/generateconfig.pl similarity index 100% rename from test/debug/generateconfig.pl rename to src/test/debug/generateconfig.pl diff --git a/test/debug/statuscheck.pl b/src/test/debug/statuscheck.pl similarity index 100% rename from test/debug/statuscheck.pl rename to src/test/debug/statuscheck.pl diff --git a/test/dns/powerdns/dns_config b/src/test/dns/powerdns/dns_config similarity index 100% rename from test/dns/powerdns/dns_config rename to src/test/dns/powerdns/dns_config diff --git a/test/dns/powerdns/expected.add_a_multiple_record.ipv4 b/src/test/dns/powerdns/expected.add_a_multiple_record.ipv4 similarity index 100% rename from test/dns/powerdns/expected.add_a_multiple_record.ipv4 rename to src/test/dns/powerdns/expected.add_a_multiple_record.ipv4 diff --git a/test/dns/powerdns/expected.add_a_multiple_record.ipv6 b/src/test/dns/powerdns/expected.add_a_multiple_record.ipv6 similarity index 100% rename from test/dns/powerdns/expected.add_a_multiple_record.ipv6 rename to src/test/dns/powerdns/expected.add_a_multiple_record.ipv6 diff --git a/test/dns/powerdns/expected.add_a_record.ipv4 b/src/test/dns/powerdns/expected.add_a_record.ipv4 similarity index 100% rename from test/dns/powerdns/expected.add_a_record.ipv4 rename to src/test/dns/powerdns/expected.add_a_record.ipv4 diff --git a/test/dns/powerdns/expected.add_a_record.ipv6 b/src/test/dns/powerdns/expected.add_a_record.ipv6 similarity index 100% rename from test/dns/powerdns/expected.add_a_record.ipv6 rename to src/test/dns/powerdns/expected.add_a_record.ipv6 diff --git a/test/dns/powerdns/expected.add_ptr_record.ipv4 b/src/test/dns/powerdns/expected.add_ptr_record.ipv4 similarity index 100% rename from test/dns/powerdns/expected.add_ptr_record.ipv4 rename to src/test/dns/powerdns/expected.add_ptr_record.ipv4 diff --git a/test/dns/powerdns/expected.add_ptr_record.ipv6 b/src/test/dns/powerdns/expected.add_ptr_record.ipv6 similarity index 100% rename from test/dns/powerdns/expected.add_ptr_record.ipv6 rename to src/test/dns/powerdns/expected.add_ptr_record.ipv6 diff --git a/test/dns/powerdns/expected.del_a_multiple_record.ipv4 b/src/test/dns/powerdns/expected.del_a_multiple_record.ipv4 similarity index 100% rename from test/dns/powerdns/expected.del_a_multiple_record.ipv4 rename to src/test/dns/powerdns/expected.del_a_multiple_record.ipv4 diff --git a/test/dns/powerdns/expected.del_a_multiple_record.ipv6 b/src/test/dns/powerdns/expected.del_a_multiple_record.ipv6 similarity index 100% rename from test/dns/powerdns/expected.del_a_multiple_record.ipv6 rename to src/test/dns/powerdns/expected.del_a_multiple_record.ipv6 diff --git a/test/dns/powerdns/expected.del_a_record.ipv4 b/src/test/dns/powerdns/expected.del_a_record.ipv4 similarity index 100% rename from test/dns/powerdns/expected.del_a_record.ipv4 rename to src/test/dns/powerdns/expected.del_a_record.ipv4 diff --git a/test/dns/powerdns/expected.del_a_record.ipv6 b/src/test/dns/powerdns/expected.del_a_record.ipv6 similarity index 100% rename from test/dns/powerdns/expected.del_a_record.ipv6 rename to src/test/dns/powerdns/expected.del_a_record.ipv6 diff --git a/test/dns/powerdns/expected.del_ptr_record.ipv4 b/src/test/dns/powerdns/expected.del_ptr_record.ipv4 similarity index 100% rename from test/dns/powerdns/expected.del_ptr_record.ipv4 rename to src/test/dns/powerdns/expected.del_ptr_record.ipv4 diff --git a/test/dns/powerdns/expected.del_ptr_record.ipv6 b/src/test/dns/powerdns/expected.del_ptr_record.ipv6 similarity index 100% rename from test/dns/powerdns/expected.del_ptr_record.ipv6 rename to src/test/dns/powerdns/expected.del_ptr_record.ipv6 diff --git a/test/dns/powerdns/expected.verify_zone b/src/test/dns/powerdns/expected.verify_zone similarity index 100% rename from test/dns/powerdns/expected.verify_zone rename to src/test/dns/powerdns/expected.verify_zone diff --git a/test/dns/powerdns/sdn_config b/src/test/dns/powerdns/sdn_config similarity index 100% rename from test/dns/powerdns/sdn_config rename to src/test/dns/powerdns/sdn_config diff --git a/test/ipams/netbox/expected.add_ip b/src/test/ipams/netbox/expected.add_ip similarity index 100% rename from test/ipams/netbox/expected.add_ip rename to src/test/ipams/netbox/expected.add_ip diff --git a/test/ipams/netbox/expected.add_ip_notgateway b/src/test/ipams/netbox/expected.add_ip_notgateway similarity index 100% rename from test/ipams/netbox/expected.add_ip_notgateway rename to src/test/ipams/netbox/expected.add_ip_notgateway diff --git a/test/ipams/netbox/expected.add_next_freeip b/src/test/ipams/netbox/expected.add_next_freeip similarity index 100% rename from test/ipams/netbox/expected.add_next_freeip rename to src/test/ipams/netbox/expected.add_next_freeip diff --git a/test/ipams/netbox/expected.add_subnet b/src/test/ipams/netbox/expected.add_subnet similarity index 100% rename from test/ipams/netbox/expected.add_subnet rename to src/test/ipams/netbox/expected.add_subnet diff --git a/test/ipams/netbox/expected.del_ip b/src/test/ipams/netbox/expected.del_ip similarity index 100% rename from test/ipams/netbox/expected.del_ip rename to src/test/ipams/netbox/expected.del_ip diff --git a/test/ipams/netbox/expected.del_subnet b/src/test/ipams/netbox/expected.del_subnet similarity index 100% rename from test/ipams/netbox/expected.del_subnet rename to src/test/ipams/netbox/expected.del_subnet diff --git a/test/ipams/netbox/expected.update_ip b/src/test/ipams/netbox/expected.update_ip similarity index 100% rename from test/ipams/netbox/expected.update_ip rename to src/test/ipams/netbox/expected.update_ip diff --git a/test/ipams/netbox/ipam_config b/src/test/ipams/netbox/ipam_config similarity index 100% rename from test/ipams/netbox/ipam_config rename to src/test/ipams/netbox/ipam_config diff --git a/test/ipams/netbox/sdn_config b/src/test/ipams/netbox/sdn_config similarity index 100% rename from test/ipams/netbox/sdn_config rename to src/test/ipams/netbox/sdn_config diff --git a/test/ipams/phpipam/expected.add_ip b/src/test/ipams/phpipam/expected.add_ip similarity index 100% rename from test/ipams/phpipam/expected.add_ip rename to src/test/ipams/phpipam/expected.add_ip diff --git a/test/ipams/phpipam/expected.add_ip_notgateway b/src/test/ipams/phpipam/expected.add_ip_notgateway similarity index 100% rename from test/ipams/phpipam/expected.add_ip_notgateway rename to src/test/ipams/phpipam/expected.add_ip_notgateway diff --git a/test/ipams/phpipam/expected.add_next_freeip b/src/test/ipams/phpipam/expected.add_next_freeip similarity index 100% rename from test/ipams/phpipam/expected.add_next_freeip rename to src/test/ipams/phpipam/expected.add_next_freeip diff --git a/test/ipams/phpipam/expected.add_subnet b/src/test/ipams/phpipam/expected.add_subnet similarity index 100% rename from test/ipams/phpipam/expected.add_subnet rename to src/test/ipams/phpipam/expected.add_subnet diff --git a/test/ipams/phpipam/expected.del_ip b/src/test/ipams/phpipam/expected.del_ip similarity index 100% rename from test/ipams/phpipam/expected.del_ip rename to src/test/ipams/phpipam/expected.del_ip diff --git a/test/ipams/phpipam/expected.del_subnet b/src/test/ipams/phpipam/expected.del_subnet similarity index 100% rename from test/ipams/phpipam/expected.del_subnet rename to src/test/ipams/phpipam/expected.del_subnet diff --git a/test/ipams/phpipam/expected.update_ip b/src/test/ipams/phpipam/expected.update_ip similarity index 100% rename from test/ipams/phpipam/expected.update_ip rename to src/test/ipams/phpipam/expected.update_ip diff --git a/test/ipams/phpipam/ipam_config b/src/test/ipams/phpipam/ipam_config similarity index 100% rename from test/ipams/phpipam/ipam_config rename to src/test/ipams/phpipam/ipam_config diff --git a/test/ipams/phpipam/sdn_config b/src/test/ipams/phpipam/sdn_config similarity index 100% rename from test/ipams/phpipam/sdn_config rename to src/test/ipams/phpipam/sdn_config diff --git a/test/run_test_dns.pl b/src/test/run_test_dns.pl similarity index 100% rename from test/run_test_dns.pl rename to src/test/run_test_dns.pl diff --git a/test/run_test_ipams.pl b/src/test/run_test_ipams.pl similarity index 100% rename from test/run_test_ipams.pl rename to src/test/run_test_ipams.pl diff --git a/test/run_test_subnets.pl b/src/test/run_test_subnets.pl similarity index 100% rename from test/run_test_subnets.pl rename to src/test/run_test_subnets.pl diff --git a/test/run_test_vnets.pl b/src/test/run_test_vnets.pl similarity index 100% rename from test/run_test_vnets.pl rename to src/test/run_test_vnets.pl diff --git a/test/run_test_zones.pl b/src/test/run_test_zones.pl similarity index 100% rename from test/run_test_zones.pl rename to src/test/run_test_zones.pl diff --git a/test/subnets/ipv4/ipam_config b/src/test/subnets/ipv4/ipam_config similarity index 100% rename from test/subnets/ipv4/ipam_config rename to src/test/subnets/ipv4/ipam_config diff --git a/test/subnets/ipv4/sdn_config b/src/test/subnets/ipv4/sdn_config similarity index 100% rename from test/subnets/ipv4/sdn_config rename to src/test/subnets/ipv4/sdn_config diff --git a/test/subnets/ipv6/ipam_config b/src/test/subnets/ipv6/ipam_config similarity index 100% rename from test/subnets/ipv6/ipam_config rename to src/test/subnets/ipv6/ipam_config diff --git a/test/subnets/ipv6/sdn_config b/src/test/subnets/ipv6/sdn_config similarity index 100% rename from test/subnets/ipv6/sdn_config rename to src/test/subnets/ipv6/sdn_config diff --git a/test/subnets/noipam/ipam_config b/src/test/subnets/noipam/ipam_config similarity index 100% rename from test/subnets/noipam/ipam_config rename to src/test/subnets/noipam/ipam_config diff --git a/test/subnets/noipam/sdn_config b/src/test/subnets/noipam/sdn_config similarity index 100% rename from test/subnets/noipam/sdn_config rename to src/test/subnets/noipam/sdn_config diff --git a/test/vnets/ipv4/ipam.db b/src/test/vnets/ipv4/ipam.db similarity index 100% rename from test/vnets/ipv4/ipam.db rename to src/test/vnets/ipv4/ipam.db diff --git a/test/vnets/ipv4/ipam_config b/src/test/vnets/ipv4/ipam_config similarity index 100% rename from test/vnets/ipv4/ipam_config rename to src/test/vnets/ipv4/ipam_config diff --git a/test/vnets/ipv4/sdn_config b/src/test/vnets/ipv4/sdn_config similarity index 100% rename from test/vnets/ipv4/sdn_config rename to src/test/vnets/ipv4/sdn_config diff --git a/test/vnets/ipv4noipam/ipam.db b/src/test/vnets/ipv4noipam/ipam.db similarity index 100% rename from test/vnets/ipv4noipam/ipam.db rename to src/test/vnets/ipv4noipam/ipam.db diff --git a/test/vnets/ipv4noipam/ipam_config b/src/test/vnets/ipv4noipam/ipam_config similarity index 100% rename from test/vnets/ipv4noipam/ipam_config rename to src/test/vnets/ipv4noipam/ipam_config diff --git a/test/vnets/ipv4noipam/sdn_config b/src/test/vnets/ipv4noipam/sdn_config similarity index 100% rename from test/vnets/ipv4noipam/sdn_config rename to src/test/vnets/ipv4noipam/sdn_config diff --git a/test/vnets/ipv6/ipam.db b/src/test/vnets/ipv6/ipam.db similarity index 100% rename from test/vnets/ipv6/ipam.db rename to src/test/vnets/ipv6/ipam.db diff --git a/test/vnets/ipv6/ipam_config b/src/test/vnets/ipv6/ipam_config similarity index 100% rename from test/vnets/ipv6/ipam_config rename to src/test/vnets/ipv6/ipam_config diff --git a/test/vnets/ipv6/sdn_config b/src/test/vnets/ipv6/sdn_config similarity index 100% rename from test/vnets/ipv6/sdn_config rename to src/test/vnets/ipv6/sdn_config diff --git a/test/zones/evpn/advertise_subnets/expected_controller_config b/src/test/zones/evpn/advertise_subnets/expected_controller_config similarity index 100% rename from test/zones/evpn/advertise_subnets/expected_controller_config rename to src/test/zones/evpn/advertise_subnets/expected_controller_config diff --git a/test/zones/evpn/advertise_subnets/expected_sdn_interfaces b/src/test/zones/evpn/advertise_subnets/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/advertise_subnets/expected_sdn_interfaces rename to src/test/zones/evpn/advertise_subnets/expected_sdn_interfaces diff --git a/test/zones/evpn/advertise_subnets/interfaces b/src/test/zones/evpn/advertise_subnets/interfaces similarity index 100% rename from test/zones/evpn/advertise_subnets/interfaces rename to src/test/zones/evpn/advertise_subnets/interfaces diff --git a/test/zones/evpn/advertise_subnets/sdn_config b/src/test/zones/evpn/advertise_subnets/sdn_config similarity index 100% rename from test/zones/evpn/advertise_subnets/sdn_config rename to src/test/zones/evpn/advertise_subnets/sdn_config diff --git a/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config b/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config similarity index 100% rename from test/zones/evpn/disable_arp_nd_suppression/expected_controller_config rename to src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config diff --git a/test/zones/evpn/disable_arp_nd_suppression/expected_sdn_interfaces b/src/test/zones/evpn/disable_arp_nd_suppression/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/disable_arp_nd_suppression/expected_sdn_interfaces rename to src/test/zones/evpn/disable_arp_nd_suppression/expected_sdn_interfaces diff --git a/test/zones/evpn/disable_arp_nd_suppression/interfaces b/src/test/zones/evpn/disable_arp_nd_suppression/interfaces similarity index 100% rename from test/zones/evpn/disable_arp_nd_suppression/interfaces rename to src/test/zones/evpn/disable_arp_nd_suppression/interfaces diff --git a/test/zones/evpn/disable_arp_nd_suppression/sdn_config b/src/test/zones/evpn/disable_arp_nd_suppression/sdn_config similarity index 100% rename from test/zones/evpn/disable_arp_nd_suppression/sdn_config rename to src/test/zones/evpn/disable_arp_nd_suppression/sdn_config diff --git a/test/zones/evpn/ebgp/expected_controller_config b/src/test/zones/evpn/ebgp/expected_controller_config similarity index 100% rename from test/zones/evpn/ebgp/expected_controller_config rename to src/test/zones/evpn/ebgp/expected_controller_config diff --git a/test/zones/evpn/ebgp/expected_sdn_interfaces b/src/test/zones/evpn/ebgp/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/ebgp/expected_sdn_interfaces rename to src/test/zones/evpn/ebgp/expected_sdn_interfaces diff --git a/test/zones/evpn/ebgp/interfaces b/src/test/zones/evpn/ebgp/interfaces similarity index 100% rename from test/zones/evpn/ebgp/interfaces rename to src/test/zones/evpn/ebgp/interfaces diff --git a/test/zones/evpn/ebgp/sdn_config b/src/test/zones/evpn/ebgp/sdn_config similarity index 100% rename from test/zones/evpn/ebgp/sdn_config rename to src/test/zones/evpn/ebgp/sdn_config diff --git a/test/zones/evpn/ebgp_loopback/expected_controller_config b/src/test/zones/evpn/ebgp_loopback/expected_controller_config similarity index 100% rename from test/zones/evpn/ebgp_loopback/expected_controller_config rename to src/test/zones/evpn/ebgp_loopback/expected_controller_config diff --git a/test/zones/evpn/ebgp_loopback/expected_sdn_interfaces b/src/test/zones/evpn/ebgp_loopback/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/ebgp_loopback/expected_sdn_interfaces rename to src/test/zones/evpn/ebgp_loopback/expected_sdn_interfaces diff --git a/test/zones/evpn/ebgp_loopback/interfaces b/src/test/zones/evpn/ebgp_loopback/interfaces similarity index 100% rename from test/zones/evpn/ebgp_loopback/interfaces rename to src/test/zones/evpn/ebgp_loopback/interfaces diff --git a/test/zones/evpn/ebgp_loopback/sdn_config b/src/test/zones/evpn/ebgp_loopback/sdn_config similarity index 100% rename from test/zones/evpn/ebgp_loopback/sdn_config rename to src/test/zones/evpn/ebgp_loopback/sdn_config diff --git a/test/zones/evpn/exitnode/expected_controller_config b/src/test/zones/evpn/exitnode/expected_controller_config similarity index 100% rename from test/zones/evpn/exitnode/expected_controller_config rename to src/test/zones/evpn/exitnode/expected_controller_config diff --git a/test/zones/evpn/exitnode/expected_sdn_interfaces b/src/test/zones/evpn/exitnode/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/exitnode/expected_sdn_interfaces rename to src/test/zones/evpn/exitnode/expected_sdn_interfaces diff --git a/test/zones/evpn/exitnode/interfaces b/src/test/zones/evpn/exitnode/interfaces similarity index 100% rename from test/zones/evpn/exitnode/interfaces rename to src/test/zones/evpn/exitnode/interfaces diff --git a/test/zones/evpn/exitnode/sdn_config b/src/test/zones/evpn/exitnode/sdn_config similarity index 100% rename from test/zones/evpn/exitnode/sdn_config rename to src/test/zones/evpn/exitnode/sdn_config diff --git a/test/zones/evpn/exitnode_local_routing/expected_controller_config b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config similarity index 100% rename from test/zones/evpn/exitnode_local_routing/expected_controller_config rename to src/test/zones/evpn/exitnode_local_routing/expected_controller_config diff --git a/test/zones/evpn/exitnode_local_routing/expected_sdn_interfaces b/src/test/zones/evpn/exitnode_local_routing/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/exitnode_local_routing/expected_sdn_interfaces rename to src/test/zones/evpn/exitnode_local_routing/expected_sdn_interfaces diff --git a/test/zones/evpn/exitnode_local_routing/interfaces b/src/test/zones/evpn/exitnode_local_routing/interfaces similarity index 100% rename from test/zones/evpn/exitnode_local_routing/interfaces rename to src/test/zones/evpn/exitnode_local_routing/interfaces diff --git a/test/zones/evpn/exitnode_local_routing/sdn_config b/src/test/zones/evpn/exitnode_local_routing/sdn_config similarity index 100% rename from test/zones/evpn/exitnode_local_routing/sdn_config rename to src/test/zones/evpn/exitnode_local_routing/sdn_config diff --git a/test/zones/evpn/exitnode_primary/expected_controller_config b/src/test/zones/evpn/exitnode_primary/expected_controller_config similarity index 100% rename from test/zones/evpn/exitnode_primary/expected_controller_config rename to src/test/zones/evpn/exitnode_primary/expected_controller_config diff --git a/test/zones/evpn/exitnode_primary/expected_sdn_interfaces b/src/test/zones/evpn/exitnode_primary/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/exitnode_primary/expected_sdn_interfaces rename to src/test/zones/evpn/exitnode_primary/expected_sdn_interfaces diff --git a/test/zones/evpn/exitnode_primary/interfaces b/src/test/zones/evpn/exitnode_primary/interfaces similarity index 100% rename from test/zones/evpn/exitnode_primary/interfaces rename to src/test/zones/evpn/exitnode_primary/interfaces diff --git a/test/zones/evpn/exitnode_primary/sdn_config b/src/test/zones/evpn/exitnode_primary/sdn_config similarity index 100% rename from test/zones/evpn/exitnode_primary/sdn_config rename to src/test/zones/evpn/exitnode_primary/sdn_config diff --git a/test/zones/evpn/exitnode_snat/expected_controller_config b/src/test/zones/evpn/exitnode_snat/expected_controller_config similarity index 100% rename from test/zones/evpn/exitnode_snat/expected_controller_config rename to src/test/zones/evpn/exitnode_snat/expected_controller_config diff --git a/test/zones/evpn/exitnode_snat/expected_sdn_interfaces b/src/test/zones/evpn/exitnode_snat/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/exitnode_snat/expected_sdn_interfaces rename to src/test/zones/evpn/exitnode_snat/expected_sdn_interfaces diff --git a/test/zones/evpn/exitnode_snat/interfaces b/src/test/zones/evpn/exitnode_snat/interfaces similarity index 100% rename from test/zones/evpn/exitnode_snat/interfaces rename to src/test/zones/evpn/exitnode_snat/interfaces diff --git a/test/zones/evpn/exitnode_snat/sdn_config b/src/test/zones/evpn/exitnode_snat/sdn_config similarity index 100% rename from test/zones/evpn/exitnode_snat/sdn_config rename to src/test/zones/evpn/exitnode_snat/sdn_config diff --git a/test/zones/evpn/ipv4/expected_controller_config b/src/test/zones/evpn/ipv4/expected_controller_config similarity index 100% rename from test/zones/evpn/ipv4/expected_controller_config rename to src/test/zones/evpn/ipv4/expected_controller_config diff --git a/test/zones/evpn/ipv4/expected_sdn_interfaces b/src/test/zones/evpn/ipv4/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/ipv4/expected_sdn_interfaces rename to src/test/zones/evpn/ipv4/expected_sdn_interfaces diff --git a/test/zones/evpn/ipv4/interfaces b/src/test/zones/evpn/ipv4/interfaces similarity index 100% rename from test/zones/evpn/ipv4/interfaces rename to src/test/zones/evpn/ipv4/interfaces diff --git a/test/zones/evpn/ipv4/sdn_config b/src/test/zones/evpn/ipv4/sdn_config similarity index 100% rename from test/zones/evpn/ipv4/sdn_config rename to src/test/zones/evpn/ipv4/sdn_config diff --git a/test/zones/evpn/ipv4ipv6/expected_controller_config b/src/test/zones/evpn/ipv4ipv6/expected_controller_config similarity index 100% rename from test/zones/evpn/ipv4ipv6/expected_controller_config rename to src/test/zones/evpn/ipv4ipv6/expected_controller_config diff --git a/test/zones/evpn/ipv4ipv6/expected_sdn_interfaces b/src/test/zones/evpn/ipv4ipv6/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/ipv4ipv6/expected_sdn_interfaces rename to src/test/zones/evpn/ipv4ipv6/expected_sdn_interfaces diff --git a/test/zones/evpn/ipv4ipv6/interfaces b/src/test/zones/evpn/ipv4ipv6/interfaces similarity index 100% rename from test/zones/evpn/ipv4ipv6/interfaces rename to src/test/zones/evpn/ipv4ipv6/interfaces diff --git a/test/zones/evpn/ipv4ipv6/sdn_config b/src/test/zones/evpn/ipv4ipv6/sdn_config similarity index 100% rename from test/zones/evpn/ipv4ipv6/sdn_config rename to src/test/zones/evpn/ipv4ipv6/sdn_config diff --git a/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config similarity index 100% rename from test/zones/evpn/ipv4ipv6nogateway/expected_controller_config rename to src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config diff --git a/test/zones/evpn/ipv4ipv6nogateway/expected_sdn_interfaces b/src/test/zones/evpn/ipv4ipv6nogateway/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/ipv4ipv6nogateway/expected_sdn_interfaces rename to src/test/zones/evpn/ipv4ipv6nogateway/expected_sdn_interfaces diff --git a/test/zones/evpn/ipv4ipv6nogateway/interfaces b/src/test/zones/evpn/ipv4ipv6nogateway/interfaces similarity index 100% rename from test/zones/evpn/ipv4ipv6nogateway/interfaces rename to src/test/zones/evpn/ipv4ipv6nogateway/interfaces diff --git a/test/zones/evpn/ipv4ipv6nogateway/sdn_config b/src/test/zones/evpn/ipv4ipv6nogateway/sdn_config similarity index 100% rename from test/zones/evpn/ipv4ipv6nogateway/sdn_config rename to src/test/zones/evpn/ipv4ipv6nogateway/sdn_config diff --git a/test/zones/evpn/ipv6/expected_controller_config b/src/test/zones/evpn/ipv6/expected_controller_config similarity index 100% rename from test/zones/evpn/ipv6/expected_controller_config rename to src/test/zones/evpn/ipv6/expected_controller_config diff --git a/test/zones/evpn/ipv6/expected_sdn_interfaces b/src/test/zones/evpn/ipv6/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/ipv6/expected_sdn_interfaces rename to src/test/zones/evpn/ipv6/expected_sdn_interfaces diff --git a/test/zones/evpn/ipv6/interfaces b/src/test/zones/evpn/ipv6/interfaces similarity index 100% rename from test/zones/evpn/ipv6/interfaces rename to src/test/zones/evpn/ipv6/interfaces diff --git a/test/zones/evpn/ipv6/sdn_config b/src/test/zones/evpn/ipv6/sdn_config similarity index 100% rename from test/zones/evpn/ipv6/sdn_config rename to src/test/zones/evpn/ipv6/sdn_config diff --git a/test/zones/evpn/multipath_relax/expected_controller_config b/src/test/zones/evpn/multipath_relax/expected_controller_config similarity index 100% rename from test/zones/evpn/multipath_relax/expected_controller_config rename to src/test/zones/evpn/multipath_relax/expected_controller_config diff --git a/test/zones/evpn/multipath_relax/expected_sdn_interfaces b/src/test/zones/evpn/multipath_relax/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/multipath_relax/expected_sdn_interfaces rename to src/test/zones/evpn/multipath_relax/expected_sdn_interfaces diff --git a/test/zones/evpn/multipath_relax/interfaces b/src/test/zones/evpn/multipath_relax/interfaces similarity index 100% rename from test/zones/evpn/multipath_relax/interfaces rename to src/test/zones/evpn/multipath_relax/interfaces diff --git a/test/zones/evpn/multipath_relax/sdn_config b/src/test/zones/evpn/multipath_relax/sdn_config similarity index 100% rename from test/zones/evpn/multipath_relax/sdn_config rename to src/test/zones/evpn/multipath_relax/sdn_config diff --git a/test/zones/evpn/rt_import/expected_controller_config b/src/test/zones/evpn/rt_import/expected_controller_config similarity index 100% rename from test/zones/evpn/rt_import/expected_controller_config rename to src/test/zones/evpn/rt_import/expected_controller_config diff --git a/test/zones/evpn/rt_import/expected_sdn_interfaces b/src/test/zones/evpn/rt_import/expected_sdn_interfaces similarity index 100% rename from test/zones/evpn/rt_import/expected_sdn_interfaces rename to src/test/zones/evpn/rt_import/expected_sdn_interfaces diff --git a/test/zones/evpn/rt_import/interfaces b/src/test/zones/evpn/rt_import/interfaces similarity index 100% rename from test/zones/evpn/rt_import/interfaces rename to src/test/zones/evpn/rt_import/interfaces diff --git a/test/zones/evpn/rt_import/sdn_config b/src/test/zones/evpn/rt_import/sdn_config similarity index 100% rename from test/zones/evpn/rt_import/sdn_config rename to src/test/zones/evpn/rt_import/sdn_config diff --git a/test/zones/qinq/bridge/expected_sdn_interfaces b/src/test/zones/qinq/bridge/expected_sdn_interfaces similarity index 100% rename from test/zones/qinq/bridge/expected_sdn_interfaces rename to src/test/zones/qinq/bridge/expected_sdn_interfaces diff --git a/test/zones/qinq/bridge/interfaces b/src/test/zones/qinq/bridge/interfaces similarity index 100% rename from test/zones/qinq/bridge/interfaces rename to src/test/zones/qinq/bridge/interfaces diff --git a/test/zones/qinq/bridge/sdn_config b/src/test/zones/qinq/bridge/sdn_config similarity index 100% rename from test/zones/qinq/bridge/sdn_config rename to src/test/zones/qinq/bridge/sdn_config diff --git a/test/zones/qinq/bridge_notagvnet/expected_sdn_interfaces b/src/test/zones/qinq/bridge_notagvnet/expected_sdn_interfaces similarity index 100% rename from test/zones/qinq/bridge_notagvnet/expected_sdn_interfaces rename to src/test/zones/qinq/bridge_notagvnet/expected_sdn_interfaces diff --git a/test/zones/qinq/bridge_notagvnet/interfaces b/src/test/zones/qinq/bridge_notagvnet/interfaces similarity index 100% rename from test/zones/qinq/bridge_notagvnet/interfaces rename to src/test/zones/qinq/bridge_notagvnet/interfaces diff --git a/test/zones/qinq/bridge_notagvnet/sdn_config b/src/test/zones/qinq/bridge_notagvnet/sdn_config similarity index 100% rename from test/zones/qinq/bridge_notagvnet/sdn_config rename to src/test/zones/qinq/bridge_notagvnet/sdn_config diff --git a/test/zones/qinq/bridge_vlanaware/expected_sdn_interfaces b/src/test/zones/qinq/bridge_vlanaware/expected_sdn_interfaces similarity index 100% rename from test/zones/qinq/bridge_vlanaware/expected_sdn_interfaces rename to src/test/zones/qinq/bridge_vlanaware/expected_sdn_interfaces diff --git a/test/zones/qinq/bridge_vlanaware/interfaces b/src/test/zones/qinq/bridge_vlanaware/interfaces similarity index 100% rename from test/zones/qinq/bridge_vlanaware/interfaces rename to src/test/zones/qinq/bridge_vlanaware/interfaces diff --git a/test/zones/qinq/bridge_vlanaware/sdn_config b/src/test/zones/qinq/bridge_vlanaware/sdn_config similarity index 100% rename from test/zones/qinq/bridge_vlanaware/sdn_config rename to src/test/zones/qinq/bridge_vlanaware/sdn_config diff --git a/test/zones/qinq/bridge_vlanaware_notagvnet/expected_sdn_interfaces b/src/test/zones/qinq/bridge_vlanaware_notagvnet/expected_sdn_interfaces similarity index 100% rename from test/zones/qinq/bridge_vlanaware_notagvnet/expected_sdn_interfaces rename to src/test/zones/qinq/bridge_vlanaware_notagvnet/expected_sdn_interfaces diff --git a/test/zones/qinq/bridge_vlanaware_notagvnet/interfaces b/src/test/zones/qinq/bridge_vlanaware_notagvnet/interfaces similarity index 100% rename from test/zones/qinq/bridge_vlanaware_notagvnet/interfaces rename to src/test/zones/qinq/bridge_vlanaware_notagvnet/interfaces diff --git a/test/zones/qinq/bridge_vlanaware_notagvnet/sdn_config b/src/test/zones/qinq/bridge_vlanaware_notagvnet/sdn_config similarity index 100% rename from test/zones/qinq/bridge_vlanaware_notagvnet/sdn_config rename to src/test/zones/qinq/bridge_vlanaware_notagvnet/sdn_config diff --git a/test/zones/qinq/bridge_vlanaware_vlanawarevnet/expected_sdn_interfaces b/src/test/zones/qinq/bridge_vlanaware_vlanawarevnet/expected_sdn_interfaces similarity index 100% rename from test/zones/qinq/bridge_vlanaware_vlanawarevnet/expected_sdn_interfaces rename to src/test/zones/qinq/bridge_vlanaware_vlanawarevnet/expected_sdn_interfaces diff --git a/test/zones/qinq/bridge_vlanaware_vlanawarevnet/interfaces b/src/test/zones/qinq/bridge_vlanaware_vlanawarevnet/interfaces similarity index 100% rename from test/zones/qinq/bridge_vlanaware_vlanawarevnet/interfaces rename to src/test/zones/qinq/bridge_vlanaware_vlanawarevnet/interfaces diff --git a/test/zones/qinq/bridge_vlanaware_vlanawarevnet/sdn_config b/src/test/zones/qinq/bridge_vlanaware_vlanawarevnet/sdn_config similarity index 100% rename from test/zones/qinq/bridge_vlanaware_vlanawarevnet/sdn_config rename to src/test/zones/qinq/bridge_vlanaware_vlanawarevnet/sdn_config diff --git a/test/zones/qinq/bridge_vlanaware_vlanprotocol/expected_sdn_interfaces b/src/test/zones/qinq/bridge_vlanaware_vlanprotocol/expected_sdn_interfaces similarity index 100% rename from test/zones/qinq/bridge_vlanaware_vlanprotocol/expected_sdn_interfaces rename to src/test/zones/qinq/bridge_vlanaware_vlanprotocol/expected_sdn_interfaces diff --git a/test/zones/qinq/bridge_vlanaware_vlanprotocol/interfaces b/src/test/zones/qinq/bridge_vlanaware_vlanprotocol/interfaces similarity index 100% rename from test/zones/qinq/bridge_vlanaware_vlanprotocol/interfaces rename to src/test/zones/qinq/bridge_vlanaware_vlanprotocol/interfaces diff --git a/test/zones/qinq/bridge_vlanaware_vlanprotocol/sdn_config b/src/test/zones/qinq/bridge_vlanaware_vlanprotocol/sdn_config similarity index 100% rename from test/zones/qinq/bridge_vlanaware_vlanprotocol/sdn_config rename to src/test/zones/qinq/bridge_vlanaware_vlanprotocol/sdn_config diff --git a/test/zones/qinq/bridge_vlanawarevnet/expected_sdn_interfaces b/src/test/zones/qinq/bridge_vlanawarevnet/expected_sdn_interfaces similarity index 100% rename from test/zones/qinq/bridge_vlanawarevnet/expected_sdn_interfaces rename to src/test/zones/qinq/bridge_vlanawarevnet/expected_sdn_interfaces diff --git a/test/zones/qinq/bridge_vlanawarevnet/interfaces b/src/test/zones/qinq/bridge_vlanawarevnet/interfaces similarity index 100% rename from test/zones/qinq/bridge_vlanawarevnet/interfaces rename to src/test/zones/qinq/bridge_vlanawarevnet/interfaces diff --git a/test/zones/qinq/bridge_vlanawarevnet/sdn_config b/src/test/zones/qinq/bridge_vlanawarevnet/sdn_config similarity index 100% rename from test/zones/qinq/bridge_vlanawarevnet/sdn_config rename to src/test/zones/qinq/bridge_vlanawarevnet/sdn_config diff --git a/test/zones/qinq/bridge_vlanprotocol/expected_sdn_interfaces b/src/test/zones/qinq/bridge_vlanprotocol/expected_sdn_interfaces similarity index 100% rename from test/zones/qinq/bridge_vlanprotocol/expected_sdn_interfaces rename to src/test/zones/qinq/bridge_vlanprotocol/expected_sdn_interfaces diff --git a/test/zones/qinq/bridge_vlanprotocol/interfaces b/src/test/zones/qinq/bridge_vlanprotocol/interfaces similarity index 100% rename from test/zones/qinq/bridge_vlanprotocol/interfaces rename to src/test/zones/qinq/bridge_vlanprotocol/interfaces diff --git a/test/zones/qinq/bridge_vlanprotocol/sdn_config b/src/test/zones/qinq/bridge_vlanprotocol/sdn_config similarity index 100% rename from test/zones/qinq/bridge_vlanprotocol/sdn_config rename to src/test/zones/qinq/bridge_vlanprotocol/sdn_config diff --git a/test/zones/qinq/ovs/expected_sdn_interfaces b/src/test/zones/qinq/ovs/expected_sdn_interfaces similarity index 100% rename from test/zones/qinq/ovs/expected_sdn_interfaces rename to src/test/zones/qinq/ovs/expected_sdn_interfaces diff --git a/test/zones/qinq/ovs/interfaces b/src/test/zones/qinq/ovs/interfaces similarity index 100% rename from test/zones/qinq/ovs/interfaces rename to src/test/zones/qinq/ovs/interfaces diff --git a/test/zones/qinq/ovs/sdn_config b/src/test/zones/qinq/ovs/sdn_config similarity index 100% rename from test/zones/qinq/ovs/sdn_config rename to src/test/zones/qinq/ovs/sdn_config diff --git a/test/zones/qinq/ovs_notagvnet/expected_sdn_interfaces b/src/test/zones/qinq/ovs_notagvnet/expected_sdn_interfaces similarity index 100% rename from test/zones/qinq/ovs_notagvnet/expected_sdn_interfaces rename to src/test/zones/qinq/ovs_notagvnet/expected_sdn_interfaces diff --git a/test/zones/qinq/ovs_notagvnet/interfaces b/src/test/zones/qinq/ovs_notagvnet/interfaces similarity index 100% rename from test/zones/qinq/ovs_notagvnet/interfaces rename to src/test/zones/qinq/ovs_notagvnet/interfaces diff --git a/test/zones/qinq/ovs_notagvnet/sdn_config b/src/test/zones/qinq/ovs_notagvnet/sdn_config similarity index 100% rename from test/zones/qinq/ovs_notagvnet/sdn_config rename to src/test/zones/qinq/ovs_notagvnet/sdn_config diff --git a/test/zones/qinq/ovs_vlanawarevnet/expected_sdn_interfaces b/src/test/zones/qinq/ovs_vlanawarevnet/expected_sdn_interfaces similarity index 100% rename from test/zones/qinq/ovs_vlanawarevnet/expected_sdn_interfaces rename to src/test/zones/qinq/ovs_vlanawarevnet/expected_sdn_interfaces diff --git a/test/zones/qinq/ovs_vlanawarevnet/interfaces b/src/test/zones/qinq/ovs_vlanawarevnet/interfaces similarity index 100% rename from test/zones/qinq/ovs_vlanawarevnet/interfaces rename to src/test/zones/qinq/ovs_vlanawarevnet/interfaces diff --git a/test/zones/qinq/ovs_vlanawarevnet/sdn_config b/src/test/zones/qinq/ovs_vlanawarevnet/sdn_config similarity index 100% rename from test/zones/qinq/ovs_vlanawarevnet/sdn_config rename to src/test/zones/qinq/ovs_vlanawarevnet/sdn_config diff --git a/test/zones/qinq/ovs_vlanprotocol/expected_sdn_interfaces b/src/test/zones/qinq/ovs_vlanprotocol/expected_sdn_interfaces similarity index 100% rename from test/zones/qinq/ovs_vlanprotocol/expected_sdn_interfaces rename to src/test/zones/qinq/ovs_vlanprotocol/expected_sdn_interfaces diff --git a/test/zones/qinq/ovs_vlanprotocol/interfaces b/src/test/zones/qinq/ovs_vlanprotocol/interfaces similarity index 100% rename from test/zones/qinq/ovs_vlanprotocol/interfaces rename to src/test/zones/qinq/ovs_vlanprotocol/interfaces diff --git a/test/zones/qinq/ovs_vlanprotocol/sdn_config b/src/test/zones/qinq/ovs_vlanprotocol/sdn_config similarity index 100% rename from test/zones/qinq/ovs_vlanprotocol/sdn_config rename to src/test/zones/qinq/ovs_vlanprotocol/sdn_config diff --git a/test/zones/simple/basic/expected_sdn_interfaces b/src/test/zones/simple/basic/expected_sdn_interfaces similarity index 100% rename from test/zones/simple/basic/expected_sdn_interfaces rename to src/test/zones/simple/basic/expected_sdn_interfaces diff --git a/test/zones/simple/basic/interfaces b/src/test/zones/simple/basic/interfaces similarity index 100% rename from test/zones/simple/basic/interfaces rename to src/test/zones/simple/basic/interfaces diff --git a/test/zones/simple/basic/sdn_config b/src/test/zones/simple/basic/sdn_config similarity index 100% rename from test/zones/simple/basic/sdn_config rename to src/test/zones/simple/basic/sdn_config diff --git a/test/zones/simple/hetzner/expected_sdn_interfaces b/src/test/zones/simple/hetzner/expected_sdn_interfaces similarity index 100% rename from test/zones/simple/hetzner/expected_sdn_interfaces rename to src/test/zones/simple/hetzner/expected_sdn_interfaces diff --git a/test/zones/simple/hetzner/interfaces b/src/test/zones/simple/hetzner/interfaces similarity index 100% rename from test/zones/simple/hetzner/interfaces rename to src/test/zones/simple/hetzner/interfaces diff --git a/test/zones/simple/hetzner/sdn_config b/src/test/zones/simple/hetzner/sdn_config similarity index 100% rename from test/zones/simple/hetzner/sdn_config rename to src/test/zones/simple/hetzner/sdn_config diff --git a/test/zones/simple/ipv4/expected_sdn_interfaces b/src/test/zones/simple/ipv4/expected_sdn_interfaces similarity index 100% rename from test/zones/simple/ipv4/expected_sdn_interfaces rename to src/test/zones/simple/ipv4/expected_sdn_interfaces diff --git a/test/zones/simple/ipv4/interfaces b/src/test/zones/simple/ipv4/interfaces similarity index 100% rename from test/zones/simple/ipv4/interfaces rename to src/test/zones/simple/ipv4/interfaces diff --git a/test/zones/simple/ipv4/sdn_config b/src/test/zones/simple/ipv4/sdn_config similarity index 100% rename from test/zones/simple/ipv4/sdn_config rename to src/test/zones/simple/ipv4/sdn_config diff --git a/test/zones/simple/ipv4snat/expected_sdn_interfaces b/src/test/zones/simple/ipv4snat/expected_sdn_interfaces similarity index 100% rename from test/zones/simple/ipv4snat/expected_sdn_interfaces rename to src/test/zones/simple/ipv4snat/expected_sdn_interfaces diff --git a/test/zones/simple/ipv4snat/interfaces b/src/test/zones/simple/ipv4snat/interfaces similarity index 100% rename from test/zones/simple/ipv4snat/interfaces rename to src/test/zones/simple/ipv4snat/interfaces diff --git a/test/zones/simple/ipv4snat/sdn_config b/src/test/zones/simple/ipv4snat/sdn_config similarity index 100% rename from test/zones/simple/ipv4snat/sdn_config rename to src/test/zones/simple/ipv4snat/sdn_config diff --git a/test/zones/simple/ipv4v6/expected_sdn_interfaces b/src/test/zones/simple/ipv4v6/expected_sdn_interfaces similarity index 100% rename from test/zones/simple/ipv4v6/expected_sdn_interfaces rename to src/test/zones/simple/ipv4v6/expected_sdn_interfaces diff --git a/test/zones/simple/ipv4v6/interfaces b/src/test/zones/simple/ipv4v6/interfaces similarity index 100% rename from test/zones/simple/ipv4v6/interfaces rename to src/test/zones/simple/ipv4v6/interfaces diff --git a/test/zones/simple/ipv4v6/sdn_config b/src/test/zones/simple/ipv4v6/sdn_config similarity index 100% rename from test/zones/simple/ipv4v6/sdn_config rename to src/test/zones/simple/ipv4v6/sdn_config diff --git a/test/zones/simple/ipv4v6nogateway/expected_sdn_interfaces b/src/test/zones/simple/ipv4v6nogateway/expected_sdn_interfaces similarity index 100% rename from test/zones/simple/ipv4v6nogateway/expected_sdn_interfaces rename to src/test/zones/simple/ipv4v6nogateway/expected_sdn_interfaces diff --git a/test/zones/simple/ipv4v6nogateway/interfaces b/src/test/zones/simple/ipv4v6nogateway/interfaces similarity index 100% rename from test/zones/simple/ipv4v6nogateway/interfaces rename to src/test/zones/simple/ipv4v6nogateway/interfaces diff --git a/test/zones/simple/ipv4v6nogateway/sdn_config b/src/test/zones/simple/ipv4v6nogateway/sdn_config similarity index 100% rename from test/zones/simple/ipv4v6nogateway/sdn_config rename to src/test/zones/simple/ipv4v6nogateway/sdn_config diff --git a/test/zones/simple/ipv6snat/expected_sdn_interfaces b/src/test/zones/simple/ipv6snat/expected_sdn_interfaces similarity index 100% rename from test/zones/simple/ipv6snat/expected_sdn_interfaces rename to src/test/zones/simple/ipv6snat/expected_sdn_interfaces diff --git a/test/zones/simple/ipv6snat/interfaces b/src/test/zones/simple/ipv6snat/interfaces similarity index 100% rename from test/zones/simple/ipv6snat/interfaces rename to src/test/zones/simple/ipv6snat/interfaces diff --git a/test/zones/simple/ipv6snat/sdn_config b/src/test/zones/simple/ipv6snat/sdn_config similarity index 100% rename from test/zones/simple/ipv6snat/sdn_config rename to src/test/zones/simple/ipv6snat/sdn_config diff --git a/test/zones/vlan/bridge/expected_sdn_interfaces b/src/test/zones/vlan/bridge/expected_sdn_interfaces similarity index 100% rename from test/zones/vlan/bridge/expected_sdn_interfaces rename to src/test/zones/vlan/bridge/expected_sdn_interfaces diff --git a/test/zones/vlan/bridge/interfaces b/src/test/zones/vlan/bridge/interfaces similarity index 100% rename from test/zones/vlan/bridge/interfaces rename to src/test/zones/vlan/bridge/interfaces diff --git a/test/zones/vlan/bridge/sdn_config b/src/test/zones/vlan/bridge/sdn_config similarity index 100% rename from test/zones/vlan/bridge/sdn_config rename to src/test/zones/vlan/bridge/sdn_config diff --git a/test/zones/vlan/bridge_vlanaware/expected_sdn_interfaces b/src/test/zones/vlan/bridge_vlanaware/expected_sdn_interfaces similarity index 100% rename from test/zones/vlan/bridge_vlanaware/expected_sdn_interfaces rename to src/test/zones/vlan/bridge_vlanaware/expected_sdn_interfaces diff --git a/test/zones/vlan/bridge_vlanaware/interfaces b/src/test/zones/vlan/bridge_vlanaware/interfaces similarity index 100% rename from test/zones/vlan/bridge_vlanaware/interfaces rename to src/test/zones/vlan/bridge_vlanaware/interfaces diff --git a/test/zones/vlan/bridge_vlanaware/sdn_config b/src/test/zones/vlan/bridge_vlanaware/sdn_config similarity index 100% rename from test/zones/vlan/bridge_vlanaware/sdn_config rename to src/test/zones/vlan/bridge_vlanaware/sdn_config diff --git a/test/zones/vlan/bridge_vlanaware_vlanawarevnet/expected_sdn_interfaces b/src/test/zones/vlan/bridge_vlanaware_vlanawarevnet/expected_sdn_interfaces similarity index 100% rename from test/zones/vlan/bridge_vlanaware_vlanawarevnet/expected_sdn_interfaces rename to src/test/zones/vlan/bridge_vlanaware_vlanawarevnet/expected_sdn_interfaces diff --git a/test/zones/vlan/bridge_vlanaware_vlanawarevnet/interfaces b/src/test/zones/vlan/bridge_vlanaware_vlanawarevnet/interfaces similarity index 100% rename from test/zones/vlan/bridge_vlanaware_vlanawarevnet/interfaces rename to src/test/zones/vlan/bridge_vlanaware_vlanawarevnet/interfaces diff --git a/test/zones/vlan/bridge_vlanaware_vlanawarevnet/sdn_config b/src/test/zones/vlan/bridge_vlanaware_vlanawarevnet/sdn_config similarity index 100% rename from test/zones/vlan/bridge_vlanaware_vlanawarevnet/sdn_config rename to src/test/zones/vlan/bridge_vlanaware_vlanawarevnet/sdn_config diff --git a/test/zones/vlan/ovs/expected_sdn_interfaces b/src/test/zones/vlan/ovs/expected_sdn_interfaces similarity index 100% rename from test/zones/vlan/ovs/expected_sdn_interfaces rename to src/test/zones/vlan/ovs/expected_sdn_interfaces diff --git a/test/zones/vlan/ovs/interfaces b/src/test/zones/vlan/ovs/interfaces similarity index 100% rename from test/zones/vlan/ovs/interfaces rename to src/test/zones/vlan/ovs/interfaces diff --git a/test/zones/vlan/ovs/sdn_config b/src/test/zones/vlan/ovs/sdn_config similarity index 100% rename from test/zones/vlan/ovs/sdn_config rename to src/test/zones/vlan/ovs/sdn_config diff --git a/test/zones/vlan/ovs_vlanware_vnet/expected_sdn_interfaces b/src/test/zones/vlan/ovs_vlanware_vnet/expected_sdn_interfaces similarity index 100% rename from test/zones/vlan/ovs_vlanware_vnet/expected_sdn_interfaces rename to src/test/zones/vlan/ovs_vlanware_vnet/expected_sdn_interfaces diff --git a/test/zones/vlan/ovs_vlanware_vnet/interfaces b/src/test/zones/vlan/ovs_vlanware_vnet/interfaces similarity index 100% rename from test/zones/vlan/ovs_vlanware_vnet/interfaces rename to src/test/zones/vlan/ovs_vlanware_vnet/interfaces diff --git a/test/zones/vlan/ovs_vlanware_vnet/sdn_config b/src/test/zones/vlan/ovs_vlanware_vnet/sdn_config similarity index 100% rename from test/zones/vlan/ovs_vlanware_vnet/sdn_config rename to src/test/zones/vlan/ovs_vlanware_vnet/sdn_config diff --git a/test/zones/vxlan/basic/expected_sdn_interfaces b/src/test/zones/vxlan/basic/expected_sdn_interfaces similarity index 100% rename from test/zones/vxlan/basic/expected_sdn_interfaces rename to src/test/zones/vxlan/basic/expected_sdn_interfaces diff --git a/test/zones/vxlan/basic/interfaces b/src/test/zones/vxlan/basic/interfaces similarity index 100% rename from test/zones/vxlan/basic/interfaces rename to src/test/zones/vxlan/basic/interfaces diff --git a/test/zones/vxlan/basic/sdn_config b/src/test/zones/vxlan/basic/sdn_config similarity index 100% rename from test/zones/vxlan/basic/sdn_config rename to src/test/zones/vxlan/basic/sdn_config diff --git a/test/zones/vxlan/vlanawarevnet/expected_sdn_interfaces b/src/test/zones/vxlan/vlanawarevnet/expected_sdn_interfaces similarity index 100% rename from test/zones/vxlan/vlanawarevnet/expected_sdn_interfaces rename to src/test/zones/vxlan/vlanawarevnet/expected_sdn_interfaces diff --git a/test/zones/vxlan/vlanawarevnet/interfaces b/src/test/zones/vxlan/vlanawarevnet/interfaces similarity index 100% rename from test/zones/vxlan/vlanawarevnet/interfaces rename to src/test/zones/vxlan/vlanawarevnet/interfaces diff --git a/test/zones/vxlan/vlanawarevnet/sdn_config b/src/test/zones/vxlan/vlanawarevnet/sdn_config similarity index 100% rename from test/zones/vxlan/vlanawarevnet/sdn_config rename to src/test/zones/vxlan/vlanawarevnet/sdn_config -- 2.39.5