From 4c434cef68262c7430a7c679ad8e776c53a37591 Mon Sep 17 00:00:00 2001
From: mukeshmv <mukesh@pensando.io>
Date: Mon, 9 Sep 2024 20:23:49 +0000
Subject: [PATCH] Add suppport for SAI DASH appliance object

Signed-off-by: mukeshmv <mukesh@pensando.io>
---
 orchagent/dash/dashorch.cpp  | 42 ++++++++++++++++++++++++++++++------
 orchagent/dash/dashorch.h    |  8 ++++++-
 tests/dash/dash_configs.py   |  5 +++--
 tests/dash/test_dash_vnet.py |  1 +
 4 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/orchagent/dash/dashorch.cpp b/orchagent/dash/dashorch.cpp
index c43092b1cf..fd8a8761ca 100644
--- a/orchagent/dash/dashorch.cpp
+++ b/orchagent/dash/dashorch.cpp
@@ -66,15 +66,31 @@ bool DashOrch::addApplianceEntry(const string& appliance_id, const dash::applian
     }
 
     uint32_t attr_count = 1;
+    sai_attribute_t appliance_attr;
+    sai_status_t status;
+
+    // NOTE: DASH Appliance object should be the first object pushed to SAI
+    sai_object_id_t sai_appliance_id = 0UL;
+    appliance_attr.id = SAI_DASH_APPLIANCE_ATTR_LOCAL_REGION_ID;
+    appliance_attr.value.u32 = entry.local_region_id();
+    status = sai_dash_appliance_api->create_dash_appliance(&sai_appliance_id, gSwitchId,
+                                                           attr_count, &appliance_attr);
+    if (status != SAI_STATUS_SUCCESS && status != SAI_STATUS_NOT_IMPLEMENTED)
+    {
+        SWSS_LOG_ERROR("Failed to create dash appliance object in SAI for %s", appliance_id.c_str());
+        task_process_status handle_status = handleSaiCreateStatus((sai_api_t) SAI_API_DASH_APPLIANCE, status);
+        if (handle_status != task_success)
+        {
+            return parseHandleSaiStatusFailure(handle_status);
+        }
+    }
+
     sai_vip_entry_t vip_entry;
     vip_entry.switch_id = gSwitchId;
     if (!to_sai(entry.sip(), vip_entry.vip))
     {
         return false;
     }
-    sai_attribute_t appliance_attr;
-    vector<sai_attribute_t> appliance_attrs;
-    sai_status_t status;
     appliance_attr.id = SAI_VIP_ENTRY_ATTR_ACTION;
     appliance_attr.value.u32 = SAI_VIP_ENTRY_ACTION_ACCEPT;
     status = sai_dash_vip_api->create_vip_entry(&vip_entry, attr_count, &appliance_attr);
@@ -103,7 +119,7 @@ bool DashOrch::addApplianceEntry(const string& appliance_id, const dash::applian
             return parseHandleSaiStatusFailure(handle_status);
         }
     }
-    appliance_entries_[appliance_id] = entry;
+    appliance_entries_[appliance_id] = ApplianceEntry { sai_appliance_id, entry };
     SWSS_LOG_NOTICE("Created vip and direction lookup entries for %s", appliance_id.c_str());
 
     return true;
@@ -114,7 +130,6 @@ bool DashOrch::removeApplianceEntry(const string& appliance_id)
     SWSS_LOG_ENTER();
 
     sai_status_t status;
-    dash::appliance::Appliance entry;
 
     if (appliance_entries_.find(appliance_id) == appliance_entries_.end())
     {
@@ -122,7 +137,7 @@ bool DashOrch::removeApplianceEntry(const string& appliance_id)
         return true;
     }
 
-    entry = appliance_entries_[appliance_id];
+    const auto& entry = appliance_entries_[appliance_id].metadata;
     sai_vip_entry_t vip_entry;
     vip_entry.switch_id = gSwitchId;
     if (!to_sai(entry.sip(), vip_entry.vip))
@@ -153,6 +168,21 @@ bool DashOrch::removeApplianceEntry(const string& appliance_id)
             return parseHandleSaiStatusFailure(handle_status);
         }
     }
+
+    auto sai_appliance_id = appliance_entries_[appliance_id].appliance_id;
+    if (sai_appliance_id != 0UL)
+    {
+        status = sai_dash_appliance_api->remove_appliance(sai_appliance_id);
+        if (status != SAI_STATUS_SUCCESS)
+        {
+            SWSS_LOG_ERROR("Failed to remove dash appliance object in SAI for %s", appliance_id.c_str());
+            task_process_status handle_status = handleSaiRemoveStatus((sai_api_t) SAI_API_DASH_APPLIANCE, status);
+            if (handle_status != task_success)
+            {
+                return parseHandleSaiStatusFailure(handle_status);
+            }
+        }
+    }
     appliance_entries_.erase(appliance_id);
     SWSS_LOG_NOTICE("Removed vip and direction lookup entries for %s", appliance_id.c_str());
 
diff --git a/orchagent/dash/dashorch.h b/orchagent/dash/dashorch.h
index e2b6e3554d..645131d443 100644
--- a/orchagent/dash/dashorch.h
+++ b/orchagent/dash/dashorch.h
@@ -30,7 +30,13 @@ struct EniEntry
     dash::eni::Eni metadata;
 };
 
-typedef std::map<std::string, dash::appliance::Appliance> ApplianceTable;
+struct ApplianceEntry
+{
+    sai_object_id_t appliance_id;
+    dash::appliance::Appliance metadata;
+};
+
+typedef std::map<std::string, ApplianceEntry> ApplianceTable;
 typedef std::map<dash::route_type::RoutingType, dash::route_type::RouteType> RoutingTypeTable;
 typedef std::map<std::string, EniEntry> EniTable;
 typedef std::map<std::string, dash::qos::Qos> QosTable;
diff --git a/tests/dash/dash_configs.py b/tests/dash/dash_configs.py
index 2f1590ebaa..0635631b41 100644
--- a/tests/dash/dash_configs.py
+++ b/tests/dash/dash_configs.py
@@ -52,7 +52,8 @@
     "sip": {
         "ipv4": socket.htonl(int(IP(SIP)))
     },
-    "vm_vni": int(VM_VNI)
+    "vm_vni": int(VM_VNI),
+    "local_region_id": 10
 }
 
 VNET_CONFIG = {
@@ -168,4 +169,4 @@
 
 ENI_ROUTE_GROUP2_CONFIG = {
     "group_id": ROUTE_GROUP2, 
-}
\ No newline at end of file
+}
diff --git a/tests/dash/test_dash_vnet.py b/tests/dash/test_dash_vnet.py
index ab46d1b1ac..1eaf1615ff 100644
--- a/tests/dash/test_dash_vnet.py
+++ b/tests/dash/test_dash_vnet.py
@@ -25,6 +25,7 @@ def test_appliance(self, dash_db):
         self.appliance_id = "100"
         self.sip = "10.0.0.1"
         self.vm_vni = "4321"
+        self.local_region_id = "10"
         pb = Appliance()
         pb.sip.ipv4 = socket.htonl(int(ipaddress.ip_address(self.sip)))
         pb.vm_vni = int(self.vm_vni)