[PATCH e2e-tests 05/38] lib: instance: add helper to check if an address answers ping

["Michael Köppl" <m.koeppl@proxmox.com>]

Move the helper function from pve_firewall to Proxmox::Test::Instance
because it's about to be used for additional tests.

Signed-off-by: Michael Köppl <m.koeppl@proxmox.com>
---
 Proxmox/Test/Instance.pm |  7 +++++++
 tests/pve_firewall.pl    | 23 ++++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Proxmox/Test/Instance.pm b/Proxmox/Test/Instance.pm
index 38f1607..8c0f710 100644
--- a/Proxmox/Test/Instance.pm
+++ b/Proxmox/Test/Instance.pm
@@ -74,4 +74,11 @@ sub run_command {
     return ($stdout, $stderr);
 }
 
+# Returns true if $ip answers a ping sent from this instance.
+sub node_can_ping {
+    my ($self, $ip) = @_;
+
+    return eval { $self->run_command("ping -c2 -W2 $ip"); 1 } ? 1 : 0;
+}
+
 1;
diff --git a/tests/pve_firewall.pl b/tests/pve_firewall.pl
index fab35b5..d3991a9 100755
--- a/tests/pve_firewall.pl
+++ b/tests/pve_firewall.pl
@@ -34,11 +34,6 @@ my $vmid = $client->get('/cluster/nextid');
 my $ct_ip = '10.250.250.10';
 my $node_ip = '10.250.250.1';
 
-# Returns true if the node can ping the container.
-my $can_ping = sub {
-    return eval { $pve->run_command("ping -c2 -W2 $ct_ip"); 1 } ? 1 : 0;
-};
-
 # Create and start the container
 
 my $upid = $client->post(
@@ -65,12 +60,15 @@ $pve->run_command("ip addr add $node_ip/24 dev vmbr0");
 eval {
     # Baseline: ping works before any firewall
     poll_until(
-        $can_ping,
+        sub { $pve->node_can_ping($ct_ip) },
         timeout => 30,
         interval => 3,
         description => "container $vmid to be pingable",
     );
-    ok($can_ping->(), 'node can ping the container before the firewall is enabled');
+    ok(
+        $pve->node_can_ping($ct_ip),
+        'node can ping the container before the firewall is enabled',
+    );
 
     # Enable the datacenter and container firewall
     $client->put('/cluster/firewall/options', { enable => 1 });
@@ -79,12 +77,15 @@ eval {
     # With the firewall enabled the default inbound policy is DROP, so ping is blocked. pve-firewall
     # applies config changes asynchronously, so poll for the effect.
     poll_until(
-        sub { !$can_ping->() },
+        sub { !$pve->node_can_ping($ct_ip) },
         timeout => 30,
         interval => 3,
         description => "the firewall to block ICMP to the container",
     );
-    ok(!$can_ping->(), 'ping is blocked once the container firewall defaults to DROP');
+    ok(
+        !$pve->node_can_ping($ct_ip),
+        'ping is blocked once the container firewall defaults to DROP',
+    );
 
     # Add an ACCEPT rule for ICMP: ping works again
     $client->post(
@@ -99,12 +100,12 @@ eval {
     );
 
     poll_until(
-        $can_ping,
+        sub { $pve->node_can_ping($ct_ip) },
         timeout => 30,
         interval => 3,
         description => "the ACCEPT rule to allow ICMP to the container",
     );
-    ok($can_ping->(), 'ping works again after adding an ACCEPT rule for ICMP');
+    ok($pve->node_can_ping($ct_ip), 'ping works again after adding an ACCEPT rule for ICMP');
 
     1;
 } or do {
-- 
2.47.3