Change in vdsm[master]: network: relax a condition so DUID can be inherited again

osvoboda at redhat.com osvoboda at redhat.com
Mon Feb 29 02:30:02 UTC 2016


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

Change subject: network: relax a condition so DUID can be inherited again
......................................................................

network: relax a condition so DUID can be inherited again

Bridges must use the same DHCP unique identifier as the underlying network
device so DHCP client obtains the same lease, including an address.

It appears to me that recently there have been changes to setupNetworks'
internal behaviour which broke the use case represented by the functional
testDhcpReplaceNicWithBridge (in which a DHCPv4 bridgeless network is
redefined to a bridged one and it is checked that IPv4 configuration
doesn't change thanks to the shared DUID): it is not true anymore that
'dhcpv4' is reported for the network being modified because it is nearly
wiped out of the system and even from VDSM's network configuration cache
(persistence).

The simplest thing to do is to relax the now unsatisfiable condition and
no longer require that 'dhcpv4' be True during network modification.

Change-Id: Id86f3afc20562ca670370b2e2907d46ae2203900
Signed-off-by: Ondřej Svoboda <osvoboda at redhat.com>
---
M lib/vdsm/network/api.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/30/54130/1

diff --git a/lib/vdsm/network/api.py b/lib/vdsm/network/api.py
index 01cd496..d608077 100644
--- a/lib/vdsm/network/api.py
+++ b/lib/vdsm/network/api.py
@@ -516,7 +516,7 @@
 
     for devices in (_netinfo.nics, _netinfo.bondings, _netinfo.vlans):
         port = devices.get(bridge.port.name)
-        if port and port['dhcpv4']:
+        if port:
             bridge.duid_source = bridge.port.name
             break
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id86f3afc20562ca670370b2e2907d46ae2203900
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda at redhat.com>


More information about the vdsm-patches mailing list