Change in vdsm[ovirt-3.5]: netinfo: report DHCP from configuration to avoid confusion a...

fromani at redhat.com fromani at redhat.com
Tue Dec 1 11:55:17 UTC 2015


Francesco Romani has submitted this change and it was merged.

Change subject: netinfo: report DHCP from configuration to avoid confusion after stopping DHCP
......................................................................


netinfo: report DHCP from configuration to avoid confusion after stopping DHCP

Until now, after moving away from reporting DHCP based on ifcfg files, VDSM
relied on dhclient's lease files. Even after a network was reconfigured to
stop using DHCP and thus dhclient was stopped, DHCP would still be reported
from the still valid leases (which preserve the state of network configuration
as obtained from a DHCP server, to rebind later to the same address if
allowed).

Although I introduced this behaviour intentionally, VDSM must stop reporting
bootproto4 (in upstream, dhcpv4) for a network that is reverted to static
configuration (which is to be effective immediately not to confuse the engine
and the user).

The currently active network configuration is queried to find out if DHCPv4
is to be reported, or not. If a network is not configured, leases are
consulted again.

testSetupNetworksAddDelDhcp reverts from DHCP-configured network to static
configuration and checks that DHCP is no longer reported (indeed, netinfo
returns the configured values for networks, now).

Change-Id: I11848101731c1d787e5b5b9c1f8fdb8a4eed6599
Signed-off-by: Ondřej Svoboda <osvoboda at redhat.com>
Reviewed-on: http://gerrit.ovirt.org/37617
Reviewed-by: Ido Barkan <ibarkan at redhat.com>
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
Bug-Url: https://bugzilla.redhat.com/1279824
Reviewed-on: https://gerrit.ovirt.org/48846
Reviewed-by: Petr Horáček <phoracek at redhat.com>
Continuous-Integration: Dan Kenigsberg <danken at redhat.com>
Reviewed-by: Francesco Romani <fromani at redhat.com>
---
M lib/vdsm/netinfo.py
M tests/functional/networkTests.py
2 files changed, 33 insertions(+), 3 deletions(-)

Approvals:
  Ido Barkan: Looks good to me, but someone else must approve
  Ondřej Svoboda: Verified
  Petr Horáček: Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved; Passed CI tests
  Francesco Romani: Looks good to me, approved

Objections:
  Jenkins CI: Failed CI tests



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11848101731c1d787e5b5b9c1f8fdb8a4eed6599
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Ondřej Svoboda <osvoboda at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani at redhat.com>
Gerrit-Reviewer: Ido Barkan <ibarkan at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Ondřej Svoboda <osvoboda at redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>


More information about the vdsm-patches mailing list