[ssw][ha] set SAI_ENI_ATTR_IS_HA_FLOW_OWNER & SAI_ENI_ATTR_HA_SCOPE_ID when creating eni (sonic-net#3881)

zjswhhh · web-flow · commit 85a0615452c3 · 2025-10-20T16:34:22.000-07:00
What I did
Before ENI is programmed, supposedly HA is programmed already. Based on the ha scope, we will configure SAI_ENI_ATTR_IS_HA_FLOW_OWNER &amp; SAI_ENI_ATTR_HA_SCOPE_ID.
diff --git a/orchagent/dash/dashhaorch.cpp b/orchagent/dash/dashhaorch.cpp
@@ -86,6 +86,9 @@ DashHaOrch::DashHaOrch(DBConnector *db, const vector<string> &tables, DashOrch *
 
     register_ha_set_notifier();
     register_ha_scope_notifier();
+
+    // Register this DashHaOrch instance with DashOrch
+    m_dash_orch->setDashHaOrch(this);
 }
 
 bool DashHaOrch::register_ha_set_notifier()
@@ -190,6 +193,21 @@ std::string DashHaOrch::getHaScopeObjectKey(const sai_object_id_t ha_scope_oid)
     return "";
 }
 
+HaScopeEntry DashHaOrch::getHaScopeForEni(const std::string& eni)
+{
+    SWSS_LOG_ENTER();
+
+    if (m_ha_scope_entries.empty())
+    {
+        HaScopeEntry emptyEntry;
+        emptyEntry.ha_scope_id = SAI_NULL_OBJECT_ID;
+        return emptyEntry;
+    }
+
+    /* Return the first entry. This logic only applies to DPU Scope HA */
+    return m_ha_scope_entries.begin()->second;
+}
+
 bool DashHaOrch::addHaSetEntry(const std::string &key, const dash::ha_set::HaSet &entry)
 {
     SWSS_LOG_ENTER();
diff --git a/orchagent/dash/dashhaorch.h b/orchagent/dash/dashhaorch.h
@@ -98,7 +98,7 @@ class DashHaOrch : public ZmqOrch
 
     std::unique_ptr<swss::Table> dash_ha_set_result_table_;
     std::unique_ptr<swss::Table> dash_ha_scope_result_table_;
-    
+
     std::unique_ptr<swss::DBConnector> m_dpuStateDbConnector;
     std::unique_ptr<swss::Table> m_dpuStateDbHaSetTable;
     std::unique_ptr<swss::Table> m_dpuStateDbHaScopeTable;
@@ -110,6 +110,7 @@ class DashHaOrch : public ZmqOrch
     const HaSetTable& getHaSetEntries() const { return m_ha_set_entries; };
     const HaScopeTable& getHaScopeEntries() const { return m_ha_scope_entries; };
     const DashBfdSessionTable& getBfdSessionPendingCreation() const { return m_bfd_session_pending_creation; };
+    virtual HaScopeEntry getHaScopeForEni(const std::string& eni);
 };
 
 #endif // DASHHAORCH_H
diff --git a/orchagent/dash/dashorch.cpp b/orchagent/dash/dashorch.cpp
@@ -9,6 +9,7 @@
 
 #include "converter.h"
 #include "dashorch.h"
+#include "dashhaorch.h"
 #include "macaddress.h"
 #include "orch.h"
 #include "sai.h"
@@ -91,6 +92,12 @@ DashOrch::DashOrch(DBConnector *db, vector<string> &tableName, DBConnector *app_
     }
 }
 
+void DashOrch::setDashHaOrch(DashHaOrch *dash_ha_orch)
+{
+    SWSS_LOG_ENTER();
+    m_dash_ha_orch = dash_ha_orch;
+}
+
 bool DashOrch::getRouteTypeActions(dash::route_type::RoutingType routing_type, dash::route_type::RouteType& route_type)
 {
     SWSS_LOG_ENTER();
@@ -554,14 +561,14 @@ bool DashOrch::addEniObject(const string& eni, EniEntry& entry)
     }
 
     DashMeterOrch *dash_meter_orch = gDirectory.get<DashMeterOrch*>();
-    const string &v4_meter_policy  = entry.metadata.has_v4_meter_policy_id() ? 
+    const string &v4_meter_policy  = entry.metadata.has_v4_meter_policy_id() ?
                                      entry.metadata.v4_meter_policy_id() : "";
