Merge pull request #122 from ktbyers/devel

Minor documentation change on regex

napalm_ios/ios.py

@@ -1261,16 +1261,13 @@ def get_interfaces_counters(self):
                     counters[interface]['tx_discards'] = -1
             for line in sh_int_sum_cmd_out.splitlines():
                 if interface in line:
-                    # '  Interface                   IHQ       IQD       OHQ       OQD' +\
-                    # '      RXBS      RXPS      TXBS      TXPS      TRTL'
-                    # '---------------------------------------------------------------' +\
-                    # '--------------------------------------------------'
-                    # '  FastEthernet0                 0         0         0         0' +\
-                    # '         0         0         0         0         0'
-                    regex = r"\b" + interface +\
-                        r"\b\s+(?P<IHQ>\d+)\s+(?P<IQD>\d+)\s+(?P<OHQ>\d+)" +\
-                        r"\s+(?P<OQD>\d+)\s+(?P<RXBS>\d+)\s+(?P<RXPS>\d+)" + \
-                        r"\s+(?P<TXBS>\d+)\s+(?P<TXPS>\d+)\s+(?P<TRTL>\d+)"
+                    # Line is tabular output with columns
+                    # Interface  IHQ  IQD  OHQ  OQD  RXBS  RXPS  TXBS  TXPS  TRTL
+                    # where columns (excluding interface) are integers
+                    regex = r"\b" + interface + \
+                        r"\b\s+(\d+)\s+(?P<IQD>\d+)\s+(\d+)" + \
+                        r"\s+(?P<OQD>\d+)\s+(\d+)\s+(\d+)" + \
+                        r"\s+(\d+)\s+(\d+)\s+(\d+)"
                     match = re.search(regex, line)
                     if match:
                         counters[interface]['rx_discards'] = int(match.group("IQD"))