Merge pull request #7465 from jlausuch/wicked_fix_dhcp_restart

Wicked: Fix issue with restarting dhcp
os-autoinst · May 15, 2019 · 1f7fae7 · 1f7fae7
2 parents e6b8f26 + 36fef17
commit 1f7fae7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/wickedbase.pm b/lib/wickedbase.pm
@@ -413,6 +413,21 @@ sub validate_macvtap {
     validate_script_output("cat $macvtap_log", sub { m/Success listening to tap device/ });
 }
 
+sub wait_for_dhcpd {
+    my ($self) = @_;
+    my $timeout = 60;
+    while ($timeout > 0) {
+        if (!systemctl('is-active dhcpd.service', ignore_failure => 1)) {
+            record_info('DHCP', 'dhcp active');
+            return 1;
+        }
+        $timeout -= 1;
+        sleep 1;
+    }
+    systemctl('status dhcpd.service');
+    die('DHCP not comming up');
+}
+
 sub post_run {
     my ($self) = @_;
     $self->{wicked_post_run} = 1;

diff --git a/tests/wicked/basic/ref/t08_setup_second_card.pm b/tests/wicked/basic/ref/t08_setup_second_card.pm
@@ -22,8 +22,10 @@ use lockapi;
 sub run {
     my ($self, $ctx) = @_;
     record_info('Info', 'Set up a second card');
+    systemctl 'stop dhcpd.service';
     $self->get_from_data('wicked/dhcp/dhcpd_2nics.conf', '/etc/dhcpd.conf');
-    systemctl 'restart dhcpd.service';
+    systemctl 'start dhcpd.service';
+    $self->wait_for_dhcpd();
     die("Create mutex failed") unless mutex_create('t08_dhcpd_setup_complete');
 }