Merge pull request #793 from netenglabs/fix-device-version-ne

Fix device version ne

Author: ddutt

suzieq/engines/pandas/device.py

@@ -117,9 +117,11 @@ def get(self, **kwargs):
             df = df.loc[df.status.isin(status)]
         if os_version:
             opdict = {'>': operator.gt, '<': operator.lt, '>=': operator.ge,
-                      '<=': operator.le, '=': operator.eq, '!=': operator.ne}
+                      '<=': operator.le, '=': operator.eq, '!': operator.ne}
             op = operator.eq
             for osv in os_version:
+                # Introduced in 0.19.1, we do this for backwards compatibility
+                osv = osv.replace('!=', '!')
                 for elem, val in opdict.items():
                     if osv.startswith(elem):
                         osv = osv.replace(elem, '')

suzieq/poller/worker/nodes/node.py

@@ -409,7 +409,11 @@ async def _parse_device_type_hostname(self, output, _) -> None:
                 f'Detected {devtype} for {self.address}:{self.port},'
                 f' {hostname}')
             self._set_devtype(devtype, version_str)
-            self._set_hostname(hostname)
+            # We don't set the hostname here because the real hostname
+            # is retrieved via a different command on some platforms
+            # and can contain the FQDN. The hostname stored with a
+            # record needs to be one that is also used in LLDP so that we
+            # can find interface peers
             self.current_exception = None
 
     async def _detect_node_type(self):

tests/integration/sqcmds/common-samples/not.yml

@@ -102769,3 +102769,24 @@ tests:
     ["ae1", "ae2", "ge-0/0/0"], "vlan": 10, "timestamp": 1631009089744}, {"namespace":
     "vmx", "hostname": "CRP-DIS-SW01", "vlanName": "vl20", "state": "active", "interfaces":
     ["ae1", "ae2", "ge-0/0/0"], "vlan": 20, "timestamp": 1631009089744}]'
+- command: device show --version="!9.3(4)" --namespace=nxos --format=json
+  data-directory: tests/data/parquet/
+  marks: device show negate
+  output: '[{"namespace": "nxos", "hostname": "server101", "model": "vm", "version":
+    "18.04.3 LTS", "vendor": "Ubuntu", "architecture": "x86-64", "status": "alive",
+    "address": "10.255.2.204", "bootupTimestamp": 1619182381.0, "timestamp": 1619275256203},
+    {"namespace": "nxos", "hostname": "server102", "model": "vm", "version": "18.04.3
+    LTS", "vendor": "Ubuntu", "architecture": "x86-64", "status": "alive", "address":
+    "10.255.2.39", "bootupTimestamp": 1619182381.0, "timestamp": 1619275256290}, {"namespace":
+    "nxos", "hostname": "server301", "model": "vm", "version": "18.04.3 LTS", "vendor":
+    "Ubuntu", "architecture": "x86-64", "status": "alive", "address": "10.255.2.140",
+    "bootupTimestamp": 1619182381.0, "timestamp": 1619275256319}, {"namespace": "nxos",
+    "hostname": "server302", "model": "vm", "version": "18.04.3 LTS", "vendor": "Ubuntu",
+    "architecture": "x86-64", "status": "alive", "address": "10.255.2.114", "bootupTimestamp":
+    1619182381.0, "timestamp": 1619275256394}, {"namespace": "nxos", "hostname": "firewall01",
+    "model": "vm", "version": "18.04.3 LTS", "vendor": "Ubuntu", "architecture": "x86-64",
+    "status": "alive", "address": "10.255.2.249", "bootupTimestamp": 1619013132.0,
+    "timestamp": 1619275256497}, {"namespace": "nxos", "hostname": "dcedge01", "model":
+    "vqfx-10000", "version": "19.4R1.10", "vendor": "Juniper", "architecture": "",
+    "status": "alive", "address": "10.255.2.250", "bootupTimestamp": 1619013129.329,
+    "timestamp": 1619275258329}]'