Change in vdsm[ovirt-3.6]: netinfo: do not mistake a veth device for a VLAN in ifaceUsed

fromani at redhat.com fromani at redhat.com
Thu Feb 25 11:34:03 UTC 2016


Francesco Romani has submitted this change and it was merged.

Change subject: netinfo: do not mistake a veth device for a VLAN in ifaceUsed
......................................................................


netinfo: do not mistake a veth device for a VLAN in ifaceUsed

A heuristic in the function looks for a 'device' property of a network
link to decide if a given device "backs" a VLAN and thus is "used".
Not only VLANs have the property, however. At least veth devices have it
as well. This patch improves detection by exploiting the 'type' property
to match only 'vlan's.

At least testSetupNetworksAddDelDhcp was affected by this misdetection
on Fedora 22. The presence of 'device' property may be due to netlink
library but this is just a guess. (Also, iproute2 package/ip binary
recently started showing veth1 at veth2 in its output but this need not
be related either.)

Change-Id: Iee3b45fb38f136bf69c175cbd745c89f80c299cf
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1310410
Signed-off-by: Ondřej Svoboda <osvoboda at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/46867
Reviewed-by: Ido Barkan <ibarkan at redhat.com>
Continuous-Integration: Jenkins CI
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
(cherry picked from commit 89c6584a4d31e31ea89266543503e9032fc1b7ea)
Reviewed-on: https://gerrit.ovirt.org/53818
Tested-by: Edward Haas <edwardh at redhat.com>
Reviewed-by: Francesco Romani <fromani at redhat.com>
---
M lib/vdsm/netinfo.py
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, approved
  Francesco Romani: Looks good to me, approved
  Edward Haas: Verified



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee3b45fb38f136bf69c175cbd745c89f80c299cf
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Edward Haas <edwardh at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh 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: gerrit-hooks <automation at ovirt.org>


More information about the vdsm-patches mailing list