Change in vdsm[master]: network.api: EL7's dhclient doesn't support -df so stop usin...

Ondřej Svoboda has uploaded a new change for review.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
temporarily
......................................................................

network.api: EL7's dhclient doesn't support -df so stop using it temporarily

Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Bug-Url: https://bugzilla.redhat.com/1219429
Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
---
M vdsm/network/api.py
M vdsm/network/configurators/__init__.py
M vdsm/network/configurators/dhclient.py
3 files changed, 26 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/45713/1

diff --git a/vdsm/network/api.py b/vdsm/network/api.py
index 5b3a905..5bd675a 100755
--- a/vdsm/network/api.py
+++ b/vdsm/network/api.py
@@ -36,7 +36,7 @@
 from vdsm import utils
 from vdsm import ipwrapper
 
-from .configurators import libvirt
+from .configurators import dhclient, libvirt
 from .errors import ConfigNetworkError
 from . import errors as ne
 from .models import Bond, Bridge, IPv4, IPv6, Nic, Vlan
@@ -608,6 +608,14 @@
     If there is dhclient already running on a bridge's port we have to use the
     same DHCP unique identifier (DUID) in order to get the same IP address.
     """
+    # On EL7 dhclient doesn't have a -df option (to read DUID from the port's
+    # lease file). We must detect if the option is available, by running
+    # dhclient manually. To unbreak a beta4 release we just won't use the -df
+    # option in that case. A proper fix is probably to fall back to -lf,
+    # passing to it a modified NIC lease file.
+    if not dhclient.supports_duid_file():
+        return
+
     for devices in (_netinfo.nics, _netinfo.bondings, _netinfo.vlans):
         port = devices.get(bridge.port.name)
         if port and port['dhcpv4']:
diff --git a/vdsm/network/configurators/__init__.py
b/vdsm/network/configurators/__init__.py
index bca3eba..86e17a1 100644
--- a/vdsm/network/configurators/__init__.py
+++ b/vdsm/network/configurators/__init__.py
@@ -176,7 +176,7 @@
 
 def runDhclient(iface, family=4, default_route=False):
     dhclient = DhcpClient(iface.name, family, default_route, iface.duid_source)
-    rc = dhclient.start(iface.blockingdhcp)
+    rc, _, _ = dhclient.start(iface.blockingdhcp)
     if iface.blockingdhcp and rc:
         raise ConfigNetworkError(ERR_FAILED_IFUP, 'dhclient%s failed' % family)
 
diff --git a/vdsm/network/configurators/dhclient.py
b/vdsm/network/configurators/dhclient.py
index 181c302..6133243 100644
--- a/vdsm/network/configurators/dhclient.py
+++ b/vdsm/network/configurators/dhclient.py
@@ -28,10 +28,7 @@
 from vdsm import cmdutils
 from vdsm import ipwrapper
 from vdsm import netinfo
-from vdsm.utils import CommandPath
-from vdsm.utils import execCmd
-from vdsm.utils import pgrep
-from vdsm.utils import rmFile
+from vdsm.utils import CommandPath, execCmd, memoized, pgrep, rmFile
 
 DHCLIENT_CGROUP = 'vdsm-dhclient'
 LEASE_DIR = '/var/lib/dhclient'
@@ -73,8 +70,8 @@
 
     def start(self, blocking):
         if blocking:
-            rc, _, _ = self._dhclient()
-            return rc
+            rc, out, err = self._dhclient()
+            return rc, out, err
         else:
             t = threading.Thread(target=self._dhclient, name='vdsm-dhclient-%s'
                                  % self.iface)
@@ -137,3 +134,16 @@
             raise
     if pid_file is not None:
         rmFile(pid_file)
+
+
+(a)utils.memoized
+def supports_duid_file():
+    probe = DhcpClient('-invalid-option')  # dhclient doesn't have -h/--help
+    rc, out, err = probe.start(blocking=True)
+    if rc:
+        for line in err:
+            if '-df' in line:
+                return True
+        return False
+    else:
+        raise AssertionError("dhclient shouldn't succeed with invalid
options")


-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;

automation(a)ovirt.org has posted comments on this change.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
temporarily
......................................................................


Patch Set 1:

* Update tracker::#1219429::OK
* Check Bug-Url::OK
* Check Public Bug::#1219429::OK, public bug
* Check Product::#1219429::OK, Correct product oVirt
* Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

automation(a)ovirt.org has posted comments on this change.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
temporarily
......................................................................


Patch Set 2:

* Update tracker::#1219429::OK
* Check Bug-Url::OK
* Check Public Bug::#1219429::OK, public bug
* Check Product::#1219429::OK, Correct product oVirt
* Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

Ondřej Svoboda has posted comments on this change.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
temporarily
......................................................................


Patch Set 2: Verified+1

Tested on Fedora 22 with testDhcpReplaceNicWithBridge. I stepped through the new function
in a debugger and it correctly processed dhclient's "usage" output.

supports_duid_file returned True because it found "-df"; on EL7 it would return
False and never set duid_source on a bridge, so no network configurator would pass
"-df" to a dhclient.

-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

Francesco Romani has posted comments on this change.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
temporarily
......................................................................


Patch Set 2:

(2 comments)

https://gerrit.ovirt.org/#/c/45713/2/vdsm/network/configurators/dhclient.py
File vdsm/network/configurators/dhclient.py:

Line 70: 
Line 71:     def start(self, blocking):
Line 72:         if blocking:
Line 73:             rc, out, err = self._dhclient()
Line 74:             return rc, out, err
maybe just

  return self._dhclient()

?
Line 75:         else:
Line 76:             t = threading.Thread(target=self._dhclient,
name='vdsm-dhclient-%s'
Line 77:                                  % self.iface)
Line 78:             t.daemon = True


Line 137: 
Line 138: 
Line 139: @memoized
Line 140: def supports_duid_file():
Line 141:     probe = DhcpClient('-invalid-option')  # dhclient doesn't have
-h/--help
well, if it doesn't support -h/--help, then --help is as good as
'-invalid-option', it isn't? :)

So what about just using --help ?
Line 142:     rc, out, err = probe.start(blocking=True)
Line 143:     if rc:
Line 144:         for line in err:
Line 145:             if '-df' in line:


-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Caro <dcaroest(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com&gt;
Gerrit-Reviewer: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: Yes

Ondřej Svoboda has posted comments on this change.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
temporarily
......................................................................


Patch Set 2:

(2 comments)

Thanks, Francesco, I'll do a revision 3 if no one else raises their objections.

https://gerrit.ovirt.org/#/c/45713/2/vdsm/network/configurators/dhclient.py
File vdsm/network/configurators/dhclient.py:

Line 70: 
Line 71:     def start(self, blocking):
Line 72:         if blocking:
Line 73:             rc, out, err = self._dhclient()
Line 74:             return rc, out, err
>  maybe just 
Aaah, right :-)
Line 75:         else:
Line 76:             t = threading.Thread(target=self._dhclient,
name='vdsm-dhclient-%s'
Line 77:                                  % self.iface)
Line 78:             t.daemon = True


Line 137: 
Line 138: 
Line 139: @memoized
Line 140: def supports_duid_file():
Line 141:     probe = DhcpClient('-invalid-option')  # dhclient doesn't have
-h/--help
>  well, if it doesn't support -h/--help, then --help is as good as
> '-invalid- 
I wouldn't be able to branch on the return code (it would be 0
once --help is implemented). I wanted to be sure this check doesn't break anytime
soon.
Line 142:     rc, out, err = probe.start(blocking=True)
Line 143:     if rc:
Line 144:         for line in err:
Line 145:             if '-df' in line:


-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Caro <dcaroest(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com&gt;
Gerrit-Reviewer: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: Yes

Francesco Romani has posted comments on this change.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
temporarily
......................................................................


Patch Set 2:

(1 comment)

https://gerrit.ovirt.org/#/c/45713/2/vdsm/network/configurators/dhclient.py
File vdsm/network/configurators/dhclient.py:

Line 137: 
Line 138: 
Line 139: @memoized
Line 140: def supports_duid_file():
Line 141:     probe = DhcpClient('-invalid-option')  # dhclient doesn't have
-h/--help
>  I wouldn't be able to branch on the return code (it would be 0
> once --help  
fair enough!
Line 142:     rc, out, err = probe.start(blocking=True)
Line 143:     if rc:
Line 144:         for line in err:
Line 145:             if '-df' in line:


-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Caro <dcaroest(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com&gt;
Gerrit-Reviewer: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: Yes

automation(a)ovirt.org has posted comments on this change.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
there
......................................................................


Patch Set 3:

* Update tracker::#1219429::OK
* Check Bug-Url::OK
* Check Public Bug::#1219429::OK, public bug
* Check Product::#1219429::OK, Correct product oVirt
* Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Caro <dcaroest(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com&gt;
Gerrit-Reviewer: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

Francesco Romani has posted comments on this change.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
there
......................................................................


Patch Set 3: Code-Review+1

-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Caro <dcaroest(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com&gt;
Gerrit-Reviewer: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Martin Sivak]

Martin Sivák has posted comments on this change.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
there
......................................................................


Patch Set 3: Verified+1

I hit the bug and was able to get over it and deploy an EL7 host (RHEL7.1) using VDSM from
the master branch with this patch applied.

-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Caro <dcaroest(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com&gt;
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com&gt;
Gerrit-Reviewer: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

automation(a)ovirt.org has posted comments on this change.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
there
......................................................................


Patch Set 4:

* Update tracker::#1219429::OK
* Check Bug-Url::OK
* Check Public Bug::#1219429::OK, public bug
* Check Product::#1219429::OK, Correct product oVirt
* Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Caro <dcaroest(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com&gt;
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com&gt;
Gerrit-Reviewer: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
there
......................................................................


Patch Set 4: Code-Review+2

-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Caro <dcaroest(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com&gt;
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com&gt;
Gerrit-Reviewer: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
there
......................................................................


Patch Set 4:

On backport to 3.6, please state clearly that the functional tests pass on el7. Thanks!

-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Caro <dcaroest(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com&gt;
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com&gt;
Gerrit-Reviewer: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
there
......................................................................


network.api: EL7's dhclient doesn't support -df so stop using it there

This is a quick fix only. A proper solution for the affected bug will
have to fall back to -lf (a copy of a lease file).

Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Bug-Url: https://bugzilla.redhat.com/1219429
Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Reviewed-on: https://gerrit.ovirt.org/45713
Reviewed-by: Francesco Romani <fromani(a)redhat.com&gt;
Tested-by: Martin Sivák <msivak(a)redhat.com&gt;
Continuous-Integration: Jenkins CI
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M vdsm/network/api.py
M vdsm/network/configurators/__init__.py
M vdsm/network/configurators/dhclient.py
3 files changed, 26 insertions(+), 10 deletions(-)

Approvals:
  Martin Sivák: Verified
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, approved
  Francesco Romani: Looks good to me, but someone else must approve



-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Caro <dcaroest(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com&gt;
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com&gt;
Gerrit-Reviewer: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org

automation(a)ovirt.org has posted comments on this change.

Change subject: network.api: EL7's dhclient doesn't support -df so stop using it
there
......................................................................


Patch Set 5:

* Update tracker::#1219429::OK
* Check TR::#1219429::ERROR, 3.6.0 should not match .*

-- 
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Caro <dcaroest(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com&gt;
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com&gt;
Gerrit-Reviewer: Ondřej Svoboda <osvoboda(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No