[muxorch] Always use direct link for SoC IPs

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)
-         :mux_name_(name), srv_ip4_(srv_ip4), srv_ip6_(srv_ip6), peer_ip4_(peer_ip)
+MuxCable::MuxCable(string name, IpPrefix& srv_ip4, IpPrefix& srv_ip6, IpAddress peer_ip, std::set<IpAddress> always_active_neighbors)
+         :mux_name_(name), srv_ip4_(srv_ip4), srv_ip6_(srv_ip6), peer_ip4_(peer_ip), always_active_neighbors_(always_active_neighbors)
 {
     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(always_active_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));
@@ -534,7 +534,8 @@ bool MuxCable::nbrHandler(bool enable, bool update_rt)
 void MuxCable::updateNeighbor(NextHopKey nh, bool add)
 {
     sai_object_id_t tnh = mux_orch_->getNextHopTunnelId(MUX_TUNNEL, peer_ip4_);
-    nbr_handler_->update(nh, tnh, add, state_);
+    MuxState state = (always_active_neighbors_.count(nh.ip_address) != 0) ? MuxState::MUX_STATE_ACTIVE : state_;
+    nbr_handler_->update(nh, tnh, add, state);
     if (add)
     {
         mux_orch_->addNexthop(nh, mux_name_);
@@ -545,6 +546,10 @@ void MuxCable::updateNeighbor(NextHopKey nh, bool add)
     }
 }
 
+MuxNbrHandler::MuxNbrHandler(std::set<IpAddress> always_enabled_neighbors) : always_enabled_neighbors_(always_enabled_neighbors)
+{
+}
+
 void MuxNbrHandler::update(NextHopKey nh, sai_object_id_t tunnelId, bool add, MuxState state)
 {
     SWSS_LOG_INFO("Neigh %s on %s, add %d, state %d",
@@ -611,7 +616,7 @@ bool MuxNbrHandler::enable(bool update_rt)
         neigh = NeighborEntry(it->first, alias_);
         if (!gNeighOrch->enableNeighbor(neigh))
         {
-            SWSS_LOG_INFO("Enabling neigh failed for %s", neigh.ip_address.to_string().c_str());
+            SWSS_LOG_NOTICE("Enabling neigh failed for %s", neigh.ip_address.to_string().c_str());
             return false;
         }
 
@@ -650,6 +655,9 @@ bool MuxNbrHandler::enable(bool update_rt)
         /* Increment ref count for ECMP NH members */
         gNeighOrch->increaseNextHopRefCount(nh_key, nh_added);
 
+        if (always_enabled_neighbors_.count(it->first) != 0) {
+            update_rt = false;
+        }
         IpPrefix pfx = it->first.to_string();
         if (update_rt)
         {
@@ -671,9 +679,13 @@ bool MuxNbrHandler::disable(sai_object_id_t tnh)
     NeighborEntry neigh;
     MuxCableOrch* mux_cb_orch = gDirectory.get<MuxCableOrch*>();
 
-    auto it = neighbors_.begin();
-    while (it != neighbors_.end())
+    for (auto it = neighbors_.begin(); it != neighbors_.end(); ++it)
     {
+        if (always_enabled_neighbors_.count(it->first) != 0) {
+            SWSS_LOG_NOTICE("Skip disabling neigh %s on %s", it->first.to_string().c_str(), alias_.c_str());
+            continue;
+        }
+
         SWSS_LOG_INFO("Disabling neigh %s on %s", it->first.to_string().c_str(), alias_.c_str());
 
         /* Update NH to point to Tunnel nexhtop */
@@ -722,8 +734,6 @@ bool MuxNbrHandler::disable(sai_object_id_t tnh)
         {
             return false;
         }
-
-        it++;
     }
 
     return true;
@@ -1208,7 +1218,36 @@ bool MuxOrch::handleMuxCfg(const Request& request)
     auto srv_ip = request.getAttrIpPrefix("server_ipv4");
     auto srv_ip6 = request.getAttrIpPrefix("server_ipv6");
 
+    std::set<IpAddress> always_active_neighbors;
+    std::string cable_type = "active-standby";
+
     const auto& port_name = request.getKeyString(0);
+
+    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 always active list", port_name.c_str(), soc_ip.getIp().to_string().c_str());
+            always_active_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 always active list", port_name.c_str(), soc_ip6.getIp().to_string().c_str());
+            always_active_neighbors.insert(soc_ip6.getIp());
+        }
+        else if (name == "cable_type")
+        {
+            cable_type = request.getAttrString("cable_type");
+        }
+    }
+
+    if (cable_type != "active-active")
+    {
+        always_active_neighbors.clear();
+    }
+
     auto op = request.getOperation();
 
     if (op == SET_COMMAND)
@@ -1226,7 +1265,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_, always_active_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> always_enabled_neighbors = {});
 
     bool enable(bool update_rt);
     bool disable(sai_object_id_t);
@@ -68,6 +68,7 @@ class MuxNbrHandler
     sai_object_id_t getNextHopId(const NextHopKey);
 
 private:
+    std::set<IpAddress> always_enabled_neighbors_;
     MuxNeighbor neighbors_;
     string alias_;
 };
@@ -76,7 +77,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> always_active_neighbors);
 
     bool isActive() const
     {
@@ -115,6 +116,8 @@ class MuxCable
     IpPrefix srv_ip4_, srv_ip6_;
     IpAddress peer_ip4_;
 
+    std::set<IpAddress> always_active_neighbors_;
+
     MuxOrch *mux_orch_;
     MuxCableOrch *mux_cb_orch_;
     MuxStateOrch *mux_state_orch_;