More miscellaneous fixes (#852)

* confutils: portmode regexp string fixup

Signed-off-by: Dinesh Dutt <[email protected]>

* pandas/network.py: display active/timestamp fields as appropriate

Signed-off-by: Dinesh Dutt <[email protected]>

* Interfaces Parser: IOS parser fix for down vs err-disable

Signed-off-by: Dinesh Dutt <[email protected]>

---------

Signed-off-by: Dinesh Dutt <[email protected]>

Author: ddutt

suzieq/engines/pandas/network.py

@@ -27,6 +27,10 @@ def find(self, **kwargs):
         query_str = kwargs.pop('query_str', '')
         fields = self.schema.get_display_fields(['default'])
 
+        if ((self.iobj.start_time and self.iobj.end_time) or
+                (self.iobj.view == 'all')):
+            fields.insert(0, 'active')
+            fields.append('timestamp')
         dflist = []
         if isinstance(addrlist, str):
             addrlist = [addrlist]

suzieq/poller/worker/services/interfaces.py

@@ -821,8 +821,10 @@ def _clean_iosxr_data(self, processed_data, raw_data):
                 elif 'Autostate Enabled' in state:
                     entry['state'] = 'down'
                     entry['reason'] = state.split(',')[1].strip()
-                elif 'disabled' in state:
+                elif 'err-disabled' in state:
                     entry['state'] = 'errDisabled'
+                elif 'disabled' in state:
+                    entry['state'] = 'down'
                 elif 'monitoring' in state:
                     entry['state'] = 'down'
                 elif 'suspended' in state: