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

danken at redhat.com danken at redhat.com
Sun Oct 11 20:12:43 UTC 2015


Dan Kenigsberg 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
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>
---
M lib/vdsm/netinfo.py
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Ido Barkan: Looks good to me, but someone else must approve
  Ondřej Svoboda: Verified
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee3b45fb38f136bf69c175cbd745c89f80c299cf
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken 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: automation at ovirt.org


More information about the vdsm-patches mailing list