[filter-fdb] Fix For Vlan Defined With No CIDR (sonic-net#976)

VLAN_INTERFACE section in Config_db may contain entries with no CIDR. This fix skip those entries. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
abdosi · Aug 3, 2020 · 9d20212 · 9d20212
1 parent 6961a91
commit 9d20212
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/scripts/filter_fdb_entries.py b/scripts/filter_fdb_entries.py
@@ -31,6 +31,8 @@ def get_vlan_cidr_map(filename):
     vlan_cidr = defaultdict()
     if "VLAN_INTERFACE" in config_db_entries.keys() and "VLAN" in config_db_entries.keys():
         for vlan_key in config_db_entries["VLAN_INTERFACE"].keys():
+            if '|' not in vlan_key:
+                continue
             vlan, cidr = tuple(vlan_key.split('|'))
             if vlan in config_db_entries["VLAN"]:
                 vlan_cidr[vlan] = ip_interface(cidr).network

diff --git a/sonic-utilities-tests/filter_fdb_input/test_vectors.py b/sonic-utilities-tests/filter_fdb_input/test_vectors.py
@@ -198,6 +198,7 @@
                 "Vlan1000": {}
             },
             "VLAN_INTERFACE": {
+                "Vlan1000": {}, 
                 "Vlan1000|192.168.128.1/21": {}
             }, 
         },