[swss][orchagent] Fix a problem where the fdborch does not update the hardware MAC address type and attribute for a MAC address learned from an MCLAG peer after receiving the MAC movement event.

orchagent/fdborch.cpp

@@ -559,13 +559,51 @@ void FdbOrch::update(sai_fdb_event_t        type,
         {
              SWSS_LOG_WARN("FdbOrch MOVE notification: mac %s is not found in bv_id 0x%" PRIx64,
                     update.entry.mac.to_string().c_str(), entry->bv_id);
+            break;
         }
         else if (!m_portsOrch->getPortByBridgePortId(existing_entry->second.bridge_port_id, port_old))
         {
             SWSS_LOG_ERROR("FdbOrch MOVE notification: Failed to get port by bridge port ID 0x%" PRIx64, existing_entry->second.bridge_port_id);
             return;
         }
 
+        /* If the existing MAC is MCLAG remote, change its type to dynamic. */
+        if (existing_entry->second.origin == FDB_ORIGIN_MCLAG_ADVERTIZED)
+        {
+            if (existing_entry->second.bridge_port_id != bridge_port_id)
+            {
+                sai_status_t status;
+                sai_fdb_entry_t fdb_entry;
+                fdb_entry.switch_id = gSwitchId;
+                memcpy(fdb_entry.mac_address, entry->mac_address, sizeof(sai_mac_t));
+                fdb_entry.bv_id = entry->bv_id;
+                sai_attribute_t attr;
+                vector<sai_attribute_t> attrs;
+
+                attr.id = SAI_FDB_ENTRY_ATTR_ALLOW_MAC_MOVE;
+                attr.value.booldata = false;
+                attrs.push_back(attr);
+
+                attr.id = SAI_FDB_ENTRY_ATTR_TYPE;
+                attr.value.s32 = SAI_FDB_ENTRY_TYPE_DYNAMIC;
+                attrs.push_back(attr);
+
+                attr.id = SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID;
+                attr.value.oid = bridge_port_id;
+                attrs.push_back(attr);
+
+                for(auto itr : attrs)
+                {
+                    status = sai_fdb_api->set_fdb_entry_attribute(&fdb_entry, &itr);
+                    if (status != SAI_STATUS_SUCCESS)
+                    {
+                        SWSS_LOG_ERROR("macUpdate-Failed for MCLAG mac attr.id=0x%x for FDB %s in 0x%" PRIx64 "on %s, rv:%d",
+                                        itr.id, update.entry.mac.to_string().c_str(), entry->bv_id, update.port.m_alias.c_str(), status);
+                    }
+                }
+            }
+        }
+
         update.add = true;
 	update.entry.port_name = update.port.m_alias;
         if (!port_old.m_alias.empty())

tests/test_mclag_fdb.py

@@ -20,6 +20,10 @@ def create_entry_pst(db, table, key, pairs):
     tbl = swsscommon.ProducerStateTable(db, table)
     create_entry(tbl, key, pairs)
 
+def delete_entry_tbl(db, table, key):
+    tbl = swsscommon.Table(db, table)
+    tbl._del(key)
+
 def delete_entry_pst(db, table, key):
     tbl = swsscommon.ProducerStateTable(db, table)
     tbl._del(key)
@@ -32,6 +36,14 @@ def get_port_oid(dvs, port_name):
             return k[1]
     return None
 
+def get_portchannel_oid(dvs, alias):
+    counters_db = swsscommon.DBConnector(swsscommon.COUNTERS_DB, dvs.redis_sock, 0)
+    lag_name_map_tbl = swsscommon.Table(counters_db, 'COUNTERS_LAG_NAME_MAP')
+    for k in lag_name_map_tbl.get('')[1]:
+        if k[0] == alias:
+            return k[1]
+    return None
+
 def get_bridge_port_oid(dvs, port_oid):
     tbl = swsscommon.Table(dvs.adb, "ASIC_STATE:SAI_OBJECT_TYPE_BRIDGE_PORT")
     for key in tbl.getKeys():
@@ -483,7 +495,77 @@ def test_mclagFdb_static_mac_dynamic_move_reject(dvs, testlog):
         "MCLAG_FDB_TABLE", "Vlan200:3C:85:99:5E:00:01",
     )
 
