Adding ethtool info to Ansible interface facts (#16513)

This will give the user details on how the interfaces are configured.
They user could query to see if TSO, GSO, etc are enbaled
on an interface.
pull/16822/head
Joe (rook) 8 years ago committed by Brian Coca
parent 7fdbfd490e
commit 2219339dd5

@ -188,7 +188,7 @@ class Facts(object):
if not cached_facts: if not cached_facts:
self.facts = {} self.facts = {}
else: else:
self.facts = cached_facts self.facts = cached_facts
### TODO: Eventually, these should all get moved to populate(). But ### TODO: Eventually, these should all get moved to populate(). But
# some of the values are currently being used by other subclasses (for # some of the values are currently being used by other subclasses (for
# instance, os_family and distribution). Have to sort out what to do # instance, os_family and distribution). Have to sort out what to do
@ -1327,7 +1327,7 @@ class LinuxHardware(Hardware):
part['sectorsize'] = get_file_content(part_sysdir + "/queue/hw_sector_size",512) part['sectorsize'] = get_file_content(part_sysdir + "/queue/hw_sector_size",512)
part['size'] = self.module.pretty_bytes((float(part['sectors']) * float(part['sectorsize']))) part['size'] = self.module.pretty_bytes((float(part['sectors']) * float(part['sectorsize'])))
self.get_holders(part, part_sysdir) self.get_holders(part, part_sysdir)
d['partitions'][partname] = part d['partitions'][partname] = part
d['rotational'] = get_file_content(sysdir + "/queue/rotational") d['rotational'] = get_file_content(sysdir + "/queue/rotational")
@ -2277,6 +2277,25 @@ class LinuxNetwork(Network):
parse_ip_output(primary_data) parse_ip_output(primary_data)
parse_ip_output(secondary_data, secondary=True) parse_ip_output(secondary_data, secondary=True)
def parse_ethtool_output(device,output):
interfaces[device]['features'] = {}
for line in output.strip().split('\n'):
if not line:
continue
if line.endswith(":") :
continue
key,value = line.split(": ")
if not value :
continue
interfaces[device]['features'][key.strip().replace('-','_')] = value.strip()
ethtool_path = self.module.get_bin_path("ethtool")
if ethtool_path:
args = [ethtool_path, '-k', device]
rc, stdout, stderr = self.module.run_command(args)
ethtool_data = stdout
parse_ethtool_output(device,ethtool_data)
# replace : by _ in interface name since they are hard to use in template # replace : by _ in interface name since they are hard to use in template
new_interfaces = {} new_interfaces = {}
for i in interfaces: for i in interfaces:

Loading…
Cancel
Save