Merge pull request #933 from rickstardust/ospf_fix

Fixed issue ospf gui (Issue #929)

Author: ddutt

suzieq/engines/pandas/ospf.py

@@ -39,6 +39,7 @@ def _get_combined_df(self, **kwargs):
 
         ifschema = SchemaForTable('ospfIf', schema=self.all_schemas)
         nbrschema = SchemaForTable('ospfNbr', schema=self.all_schemas)
+        ospfschema = SchemaForTable('ospf', schema=self.all_schemas)
 
         if columns not in [['default'], ['*']]:
             ifkeys = ifschema.key_fields()
@@ -102,6 +103,13 @@ def _get_combined_df(self, **kwargs):
         nbr_df = self._get_table_sqobj('ospfNbr') \
                      .get(columns=nbrcols, **kwargs)
         if nbr_df.empty:
+            ospf_clmns = ospfschema.get_display_fields(['default'])
+            missing_cols = set(ospf_clmns) - set(df.columns)
+            for col in missing_cols:
+                df[col] = np.nan
+            df = df.fillna({'peerIP': '-', 'peerHostname': '',
+                            'lastChangeTime': 0, 'numChanges': 0,
+                            'ifState': '', 'adjState': ''})
             return df
 
         merge_cols = [x for x in ['namespace', 'hostname', 'ifname']