opendev
/
glean
Code Issues Proposed changes

Improve the support for checking vlan interfaces 

Currently this check was only working for debian systems.
Improved the coverage to check in RedHat and Gentoo as well.

Change-Id: Ie3398363e2086e65f2ad94d3633c38efb7f42a23
This commit is contained in:
Yolanda Robla Mota 2016-08-24 17:26:50 +02:00
parent 1cc6d21144
commit 555d9db38f
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glean/cmd.py
View File

@ -672,10 +672,20 @@ def interface_live(iface, sys_root, args):
return False
def is_interface_vlan(iface):
file_name = '/etc/network/interfaces.d/%s.cfg' % iface
if os.path.exists(file_name):
return 'vlan-raw-device' in open(file_name).read()
def is_interface_vlan(iface, distro):
if distro in ('debian', 'ubuntu'):
file_name = '/etc/network/interfaces.d/%s.cfg' % iface
if os.path.exists(file_name):
return 'vlan-raw-device' in open(file_name).read()
elif distro in ('redhat', 'centos', 'fedora', 'suse', 'opensuse'):
file_name = '/etc/sysconfig/network-scripts/ifcfg-%s' % iface
if os.path.exists(file_name):
return 'VLAN=YES' in open(file_name).read()
elif distro in ('gentoo'):
file_name = '/etc/conf.d/net.%s' % iface
if os.path.exists(file_name):
return 'vlan_id' in open(file_name).read()
return False
@ -694,7 +704,7 @@ def get_sys_interfaces(interface, args):
if not f.startswith(ignored_interfaces)]
for iface in interfaces:
# if interface is for an already configured vlan, skip it
if is_interface_vlan(iface):
if is_interface_vlan(iface, args.distro):
log.debug("Skipping vlan %s" % iface)
continue