[intfsorch]:add support to change rif mac address

cfgmgr/intfmgr.cpp

@@ -184,6 +184,28 @@ bool IntfMgr::doIntfAddrTask(const vector<string>& keys,
     bool is_lo = !alias.compare(0, strlen(LOOPBACK_PREFIX), LOOPBACK_PREFIX);
     string appKey = (is_lo ? "lo" : keys[0]) + ":" + keys[1];
 
+    MacAddress mac;
+    bool invalid_mac = false;
+
+    for (auto idx : data)
+    {
+        const auto &field = fvField(idx);
+        const auto &value = fvValue(idx);
+        if (field == "mac_addr")
+        {
+            try
+            {
+                mac = MacAddress(value);
+            }
+            catch (const std::invalid_argument& e)
+            {
+                SWSS_LOG_ERROR("Invalid Mac addr '%s' for '%s'", value.c_str(), alias.c_str());
+                invalid_mac = true;
+                break;
+            }
+        }
+    }
+
     if (op == SET_COMMAND)
     {
         /*
@@ -207,6 +229,15 @@ bool IntfMgr::doIntfAddrTask(const vector<string>& keys,
         FieldValueTuple s("scope", "global");
         fvVector.push_back(s);
         fvVector.push_back(f);
+        /*Set the mac of interface*/
+        if(mac)
+        {
+            if (invalid_mac == false)
+            {
+                FieldValueTuple mac_attr("mac_addr",mac.to_string().c_str());
+                fvVector.push_back(mac_attr);
+            }
+        }
 
         m_appIntfTableProducer.set(appKey, fvVector);
         m_stateIntfTable.hset(keys[0] + state_db_key_delimiter + keys[1], "state", "ok");

orchagent/intfsorch.cpp

@@ -181,6 +181,7 @@ void IntfsOrch::doTask(Consumer &consumer)
     while (it != consumer.m_toSync.end())
     {
         KeyOpFieldsValuesTuple t = it->second;
+        MacAddress mac;
 
         vector<string> keys = tokenize(kfvKey(t), ':');
         string alias(keys[0]);
@@ -208,6 +209,10 @@ void IntfsOrch::doTask(Consumer &consumer)
             {
                 vnet_name = value;
             }
+            else if (field == "mac_addr")
+            {
+                mac = MacAddress(value);
+            }
         }
 
         if (alias == "eth0" || alias == "docker0")
@@ -299,6 +304,31 @@ void IntfsOrch::doTask(Consumer &consumer)
                 }
             }
 
+            if (mac)
+            {
+                auto it_intfs = m_syncdIntfses.find(alias);
+                if (it_intfs != m_syncdIntfses.end())
+                {
+                /* Get mac information and update mac of the interface*/
+                    sai_attribute_t attr;
+
+                    attr.id = SAI_ROUTER_INTERFACE_ATTR_SRC_MAC_ADDRESS;
+                    memcpy(attr.value.mac, mac.getMac(), sizeof(sai_mac_t));
+
+                    sai_status_t status = sai_router_intfs_api->set_router_interface_attribute(port.m_rif_id, &attr);
+                    if (status != SAI_STATUS_SUCCESS)
+                    {
+                        SWSS_LOG_ERROR("Failed to set router interface mac %s for port %s, rv:%d",
+                                                     mac.to_string().c_str(), port.m_alias.c_str(), status);
+                    }
+                    else
+                    {
+                        SWSS_LOG_NOTICE("Set router interface mac %s for port %s success",
+                                                      mac.to_string().c_str(), port.m_alias.c_str());
+                    }
+                }
+            }
+
             it = consumer.m_toSync.erase(it);
         }
         else if (op == DEL_COMMAND)

tests/test_intf_mac.py