-    const string &v6_meter_policy  = entry.metadata.has_v6_meter_policy_id() ? 
+    const string &v6_meter_policy  = entry.metadata.has_v6_meter_policy_id() ?
                                      entry.metadata.v6_meter_policy_id() : "";
 
     if (!v4_meter_policy.empty())
     {
-        sai_object_id_t meter_policy_oid = dash_meter_orch->getMeterPolicyOid(v4_meter_policy);    
+        sai_object_id_t meter_policy_oid = dash_meter_orch->getMeterPolicyOid(v4_meter_policy);
         if (meter_policy_oid == SAI_NULL_OBJECT_ID)
         {
             SWSS_LOG_INFO("Retry as v4 meter_policy %s not found", v4_meter_policy.c_str());
@@ -570,7 +577,7 @@ bool DashOrch::addEniObject(const string& eni, EniEntry& entry)
     }
     if (!v6_meter_policy.empty())
     {
-        sai_object_id_t meter_policy_oid = dash_meter_orch->getMeterPolicyOid(v6_meter_policy);    
+        sai_object_id_t meter_policy_oid = dash_meter_orch->getMeterPolicyOid(v6_meter_policy);
         if (meter_policy_oid == SAI_NULL_OBJECT_ID)
         {
             SWSS_LOG_INFO("Retry as v6 meter_policy %s not found", v6_meter_policy.c_str());
@@ -639,17 +646,54 @@ bool DashOrch::addEniObject(const string& eni, EniEntry& entry)
     if (!v4_meter_policy.empty())
     {
         eni_attr.id = SAI_ENI_ATTR_V4_METER_POLICY_ID;
-        eni_attr.value.oid = dash_meter_orch->getMeterPolicyOid(v4_meter_policy);    
+        eni_attr.value.oid = dash_meter_orch->getMeterPolicyOid(v4_meter_policy);
         eni_attrs.push_back(eni_attr);
     }
 
     if (!v6_meter_policy.empty())
     {
         eni_attr.id = SAI_ENI_ATTR_V6_METER_POLICY_ID;
-        eni_attr.value.oid = dash_meter_orch->getMeterPolicyOid(v6_meter_policy);    
+        eni_attr.value.oid = dash_meter_orch->getMeterPolicyOid(v6_meter_policy);
         eni_attrs.push_back(eni_attr);
     }
 
+    // Set HA Scope ID if DashHaOrch is available and has HA scopes configured
+    if (m_dash_ha_orch != nullptr)
+    {
+        HaScopeEntry ha_scope_entry = m_dash_ha_orch->getHaScopeForEni(eni);
+        if (ha_scope_entry.ha_scope_id != SAI_NULL_OBJECT_ID)
+        {
+            eni_attr.id = SAI_ENI_ATTR_HA_SCOPE_ID;
+            eni_attr.value.oid = ha_scope_entry.ha_scope_id;
+            eni_attrs.push_back(eni_attr);
+            SWSS_LOG_INFO("Setting HA Scope ID %" PRIx64 " for ENI %s", ha_scope_entry.ha_scope_id, eni.c_str());
+
+            // Set HA flow owner based on HA role
+            eni_attr.id = SAI_ENI_ATTR_IS_HA_FLOW_OWNER;
+            if (ha_scope_entry.metadata.ha_role() == dash::types::HA_ROLE_ACTIVE || ha_scope_entry.metadata.ha_role() == dash::types::HA_ROLE_STANDALONE)
+            {
+                eni_attr.value.booldata = true;
+                SWSS_LOG_INFO("Setting HA flow owner to true (ACTIVE) for ENI %s", eni.c_str());
+            }
+            else if (ha_scope_entry.metadata.ha_role() == dash::types::HA_ROLE_STANDBY)
+            {
+                eni_attr.value.booldata = false;
+                SWSS_LOG_INFO("Setting HA flow owner to false (STANDBY) for ENI %s", eni.c_str());
+            }
+            else
+            {
+                // For other roles (DEAD, SWITCHING_TO_ACTIVE), default to false
+                eni_attr.value.booldata = false;
+                SWSS_LOG_INFO("Setting HA flow owner to false (role: %s) for ENI %s", dash::types::HaRole_Name(ha_scope_entry.metadata.ha_role()).c_str(), eni.c_str());
+            }
+            eni_attrs.push_back(eni_attr);
+        }
+        else
+        {
+            SWSS_LOG_INFO("No HA Scope ID set for ENI %s", eni.c_str());
+        }
+    }
+
     if (entry.metadata.has_eni_mode()) {
         auto it = eniModeMap.find(entry.metadata.eni_mode());
         eni_attr.id = SAI_ENI_ATTR_DASH_ENI_MODE;
@@ -838,9 +882,9 @@ bool DashOrch::removeEniObject(const string& eni)
         }
     }
 
-    const string &v4_meter_policy  = entry.metadata.has_v4_meter_policy_id() ? 
+    const string &v4_meter_policy  = entry.metadata.has_v4_meter_policy_id() ?
                                      entry.metadata.v4_meter_policy_id() : "";
-    const string &v6_meter_policy  = entry.metadata.has_v6_meter_policy_id() ? 
+    const string &v6_meter_policy  = entry.metadata.has_v6_meter_policy_id() ?
                                      entry.metadata.v6_meter_policy_id() : "";
 
     if (!v4_meter_policy.empty())
@@ -1367,7 +1411,7 @@ void DashOrch::removeEniMapEntry(sai_object_id_t oid, const string &name) {
 
 void DashOrch::addEniToFC(sai_object_id_t oid, const string &name)
 {
-    if (!m_eni_fc_status) 
+    if (!m_eni_fc_status)
     {
        return ;
     }
diff --git a/orchagent/dash/dashorch.h b/orchagent/dash/dashorch.h
@@ -31,6 +31,8 @@
 #define DASH_RESULT_SUCCESS 0
 #define DASH_RESULT_FAILURE 1
 
+class DashHaOrch;
+
 struct EniEntry
 {
     sai_object_id_t eni_id;
@@ -53,6 +55,7 @@ class DashOrch : public ZmqOrch
 {
 public:
     DashOrch(swss::DBConnector *db, std::vector<std::string> &tables, swss::DBConnector *app_state_db, swss::ZmqServer *zmqServer);
+    void setDashHaOrch(DashHaOrch *dash_ha_orch);
     const EniEntry *getEni(const std::string &eni) const;
     const EniTable *getEniTable() const { return &eni_entries_; };
     bool getRouteTypeActions(dash::route_type::RoutingType routing_type, dash::route_type::RouteType& route_type);
@@ -110,6 +113,7 @@ class DashOrch : public ZmqOrch
     std::shared_ptr<swss::DBConnector> m_counter_db;
     std::shared_ptr<swss::DBConnector> m_asic_db;
     swss::SelectableTimer* m_fc_update_timer = nullptr;
+    DashHaOrch* m_dash_ha_orch = nullptr;
 
     void doTask(swss::SelectableTimer&);
     void addEniMapEntry(sai_object_id_t oid, const std::string& name);
diff --git a/tests/mock_tests/dashorch_ut.cpp b/tests/mock_tests/dashorch_ut.cpp
@@ -20,6 +20,24 @@ EXTERN_MOCK_FNS
 
 namespace dashorch_test
 {
+    class MockDashHaOrch : public DashHaOrch
+    {
+    public:
+        MockDashHaOrch(DBConnector *db, const std::vector<std::string> &tableNames, DashOrch *dash_orch, BfdOrch *bfd_orch, DBConnector *app_state_db, ZmqServer *zmqServer)
+            : DashHaOrch(db, tableNames, dash_orch, bfd_orch, app_state_db, zmqServer) {}
+
+        HaScopeEntry getHaScopeForEni(const std::string& eni) override
+        {
+            HaScopeEntry entry;
+
+            entry.ha_scope_id = 0x123456789ABCDEF0ULL;
+            entry.metadata.set_ha_role(dash::types::HA_ROLE_ACTIVE);
+            entry.metadata.set_disabled(false);
+
+            return entry;
+        }
+    };
+
     DEFINE_SAI_GENERIC_APIS_MOCK(dash_eni, eni)
     DEFINE_SAI_ENTRY_APIS_MOCK(dash_trusted_vni, global_trusted_vni, eni_trusted_vni)
     DEFINE_SAI_ENTRY_APIS_MOCK(dash_direction_lookup, direction_lookup)
@@ -63,6 +81,8 @@ namespace dashorch_test
         }
     }
     class DashOrchTest : public MockDashOrchTest, public ::testing::WithParamInterface<std::tuple<ValueOrRange, ValueOrRange>> {
+    private:
+        std::unique_ptr<MockDashHaOrch> m_mock_dash_ha_orch;
         
         void ApplySaiMock()
         {
@@ -72,6 +92,13 @@ namespace dashorch_test
             MockSaiApis();
         }
 
+        void PostSetUp()
+        {
+            m_mock_dash_ha_orch = std::make_unique<MockDashHaOrch>(m_dpu_app_db.get(), std::vector<std::string>{APP_DASH_HA_SET_TABLE_NAME, APP_DASH_HA_SCOPE_TABLE_NAME}, m_DashOrch, nullptr, m_dpu_app_state_db.get(), nullptr);
+
+            m_DashOrch->setDashHaOrch(m_mock_dash_ha_orch.get());
+        }
+
         void PreTearDown() override
         {
             RestoreSaiApis();
