[muxorch] Use direct link for SoC IPs for active-active ports

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Author: lolyu

orchagent/muxorch.cpp

@@ -351,14 +351,14 @@ static bool remove_nh_tunnel(sai_object_id_t nh_id, IpAddress& ipAddr)
     return true;
 }
 
-MuxCable::MuxCable(string name, IpPrefix& srv_ip4, IpPrefix& srv_ip6, IpAddress peer_ip)
+MuxCable::MuxCable(string name, IpPrefix& srv_ip4, IpPrefix& srv_ip6, IpAddress peer_ip, std::set<IpAddress> ignored_neighbors)
          :mux_name_(name), srv_ip4_(srv_ip4), srv_ip6_(srv_ip6), peer_ip4_(peer_ip)
 {
     mux_orch_ = gDirectory.get<MuxOrch*>();
     mux_cb_orch_ = gDirectory.get<MuxCableOrch*>();
     mux_state_orch_ = gDirectory.get<MuxStateOrch*>();
 
-    nbr_handler_ = std::make_unique<MuxNbrHandler> (MuxNbrHandler());
+    nbr_handler_ = std::make_unique<MuxNbrHandler> (MuxNbrHandler(ignored_neighbors));
 
     state_machine_handlers_.insert(handler_pair(MUX_STATE_INIT_ACTIVE, &MuxCable::stateInitActive));
     state_machine_handlers_.insert(handler_pair(MUX_STATE_STANDBY_ACTIVE, &MuxCable::stateActive));
@@ -545,8 +545,21 @@ void MuxCable::updateNeighbor(NextHopKey nh, bool add)
     }
 }
 
+MuxNbrHandler::MuxNbrHandler(std::set<IpAddress> ignored_neighbors) : ignored_neighbors_(ignored_neighbors)
+{
+}
+
+bool MuxNbrHandler::isNeighborIgnored(IpAddress ip)
+{
+    return ignored_neighbors_.count(ip) != 0;
+}
+
 void MuxNbrHandler::update(NextHopKey nh, sai_object_id_t tunnelId, bool add, MuxState state)
 {
+    if (isNeighborIgnored(nh.ip_address)) {
+        SWSS_LOG_NOTICE("Skip neighbor %s on %s", nh.ip_address.to_string().c_str(), nh.alias.c_str());
+        return;
+    }
     SWSS_LOG_INFO("Neigh %s on %s, add %d, state %d",
                    nh.ip_address.to_string().c_str(), nh.alias.c_str(), add, state);
 
@@ -1208,9 +1221,37 @@ bool MuxOrch::handleMuxCfg(const Request& request)
     auto srv_ip = request.getAttrIpPrefix("server_ipv4");
     auto srv_ip6 = request.getAttrIpPrefix("server_ipv6");
 
+    std::set<IpAddress> ignored_neighbors;
+    std::string cable_type = "active-standby";
+
     const auto& port_name = request.getKeyString(0);
     auto op = request.getOperation();
 
+    for (const auto &name : request.getAttrFieldNames())
+    {
+        if (name == "soc_ipv4")
+        {
+            auto soc_ip = request.getAttrIpPrefix("soc_ipv4");
+            SWSS_LOG_NOTICE("%s: %s was added to ignored neighbor list", port_name.c_str(), soc_ip.getIp().to_string().c_str());
+            ignored_neighbors.insert(soc_ip.getIp());
+        }
+        else if (name == "soc_ipv6")
+        {
+            auto soc_ip6 = request.getAttrIpPrefix("soc_ipv6");
+            SWSS_LOG_NOTICE("%s: %s was added to ignored neighbor list", port_name.c_str(), soc_ip6.getIp().to_string().c_str());
+            ignored_neighbors.insert(soc_ip6.getIp());
+        }
+        else if (name == "cable_type")
+        {
+            cable_type = request.getAttrString("cable_type");
+        }
+    }
+
+    if (cable_type != "active-active")
+    {
+        ignored_neighbors.clear();
+    }
+
     if (op == SET_COMMAND)
     {
         if(isMuxExists(port_name))
@@ -1226,7 +1267,7 @@ bool MuxOrch::handleMuxCfg(const Request& request)
         }
 
         mux_cable_tb_[port_name] = std::make_unique<MuxCable>
-                                   (MuxCable(port_name, srv_ip, srv_ip6, mux_peer_switch_));
+                                   (MuxCable(port_name, srv_ip, srv_ip6, mux_peer_switch_, ignored_neighbors));
 
         SWSS_LOG_NOTICE("Mux entry for port '%s' was added", port_name.c_str());
     }

orchagent/muxorch.h

@@ -59,7 +59,7 @@ typedef std::map<IpAddress, sai_object_id_t> MuxNeighbor;
 class MuxNbrHandler
 {
 public:
-    MuxNbrHandler() = default;
+    MuxNbrHandler(std::set<IpAddress> ignored_neighbors = {});
 
     bool enable(bool update_rt);
     bool disable(sai_object_id_t);
@@ -68,6 +68,10 @@ class MuxNbrHandler
     sai_object_id_t getNextHopId(const NextHopKey);
 
 private:
+    inline bool isNeighborIgnored(IpAddress ip);
+
+private:
+    std::set<IpAddress> ignored_neighbors_;
     MuxNeighbor neighbors_;
     string alias_;
 };
