Merge ~kissiel/plainbox-provider-checkbox:revive-ethtool into plainbox-provider-checkbox:master

[Maciej Kisielewski]

bring back ethtool and use it as the main tool for determining NIC's speed. If it's not available try mii-tool. This should give us maximum resilience.

[Sylvain Pineau (sylvain-pineau)]

I'd rather fix https://git.launchpad.net/checkbox-support/tree/checkbox_support/scripts/network.py instead and make changes to the checkbox provider only to use checkbox-support-network

review: Needs Fixing

[Maciej Kisielewski (kissiel)]

> I'd rather fix https://git.launchpad.net/checkbox-
> support/tree/checkbox_support/scripts/network.py instead and make changes to
> the checkbox provider only to use checkbox-support-network

Yeah, I gave it some thought and decided my sequence of actions would be as follows:
1) patch bin/network here
2) propagate to checkbox-support
2.5) release c-s
3) patch *.pxus here to use checkbox-support-network

[Sylvain Pineau (sylvain-pineau)]

I'm fine with the plan above if we add 4) drop the network script from the provider

review: Approve

[Jeff Lane  (bladernr)]

Ummm... what is checkbox-support? are scripts moving there?
I started to work on this and fix the network script, but saw Maciej started working on it before I got to it.

[Maciej Kisielewski (kissiel)]

> Ummm... what is checkbox-support? are scripts moving there?
> I started to work on this and fix the network script, but saw Maciej started
> working on it before I got to it.
We've started moving scripts that are used in more than one provider to checkbox-support, to not have to pull changes by hand, every time something changes. I see another benefit of having them available in checkbox-support-* _namespace_ ;)

[Jeff Lane  (bladernr)]

Sylvain approved the code, so I'm setting the branch to Approve to get it into Dev.

It's affecting our regression testing.

diff --git a/bin/network b/bin/network
index ae9cd38..88fd931 100755
--- a/bin/network
+++ b/bin/network
@@ -280,29 +280,46 @@ class Interface(socket.socket):
 
     @property
     def max_speed(self):
-        # Parse mii-tool data for max speed
-        # search for numbers in the line starting with 'capabilities'
-        # return largest number as max_speed
+        speeds = [0]
+        # parse ethtool output, look for things like:
+        # 100baseSX, 40000baseNX, 10000baseT
         try:
-            info = check_output(['mii-tool', '-v',  self.interface],
-                                universal_newlines=True,
-                                stderr=STDOUT).split('\n')
-        except FileNotFoundError:
-            logging.warning('mii-tool not found! Unable to get max speed')
-            ethinfo = None
-        except CalledProcessError as e:
-            logging.error('mii-tool returned an error!')
-            logging.error(e.output)
-            ethinfo = None
-        finally:
-            regex = re.compile(r'(\d+)(base)([A-Z]+)')
-            speeds = [0]
-            for line in filter(lambda l: 'capabilities' in l, info):
-                for s in line.split(' '):
-                    hit = regex.search(s)
+            ethinfo = check_output(['ethtool', self.interface],
+                                   universal_newlines=True,
+                                   stderr=STDOUT).split(' ')
+            expression = '(\\d+)(base)([A-Z]+)|(\d+)(Mb/s)'
+
+            regex = re.compile(expression)
+            if ethinfo:
+                for i in ethinfo:
+                    hit = regex.search(i)
                     if hit:
                         speeds.append(int(re.sub("\D", "", hit.group(0))))
-            return max(speeds)
+        except CalledProcessError as e:
+            logging.error('ethtool returned an error!')
+            logging.error(e.output)
+        except FileNotFoundError:
+            logging.warning('ethtool not found! Trying mii-tool')
+            # Parse mii-tool data for max speed
+            # search for numbers in the line starting with 'capabilities'
+            # return largest number as max_speed
+            try:
+                info = check_output(['mii-tool', '-v',  self.interface],
+                                    universal_newlines=True,
+                                    stderr=STDOUT).split('\n')
+                regex = re.compile(r'(\d+)(base)([A-Z]+)')
+                speeds = [0]
+                for line in filter(lambda l: 'capabilities' in l, info):
+                    for s in line.split(' '):
+                        hit = regex.search(s)
+                        if hit:
+                            speeds.append(int(re.sub("\D", "", hit.group(0))))
+            except FileNotFoundError:
+                logging.warning('mii-tool not found! Unable to get max speed')
+            except CalledProcessError as e:
+                logging.error('mii-tool returned an error!')
+                logging.error(e.output)
+        return max(speeds)
 
     @property
     def macaddress(self):