Merge branch 'master' into swss_1

Author: divyagayathri-hcl

common/consumer_table_pops.lua

@@ -91,7 +91,9 @@ for i = n, 1, -3 do
        op == 'object_type_get_availability_query' or
        op == 'object_type_get_availability_response' or
        op == 'stats_capability_query' or
-       op == 'stats_capability_response' then
+       op == 'stats_capability_response' or
+       op == 'stats_st_capability_query' or
+       op == 'stats_st_capability_response' then
 
     -- do not modify db entries when spotted those commands, they are used to
     -- trigger actions or get data synchronously from database

common/schema.h

@@ -168,7 +168,9 @@ namespace swss {
 #define APP_DASH_ACL_OUT_TABLE_NAME         "DASH_ACL_OUT_TABLE"
 #define APP_DASH_ACL_GROUP_TABLE_NAME       "DASH_ACL_GROUP_TABLE"
 #define APP_DASH_ACL_RULE_TABLE_NAME        "DASH_ACL_RULE_TABLE"
+#define APP_DASH_HA_SET_CONFIG_TABLE_NAME   "DASH_HA_SET_CONFIG_TABLE"
 #define APP_DASH_HA_SET_TABLE_NAME          "DASH_HA_SET_TABLE"
+#define APP_DASH_HA_SCOPE_CONFIG_TABLE_NAME "DASH_HA_SCOPE_CONFIG_TABLE"
 #define APP_DASH_HA_SCOPE_TABLE_NAME        "DASH_HA_SCOPE_TABLE"
 #define APP_DASH_PREFIX_TAG_TABLE_NAME      "DASH_PREFIX_TAG_TABLE"
 #define APP_DASH_ROUTING_TYPE_TABLE_NAME    "DASH_ROUTING_TYPE_TABLE"
@@ -184,6 +186,7 @@ namespace swss {
 #define APP_DASH_METER_RULE_TABLE_NAME      "DASH_METER_RULE_TABLE"
 #define APP_DASH_ROUTING_APPLIANCE_TABLE_NAME "DASH_ROUTING_APPLIANCE_TABLE"
 #define APP_DASH_ENI_FORWARD_TABLE          "DASH_ENI_FORWARD_TABLE"
+#define APP_DASH_ENI_PLACEMENT_TABLE_NAME   "DASH_ENI_PLACEMENT_TABLE"
 
 #define APP_PAC_PORT_TABLE_NAME               "PAC_PORT_TABLE"
 
@@ -477,6 +480,8 @@ namespace swss {
 #define CFG_DHCP_TABLE                              "DHCP_RELAY"
 #define CFG_DPU_TABLE                               "DPU_TABLE"
 
+#define CFG_DASH_HA_GLOBAL_CONFIG_TABLE_NAME        "DASH_HA_GLOBAL_CONFIG"
+
 #define CFG_FLOW_COUNTER_ROUTE_PATTERN_TABLE_NAME   "FLOW_COUNTER_ROUTE_PATTERN"
 #define CFG_LOGGER_TABLE_NAME                       "LOGGER"
 
@@ -530,6 +535,10 @@ namespace swss {
 #define STATE_COPP_TRAP_TABLE_NAME                  "COPP_TRAP_TABLE"
 #define STATE_FG_ROUTE_TABLE_NAME                   "FG_ROUTE_TABLE"
 
+#define STATE_DASH_HA_SET_STATE_TABLE_NAME              "DASH_HA_SET_STATE_TABLE"
+#define STATE_DASH_HA_SCOPE_STATE_TABLE_NAME            "DASH_HA_SCOPE_STATE_TABLE"
+#define STATE_DASH_FLOW_SYNC_SESSION_STATE_TABLE_NAME   "DASH_FLOW_SYNC_SESSION_STATE_TABLE"
+
 #define STATE_MUX_CABLE_TABLE_NAME                  "MUX_CABLE_TABLE"
 #define STATE_HW_MUX_CABLE_TABLE_NAME               "HW_MUX_CABLE_TABLE"
 #define STATE_MUX_LINKMGR_TABLE_NAME                "MUX_LINKMGR_TABLE"