review comments

making lgtm happy Added two more test cases
sonic-net · Jun 22, 2020 · be445f8 · be445f8
1 parent 4c1b8cc
commit be445f8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/scripts/fast-reboot b/scripts/fast-reboot
@@ -415,6 +415,7 @@ if [[ "$REBOOT_TYPE" = "fast-reboot" ]]; then
     # Dump the ARP and FDB tables to files also as default routes for both IPv4 and IPv6
     # into /host/fast-reboot
     DUMP_DIR=/host/fast-reboot
+    CONFIG_DB_FILE=/etc/sonic/config_db.json
     mkdir -p $DUMP_DIR
     FAST_REBOOT_DUMP_RC=0
     /usr/bin/fast-reboot-dump.py -t $DUMP_DIR || FAST_REBOOT_DUMP_RC=$?
@@ -426,7 +427,7 @@ if [[ "$REBOOT_TYPE" = "fast-reboot" ]]; then
 
     FILTER_FDB_ENTRIES_RC=0
     # Filter FDB entries using MAC addresses from ARP table
-    /usr/bin/filter_fdb_entries.py -f $DUMP_DIR/fdb.json -a $DUMP_DIR/arp.json -c $DUMP_DIR/config_db.json || FILTER_FDB_ENTRIES_RC=$?
+    /usr/bin/filter_fdb_entries.py -f $DUMP_DIR/fdb.json -a $DUMP_DIR/arp.json -c $CONFIG_DB_FILE || FILTER_FDB_ENTRIES_RC=$?
     if [[ FILTER_FDB_ENTRIES_RC -ne 0 ]]; then
         error "Failed to filter FDb entries. Exit code: $FILTER_FDB_ENTRIES_RC"
         unload_kernel

diff --git a/scripts/filter_fdb_entries.py b/scripts/filter_fdb_entries.py
@@ -24,11 +24,10 @@ def get_vlan_entries_map(filename):
         Returns:
             vlan_map(dict) map of Vlan configuration for SONiC device
     """
-    config_db_entries = defaultdict()
     with open(filename, 'r') as fp:
         config_db_entries = json.load(fp)
 
-    return config_db_entries["VLAN"] if "VLAN" in config_db_entries else defaultdict()
+    return config_db_entries["VLAN"] if "VLAN" in config_db_entries.keys() else defaultdict()
 
 def get_arp_entries_map(arp_filename, config_db_filename):
     """

diff --git a/sonic-utilities-tests/filter_fdb_entries_test.py b/sonic-utilities-tests/filter_fdb_entries_test.py
@@ -69,7 +69,6 @@ def __tearDown(self):
             Returns:
                 None
         """
-        return
         os.remove(self.ARP_FILENAME)
         os.remove(self.EXPECTED_FDB_FILENAME)
         fdbFiles = glob.glob(self.FDB_FILENAME + '*')

diff --git a/sonic-utilities-tests/filter_fdb_input/test_vectors.py b/sonic-utilities-tests/filter_fdb_input/test_vectors.py
@@ -100,4 +100,21 @@
         "config_db": "sonic-utilities-tests/filter_fdb_input/config_db.json",
         "expected_fdb": "sonic-utilities-tests/filter_fdb_input/expected_fdb.json"
     },
+    {
+        "arp": "sonic-utilities-tests/filter_fdb_input/arp.json",
+        "fdb": "sonic-utilities-tests/filter_fdb_input/fdb.json",
+        "config_db": {"VLAN": {
+            "Vlan1": {}
+        }},
+        "expected_fdb": [
+        ],
+    },
+    {
+        "arp": "sonic-utilities-tests/filter_fdb_input/arp.json",
+        "fdb": "sonic-utilities-tests/filter_fdb_input/fdb.json",
+        "config_db": {
+        },
+        "expected_fdb": [
+        ],
+    },
 ]