Misc fixes

Signed-off-by: Prabhat Aravind <paravind@microsoft.com>

Author: prabhataravind

orchagent/vxlanorch.cpp

@@ -638,7 +638,8 @@ bool VxlanTunnel::removeNextHop(IpAddress& ipAddr, MacAddress macAddress, uint32
 
     if (!nh_tunnels_[key].ref_count)
     {
-        if (sai_next_hop_api->remove_next_hop(nh_tunnels_[key].nh_id) != SAI_STATUS_SUCCESS)
+        sai_status_t status = sai_next_hop_api->remove_next_hop(nh_tunnels_[key].nh_id);
+        if (status != SAI_STATUS_SUCCESS)
         {
             task_process_status handle_status = handleSaiRemoveStatus(SAI_API_NEXT_HOP, status);
             if (handle_status != task_success)

tests/conftest.py

@@ -278,6 +278,7 @@ class DockerVirtualSwitch:
     CONFIG_DB_ID = 4
     FLEX_COUNTER_DB_ID = 5
     STATE_DB_ID = 6
+    DPU_APPL_DB_ID = 15
 
     # FIXME: Should be broken up into helper methods in a later PR.
     def __init__(
@@ -563,6 +564,9 @@ def init_asic_db_validator(self) -> None:
     def init_appl_db_validator(self) -> None:
         self.appldb = ApplDbValidator(self.APPL_DB_ID, self.redis_sock)
 
+    def init_dpu_appl_db_validator(self) -> None:
+        self.dpu_appldb = ApplDbValidator(self.DPU_APPL_DB_ID, self.redis_sock)
+
     def check_swss_ready(self, timeout: int = 300) -> None:
         """Verify that SWSS is ready to receive inputs.
 
@@ -1246,6 +1250,7 @@ def setup_db(self):
         self.adb = swsscommon.DBConnector(swsscommon.ASIC_DB, self.redis_sock, 0)
         self.cdb = swsscommon.DBConnector(swsscommon.CONFIG_DB, self.redis_sock, 0)
         self.sdb = swsscommon.DBConnector(swsscommon.STATE_DB, self.redis_sock, 0)
+        self.ddb = swsscommon.DBConnector(swsscommon.DPU_APPL_DB, self.redis_sock, 0)
 
     def getSwitchOid(self):
         tbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_SWITCH")
@@ -1437,6 +1442,12 @@ def get_app_db(self) -> ApplDbValidator:
 
         return self.app_db
 
+    def get_dpu_app_db(self) -> ApplDbValidator:
+        if not self.dpu_app_db:
+            self.dpu_app_db = DVSDatabase(self.DPU_APPL_DB_ID, self.redis_sock)
+
+        return self.app_db
+
     # FIXME: Now that AsicDbValidator is using DVSDatabase we should converge this with
     # that implementation. Save it for a follow-up PR.
     def get_asic_db(self) -> AsicDbValidator:

tests/create_appliance.py

@@ -23,7 +23,7 @@ def to_string(value):
     return str(value)
 
 # connect to Dash ZMQ endpoint
-db_connection = swsscommon.DBConnector("APPL_DB", 0)
+db_connection = swsscommon.DBConnector("DPU_APPL_DB", 0)
 zmq_client = swsscommon.ZmqClient("tcp://127.0.0.1:8100")
 app_dash_appliance_table = swsscommon.ZmqProducerStateTable(
                 db_connection,

tests/dash/dash_db.py

@@ -138,12 +138,12 @@ def set_app_db_entry(self, table_name, *args):
         else:
             pb_string = value
 
-        table = ProducerStateTable(self.dvs.get_app_db().db_connection, table_name)
+        table = ProducerStateTable(self.dvs.get_dpu_app_db().db_connection, table_name)
         table[key] = {'pb': pb_string}
 
     def remove_app_db_entry(self, table_name, *key_parts):
         key = ":".join(key_parts)
-        table = ProducerStateTable(self.dvs.get_app_db().db_connection, table_name)
+        table = ProducerStateTable(self.dvs.get_dpu_app_db().db_connection, table_name)
         del table[key]
 
     def get_asic_db_entry(self, table_name, key):
@@ -204,7 +204,7 @@ def get_attr_to_sai_object_map(self, table_name, attribute):
         return attr_to_sai_object_map
 
     def get_app_db_keys(self, table_name):
-        table = Table(self.dvs.get_app_db().db_connection, table_name)
+        table = Table(self.dvs.get_dpu_app_db().db_connection, table_name)
         return table.get_keys()
 
     def get_asic_db_keys(self, table_name):
@@ -214,27 +214,27 @@ def get_asic_db_keys(self, table_name):
     def __init__(self, dvs):
         self.dvs = dvs
         self.app_dash_routing_type_table = ProducerStateTable(
-            self.dvs.get_app_db().db_connection, "DASH_ROUTING_TYPE_TABLE")
+            self.dvs.get_dpu_app_db().db_connection, "DASH_ROUTING_TYPE_TABLE")
         self.app_dash_appliance_table = ProducerStateTable(
-            self.dvs.get_app_db().db_connection, "DASH_APPLIANCE_TABLE")
+            self.dvs.get_dpu_app_db().db_connection, "DASH_APPLIANCE_TABLE")
         self.app_dash_vnet_table = ProducerStateTable(
-            self.dvs.get_app_db().db_connection, "DASH_VNET_TABLE")
+            self.dvs.get_dpu_app_db().db_connection, "DASH_VNET_TABLE")
         self.app_dash_eni_table = ProducerStateTable(
-            self.dvs.get_app_db().db_connection, "DASH_ENI_TABLE")
+            self.dvs.get_dpu_app_db().db_connection, "DASH_ENI_TABLE")
         self.app_dash_vnet_map_table = ProducerStateTable(
-            self.dvs.get_app_db().db_connection, "DASH_VNET_MAPPING_TABLE")
+            self.dvs.get_dpu_app_db().db_connection, "DASH_VNET_MAPPING_TABLE")
         self.app_dash_route_table = ProducerStateTable(
-            self.dvs.get_app_db().db_connection, "DASH_ROUTE_TABLE")
+            self.dvs.get_dpu_app_db().db_connection, "DASH_ROUTE_TABLE")
         self.app_dash_route_rule_table = ProducerStateTable(
-            self.dvs.get_app_db().db_connection, "DASH_ROUTE_RULE_TABLE")
+            self.dvs.get_dpu_app_db().db_connection, "DASH_ROUTE_RULE_TABLE")
         self.app_dash_eni_route_table = ProducerStateTable(
-            self.dvs.get_app_db().db_connection, "DASH_ENI_ROUTE_TABLE")
+            self.dvs.get_dpu_app_db().db_connection, "DASH_ENI_ROUTE_TABLE")
         self.app_dash_route_group_table = ProducerStateTable(
-            self.dvs.get_app_db().db_connection, "DASH_ROUTE_GROUP_TABLE")
+            self.dvs.get_dpu_app_db().db_connection, "DASH_ROUTE_GROUP_TABLE")
         self.app_dash_meter_policy_table = ProducerStateTable(
-            self.dvs.get_app_db().db_connection, "DASH_METER_POLICY_TABLE")
+            self.dvs.get_dpu_app_db().db_connection, "DASH_METER_POLICY_TABLE")
         self.app_dash_meter_rule_table = ProducerStateTable(
-            self.dvs.get_app_db().db_connection, "DASH_METER_RULE_TABLE")
+            self.dvs.get_dpu_app_db().db_connection, "DASH_METER_RULE_TABLE")
 
         self.asic_dash_appliance_table = Table(
             self.dvs.get_asic_db().db_connection, "ASIC_STATE:SAI_OBJECT_TYPE_DASH_APPLIANCE")