-# Test-12 Verify cleanup of the basic config.
+# Test-12 Verify Remote to Local Move.
+
+@pytest.mark.dev_sanity
+def test_mclagFdb_remote_to_local_mac_move_ntf(dvs, testlog):
+    dvs.setup_db()
+
+    #Add remote MAC to MCLAG_FDB_TABLE on PortChannel0005
+    create_entry_pst(
+        dvs.pdb,
+        "MCLAG_FDB_TABLE", "Vlan200:3C:85:99:5E:00:01",
+        [
+            ("port", "PortChannel0005"),
+            ("type", "dynamic"),
+        ]
+    )
+
+    # check that the FDB entry inserted into ASIC DB
+    assert how_many_entries_exist(dvs.adb, "ASIC_STATE:SAI_OBJECT_TYPE_FDB_ENTRY") == 1, "The MCLAG fdb entry not inserted to ASIC"
+
+    ok, extra = dvs.is_fdb_entry_exists(dvs.adb, "ASIC_STATE:SAI_OBJECT_TYPE_FDB_ENTRY",
+            [("mac", "3C:85:99:5E:00:01"), ("bvid", str(dvs.getVlanOid("200")))],
+            [("SAI_FDB_ENTRY_ATTR_TYPE", "SAI_FDB_ENTRY_TYPE_STATIC"),
+             ("SAI_FDB_ENTRY_ATTR_ALLOW_MAC_MOVE", "true")]
+    )
+
+    assert ok, str(extra)
+
+    mac = "3C:85:99:5E:00:01"
+    vlan_oid = dvs.getVlanOid("200")
+    switch_id = dvs.getSwitchOid()
+    port_oid = get_portchannel_oid(dvs, "PortChannel0008")
+    bp_port_oid = get_bridge_port_oid(dvs, port_oid)
+
+    # send fdb_event SAI_FDB_EVENT_MOVE 
+    ntf = swsscommon.NotificationProducer(dvs.adb, "NOTIFICATIONS")
+    fvp = swsscommon.FieldValuePairs()
+    ntf_data = "[{\"fdb_entry\":\"{\\\"bvid\\\":\\\""+vlan_oid+"\\\",\\\"mac\\\":\\\"3C:85:99:5E:00:01\\\",\\\"switch_id\\\":\\\""+switch_id+"\\\"}\",\"fdb_event\":\"SAI_FDB_EVENT_MOVE\",\"list\":[{\"id\":\"SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID\",\"value\":\""+bp_port_oid+"\"}]}]"
+    ntf.send("fdb_event", ntf_data, fvp)
+
+    time.sleep(2)
+
+    # check that the FDB entry was inserted into ASIC DB
+    assert how_many_entries_exist(dvs.adb, "ASIC_STATE:SAI_OBJECT_TYPE_FDB_ENTRY") == 1, "The fdb entry not inserted to ASIC"
+    ok, extra = dvs.is_fdb_entry_exists(dvs.adb, "ASIC_STATE:SAI_OBJECT_TYPE_FDB_ENTRY",
+            [("mac", "3C:85:99:5E:00:01"), ("bvid", str(dvs.getVlanOid("200")))],
+            [("SAI_FDB_ENTRY_ATTR_TYPE", "SAI_FDB_ENTRY_TYPE_DYNAMIC"),
+             ("SAI_FDB_ENTRY_ATTR_ALLOW_MAC_MOVE", "false")]
+    )
+    assert ok, str(extra)
+
+    delete_entry_tbl(
+        dvs.sdb,
+        "FDB_TABLE", "Vlan200:3c:85:99:5e:00:01",
+    ) 
+
+    time.sleep(2)
+
+    delete_entry_tbl(
+        dvs.adb,
+        "ASIC_STATE", "SAI_OBJECT_TYPE_FDB_ENTRY:{\"bvid\":\""+vlan_oid+"\",\"mac\":\"3C:85:99:5E:00:01\",\"switch_id\":\""+switch_id+"\"}"
+    )
+
+    # check that the FDB entry was deleted from ASIC DB
+    assert how_many_entries_exist(dvs.adb, "ASIC_STATE:SAI_OBJECT_TYPE_FDB_ENTRY") == 0, "The MCLAG static fdb entry not deleted"
+
+    delete_entry_pst(
+        dvs.pdb,
+        "MCLAG_FDB_TABLE", "Vlan200:3C:85:99:5E:00:01",
+    )
+
+# Test-13 Verify cleanup of the basic config.
 
 @pytest.mark.dev_sanity
 def test_mclagFdb_basic_config_del(dvs, testlog):