refactored ethtool data to allow for other callers

lib/ansible/module_utils/facts.py

@@ -2277,24 +2277,7 @@ class LinuxNetwork(Network):
             parse_ip_output(primary_data)
             parse_ip_output(secondary_data, secondary=True)
 
-            def parse_ethtool_output(device,output):
+            interfaces[device]['features'] = self.get_ethtool_data(device)
-                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
         new_interfaces = {}
@@ -2305,6 +2288,23 @@ class LinuxNetwork(Network):
                 new_interfaces[i] = interfaces[i]
         return new_interfaces, ips
 
+    def get_ethtool_data(self, device):
+
+        features = {}
+        ethtool_path = self.module.get_bin_path("ethtool")
+        if ethtool_path:
+            args = [ethtool_path, '-k', device]
+            rc, stdout, stderr = self.module.run_command(args)
+            if rc == 0:
+                for line in stdout.strip().split('\n'):
+                    if not line or line.endswith(":"):
+                        continue
+                    key,value = line.split(": ")
+                    if not value:
+                        continue
+                    features[key.strip().replace('-','_')] = value.strip()
+        return features
+
 class GenericBsdIfconfigNetwork(Network):
     """
     This is a generic BSD subclass of Network using the ifconfig command.