Merge pull request #790 from netenglabs/minor-fixes-0.19.1

Minor fixes 0.19.1

Author: ddutt

suzieq/engines/pandas/path.py

@@ -119,10 +119,10 @@ def _init_dfs(self, ns, source, dest):
 
         if ':' in source:
             self._src_df = self._if_df[self._if_df.ip6AddressList.astype(str)
-                                       .str.contains(source + "/")]
+                                       .str.startswith(source + "/")]
         else:
             self._src_df = self._if_df[self._if_df.ipAddressList.astype(str)
-                                       .str.contains(source + "/")]
+                                       .str.startswith(source + "/")]
 
         if self._src_df.empty:
             # TODO: No host with this src addr. Is addr a local ARP entry?
@@ -147,10 +147,10 @@ def _init_dfs(self, ns, source, dest):
 
         if ':' in dest:
             self._dest_df = self._if_df[self._if_df.ip6AddressList.astype(str)
-                                        .str.contains(dest + "/")]
+                                        .str.startswith(dest + "/")]
         else:
             self._dest_df = self._if_df[self._if_df.ipAddressList.astype(str)
-                                        .str.contains(dest + "/")]
+                                        .str.startswith(dest + "/")]
 
         if self._dest_df.empty:
             # Check if addr is in any switch's local ARP
@@ -929,10 +929,10 @@ def get(self, **kwargs) -> pd.DataFrame:
                     if not nhdf.empty:
                         if srcvers == 4:
                             nhdf = nhdf.query(
-                                f'ipAddressList.str.contains("{ndst}")')
+                                f'ipAddressList.str.startswith("{ndst}/")')
                         else:
                             nhdf = nhdf.query(
-                                f'ip6AddressList.str.contains("{ndst}")')
+                                f'ip6AddressList.str.startswith("{ndst}/")')
                     if not nhdf.empty:
                         ifmac = nhdf.macaddr.unique().tolist()
                         if (not macaddr) or (macaddr in ifmac):

suzieq/engines/pandas/topology.py

@@ -23,6 +23,13 @@
 class TopologyObj(SqPandasEngine):
     '''Backend class to operate on virtual table, topology, with pandas'''
 
+    def __init__(self, baseobj):
+        super().__init__(baseobj)
+        self.lsdb = pd.DataFrame()
+        self._a_df = pd.DataFrame()
+        self._ip_table = pd.DataFrame()
+        self.nses = []
+
     @staticmethod
     def table_name():
         '''Table name'''
@@ -86,9 +93,6 @@ class Services:
         self._init_dfs(self._namespaces)
         if self._if_df.empty:
             return pd.DataFrame({'error': ['No interfaces data found']})
-        self.lsdb = pd.DataFrame()
-        self._a_df = pd.DataFrame()
-        self._ip_table = pd.DataFrame()
 
         fields = self.schema.get_display_fields(columns)
 

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

@@ -0,0 +1,6 @@
+description: Testing some common errors independent of NOS
+tests:
+- command: topology summarize --namespace=whatever --format=json
+  data-directory: tests/data/parquet/
+  marks: topology summarize
+  output: '{}'