@@ -76,7 +80,7 @@ class MuxNbrHandler
 class MuxCable
 {
 public:
-    MuxCable(string name, IpPrefix& srv_ip4, IpPrefix& srv_ip6, IpAddress peer_ip);
+    MuxCable(string name, IpPrefix& srv_ip4, IpPrefix& srv_ip6, IpAddress peer_ip, std::set<IpAddress> ignored_neighbors = {});
 
     bool isActive() const
     {

tests/test_mux.py

@@ -29,6 +29,10 @@ class TestMuxTunnelBase(object):
     SERV1_IPV6                  = "fc02:1000::100"
     SERV2_IPV4                  = "192.168.0.101"
     SERV2_IPV6                  = "fc02:1000::101"
+    SERV3_IPV4                  = "192.168.0.102"
+    SERV3_IPV6                  = "fc02:1000::102"
+    SERV3_SOC_IPV4              = "192.168.0.103"
+    SERV3_SOC_IPV6              = "fc02:1000::103"
     IPV4_MASK                   = "/32"
     IPV6_MASK                   = "/128"
     TUNNEL_NH_ID                = 0
@@ -80,6 +84,14 @@ def create_mux_cable(self, confdb):
         fvs = { "server_ipv4":self.SERV2_IPV4+self.IPV4_MASK, "server_ipv6":self.SERV2_IPV6+self.IPV6_MASK }
         confdb.create_entry(self.CONFIG_MUX_CABLE, "Ethernet4", fvs)
 
+        fvs = {
+            "server_ipv4": self.SERV3_IPV4 + self.IPV4_MASK,
+            "server_ipv6": self.SERV3_IPV6 + self.IPV6_MASK,
+            "soc_ipv4": self.SERV3_SOC_IPV4 + self.IPV4_MASK,
+            "soc_ipv6": self.SERV3_SOC_IPV6 + self.IPV6_MASK,
+            "cable_type": "active-active"
+        }
+        confdb.create_entry(self.CONFIG_MUX_CABLE, "Ethernet8", fvs)
 
     def set_mux_state(self, appdb, ifname, state_change):
 
@@ -193,6 +205,7 @@ def create_and_test_neighbor(self, confdb, appdb, asicdb, dvs, dvs_route):
 
         self.set_mux_state(appdb, "Ethernet0", "active")
         self.set_mux_state(appdb, "Ethernet4", "standby")
+        self.set_mux_state(appdb, "Ethernet8", "active")
 
         self.add_neighbor(dvs, self.SERV1_IPV4, "00:00:00:00:00:01")
         # Broadcast neigh 192.168.0.255 is default added. Hence +1 for expected number
@@ -201,6 +214,18 @@ def create_and_test_neighbor(self, confdb, appdb, asicdb, dvs, dvs_route):
         self.add_neighbor(dvs, self.SERV1_IPV6, "00:00:00:00:00:01", True)
         srv1_v6 = self.check_neigh_in_asic_db(asicdb, self.SERV1_IPV6, 3)
 
+        self.add_neighbor(dvs, self.SERV3_IPV4, "00:00:00:00:00:03")
+        srv3_v4 = self.check_neigh_in_asic_db(asicdb, self.SERV3_IPV4, 4)
+
+        self.add_neighbor(dvs, self.SERV3_IPV6, "00:00:00:00:00:03", True)
+        srv3_v6 = self.check_neigh_in_asic_db(asicdb, self.SERV3_IPV6, 5)
+
+        self.add_neighbor(dvs, self.SERV3_SOC_IPV4, "00:00:00:00:00:04")
+        self.check_neigh_in_asic_db(asicdb, self.SERV3_SOC_IPV4, 6)
+
+        self.add_neighbor(dvs, self.SERV3_SOC_IPV6, "00:00:00:00:00:04", True)
+        self.check_neigh_in_asic_db(asicdb, self.SERV3_SOC_IPV6, 7)
+
         existing_keys = asicdb.get_keys(self.ASIC_NEIGH_TABLE)
 
         self.add_neighbor(dvs, self.SERV2_IPV4, "00:00:00:00:00:02")
@@ -225,9 +250,18 @@ def create_and_test_neighbor(self, confdb, appdb, asicdb, dvs, dvs_route):
         self.set_mux_state(appdb, "Ethernet4", "active")
 
         dvs_route.check_asicdb_deleted_route_entries([self.SERV2_IPV4+self.IPV4_MASK, self.SERV2_IPV6+self.IPV6_MASK])
-        self.check_neigh_in_asic_db(asicdb, self.SERV2_IPV4, 3)
-        self.check_neigh_in_asic_db(asicdb, self.SERV2_IPV6, 3)
+        self.check_neigh_in_asic_db(asicdb, self.SERV2_IPV4, 7)
+        self.check_neigh_in_asic_db(asicdb, self.SERV2_IPV6, 7)
+
+        self.set_mux_state(appdb, "Ethernet8", "standby")
+
+        asicdb.wait_for_deleted_entry(self.ASIC_NEIGH_TABLE, srv3_v4)
+        asicdb.wait_for_deleted_entry(self.ASIC_NEIGH_TABLE, srv3_v6)
+        dvs_route.check_asicdb_route_entries([self.SERV3_IPV4+self.IPV4_MASK, self.SERV3_IPV6+self.IPV6_MASK])
 
+        self.check_neigh_in_asic_db(asicdb, self.SERV3_SOC_IPV4, 5)
+        self.check_neigh_in_asic_db(asicdb, self.SERV3_SOC_IPV4, 5)
+        dvs_route.check_asicdb_deleted_route_entries([self.SERV3_SOC_IPV4+self.IPV4_MASK, self.SERV3_SOC_IPV4+self.IPV6_MASK])
 
     def create_and_test_fdb(self, appdb, asicdb, dvs, dvs_route):