From 3b04bcb3aca0e998363a4ecc57a5d0d4a8aa8f77 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Tue, 4 Jun 2019 07:03:42 +0200 Subject: [PATCH] generateconfig test: remove verify merge config we can check conflict with ifquery now Signed-off-by: Alexandre Derumier --- test/generateconfig.pl | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/test/generateconfig.pl b/test/generateconfig.pl index cf55192..fa4e74f 100644 --- a/test/generateconfig.pl +++ b/test/generateconfig.pl @@ -16,7 +16,6 @@ PVE::Network::Network::Plugin->init(); my $rawconfig = generate_network_config(); print $rawconfig; -verify_merged_config($rawconfig); write_final_config($rawconfig); sub generate_network_config { @@ -68,26 +67,6 @@ sub generate_network_config { return $rawconfig; } -#implement reload (split and reuse code from API2/Network.pm for bridge delete verification) - -sub verify_merged_config { - my ($rawconfig) = @_; - - #merge main network intefaces and vnet file for possible conflict verification - my $tmp_merged_network_interfaces = "/var/tmp/pve-merged_network_interfaces"; - copy("/etc/network/interfaces", $tmp_merged_network_interfaces); - - my $writefh = IO::File->new($tmp_merged_network_interfaces, '>>'); - print $writefh $rawconfig; - $writefh->close(); - - my $readfh = IO::File->new($tmp_merged_network_interfaces); - my $merged_interfaces_config = PVE::INotify::read_etc_network_interfaces(1,$readfh); - $readfh->close(); - unlink $tmp_merged_network_interfaces; - PVE::INotify::__write_etc_network_interfaces($merged_interfaces_config, 1); - -} sub write_final_config { my ($rawconfig) = @_; -- 2.39.5