Skip to content

Commit

Permalink
Actually validate network connectivity on NM MM setup
Browse files Browse the repository at this point in the history
  • Loading branch information
asdil12 committed Feb 23, 2024
1 parent db9d3de commit ae04a5d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 2 additions & 1 deletion lib/mm_network.pm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use Exporter;

use testapi;
use version_utils 'is_opensuse';
use utils qw(validate_script_output_retry);

our @EXPORT = qw(configure_hostname get_host_resolv_conf is_networkmanager restart_networking
configure_static_ip configure_dhcp configure_default_gateway configure_static_dns
Expand Down Expand Up @@ -237,7 +238,7 @@ sub restart_networking {
assert_script_run 'nmcli networking off';
assert_script_run 'nmcli networking on';
# Wait until the connections are configured
assert_script_run 'nmcli networking connectivity check';
validate_script_output_retry('nmcli networking connectivity check', m/full/, delay => 3, retry => 5);
} else {
assert_script_run 'rcnetwork restart';
}
Expand Down
1 change: 0 additions & 1 deletion lib/utils.pm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use strict;
use warnings;
use testapi qw(is_serial_terminal :DEFAULT);
use lockapi 'mutex_wait';
use mm_network;
use version_utils qw(is_alp is_sle_micro is_microos is_leap is_leap_micro is_public_cloud is_sle is_sle12_hdd_in_upgrade is_storage_ng is_jeos package_version_cmp is_transactional is_bootloader_sdboot);
use Utils::Architectures;
use Utils::Systemd qw(systemctl disable_and_stop_service);
Expand Down

0 comments on commit ae04a5d

Please sign in to comment.