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 B31C2924D6 for ; Fri, 5 Apr 2024 15:18:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7A9BC14223 for ; Fri, 5 Apr 2024 15:18:24 +0200 (CEST) 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 ; Fri, 5 Apr 2024 15:18:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3A39E465DD for ; Fri, 5 Apr 2024 15:18:21 +0200 (CEST) From: Stefan Lendl To: pve-devel@lists.proxmox.com Date: Fri, 5 Apr 2024 15:18:05 +0200 Message-ID: <20240405131806.388178-13-s.lendl@proxmox.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405131806.388178-1-s.lendl@proxmox.com> References: <20240405131806.388178-1-s.lendl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 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 Subject: [pve-devel] [PATCH v3 pve-network 12/12] tests: remove old Vnets tests 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: Fri, 05 Apr 2024 13:18:54 -0000 The did not work and were primarily testing against internal state. Signed-off-by: Stefan Lendl Reviewed-by: Max Carrara Tested-by: Max Carrara Reviewed-by: Stefan Hanreich Tested-by: Stefan Hanreich --- src/test/run_test_vnets.pl | 343 ------------------------------------- 1 file changed, 343 deletions(-) delete mode 100755 src/test/run_test_vnets.pl diff --git a/src/test/run_test_vnets.pl b/src/test/run_test_vnets.pl deleted file mode 100755 index 65fbfb7..0000000 --- a/src/test/run_test_vnets.pl +++ /dev/null @@ -1,343 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; - -use lib qw(..); -use File::Slurp; -use NetAddr::IP qw(:lower); - -use Test::More; -use Test::MockModule; - -use PVE::Network::SDN; -use PVE::Network::SDN::Zones; -use PVE::Network::SDN::Controllers; -use PVE::INotify; -use JSON; - -use Data::Dumper qw(Dumper); -$Data::Dumper::Sortkeys = 1; - -sub read_sdn_config { - my ($file) = @_; - - # Read structure back in again - open my $in, '<', $file or die $!; - my $sdn_config; - { - local $/; # slurp mode - $sdn_config = eval <$in>; - } - close $in; - return $sdn_config; -} - -my @plugins = read_dir('./vnets/', prefix => 1); - -foreach my $path (@plugins) { - - my (undef, $testid) = split(/\//, $path); - - print "test: $testid\n"; - my $sdn_config = read_sdn_config("$path/sdn_config"); - - my $pve_sdn_zones; - $pve_sdn_zones = Test::MockModule->new('PVE::Network::SDN::Zones'); - $pve_sdn_zones->mock( - config => sub { - return $sdn_config->{zones}; - }, - ); - - my $pve_sdn_vnets; - $pve_sdn_vnets = Test::MockModule->new('PVE::Network::SDN::Vnets'); - $pve_sdn_vnets->mock( - config => sub { - return $sdn_config->{vnets}; - }, - ); - - my $pve_sdn_subnets; - $pve_sdn_subnets = Test::MockModule->new('PVE::Network::SDN::Subnets'); - $pve_sdn_subnets->mock( - config => sub { - return $sdn_config->{subnets}; - }, - verify_dns_zone => sub { - return; - }, - add_dns_record => sub { - return; - }, - ); - - my $js = JSON->new; - $js->canonical(1); - - #test params; - #test params; - my $subnets = $sdn_config->{subnets}->{ids}; - - my $subnetid = (sort keys %{$subnets})[0]; - my $subnet = - PVE::Network::SDN::Subnets::sdn_subnets_config($sdn_config->{subnets}, $subnetid, 1); - my $subnet_cidr = $subnet->{cidr}; - my $iplist = NetAddr::IP->new($subnet_cidr); - my $mask = $iplist->masklen(); - my $ipversion = undef; - - if (Net::IP::ip_is_ipv4($iplist->canon())) { - $iplist++; #skip network address for ipv4 - $ipversion = 4; - } else { - $ipversion = 6; - } - - my $cidr1 = $iplist->canon() . "/$mask"; - $iplist++; - my $cidr2 = $iplist->canon() . "/$mask"; - my $cidr_outofrange = '8.8.8.8/8'; - - my $subnetid2 = (sort keys %{$subnets})[1]; - my $subnet2 = - PVE::Network::SDN::Subnets::sdn_subnets_config($sdn_config->{subnets}, $subnetid2, 1); - my $subnet2_cidr = $subnet2->{cidr}; - my $iplist2 = NetAddr::IP->new($subnet2_cidr); - $iplist2++; - my $cidr3 = $iplist2->canon() . "/$mask"; - $iplist2++; - my $cidr4 = $iplist2->canon() . "/$mask"; - - my $hostname = "myhostname"; - my $mac = "da:65:8f:18:9b:6f"; - my $description = "mydescription"; - my $ipamdb = read_sdn_config("$path/ipam.db"); - - my $zone = $sdn_config->{zones}->{ids}->{"myzone"}; - my $ipam = $zone->{ipam}; - - my $plugin; - my $sdn_ipam_plugin; - if ($ipam) { - $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($ipam); - $sdn_ipam_plugin = Test::MockModule->new($plugin); - $sdn_ipam_plugin->mock( - read_db => sub { - return $ipamdb; - }, - write_db => sub { - my ($cfg) = @_; - $ipamdb = $cfg; - }, - ); - } - - my $pve_sdn_ipams; - $pve_sdn_ipams = Test::MockModule->new('PVE::Network::SDN::Ipams'); - $pve_sdn_ipams->mock( - config => sub { - my $ipam_config = read_sdn_config("$path/ipam_config"); - return $ipam_config; - }, - ); - - my $vnetid = "myvnet"; - - ## add_ip - my $test = "add_cidr $cidr1"; - my $name = "$testid $test"; - my $result = undef; - my $expected = ''; - - eval { PVE::Network::SDN::Vnets::add_cidr($vnetid, $cidr1, $hostname, $mac, $description); }; - - if ($@) { - fail("$name : $@"); - } else { - is(undef, undef, $name); - } - - ## add_ip - $test = "add_already_exist_cidr $cidr1"; - $name = "$testid $test"; - $result = undef; - $expected = ''; - - eval { PVE::Network::SDN::Vnets::add_cidr($vnetid, $cidr1, $hostname, $mac, $description); }; - - if ($@) { - is(undef, undef, $name); - } elsif ($ipam) { - fail("$name : $@"); - } else { - is(undef, undef, $name); - } - - ## add_ip - $test = "add_cidr $cidr2"; - $name = "$testid $test"; - $result = undef; - $expected = ''; - - eval { PVE::Network::SDN::Vnets::add_cidr($vnetid, $cidr2, $hostname, $mac, $description); }; - - if ($@) { - fail("$name : $@"); - } else { - is(undef, undef, $name); - } - - ## add_ip - $test = "add_ip_out_of_range_subnets $cidr_outofrange"; - $name = "$testid $test"; - $result = undef; - $expected = ''; - - eval { - PVE::Network::SDN::Vnets::add_cidr($vnetid, $cidr_outofrange, $hostname, $mac, - $description); - }; - - if ($@) { - is(undef, undef, $name); - } else { - fail("$name : $@"); - } - - ## add_ip - $test = "add_cidr $cidr4"; - $name = "$testid $test"; - $result = undef; - $expected = ''; - - eval { PVE::Network::SDN::Vnets::add_cidr($vnetid, $cidr4, $hostname, $mac, $description); }; - - if ($@) { - fail("$name : $@"); - } else { - is(undef, undef, $name); - } - - $test = "find_next_free_cidr_in_second_subnet ($cidr3)"; - $name = "$testid $test"; - $result = undef; - $expected = $ipam ? $cidr3 : undef; - - eval { - $result = - PVE::Network::SDN::Vnets::add_next_free_cidr($vnetid, $hostname, $mac, $description); - }; - - if ($@) { - fail("$name : $@"); - } else { - is($result, $expected, $name); - } - - $test = "del_cidr $cidr1"; - $name = "$testid $test"; - $result = undef; - $expected = undef; - - eval { $result = PVE::Network::SDN::Vnets::del_cidr($vnetid, $cidr1, $hostname); }; - - if ($@) { - fail("$name : $@"); - } else { - is(undef, undef, $name); - } - - $test = "del_cidr $cidr3"; - $name = "$testid $test"; - $result = undef; - $expected = undef; - - eval { $result = PVE::Network::SDN::Vnets::del_cidr($vnetid, $cidr3, $hostname); }; - - if ($@) { - fail("$name : $@"); - } else { - is(undef, undef, $name); - } - - $test = "del_cidr not exist $cidr1"; - $name = "$testid $test"; - $result = undef; - $expected = undef; - - eval { $result = PVE::Network::SDN::Vnets::del_cidr($vnetid, $cidr1, $hostname); }; - - if ($@) { - is(undef, undef, $name); - } elsif ($ipam) { - fail("$name : $@"); - } else { - is(undef, undef, $name); - } - - $test = "del_cidr outofrange $cidr_outofrange"; - $name = "$testid $test"; - $result = undef; - $expected = undef; - - eval { $result = PVE::Network::SDN::Vnets::del_cidr($vnetid, $cidr_outofrange, $hostname); }; - - if ($@) { - is(undef, undef, $name); - } else { - fail("$name : $@"); - } - - $test = "find_next_free_cidr_in_first_subnet ($cidr1)"; - $name = "$testid $test"; - $result = undef; - $expected = $ipam ? $cidr1 : undef; - - eval { - $result = - PVE::Network::SDN::Vnets::add_next_free_cidr($vnetid, $hostname, $mac, $description); - }; - - if ($@) { - fail("$name : $@"); - } else { - is($result, $expected, $name); - } - - $test = "update_cidr $cidr1"; - $name = "$testid $test"; - $result = undef; - $expected = undef; - - eval { - $result = PVE::Network::SDN::Vnets::update_cidr($vnetid, $cidr1, $hostname, $hostname, $mac, - $description); - }; - - if ($@) { - fail("$name : $@"); - } else { - is(undef, undef, $name); - } - - $test = "update_cidr deleted $cidr3"; - $name = "$testid $test"; - $result = undef; - $expected = undef; - - eval { - $result = PVE::Network::SDN::Vnets::update_cidr($vnetid, $cidr1, $hostname, $hostname, $mac, - $description); - }; - - if ($@) { - fail("$name : $@"); - } else { - is(undef, undef, $name); - } - -} - -done_testing(); - -- 2.44.0