Add mm_network::restart_networking

Signed-off-by: Pavel Dostál <[email protected]>
os-autoinst · May 2, 2022 · 68b8236 · 68b8236
1 parent 98775de
commit 68b8236
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 42 deletions.
diff --git a/lib/mailtest.pm b/lib/mailtest.pm
@@ -58,6 +58,7 @@ sub prepare_mail_server {
         configure_static_dns(get_host_resolv_conf());
         configure_static_ip(ip => "$mail_server_ip");
         set_var("MAIL_SERVER_IP", "$mail_server_ip") if not get_var("MAIL_SERVER_IP");
+        restart_networking();
     }
 
     set_var("MAIL_SERVER_NAME", "$mail_server_name") if not get_var("MAIL_SERVER_NAME");
@@ -80,6 +81,7 @@ sub prepare_mail_client {
         configure_default_gateway;
         configure_static_dns(get_host_resolv_conf());
         configure_static_ip(ip => "$mail_client_ip");
+        restart_networking();
 
         # Wait for the mail server ready
         mutex_lock "mail_server";

diff --git a/lib/mm_network.pm b/lib/mm_network.pm
@@ -9,7 +9,7 @@ use Exporter;
 use testapi;
 use version_utils 'is_opensuse';
 
-our @EXPORT = qw(configure_hostname get_host_resolv_conf is_networkmanager
+our @EXPORT = qw(configure_hostname get_host_resolv_conf is_networkmanager restart_networking
   configure_static_ip configure_dhcp configure_default_gateway configure_static_dns
   parse_network_configuration ip_in_subnet check_ip_in_subnet setup_static_mm_network);
 
@@ -42,48 +42,43 @@ sub get_host_resolv_conf {
 }
 
 sub is_networkmanager {
-    return (script_run('readlink /etc/systemd/system/network.service | grep NetworkManager') == 0);
+    my $is_nm = (script_run('readlink /etc/systemd/system/network.service | grep NetworkManager') == 0);
+    record_info('NetworkManager', (($is_nm) ? 'NetworkManager has been detected.' : 'NetworkManager has not been detected.'));
+    return $is_nm;
 }
 
 sub configure_static_ip {
     my (%args) = @_;
     my $ip = $args{ip};
     my $mtu = $args{mtu} // 1458;
     my $is_nm = $args{is_nm} // is_networkmanager();
+    my $device = $args{device};
     $mtu //= 1458;
 
     if ($is_nm) {
-        my $device = script_output('nmcli -t -f DEVICE c');
-        my $nm_id = script_output('nmcli -t -f NAME c');
+        my $nm_id;
+        my $nm_list = script_output("nmcli -t -f DEVICE,NAME c | grep '$device' | head -n1");
+        ($device, $nm_id) = split(':', $nm_list);
 
-        assert_script_run "nmcli connection modify '$nm_id' ifname '$device' ip4 $ip gw4 10.0.2.2 ipv4.method manual ";
-        assert_script_run "nmcli connection down '$nm_id'";
-        assert_script_run "nmcli connection up '$nm_id'";
+        record_info('set_ip', "Device: $device\n NM ID: $nm_id\nIP: $ip");
+
+        assert_script_run "nmcli connection modify '$nm_id' ifname '$device' ip4 $ip ipv4.method manual ";
     } else {
         # Get MAC address
         my $net_conf = parse_network_configuration();
         my $mac = $net_conf->{fixed}->{mac};
 
         # Get default network adapter name
-        script_run "NIC=`grep $mac /sys/class/net/*/address |cut -d / -f 5`";
-        assert_script_run "echo \$NIC";
+        $device = script_output("grep $mac /sys/class/net/*/address |cut -d / -f 5") unless ($device);
+        record_info('set_ip', "Device: $device\nIP: $ip\nMTU: $mtu");
 
         # check for duplicate IP
         my ($ip_no_mask, $mask) = split('/', $ip);
-        script_run "arping -w 1 -I \$NIC $ip_no_mask";
+        script_run "arping -w 1 -I $device $ip_no_mask";
 
         # Configure the static networking
-        assert_script_run "echo -e \"STARTMODE='auto'\\nBOOTPROTO='static'\\nIPADDR='$ip'\\nMTU='$mtu'\" > /etc/sysconfig/network/ifcfg-\$NIC";
-
-        configure_default_gateway();
-
-        # Restart the networking
-        assert_script_run "rcnetwork restart";
+        assert_script_run "echo -e \"STARTMODE='auto'\\nBOOTPROTO='static'\\nIPADDR='$ip'\\nMTU='$mtu'\" > /etc/sysconfig/network/ifcfg-$device";
     }
-
-    save_screenshot;
-    assert_script_run "ip addr";
-    save_screenshot;
 }
 
 sub configure_dhcp {
@@ -103,7 +98,19 @@ sub configure_dhcp {
 }
 
 sub configure_default_gateway {
-    enter_cmd("echo 'default 10.0.2.2 - -' > /etc/sysconfig/network/routes");
+    my (%args) = @_;
+    my $is_nm = $args{is_nm} // is_networkmanager();
+    my $device = $args{device};
+    if ($is_nm) {
+        my $nm_id;
+        # When $device is not specified grep just does nothing and first connection is selected
+        my $nm_list = script_output("nmcli -t -f DEVICE,NAME c | grep '$device' | head -n1");
+        ($device, $nm_id) = split(':', $nm_list);
+
+        assert_script_run "nmcli connection modify '$nm_id' ipv4.gateway 10.0.2.2";
+    } else {
+        enter_cmd("echo 'default 10.0.2.2 - -' > /etc/sysconfig/network/routes");
+    }
 }
 
 sub configure_static_dns {
@@ -118,14 +125,10 @@ sub configure_static_dns {
         $nm_id = script_output('nmcli -t -f NAME c | head -n 1') unless ($nm_id);
 
         assert_script_run "nmcli connection modify '$nm_id' ipv4.dns '$servers'";
-        assert_script_run "nmcli connection down '$nm_id'";
-        assert_script_run "nmcli connection up '$nm_id'";
     } else {
         assert_script_run("sed -i -e 's|^NETCONFIG_DNS_STATIC_SERVERS=.*|NETCONFIG_DNS_STATIC_SERVERS=\"$servers\"|' /etc/sysconfig/network/config");
         assert_script_run("netconfig -f update");
     }
-
-    assert_script_run("cat /etc/resolv.conf") unless $silent;
 }
 
 sub parse_network_configuration {
@@ -216,7 +219,24 @@ sub setup_static_mm_network {
     my $ip = shift;
     my $is_nm = is_networkmanager();
     configure_static_ip(ip => $ip, is_nm => $is_nm);
+    configure_default_gateway(is_nm => $is_nm);
     configure_static_dns(get_host_resolv_conf(), is_nm => $is_nm);
+    restart_networking(is_nm => $is_nm);
+}
+
+sub restart_networking {
+    my (%args) = @_;
+    my $is_nm = $args{is_nm} // is_networkmanager();
+
+    if ($is_nm) {
+        assert_script_run 'nmcli networking off';
+        assert_script_run 'nmcli networking on';
+    } else {
+        assert_script_run 'wicked ifdown all';
+        assert_script_run 'wicked ifup all';
+    }
+
+    record_info('network cfg', script_output('ip address show; echo; ip route show; echo; grep -v "^#" /etc/resolv.conf', proceed_on_failure => 1));
 }
 
 1;
diff --git a/lib/mm_tests.pm b/lib/mm_tests.pm
@@ -30,6 +30,7 @@ sub configure_static_network {
     configure_default_gateway;
     configure_static_ip(ip => $ip);
     configure_static_dns(get_host_resolv_conf());
+    restart_networking();
     assert_script_run "ping -c 1 10.0.2.2 || journalctl -b --no-pager -o short-precise >/dev/$serialdev";
 }
 

diff --git a/tests/console/ipsec_tools_h2h.pm b/tests/console/ipsec_tools_h2h.pm
@@ -31,6 +31,7 @@ sub run {
     configure_default_gateway;
     configure_static_ip(ip => $my_static_ip);
     configure_static_dns(get_host_resolv_conf());
+    restart_networking();
     zypper_call 'in ipsec-tools';
 
     if ($is_ipsec_primary) {

diff --git a/tests/network/firewalld_policy_objects.pm b/tests/network/firewalld_policy_objects.pm
@@ -34,7 +34,7 @@ use strict;
 use warnings;
 use testapi;
 use lockapi;
-use mm_network qw(configure_default_gateway configure_static_ip configure_static_dns get_host_resolv_conf parse_network_configuration);
+use mm_network;
 use utils 'zypper_call';
 use Utils::Systemd 'disable_and_stop_service';
 use version_utils qw(is_sle);
@@ -45,39 +45,39 @@ my $SRV_IP = '10.0.2.102';
 my $SRV_PORT = '80';
 my $CLI_IP = '10.0.3.102';
 
-sub set_ip {
-    my ($ip, $nic) = @_;
-    script_run "arping -w 1 -I $nic $ip";    # check for duplicate IP
-    assert_script_run "echo -e \"STARTMODE='auto'\\nBOOTPROTO='static'\\nIPADDR='$ip/24'\\nMTU='1458'\" > /etc/sysconfig/network/ifcfg-$nic";
-    assert_script_run "rcnetwork restart";
-    assert_script_run "ip addr";
-}
-
 sub configure_machines {
     my ($self, $hostname, $net0, $net1) = @_;
 
     # Configure static network, disable firewall
     disable_and_stop_service($self->firewall);
     disable_and_stop_service('apparmor', ignore_failure => 1);
-    configure_default_gateway;
+
+    my $is_nm = is_networkmanager();
 
     if ($hostname eq "firewall") {
         record_info 'Setting up Firewall machine';
-        set_ip($FW_EXT_IP, $net0);
-        set_ip($FW_INT_IP, $net1);
+        configure_static_ip(ip => "$FW_EXT_IP/24", device => $net0, is_nm => $is_nm);
+        configure_static_ip(ip => "$FW_INT_IP/24", device => $net1, is_nm => $is_nm);
+        configure_default_gateway(is_nm => $is_nm, device => $net0);
+        configure_static_dns(get_host_resolv_conf(), is_nm => $is_nm);
         assert_script_run("sysctl -w net.ipv4.ip_forward=1");
-
+        restart_networking(is_nm => $is_nm);
     } elsif ($hostname eq "server") {
         record_info 'Setting up Server machine';
-        set_ip($SRV_IP, $net0);
+        configure_static_ip(ip => "$SRV_IP/24", device => $net0, is_nm => $is_nm);
+        configure_default_gateway(is_nm => $is_nm, device => $net0);
+        configure_static_dns(get_host_resolv_conf(), is_nm => $is_nm);
+        restart_networking(is_nm => $is_nm);
         assert_script_run("ip route add 10.0.3.0/24 via $FW_EXT_IP");
-
+        assert_script_run("ip route show");
     } elsif ($hostname eq "client") {
         record_info 'Setting up Client machine';
-        set_ip($CLI_IP, $net0);
+        configure_static_ip(ip => "$CLI_IP/24", device => $net0, is_nm => $is_nm);
+        configure_static_dns(get_host_resolv_conf(), is_nm => $is_nm);
+        restart_networking(is_nm => $is_nm);
         assert_script_run("ip route add default via $FW_INT_IP");
+        assert_script_run("ip route show");
     }
-    configure_static_dns(get_host_resolv_conf());
 }
 
 sub start_webserver {

diff --git a/tests/ses/nodes_preparation.pm b/tests/ses/nodes_preparation.pm
@@ -52,6 +52,7 @@ sub run {
         my $node_ip = get_var('NODE_IP');
         configure_static_ip(ip => "$node_ip/24");
         configure_static_dns(get_host_resolv_conf());
+        restart_networking();
         # add node entries to /etc/hosts
         my $hosts = <<'EOF';
 echo -e '10.0.2.100\tmaster.openqa.test master' >> /etc/hosts

diff --git a/tests/slenkins/slenkins_control_network.pm b/tests/slenkins/slenkins_control_network.pm
@@ -17,6 +17,7 @@ sub run {
     configure_default_gateway;
     configure_static_ip(ip => '10.0.2.1/24');
     configure_static_dns(get_host_resolv_conf());
+    restart_networking();
 
     script_output("
         zypper -n --no-gpg-checks ar '" . get_var('SLENKINS_TESTSUITES_REPO') . "' slenkins_testsuites

diff --git a/tests/slepos/prepare.pm b/tests/slepos/prepare.pm
@@ -68,6 +68,7 @@ sub run {
         configure_default_gateway;
         configure_static_ip(ip => get_var('MY_ADDR') . "/24");
         configure_static_dns(get_host_resolv_conf());
+        restart_networking();
     }
     else {
         # on standalone image server with qemu network we don't have to wait