Layer 2 Forwarding Enhancements

config/main.py

@@ -739,11 +739,33 @@ def add_vlan_member(ctx, vid, interface_name, untagged):
             interface_name = interface_name_to_alias(interface_name)
             if interface_name is None:
                 ctx.fail("'interface_name' is None!")
-            ctx.fail("{} is already a member of {}".format(interface_name,
-                                                        vlan_name))
+            ctx.fail("{} is already a member of {}".format(interface_name,vlan_name))
         else:
+<<<<<<< HEAD
+            ctx.fail("{} is already a member of {}".format(interface_name,vlan_name))
+    #Validate If the interface is already untagged member any other Vlan
+    if untagged is True:
+        keys = [ (k, v) for k, v in db.get_table('VLAN_MEMBER') if v == interface_name ]
+        for k in keys:
+            if db.get_entry('VLAN_MEMBER',k).get('tagging_mode',)== 'untagged':
+                ctx.fail("Interface {} is already untagged member of {} ".format(interface_name,k[0]))
+                return
+
+    # Validate if member is IP interface
+    for k,v in db.get_table('INTERFACE'):
+        if k == interface_name:
+            ctx.fail(" {} has ip address configured".format(interface_name))
+            return
+    # Validate if ip interface 
+    for k,v in db.get_table('PORTCHANNEL_INTERFACE'):
+        if k == interface_name:
+            ctx.fail(" {} has ip address configured".format(interface_name))
+            return
+
+=======
             ctx.fail("{} is already a member of {}".format(interface_name,
                                                         vlan_name))
+>>>>>>> parent of eee827e... Update main.py
     members.append(interface_name)
     vlan['members'] = members
     db.set_entry('VLAN', vlan_name, vlan)

scripts/fdbshow

@@ -63,25 +63,51 @@ class FdbShow(object):
             return
 
         oid_pfx = len("oid:0x")
+
+        client = self.db.redis_clients["ASIC_DB"]
+        pipe = client.pipeline()
+        values = []
+        fdb_list = []
         for s in fdb_str:
             fdb_entry = s.decode()
             fdb = json.loads(fdb_entry .split(":", 2)[-1])
             if not fdb:
                 continue
-
-            ent = self.db.get_all('ASIC_DB', s, blocking=True)
+            fdb_list.append(fdb)
+            pipe.hgetall(s)
+        values = pipe.execute()
+        client = self.db.redis_clients["ASIC_DB"]
+        pipe = client.pipeline()
+        vlans = []
+        vlan_keys = self.db.keys('ASIC_DB', "ASIC_STATE:SAI_OBJECT_TYPE_VLAN:*")
+        for v in vlan_keys:
+            pipe.hgetall(v)
+        vlans = pipe.execute()
+
+        posi = 0
+        for ent in values:
+            if 'SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID' not in ent:
+                posi = posi + 1
+                continue
             br_port_id = ent[b"SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID"][oid_pfx:]
             ent_type = ent[b"SAI_FDB_ENTRY_ATTR_TYPE"]
             fdb_type = ['Dynamic','Static'][ent_type == "SAI_FDB_ENTRY_TYPE_STATIC"]
             if br_port_id not in self.if_br_oid_map:
+                posi = posi + 1
                 continue
             port_id = self.if_br_oid_map[br_port_id]
-            if_name = self.if_oid_map[port_id]
+            #When if_name not mapped to port_id in DB, using port_id as if_name in the display.
+            try:
+                if_name = self.if_oid_map[port_id]
+            except :
+                if_name = port_id
+
             if 'vlan' in fdb:
                 vlan_id = fdb["vlan"]
             elif 'bvid' in fdb:
-                vlan_id = port_util.get_vlan_id_from_bvid(self.db, fdb["bvid"])
-            self.bridge_mac_list.append((int(vlan_id),) + (fdb["mac"],) + (if_name,) + (fdb_type,))
+                vlan_id  = vlans[vlan_keys.index("ASIC_STATE:SAI_OBJECT_TYPE_VLAN:{}".format(fdb_list[posi][u'bvid']))] [b"SAI_VLAN_ATTR_VLAN_ID"]
+            self.bridge_mac_list.append((int(vlan_id),) + (fdb_list[posi]["mac"],) + (if_name,) + (fdb_type,))
+            posi = posi + 1
 
         self.bridge_mac_list.sort(key = lambda x: x[0])
         return