@@ -0,0 +1,216 @@
+from swsscommon import swsscommon
+
+import time
+import json
+
+class TestRouterInterfaceMac(object):
+    def set_mac(self, dvs, interface, mac, ip):
+        tbl = swsscommon.Table(dvs.cdb, "INTERFACE")
+        fvs = swsscommon.FieldValuePairs([("mac_addr", mac)])
+        tbl.set(interface + "|" + ip, fvs)
+        time.sleep(2)
+
+    def find_mac(self, dvs, interface, mac):
+        port_oid = dvs.asicdb.portnamemap[interface]
+
+        tbl = swsscommon.Table(dvs.adb, "ASIC_STATE:SAI_OBJECT_TYPE_ROUTER_INTERFACE")
+        intf_entries = tbl.getKeys()
+        for key in intf_entries:
+            (status, fvs) = tbl.get(key)
+            assert status == True
+            values = dict(fvs)
+            if "SAI_ROUTER_INTERFACE_TYPE_PORT" != values["SAI_ROUTER_INTERFACE_ATTR_TYPE"]:
+                continue
+            if port_oid == values["SAI_ROUTER_INTERFACE_ATTR_PORT_ID"] and mac == values["SAI_ROUTER_INTERFACE_ATTR_SRC_MAC_ADDRESS"]:
+                return True
+        return False
+
+    def test_InterfaceSetMac(self, dvs, testlog):
+        dvs.setup_db()
+
+        # assign IP to interface
+        dvs.add_ip_address("Ethernet8", "10.0.0.4/31")
+
+        # set MAC to interface
+        self.set_mac(dvs, "Ethernet8", "6C:EC:5A:11:22:33", "10.0.0.4/31")
+
+        # check application database
+        tbl = swsscommon.Table(dvs.pdb, "INTF_TABLE:Ethernet8")
+        (status, fvs) = tbl.get(tbl.getKeys()[0])
+        assert status == True
+        values = dict(fvs)
+        assert values["mac_addr"] == "6c:ec:5a:11:22:33"
+
+        # check ASIC router interface database
+        src_mac_addr_found = self.find_mac(dvs, "Ethernet8", "6C:EC:5A:11:22:33")
+        assert src_mac_addr_found == True
+
+        # remove IP from interface
+        dvs.remove_ip_address("Ethernet8", "10.0.0.4/31")
+
+        # check application database
+        tbl = swsscommon.Table(dvs.pdb, "INTF_TABLE:Ethernet8")
+        intf_entries = tbl.getKeys()
+        assert len(intf_entries) == 0
+
+    def test_InterfaceChangeMac(self, dvs, testlog):
+        dvs.setup_db()
+
+        # assign IP to interface
+        dvs.add_ip_address("Ethernet12", "12.0.0.4/31")
+
+        # set MAC to interface
+        self.set_mac(dvs, "Ethernet12", "6C:EC:5A:22:33:44", "12.0.0.4/31")
+
+        # change interface MAC
+        self.set_mac(dvs, "Ethernet12", "6C:EC:5A:33:44:55", "12.0.0.4/31")
+
+        # check application database
+        tbl = swsscommon.Table(dvs.pdb, "INTF_TABLE:Ethernet12")
+        (status, fvs) = tbl.get(tbl.getKeys()[0])
+        assert status == True
+        values = dict(fvs)
+        assert values["mac_addr"] == "6c:ec:5a:33:44:55"
+
+        # check ASIC router interface database
+        src_mac_addr_found = self.find_mac(dvs, "Ethernet12", "6C:EC:5A:33:44:55")
+        assert src_mac_addr_found == True
+
+        # remove IP from interface
+        dvs.remove_ip_address("Ethernet12", "12.0.0.4/31")
+
+        # check application database
+        tbl = swsscommon.Table(dvs.pdb, "INTF_TABLE:Ethernet12")
+        intf_entries = tbl.getKeys()
+        assert len(intf_entries) == 0
+
+class TestLagRouterInterfaceMac(object):
+    def create_port_channel(self, dvs, alias):
+        tbl = swsscommon.Table(dvs.cdb, "PORTCHANNEL")
+        fvs = swsscommon.FieldValuePairs([("admin_status", "up"),
+                                          ("mtu", "9100")])
+        tbl.set(alias, fvs)
+        time.sleep(1)
+
+    def remove_port_channel(self, dvs, alias):
+        tbl = swsscommon.Table(dvs.cdb, "PORTCHANNEL")
+        tbl._del(alias)
+        time.sleep(1)
+
+    def add_port_channel_members(self, dvs, lag, members):
+        tbl = swsscommon.Table(dvs.cdb, "PORTCHANNEL_MEMBER")
+        fvs = swsscommon.FieldValuePairs([("NULL", "NULL")])
+        for member in members:
+            tbl.set(lag + "|" + member, fvs)
+            time.sleep(1)
+
+    def remove_port_channel_members(self, dvs, lag, members):
+        tbl = swsscommon.Table(dvs.cdb, "PORTCHANNEL_MEMBER")
+        for member in members:
+            tbl._del(lag + "|" + member)
+            time.sleep(1)
+
+    def set_mac(self, dvs, interface, mac, ip):
+        tbl = swsscommon.Table(dvs.cdb, "PORTCHANNEL_INTERFACE")
+        fvs = swsscommon.FieldValuePairs([("mac_addr", mac)])
+        tbl.set(interface + "|" + ip, fvs)
+        time.sleep(2)
+
+    def find_mac(self, dvs, lag_oid, mac):
+        tbl = swsscommon.Table(dvs.adb, "ASIC_STATE:SAI_OBJECT_TYPE_ROUTER_INTERFACE")
+        intf_entries = tbl.getKeys()
+
+        for key in intf_entries:
+            (status, fvs) = tbl.get(key)
+            assert status == True
+            values = dict(fvs)
+            if "SAI_ROUTER_INTERFACE_TYPE_PORT" != values["SAI_ROUTER_INTERFACE_ATTR_TYPE"]:
+                continue
+            if lag_oid == values["SAI_ROUTER_INTERFACE_ATTR_PORT_ID"] and mac == values["SAI_ROUTER_INTERFACE_ATTR_SRC_MAC_ADDRESS"]:
+                return True
+        return False
+
+    def test_InterfaceSetMac(self, dvs, testlog):
+        dvs.setup_db()
+
+        # create port channel
+        self.create_port_channel(dvs, "PortChannel001")
+
+        # assign IP to interface
+        dvs.add_ip_address("PortChannel001", "30.0.0.4/31")
+
+        # set MAC to interface
+        self.set_mac(dvs, "PortChannel001", "6C:EC:5A:11:22:33", "30.0.0.4/31")
+
+        # check application database
+        tbl = swsscommon.Table(dvs.pdb, "INTF_TABLE:PortChannel001")
+        (status, fvs) = tbl.get(tbl.getKeys()[0])
+        assert status == True
+        values = dict(fvs)
+        assert values["mac_addr"] == "6c:ec:5a:11:22:33"
+
+        # get PortChannel oid; When sonic-swss pr885 is complete, you can get oid directly from COUNTERS_LAG_NAME_MAP, which would be better.
+        lag_tbl = swsscommon.Table(dvs.adb, "ASIC_STATE:SAI_OBJECT_TYPE_LAG")
+        lag_entries = lag_tbl.getKeys()
+        # At this point there should be only one lag in the system, which is PortChannel001.
+        assert len(lag_entries) == 1
+        lag_oid = lag_entries[0]
+
+        # check ASIC router interface database
+        src_mac_addr_found = self.find_mac(dvs, lag_oid, "6C:EC:5A:11:22:33")
+        assert src_mac_addr_found == True
+
+        # remove IP from interface
+        dvs.remove_ip_address("PortChannel001", "30.0.0.4/31")
+
+        # check application database
+        tbl = swsscommon.Table(dvs.pdb, "INTF_TABLE:PortChannel001")
+        intf_entries = tbl.getKeys()
+        assert len(intf_entries) == 0
+
+        # remove port channel
+        self.remove_port_channel(dvs, "PortChannel001")
+
+    def test_InterfaceChangeMac(self, dvs, testlog):
+        dvs.setup_db()
+
+        # create port channel
+        self.create_port_channel(dvs, "PortChannel002")
+
+        # assign IP to interface
+        dvs.add_ip_address("PortChannel002", "32.0.0.4/31")
+
+        # set MAC to interface
+        self.set_mac(dvs, "PortChannel002", "6C:EC:5A:22:33:44", "32.0.0.4/31")
+
+        # change interface MAC
+        self.set_mac(dvs, "PortChannel002", "6C:EC:5A:33:44:55", "32.0.0.4/31")
+
+        # check application database
+        tbl = swsscommon.Table(dvs.pdb, "INTF_TABLE:PortChannel002")
+        (status, fvs) = tbl.get(tbl.getKeys()[0])
+        assert status == True
+        values = dict(fvs)
+        assert values["mac_addr"] == "6c:ec:5a:33:44:55"
+
+        # get PortChannel oid; When sonic-swss pr885 is complete, you can get oid directly from COUNTERS_LAG_NAME_MAP, which would be better.
+        lag_tbl = swsscommon.Table(dvs.adb, "ASIC_STATE:SAI_OBJECT_TYPE_LAG")
+        lag_entries = lag_tbl.getKeys()
+        # At this point there should be only one lag in the system, which is PortChannel002.
+        assert len(lag_entries) == 1
+        lag_oid = lag_entries[0]
+
+        # check ASIC router interface database
+        src_mac_addr_found = self.find_mac(dvs, lag_oid, "6C:EC:5A:33:44:55")
+        assert src_mac_addr_found == True
+
+        # remove IP from interface
+        dvs.remove_ip_address("PortChannel002", "32.0.0.4/31")
+
+        # check application database
+        tbl = swsscommon.Table(dvs.pdb, "INTF_TABLE:PortChannel002")
+        intf_entries = tbl.getKeys()
+        assert len(intf_entries) == 0
+
+        # remove port channel
+        self.remove_port_channel(dvs, "PortChannel002")