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 <t.lamprecht@proxmox.com>

239 files changed, 25 insertions, 15 deletions

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
index 28b2830..28b2830 100644
--- a/PVE/API2/Makefile
+++ b/src/PVE/API2/Makefile
diff --git a/PVE/API2/Network/Makefile b/src/PVE/API2/Network/Makefile
index 396f79d..396f79d 100644
--- a/PVE/API2/Network/Makefile
+++ b/src/PVE/API2/Network/Makefile
diff --git a/PVE/API2/Network/SDN.pm b/src/PVE/API2/Network/SDN.pm
index f129d60..f129d60 100644
--- a/PVE/API2/Network/SDN.pm
+++ b/src/PVE/API2/Network/SDN.pm
diff --git a/PVE/API2/Network/SDN/Controllers.pm b/src/PVE/API2/Network/SDN/Controllers.pm
index d8f18ab..d8f18ab 100644
--- a/PVE/API2/Network/SDN/Controllers.pm
+++ b/src/PVE/API2/Network/SDN/Controllers.pm
diff --git a/PVE/API2/Network/SDN/Dns.pm b/src/PVE/API2/Network/SDN/Dns.pm
index 3d08552..3d08552 100644
--- a/PVE/API2/Network/SDN/Dns.pm
+++ b/src/PVE/API2/Network/SDN/Dns.pm
diff --git a/PVE/API2/Network/SDN/Ipams.pm b/src/PVE/API2/Network/SDN/Ipams.pm
index 6410e8e..6410e8e 100644
--- a/PVE/API2/Network/SDN/Ipams.pm
+++ b/src/PVE/API2/Network/SDN/Ipams.pm
diff --git a/PVE/API2/Network/SDN/Makefile b/src/PVE/API2/Network/SDN/Makefile
index 3683fa4..3683fa4 100644
--- a/PVE/API2/Network/SDN/Makefile
+++ b/src/PVE/API2/Network/SDN/Makefile
diff --git a/PVE/API2/Network/SDN/Subnets.pm b/src/PVE/API2/Network/SDN/Subnets.pm
index 377a568..377a568 100644
--- a/PVE/API2/Network/SDN/Subnets.pm
+++ b/src/PVE/API2/Network/SDN/Subnets.pm
diff --git a/PVE/API2/Network/SDN/Vnets.pm b/src/PVE/API2/Network/SDN/Vnets.pm
index 811a2e8..811a2e8 100644
--- a/PVE/API2/Network/SDN/Vnets.pm
+++ b/src/PVE/API2/Network/SDN/Vnets.pm
diff --git a/PVE/API2/Network/SDN/Zones.pm b/src/PVE/API2/Network/SDN/Zones.pm
index 6e53240..6e53240 100644
--- a/PVE/API2/Network/SDN/Zones.pm
+++ b/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
index 66f49df..66f49df 100644
--- a/PVE/API2/Network/SDN/Zones/Content.pm
+++ b/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
index 9b0a42b..9b0a42b 100644
--- a/PVE/API2/Network/SDN/Zones/Makefile
+++ b/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
index 17de68f..17de68f 100644
--- a/PVE/API2/Network/SDN/Zones/Status.pm
+++ b/src/PVE/API2/Network/SDN/Zones/Status.pm
diff --git a/PVE/Makefile b/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
index 277e19c..277e19c 100644
--- a/PVE/Network/Makefile
+++ b/src/PVE/Network/Makefile
diff --git a/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
index b95dd5b..b95dd5b 100644
--- a/PVE/Network/SDN.pm
+++ b/src/PVE/Network/SDN.pm
diff --git a/PVE/Network/SDN/Controllers.pm b/src/PVE/Network/SDN/Controllers.pm
index a23048e..a23048e 100644
--- a/PVE/Network/SDN/Controllers.pm
+++ b/src/PVE/Network/SDN/Controllers.pm
diff --git a/PVE/Network/SDN/Controllers/BgpPlugin.pm b/src/PVE/Network/SDN/Controllers/BgpPlugin.pm
index 0b8cf1a..0b8cf1a 100644
--- a/PVE/Network/SDN/Controllers/BgpPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/BgpPlugin.pm
diff --git a/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
index 727aeaa..727aeaa 100644
--- a/PVE/Network/SDN/Controllers/EvpnPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
diff --git a/PVE/Network/SDN/Controllers/FaucetPlugin.pm b/src/PVE/Network/SDN/Controllers/FaucetPlugin.pm
index 4f3bb5c..4f3bb5c 100644
--- a/PVE/Network/SDN/Controllers/FaucetPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/FaucetPlugin.pm
diff --git a/PVE/Network/SDN/Controllers/Makefile b/src/PVE/Network/SDN/Controllers/Makefile
index 11686a3..11686a3 100644
--- a/PVE/Network/SDN/Controllers/Makefile
+++ b/src/PVE/Network/SDN/Controllers/Makefile
diff --git a/PVE/Network/SDN/Controllers/Plugin.pm b/src/PVE/Network/SDN/Controllers/Plugin.pm
index c1c2cfd..c1c2cfd 100644
--- a/PVE/Network/SDN/Controllers/Plugin.pm
+++ b/src/PVE/Network/SDN/Controllers/Plugin.pm
diff --git a/PVE/Network/SDN/Dns.pm b/src/PVE/Network/SDN/Dns.pm
index c2e153a..c2e153a 100644
--- a/PVE/Network/SDN/Dns.pm
+++ b/src/PVE/Network/SDN/Dns.pm
diff --git a/PVE/Network/SDN/Dns/Makefile b/src/PVE/Network/SDN/Dns/Makefile
index 81cd2a1..81cd2a1 100644
--- a/PVE/Network/SDN/Dns/Makefile
+++ b/src/PVE/Network/SDN/Dns/Makefile
diff --git a/PVE/Network/SDN/Dns/Plugin.pm b/src/PVE/Network/SDN/Dns/Plugin.pm
index 07d0be1..07d0be1 100644
--- a/PVE/Network/SDN/Dns/Plugin.pm
+++ b/src/PVE/Network/SDN/Dns/Plugin.pm
diff --git a/PVE/Network/SDN/Dns/PowerdnsPlugin.pm b/src/PVE/Network/SDN/Dns/PowerdnsPlugin.pm
index 096d131..096d131 100644
--- a/PVE/Network/SDN/Dns/PowerdnsPlugin.pm
+++ b/src/PVE/Network/SDN/Dns/PowerdnsPlugin.pm
diff --git a/PVE/Network/SDN/Ipams.pm b/src/PVE/Network/SDN/Ipams.pm
index e8a4b0b..e8a4b0b 100644
--- a/PVE/Network/SDN/Ipams.pm
+++ b/src/PVE/Network/SDN/Ipams.pm
diff --git a/PVE/Network/SDN/Ipams/Makefile b/src/PVE/Network/SDN/Ipams/Makefile
index 4e7d65f..4e7d65f 100644
--- a/PVE/Network/SDN/Ipams/Makefile
+++ b/src/PVE/Network/SDN/Ipams/Makefile
diff --git a/PVE/Network/SDN/Ipams/NetboxPlugin.pm b/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm
index f0e7168..f0e7168 100644
--- a/PVE/Network/SDN/Ipams/NetboxPlugin.pm
+++ b/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm
diff --git a/PVE/Network/SDN/Ipams/PVEPlugin.pm b/src/PVE/Network/SDN/Ipams/PVEPlugin.pm
index 3e8ffc5..3e8ffc5 100644
--- a/PVE/Network/SDN/Ipams/PVEPlugin.pm
+++ b/src/PVE/Network/SDN/Ipams/PVEPlugin.pm
diff --git a/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm b/src/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm
index ad5286b..ad5286b 100644
--- a/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm
+++ b/src/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm
diff --git a/PVE/Network/SDN/Ipams/Plugin.pm b/src/PVE/Network/SDN/Ipams/Plugin.pm
index c96eeda..c96eeda 100644
--- a/PVE/Network/SDN/Ipams/Plugin.pm
+++ b/src/PVE/Network/SDN/Ipams/Plugin.pm
diff --git a/PVE/Network/SDN/Makefile b/src/PVE/Network/SDN/Makefile
index 92cfcd0..92cfcd0 100644
--- a/PVE/Network/SDN/Makefile
+++ b/src/PVE/Network/SDN/Makefile
diff --git a/PVE/Network/SDN/SubnetPlugin.pm b/src/PVE/Network/SDN/SubnetPlugin.pm
index 15b370f..15b370f 100644
--- a/PVE/Network/SDN/SubnetPlugin.pm
+++ b/src/PVE/Network/SDN/SubnetPlugin.pm
diff --git a/PVE/Network/SDN/Subnets.pm b/src/PVE/Network/SDN/Subnets.pm
index 6bb42e5..6bb42e5 100644
--- a/PVE/Network/SDN/Subnets.pm
+++ b/src/PVE/Network/SDN/Subnets.pm
diff --git a/PVE/Network/SDN/VnetPlugin.pm b/src/PVE/Network/SDN/VnetPlugin.pm
index 062904c..062904c 100644
--- a/PVE/Network/SDN/VnetPlugin.pm
+++ b/src/PVE/Network/SDN/VnetPlugin.pm
diff --git a/PVE/Network/SDN/Vnets.pm b/src/PVE/Network/SDN/Vnets.pm
index 0b32c58..0b32c58 100644
--- a/PVE/Network/SDN/Vnets.pm
+++ b/src/PVE/Network/SDN/Vnets.pm
diff --git a/PVE/Network/SDN/Zones.pm b/src/PVE/Network/SDN/Zones.pm
index f8e40b1..f8e40b1 100644
--- a/PVE/Network/SDN/Zones.pm
+++ b/src/PVE/Network/SDN/Zones.pm
diff --git a/PVE/Network/SDN/Zones/EvpnPlugin.pm b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm
index a5a7539..a5a7539 100644
--- a/PVE/Network/SDN/Zones/EvpnPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm
diff --git a/PVE/Network/SDN/Zones/FaucetPlugin.pm b/src/PVE/Network/SDN/Zones/FaucetPlugin.pm
index a237d17..a237d17 100644
--- a/PVE/Network/SDN/Zones/FaucetPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/FaucetPlugin.pm
diff --git a/PVE/Network/SDN/Zones/Makefile b/src/PVE/Network/SDN/Zones/Makefile
index 8454388..8454388 100644
--- a/PVE/Network/SDN/Zones/Makefile
+++ b/src/PVE/Network/SDN/Zones/Makefile
diff --git a/PVE/Network/SDN/Zones/Plugin.pm b/src/PVE/Network/SDN/Zones/Plugin.pm
index 2c707b3..2c707b3 100644
--- a/PVE/Network/SDN/Zones/Plugin.pm
+++ b/src/PVE/Network/SDN/Zones/Plugin.pm
diff --git a/PVE/Network/SDN/Zones/QinQPlugin.pm b/src/PVE/Network/SDN/Zones/QinQPlugin.pm
index f4d12bc..f4d12bc 100644
--- a/PVE/Network/SDN/Zones/QinQPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/QinQPlugin.pm
diff --git a/PVE/Network/SDN/Zones/SimplePlugin.pm b/src/PVE/Network/SDN/Zones/SimplePlugin.pm
index 7757747..7757747 100644
--- a/PVE/Network/SDN/Zones/SimplePlugin.pm
+++ b/src/PVE/Network/SDN/Zones/SimplePlugin.pm
diff --git a/PVE/Network/SDN/Zones/VlanPlugin.pm b/src/PVE/Network/SDN/Zones/VlanPlugin.pm
index 0bb6b8a..0bb6b8a 100644
--- a/PVE/Network/SDN/Zones/VlanPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/VlanPlugin.pm
diff --git a/PVE/Network/SDN/Zones/VxlanPlugin.pm b/src/PVE/Network/SDN/Zones/VxlanPlugin.pm
index c523cf7..c523cf7 100644
--- a/PVE/Network/SDN/Zones/VxlanPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/VxlanPlugin.pm
diff --git a/test/Makefile b/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
index 6ee8ee6..6ee8ee6 100644
--- a/test/debug/documentation.txt
+++ b/src/test/debug/documentation.txt
diff --git a/test/debug/generateconfig.pl b/src/test/debug/generateconfig.pl
index 250db43..250db43 100644
--- a/test/debug/generateconfig.pl
+++ b/src/test/debug/generateconfig.pl
diff --git a/test/debug/statuscheck.pl b/src/test/debug/statuscheck.pl
index e43003b..e43003b 100644
--- a/test/debug/statuscheck.pl
+++ b/src/test/debug/statuscheck.pl
diff --git a/test/dns/powerdns/dns_config b/src/test/dns/powerdns/dns_config
index 6052366..6052366 100644
--- a/test/dns/powerdns/dns_config
+++ b/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
index 0e5539f..0e5539f 100644
--- a/test/dns/powerdns/expected.add_a_multiple_record.ipv4
+++ b/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
index e432e7b..e432e7b 100644
--- a/test/dns/powerdns/expected.add_a_multiple_record.ipv6
+++ b/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
index 888d67f..888d67f 100644
--- a/test/dns/powerdns/expected.add_a_record.ipv4
+++ b/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
index bfeeab7..bfeeab7 100644
--- a/test/dns/powerdns/expected.add_a_record.ipv6
+++ b/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
index 6923971..6923971 100644
--- a/test/dns/powerdns/expected.add_ptr_record.ipv4
+++ b/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
index 1d8049f..1d8049f 100644
--- a/test/dns/powerdns/expected.add_ptr_record.ipv6
+++ b/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
index 45d76c6..45d76c6 100644
--- a/test/dns/powerdns/expected.del_a_multiple_record.ipv4
+++ b/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
index 9b56abd..9b56abd 100644
--- a/test/dns/powerdns/expected.del_a_multiple_record.ipv6
+++ b/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
index 7c0cf45..7c0cf45 100644
--- a/test/dns/powerdns/expected.del_a_record.ipv4
+++ b/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
index 9494c83..9494c83 100644
--- a/test/dns/powerdns/expected.del_a_record.ipv6
+++ b/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
index 120485b..120485b 100644
--- a/test/dns/powerdns/expected.del_ptr_record.ipv4
+++ b/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
index 7948e78..7948e78 100644
--- a/test/dns/powerdns/expected.del_ptr_record.ipv6
+++ b/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
index b476875..b476875 100644
--- a/test/dns/powerdns/expected.verify_zone
+++ b/src/test/dns/powerdns/expected.verify_zone
diff --git a/test/dns/powerdns/sdn_config b/src/test/dns/powerdns/sdn_config
index 2087729..2087729 100644
--- a/test/dns/powerdns/sdn_config
+++ b/src/test/dns/powerdns/sdn_config
diff --git a/test/ipams/netbox/expected.add_ip b/src/test/ipams/netbox/expected.add_ip
index ae876f2..ae876f2 100644
--- a/test/ipams/netbox/expected.add_ip
+++ b/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
index ae876f2..ae876f2 100644
--- a/test/ipams/netbox/expected.add_ip_notgateway
+++ b/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
index 7f80f4c..7f80f4c 100644
--- a/test/ipams/netbox/expected.add_next_freeip
+++ b/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
index 62ca823..62ca823 100644
--- a/test/ipams/netbox/expected.add_subnet
+++ b/src/test/ipams/netbox/expected.add_subnet
diff --git a/test/ipams/netbox/expected.del_ip b/src/test/ipams/netbox/expected.del_ip
index 3c41de4..3c41de4 100644
--- a/test/ipams/netbox/expected.del_ip
+++ b/src/test/ipams/netbox/expected.del_ip
diff --git a/test/ipams/netbox/expected.del_subnet b/src/test/ipams/netbox/expected.del_subnet
index bdadb71..bdadb71 100644
--- a/test/ipams/netbox/expected.del_subnet
+++ b/src/test/ipams/netbox/expected.del_subnet
diff --git a/test/ipams/netbox/expected.update_ip b/src/test/ipams/netbox/expected.update_ip
index a1202ad..a1202ad 100644
--- a/test/ipams/netbox/expected.update_ip
+++ b/src/test/ipams/netbox/expected.update_ip
diff --git a/test/ipams/netbox/ipam_config b/src/test/ipams/netbox/ipam_config
index a33be30..a33be30 100644
--- a/test/ipams/netbox/ipam_config
+++ b/src/test/ipams/netbox/ipam_config
diff --git a/test/ipams/netbox/sdn_config b/src/test/ipams/netbox/sdn_config
index c31847b..c31847b 100644
--- a/test/ipams/netbox/sdn_config
+++ b/src/test/ipams/netbox/sdn_config
diff --git a/test/ipams/phpipam/expected.add_ip b/src/test/ipams/phpipam/expected.add_ip
index 50af460..50af460 100644
--- a/test/ipams/phpipam/expected.add_ip
+++ b/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
index 7a91359..7a91359 100644
--- a/test/ipams/phpipam/expected.add_ip_notgateway
+++ b/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
index d72f94f..d72f94f 100644
--- a/test/ipams/phpipam/expected.add_next_freeip
+++ b/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
index b10cc5a..b10cc5a 100644
--- a/test/ipams/phpipam/expected.add_subnet
+++ b/src/test/ipams/phpipam/expected.add_subnet
diff --git a/test/ipams/phpipam/expected.del_ip b/src/test/ipams/phpipam/expected.del_ip
index 72e83cb..72e83cb 100644
--- a/test/ipams/phpipam/expected.del_ip
+++ b/src/test/ipams/phpipam/expected.del_ip
diff --git a/test/ipams/phpipam/expected.del_subnet b/src/test/ipams/phpipam/expected.del_subnet
index 349a34f..349a34f 100644
--- a/test/ipams/phpipam/expected.del_subnet
+++ b/src/test/ipams/phpipam/expected.del_subnet
diff --git a/test/ipams/phpipam/expected.update_ip b/src/test/ipams/phpipam/expected.update_ip
index 96c219b..96c219b 100644
--- a/test/ipams/phpipam/expected.update_ip
+++ b/src/test/ipams/phpipam/expected.update_ip
diff --git a/test/ipams/phpipam/ipam_config b/src/test/ipams/phpipam/ipam_config
index a33be30..a33be30 100644
--- a/test/ipams/phpipam/ipam_config
+++ b/src/test/ipams/phpipam/ipam_config
diff --git a/test/ipams/phpipam/sdn_config b/src/test/ipams/phpipam/sdn_config
index c774807..c774807 100644
--- a/test/ipams/phpipam/sdn_config
+++ b/src/test/ipams/phpipam/sdn_config
diff --git a/test/run_test_dns.pl b/src/test/run_test_dns.pl
index 87e011e..87e011e 100755
--- a/test/run_test_dns.pl
+++ b/src/test/run_test_dns.pl
diff --git a/test/run_test_ipams.pl b/src/test/run_test_ipams.pl
index 27bd441..27bd441 100755
--- a/test/run_test_ipams.pl
+++ b/src/test/run_test_ipams.pl
diff --git a/test/run_test_subnets.pl b/src/test/run_test_subnets.pl
index f6564e1..f6564e1 100755
--- a/test/run_test_subnets.pl
+++ b/src/test/run_test_subnets.pl
diff --git a/test/run_test_vnets.pl b/src/test/run_test_vnets.pl
index 5aeb676..5aeb676 100755
--- a/test/run_test_vnets.pl
+++ b/src/test/run_test_vnets.pl
diff --git a/test/run_test_zones.pl b/src/test/run_test_zones.pl
index 12e017a..12e017a 100755
--- a/test/run_test_zones.pl
+++ b/src/test/run_test_zones.pl
diff --git a/test/subnets/ipv4/ipam_config b/src/test/subnets/ipv4/ipam_config
index a33be30..a33be30 100644
--- a/test/subnets/ipv4/ipam_config
+++ b/src/test/subnets/ipv4/ipam_config
diff --git a/test/subnets/ipv4/sdn_config b/src/test/subnets/ipv4/sdn_config
index 72697d4..72697d4 100644
--- a/test/subnets/ipv4/sdn_config
+++ b/src/test/subnets/ipv4/sdn_config
diff --git a/test/subnets/ipv6/ipam_config b/src/test/subnets/ipv6/ipam_config
index a33be30..a33be30 100644
--- a/test/subnets/ipv6/ipam_config
+++ b/src/test/subnets/ipv6/ipam_config
diff --git a/test/subnets/ipv6/sdn_config b/src/test/subnets/ipv6/sdn_config
index 618f234..618f234 100644
--- a/test/subnets/ipv6/sdn_config
+++ b/src/test/subnets/ipv6/sdn_config
diff --git a/test/subnets/noipam/ipam_config b/src/test/subnets/noipam/ipam_config
index a33be30..a33be30 100644
--- a/test/subnets/noipam/ipam_config
+++ b/src/test/subnets/noipam/ipam_config
diff --git a/test/subnets/noipam/sdn_config b/src/test/subnets/noipam/sdn_config
index 55107d6..55107d6 100644
--- a/test/subnets/noipam/sdn_config
+++ b/src/test/subnets/noipam/sdn_config
diff --git a/test/vnets/ipv4/ipam.db b/src/test/vnets/ipv4/ipam.db
index ef3fa93..ef3fa93 100644
--- a/test/vnets/ipv4/ipam.db
+++ b/src/test/vnets/ipv4/ipam.db
diff --git a/test/vnets/ipv4/ipam_config b/src/test/vnets/ipv4/ipam_config
index f5f36ad..f5f36ad 100644
--- a/test/vnets/ipv4/ipam_config
+++ b/src/test/vnets/ipv4/ipam_config
diff --git a/test/vnets/ipv4/sdn_config b/src/test/vnets/ipv4/sdn_config
index ee11fd1..ee11fd1 100644
--- a/test/vnets/ipv4/sdn_config
+++ b/src/test/vnets/ipv4/sdn_config
diff --git a/test/vnets/ipv4noipam/ipam.db b/src/test/vnets/ipv4noipam/ipam.db
index ef3fa93..ef3fa93 100644
--- a/test/vnets/ipv4noipam/ipam.db
+++ b/src/test/vnets/ipv4noipam/ipam.db
diff --git a/test/vnets/ipv4noipam/ipam_config b/src/test/vnets/ipv4noipam/ipam_config
index f5f36ad..f5f36ad 100644
--- a/test/vnets/ipv4noipam/ipam_config
+++ b/src/test/vnets/ipv4noipam/ipam_config
diff --git a/test/vnets/ipv4noipam/sdn_config b/src/test/vnets/ipv4noipam/sdn_config
index 470c1ae..470c1ae 100644
--- a/test/vnets/ipv4noipam/sdn_config
+++ b/src/test/vnets/ipv4noipam/sdn_config
diff --git a/test/vnets/ipv6/ipam.db b/src/test/vnets/ipv6/ipam.db
index d3f2ce9..d3f2ce9 100644
--- a/test/vnets/ipv6/ipam.db
+++ b/src/test/vnets/ipv6/ipam.db
diff --git a/test/vnets/ipv6/ipam_config b/src/test/vnets/ipv6/ipam_config
index f5f36ad..f5f36ad 100644
--- a/test/vnets/ipv6/ipam_config
+++ b/src/test/vnets/ipv6/ipam_config
diff --git a/test/vnets/ipv6/sdn_config b/src/test/vnets/ipv6/sdn_config
index 231ca8a..231ca8a 100644
--- a/test/vnets/ipv6/sdn_config
+++ b/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
index 82b06b4..82b06b4 100644
--- a/test/zones/evpn/advertise_subnets/expected_controller_config
+++ b/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
index 9d1c64c..9d1c64c 100644
--- a/test/zones/evpn/advertise_subnets/expected_sdn_interfaces
+++ b/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
index 66bb826..66bb826 100644
--- a/test/zones/evpn/advertise_subnets/interfaces
+++ b/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
index 76f16a1..76f16a1 100644
--- a/test/zones/evpn/advertise_subnets/sdn_config
+++ b/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
index bd7830a..bd7830a 100644
--- a/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config
+++ b/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
index bbde906..bbde906 100644
--- a/test/zones/evpn/disable_arp_nd_suppression/expected_sdn_interfaces
+++ b/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
index 66bb826..66bb826 100644
--- a/test/zones/evpn/disable_arp_nd_suppression/interfaces
+++ b/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
index 199596b..199596b 100644
--- a/test/zones/evpn/disable_arp_nd_suppression/sdn_config
+++ b/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
index ccc0b28..ccc0b28 100644
--- a/test/zones/evpn/ebgp/expected_controller_config
+++ b/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
index 4cf13e0..4cf13e0 100644
--- a/test/zones/evpn/ebgp/expected_sdn_interfaces
+++ b/src/test/zones/evpn/ebgp/expected_sdn_interfaces
diff --git a/test/zones/evpn/ebgp/interfaces b/src/test/zones/evpn/ebgp/interfaces
index 66bb826..66bb826 100644
--- a/test/zones/evpn/ebgp/interfaces
+++ b/src/test/zones/evpn/ebgp/interfaces
diff --git a/test/zones/evpn/ebgp/sdn_config b/src/test/zones/evpn/ebgp/sdn_config
index 6e9d116..6e9d116 100644
--- a/test/zones/evpn/ebgp/sdn_config
+++ b/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
index 548d532..548d532 100644
--- a/test/zones/evpn/ebgp_loopback/expected_controller_config
+++ b/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
index 4cf13e0..4cf13e0 100644
--- a/test/zones/evpn/ebgp_loopback/expected_sdn_interfaces
+++ b/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
index f6bc352..f6bc352 100644
--- a/test/zones/evpn/ebgp_loopback/interfaces
+++ b/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
index c8bc2e0..c8bc2e0 100644
--- a/test/zones/evpn/ebgp_loopback/sdn_config
+++ b/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
index 48830a3..48830a3 100644
--- a/test/zones/evpn/exitnode/expected_controller_config
+++ b/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
index 5ab3084..5ab3084 100644
--- a/test/zones/evpn/exitnode/expected_sdn_interfaces
+++ b/src/test/zones/evpn/exitnode/expected_sdn_interfaces
diff --git a/test/zones/evpn/exitnode/interfaces b/src/test/zones/evpn/exitnode/interfaces
index 66bb826..66bb826 100644
--- a/test/zones/evpn/exitnode/interfaces
+++ b/src/test/zones/evpn/exitnode/interfaces
diff --git a/test/zones/evpn/exitnode/sdn_config b/src/test/zones/evpn/exitnode/sdn_config
index fd81817..fd81817 100644
--- a/test/zones/evpn/exitnode/sdn_config
+++ b/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
index f671b63..f671b63 100644
--- a/test/zones/evpn/exitnode_local_routing/expected_controller_config
+++ b/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
index 301f5b3..301f5b3 100644
--- a/test/zones/evpn/exitnode_local_routing/expected_sdn_interfaces
+++ b/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
index 66bb826..66bb826 100644
--- a/test/zones/evpn/exitnode_local_routing/interfaces
+++ b/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
index f5f7ca1..f5f7ca1 100644
--- a/test/zones/evpn/exitnode_local_routing/sdn_config
+++ b/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
index e45b22c..e45b22c 100644
--- a/test/zones/evpn/exitnode_primary/expected_controller_config
+++ b/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
index 5ab3084..5ab3084 100644
--- a/test/zones/evpn/exitnode_primary/expected_sdn_interfaces
+++ b/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
index 66bb826..66bb826 100644
--- a/test/zones/evpn/exitnode_primary/interfaces
+++ b/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
index bfeafc5..bfeafc5 100644
--- a/test/zones/evpn/exitnode_primary/sdn_config
+++ b/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
index 48830a3..48830a3 100644
--- a/test/zones/evpn/exitnode_snat/expected_controller_config
+++ b/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
index 47df77a..47df77a 100644
--- a/test/zones/evpn/exitnode_snat/expected_sdn_interfaces
+++ b/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
index 66bb826..66bb826 100644
--- a/test/zones/evpn/exitnode_snat/interfaces
+++ b/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
index 35cdf5d..35cdf5d 100644
--- a/test/zones/evpn/exitnode_snat/sdn_config
+++ b/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
index bd7830a..bd7830a 100644
--- a/test/zones/evpn/ipv4/expected_controller_config
+++ b/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
index 9d1c64c..9d1c64c 100644
--- a/test/zones/evpn/ipv4/expected_sdn_interfaces
+++ b/src/test/zones/evpn/ipv4/expected_sdn_interfaces
diff --git a/test/zones/evpn/ipv4/interfaces b/src/test/zones/evpn/ipv4/interfaces
index 66bb826..66bb826 100644
--- a/test/zones/evpn/ipv4/interfaces
+++ b/src/test/zones/evpn/ipv4/interfaces
diff --git a/test/zones/evpn/ipv4/sdn_config b/src/test/zones/evpn/ipv4/sdn_config
index dd73b5c..dd73b5c 100644
--- a/test/zones/evpn/ipv4/sdn_config
+++ b/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
index bd7830a..bd7830a 100644
--- a/test/zones/evpn/ipv4ipv6/expected_controller_config
+++ b/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
index 7a5d741..7a5d741 100644
--- a/test/zones/evpn/ipv4ipv6/expected_sdn_interfaces
+++ b/src/test/zones/evpn/ipv4ipv6/expected_sdn_interfaces
diff --git a/test/zones/evpn/ipv4ipv6/interfaces b/src/test/zones/evpn/ipv4ipv6/interfaces
index 66bb826..66bb826 100644
--- a/test/zones/evpn/ipv4ipv6/interfaces
+++ b/src/test/zones/evpn/ipv4ipv6/interfaces
diff --git a/test/zones/evpn/ipv4ipv6/sdn_config b/src/test/zones/evpn/ipv4ipv6/sdn_config
index 4583818..4583818 100644
--- a/test/zones/evpn/ipv4ipv6/sdn_config
+++ b/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
index bd7830a..bd7830a 100644
--- a/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config
+++ b/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
index 378fa77..378fa77 100644
--- a/test/zones/evpn/ipv4ipv6nogateway/expected_sdn_interfaces
+++ b/src/test/zones/evpn/ipv4ipv6nogateway/expected_sdn_interfaces
diff --git a/test/zones/evpn/ipv4ipv6nogateway/interfaces b/src/test/zones/evpn/ipv4ipv6nogateway/interfaces
index 66bb826..66bb826 100644
--- a/test/zones/evpn/ipv4ipv6nogateway/interfaces
+++ b/src/test/zones/evpn/ipv4ipv6nogateway/interfaces
diff --git a/test/zones/evpn/ipv4ipv6nogateway/sdn_config b/src/test/zones/evpn/ipv4ipv6nogateway/sdn_config
index ab2273f..ab2273f 100644
--- a/test/zones/evpn/ipv4ipv6nogateway/sdn_config
+++ b/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
index bd7830a..bd7830a 100644
--- a/test/zones/evpn/ipv6/expected_controller_config
+++ b/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
index b2bdbfe..b2bdbfe 100644
--- a/test/zones/evpn/ipv6/expected_sdn_interfaces
+++ b/src/test/zones/evpn/ipv6/expected_sdn_interfaces
diff --git a/test/zones/evpn/ipv6/interfaces b/src/test/zones/evpn/ipv6/interfaces
index 66bb826..66bb826 100644
--- a/test/zones/evpn/ipv6/interfaces
+++ b/src/test/zones/evpn/ipv6/interfaces
diff --git a/test/zones/evpn/ipv6/sdn_config b/src/test/zones/evpn/ipv6/sdn_config
index 949e886..949e886 100644
--- a/test/zones/evpn/ipv6/sdn_config
+++ b/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
index 2d1ad44..2d1ad44 100644
--- a/test/zones/evpn/multipath_relax/expected_controller_config
+++ b/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
index 4cf13e0..4cf13e0 100644
--- a/test/zones/evpn/multipath_relax/expected_sdn_interfaces
+++ b/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
index 66bb826..66bb826 100644
--- a/test/zones/evpn/multipath_relax/interfaces
+++ b/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
index 5a1d8a7..5a1d8a7 100644
--- a/test/zones/evpn/multipath_relax/sdn_config
+++ b/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
index f4f28dd..f4f28dd 100644
--- a/test/zones/evpn/rt_import/expected_controller_config
+++ b/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
index 9d1c64c..9d1c64c 100644
--- a/test/zones/evpn/rt_import/expected_sdn_interfaces
+++ b/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
index 66bb826..66bb826 100644
--- a/test/zones/evpn/rt_import/interfaces
+++ b/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
index b62bb2e..b62bb2e 100644
--- a/test/zones/evpn/rt_import/sdn_config
+++ b/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
index 58a0e23..58a0e23 100644
--- a/test/zones/qinq/bridge/expected_sdn_interfaces
+++ b/src/test/zones/qinq/bridge/expected_sdn_interfaces
diff --git a/test/zones/qinq/bridge/interfaces b/src/test/zones/qinq/bridge/interfaces
index 68b6a88..68b6a88 100644
--- a/test/zones/qinq/bridge/interfaces
+++ b/src/test/zones/qinq/bridge/interfaces
diff --git a/test/zones/qinq/bridge/sdn_config b/src/test/zones/qinq/bridge/sdn_config
index 6321603..6321603 100644
--- a/test/zones/qinq/bridge/sdn_config
+++ b/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
index cfa43a2..cfa43a2 100644
--- a/test/zones/qinq/bridge_notagvnet/expected_sdn_interfaces
+++ b/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
index 68b6a88..68b6a88 100644
--- a/test/zones/qinq/bridge_notagvnet/interfaces
+++ b/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
index 1f40369..1f40369 100644
--- a/test/zones/qinq/bridge_notagvnet/sdn_config
+++ b/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
index c325dec..c325dec 100644
--- a/test/zones/qinq/bridge_vlanaware/expected_sdn_interfaces
+++ b/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
index cfdfafe..cfdfafe 100644
--- a/test/zones/qinq/bridge_vlanaware/interfaces
+++ b/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
index 6321603..6321603 100644
--- a/test/zones/qinq/bridge_vlanaware/sdn_config
+++ b/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
index cd87a3a..cd87a3a 100644
--- a/test/zones/qinq/bridge_vlanaware_notagvnet/expected_sdn_interfaces
+++ b/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
index cfdfafe..cfdfafe 100644
--- a/test/zones/qinq/bridge_vlanaware_notagvnet/interfaces
+++ b/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
index 2382f4d..2382f4d 100644
--- a/test/zones/qinq/bridge_vlanaware_notagvnet/sdn_config
+++ b/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
index 28d215b..28d215b 100644
--- a/test/zones/qinq/bridge_vlanaware_vlanawarevnet/expected_sdn_interfaces
+++ b/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
index cfdfafe..cfdfafe 100644
--- a/test/zones/qinq/bridge_vlanaware_vlanawarevnet/interfaces
+++ b/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
index c013176..c013176 100644
--- a/test/zones/qinq/bridge_vlanaware_vlanawarevnet/sdn_config
+++ b/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
index 0bc301b..0bc301b 100644
--- a/test/zones/qinq/bridge_vlanaware_vlanprotocol/expected_sdn_interfaces
+++ b/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
index cfdfafe..cfdfafe 100644
--- a/test/zones/qinq/bridge_vlanaware_vlanprotocol/interfaces
+++ b/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
index 20a8a51..20a8a51 100644
--- a/test/zones/qinq/bridge_vlanaware_vlanprotocol/sdn_config
+++ b/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
index bde23d9..bde23d9 100644
--- a/test/zones/qinq/bridge_vlanawarevnet/expected_sdn_interfaces
+++ b/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
index 68b6a88..68b6a88 100644
--- a/test/zones/qinq/bridge_vlanawarevnet/interfaces
+++ b/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
index c013176..c013176 100644
--- a/test/zones/qinq/bridge_vlanawarevnet/sdn_config
+++ b/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
index 6b59164..6b59164 100644
--- a/test/zones/qinq/bridge_vlanprotocol/expected_sdn_interfaces
+++ b/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
index 68b6a88..68b6a88 100644
--- a/test/zones/qinq/bridge_vlanprotocol/interfaces
+++ b/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
index 20a8a51..20a8a51 100644
--- a/test/zones/qinq/bridge_vlanprotocol/sdn_config
+++ b/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
index d25b2a8..d25b2a8 100644
--- a/test/zones/qinq/ovs/expected_sdn_interfaces
+++ b/src/test/zones/qinq/ovs/expected_sdn_interfaces
diff --git a/test/zones/qinq/ovs/interfaces b/src/test/zones/qinq/ovs/interfaces
index 14d2f1e..14d2f1e 100644
--- a/test/zones/qinq/ovs/interfaces
+++ b/src/test/zones/qinq/ovs/interfaces
diff --git a/test/zones/qinq/ovs/sdn_config b/src/test/zones/qinq/ovs/sdn_config
index 6321603..6321603 100644
--- a/test/zones/qinq/ovs/sdn_config
+++ b/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
index 5f47b28..5f47b28 100644
--- a/test/zones/qinq/ovs_notagvnet/expected_sdn_interfaces
+++ b/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
index 14d2f1e..14d2f1e 100644
--- a/test/zones/qinq/ovs_notagvnet/interfaces
+++ b/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
index 2382f4d..2382f4d 100644
--- a/test/zones/qinq/ovs_notagvnet/sdn_config
+++ b/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
index d69d38c..d69d38c 100644
--- a/test/zones/qinq/ovs_vlanawarevnet/expected_sdn_interfaces
+++ b/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
index 14d2f1e..14d2f1e 100644
--- a/test/zones/qinq/ovs_vlanawarevnet/interfaces
+++ b/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
index c013176..c013176 100644
--- a/test/zones/qinq/ovs_vlanawarevnet/sdn_config
+++ b/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
index aeefec9..aeefec9 100644
--- a/test/zones/qinq/ovs_vlanprotocol/expected_sdn_interfaces
+++ b/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
index 14d2f1e..14d2f1e 100644
--- a/test/zones/qinq/ovs_vlanprotocol/interfaces
+++ b/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
index 20a8a51..20a8a51 100644
--- a/test/zones/qinq/ovs_vlanprotocol/sdn_config
+++ b/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
index 1e0c2c7..1e0c2c7 100644
--- a/test/zones/simple/basic/expected_sdn_interfaces
+++ b/src/test/zones/simple/basic/expected_sdn_interfaces
diff --git a/test/zones/simple/basic/interfaces b/src/test/zones/simple/basic/interfaces
index 68b6a88..68b6a88 100644
--- a/test/zones/simple/basic/interfaces
+++ b/src/test/zones/simple/basic/interfaces
diff --git a/test/zones/simple/basic/sdn_config b/src/test/zones/simple/basic/sdn_config
index 527dcba..527dcba 100644
--- a/test/zones/simple/basic/sdn_config
+++ b/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
index f47ac53..f47ac53 100644
--- a/test/zones/simple/hetzner/expected_sdn_interfaces
+++ b/src/test/zones/simple/hetzner/expected_sdn_interfaces
diff --git a/test/zones/simple/hetzner/interfaces b/src/test/zones/simple/hetzner/interfaces
index 5ab9635..5ab9635 100644
--- a/test/zones/simple/hetzner/interfaces
+++ b/src/test/zones/simple/hetzner/interfaces
diff --git a/test/zones/simple/hetzner/sdn_config b/src/test/zones/simple/hetzner/sdn_config
index 30773ca..30773ca 100644
--- a/test/zones/simple/hetzner/sdn_config
+++ b/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
index 06e43ad..06e43ad 100644
--- a/test/zones/simple/ipv4/expected_sdn_interfaces
+++ b/src/test/zones/simple/ipv4/expected_sdn_interfaces
diff --git a/test/zones/simple/ipv4/interfaces b/src/test/zones/simple/ipv4/interfaces
index 68b6a88..68b6a88 100644
--- a/test/zones/simple/ipv4/interfaces
+++ b/src/test/zones/simple/ipv4/interfaces
diff --git a/test/zones/simple/ipv4/sdn_config b/src/test/zones/simple/ipv4/sdn_config
index dd77b75..dd77b75 100644
--- a/test/zones/simple/ipv4/sdn_config
+++ b/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
index 69d7986..69d7986 100644
--- a/test/zones/simple/ipv4snat/expected_sdn_interfaces
+++ b/src/test/zones/simple/ipv4snat/expected_sdn_interfaces
diff --git a/test/zones/simple/ipv4snat/interfaces b/src/test/zones/simple/ipv4snat/interfaces
index 66bb826..66bb826 100644
--- a/test/zones/simple/ipv4snat/interfaces
+++ b/src/test/zones/simple/ipv4snat/interfaces
diff --git a/test/zones/simple/ipv4snat/sdn_config b/src/test/zones/simple/ipv4snat/sdn_config
index 5936d7d..5936d7d 100644
--- a/test/zones/simple/ipv4snat/sdn_config
+++ b/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
index 34ed5db..34ed5db 100644
--- a/test/zones/simple/ipv4v6/expected_sdn_interfaces
+++ b/src/test/zones/simple/ipv4v6/expected_sdn_interfaces
diff --git a/test/zones/simple/ipv4v6/interfaces b/src/test/zones/simple/ipv4v6/interfaces
index 68b6a88..68b6a88 100644
--- a/test/zones/simple/ipv4v6/interfaces
+++ b/src/test/zones/simple/ipv4v6/interfaces
diff --git a/test/zones/simple/ipv4v6/sdn_config b/src/test/zones/simple/ipv4v6/sdn_config
index b8ed848..b8ed848 100644
--- a/test/zones/simple/ipv4v6/sdn_config
+++ b/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
index 1e0c2c7..1e0c2c7 100644
--- a/test/zones/simple/ipv4v6nogateway/expected_sdn_interfaces
+++ b/src/test/zones/simple/ipv4v6nogateway/expected_sdn_interfaces
diff --git a/test/zones/simple/ipv4v6nogateway/interfaces b/src/test/zones/simple/ipv4v6nogateway/interfaces
index 68b6a88..68b6a88 100644
--- a/test/zones/simple/ipv4v6nogateway/interfaces
+++ b/src/test/zones/simple/ipv4v6nogateway/interfaces
diff --git a/test/zones/simple/ipv4v6nogateway/sdn_config b/src/test/zones/simple/ipv4v6nogateway/sdn_config
index dbd75c9..dbd75c9 100644
--- a/test/zones/simple/ipv4v6nogateway/sdn_config
+++ b/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
index d3adc24..d3adc24 100644
--- a/test/zones/simple/ipv6snat/expected_sdn_interfaces
+++ b/src/test/zones/simple/ipv6snat/expected_sdn_interfaces
diff --git a/test/zones/simple/ipv6snat/interfaces b/src/test/zones/simple/ipv6snat/interfaces
index 66bb826..66bb826 100644
--- a/test/zones/simple/ipv6snat/interfaces
+++ b/src/test/zones/simple/ipv6snat/interfaces
diff --git a/test/zones/simple/ipv6snat/sdn_config b/src/test/zones/simple/ipv6snat/sdn_config
index bc38527..bc38527 100644
--- a/test/zones/simple/ipv6snat/sdn_config
+++ b/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
index f9e96d1..f9e96d1 100644
--- a/test/zones/vlan/bridge/expected_sdn_interfaces
+++ b/src/test/zones/vlan/bridge/expected_sdn_interfaces
diff --git a/test/zones/vlan/bridge/interfaces b/src/test/zones/vlan/bridge/interfaces
index 68b6a88..68b6a88 100644
--- a/test/zones/vlan/bridge/interfaces
+++ b/src/test/zones/vlan/bridge/interfaces
diff --git a/test/zones/vlan/bridge/sdn_config b/src/test/zones/vlan/bridge/sdn_config
index c6cfaaa..c6cfaaa 100644
--- a/test/zones/vlan/bridge/sdn_config
+++ b/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
index a318c7a..a318c7a 100644
--- a/test/zones/vlan/bridge_vlanaware/expected_sdn_interfaces
+++ b/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
index cfdfafe..cfdfafe 100644
--- a/test/zones/vlan/bridge_vlanaware/interfaces
+++ b/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
index c6cfaaa..c6cfaaa 100644
--- a/test/zones/vlan/bridge_vlanaware/sdn_config
+++ b/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
index ebf9d2e..ebf9d2e 100644
--- a/test/zones/vlan/bridge_vlanaware_vlanawarevnet/expected_sdn_interfaces
+++ b/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
index 64eec9e..64eec9e 100644
--- a/test/zones/vlan/bridge_vlanaware_vlanawarevnet/interfaces
+++ b/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
index 67068f9..67068f9 100644
--- a/test/zones/vlan/bridge_vlanaware_vlanawarevnet/sdn_config
+++ b/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
index 044559e..044559e 100644
--- a/test/zones/vlan/ovs/expected_sdn_interfaces
+++ b/src/test/zones/vlan/ovs/expected_sdn_interfaces
diff --git a/test/zones/vlan/ovs/interfaces b/src/test/zones/vlan/ovs/interfaces
index 14d2f1e..14d2f1e 100644
--- a/test/zones/vlan/ovs/interfaces
+++ b/src/test/zones/vlan/ovs/interfaces
diff --git a/test/zones/vlan/ovs/sdn_config b/src/test/zones/vlan/ovs/sdn_config
index c6cfaaa..c6cfaaa 100644
--- a/test/zones/vlan/ovs/sdn_config
+++ b/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
index 7bb73b6..7bb73b6 100644
--- a/test/zones/vlan/ovs_vlanware_vnet/expected_sdn_interfaces
+++ b/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
index 14d2f1e..14d2f1e 100644
--- a/test/zones/vlan/ovs_vlanware_vnet/interfaces
+++ b/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
index 9cfdb52..9cfdb52 100644
--- a/test/zones/vlan/ovs_vlanware_vnet/sdn_config
+++ b/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
index 7b73c3e..7b73c3e 100644
--- a/test/zones/vxlan/basic/expected_sdn_interfaces
+++ b/src/test/zones/vxlan/basic/expected_sdn_interfaces
diff --git a/test/zones/vxlan/basic/interfaces b/src/test/zones/vxlan/basic/interfaces
index 66bb826..66bb826 100644
--- a/test/zones/vxlan/basic/interfaces
+++ b/src/test/zones/vxlan/basic/interfaces
diff --git a/test/zones/vxlan/basic/sdn_config b/src/test/zones/vxlan/basic/sdn_config
index f929304..f929304 100644
--- a/test/zones/vxlan/basic/sdn_config
+++ b/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
index 55cdf9c..55cdf9c 100644
--- a/test/zones/vxlan/vlanawarevnet/expected_sdn_interfaces
+++ b/src/test/zones/vxlan/vlanawarevnet/expected_sdn_interfaces
diff --git a/test/zones/vxlan/vlanawarevnet/interfaces b/src/test/zones/vxlan/vlanawarevnet/interfaces
index 66bb826..66bb826 100644
--- a/test/zones/vxlan/vlanawarevnet/interfaces
+++ b/src/test/zones/vxlan/vlanawarevnet/interfaces
diff --git a/test/zones/vxlan/vlanawarevnet/sdn_config b/src/test/zones/vxlan/vlanawarevnet/sdn_config
index 23fb557..23fb557 100644
--- a/test/zones/vxlan/vlanawarevnet/sdn_config
+++ b/src/test/zones/vxlan/vlanawarevnet/sdn_config