From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7C9ECB8857 for ; Tue, 5 Dec 2023 14:14:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5E1AB1B3AF for ; Tue, 5 Dec 2023 14:13:44 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 5 Dec 2023 14:13:43 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7FB7444C8E for ; Tue, 5 Dec 2023 14:13:43 +0100 (CET) From: Stefan Lendl To: pve-devel@lists.proxmox.com Date: Tue, 5 Dec 2023 14:12:09 +0100 Message-ID: <20231205131209.1813439-5-s.lendl@proxmox.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205131209.1813439-2-s.lendl@proxmox.com> References: <20231205131209.1813439-2-s.lendl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.039 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-network 3/4] tests: mocking more functions to avoid access to system files X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2023 13:14:14 -0000 previously extracted functions are now mocked in the zone tests mocked PVE::Network::SDN::Controllers::read_etc_network_interfaces and also INotify::read_etc_network_interfaces to return the same $interfaces_config created a mock for several PVE::Network::SDN::Controllers::Plugin methods that would require system access. Just to be sure. Added a note that mocking INotify::read_file is a HACK and not garanteed to work if anything other than /etc/network/interfaces is read. Signed-off-by: Stefan Lendl --- src/test/run_test_zones.pl | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/src/test/run_test_zones.pl b/src/test/run_test_zones.pl index ce8edc2..2d9be88 100755 --- a/src/test/run_test_zones.pl +++ b/src/test/run_test_zones.pl @@ -14,6 +14,10 @@ use PVE::Network::SDN::Zones; use PVE::Network::SDN::Controllers; use PVE::INotify; +use Data::Dumper qw(Dumper); +$Data::Dumper::Sortkeys = 1; +$Data::Dumper::Indent = 1; + sub read_sdn_config { my ($file) = @_; @@ -29,7 +33,6 @@ sub read_sdn_config { return $sdn_config; } - my @tests = grep { -d } glob './zones/*/*'; foreach my $test (@tests) { @@ -47,8 +50,20 @@ foreach my $test (@tests) { return 'localhost'; }, read_file => sub { + # HACK this assumes we are always calling PVE::INotify::read_file('interfaces'); return $interfaces_config; }, + read_etc_network_interfaces => sub { + return $interfaces_config; + }, + ); + + my $mocked_pve_sdn_controllers; + $mocked_pve_sdn_controllers = Test::MockModule->new('PVE::Network::SDN::Controllers'); + $mocked_pve_sdn_controllers->mock( + read_etc_network_interfaces => sub { + return $interfaces_config; + } ); my $pve_sdn_subnets; @@ -88,6 +103,25 @@ foreach my $test (@tests) { }, ); + my ($first_plugin) = %{$sdn_config->{controllers}->{ids}} if defined $sdn_config->{controllers}; + if ($first_plugin) { + my $controller_plugin = PVE::Network::SDN::Controllers::Plugin->lookup( + $sdn_config->{controllers}->{ids}->{$first_plugin}->{type} + ); + my $mocked_controller_plugin = Test::MockModule->new($controller_plugin); + $mocked_controller_plugin->mock( + write_controller_config => sub { + return; + }, + reload_controller => sub { + return; + }, + read_local_frr_config => sub { + return; + }, + ); + } + my $name = $test; my $expected = read_file("./$test/expected_sdn_interfaces"); -- 2.42.0