Merge branch 'master' into notif-consumer-fix

sonic-net · Jan 14, 2025 · de14bf0 · de14bf0
2 parents 290cbfc + 12c428e
commit de14bf0
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/common/schema.h b/common/schema.h
@@ -212,6 +212,7 @@ namespace swss {
 #define COUNTERS_RIF_TYPE_MAP               "COUNTERS_RIF_TYPE_MAP"
 #define COUNTERS_RIF_NAME_MAP               "COUNTERS_RIF_NAME_MAP"
 #define COUNTERS_TRAP_NAME_MAP              "COUNTERS_TRAP_NAME_MAP"
+#define COUNTERS_POLICER_NAME_MAP           "COUNTERS_POLICER_NAME_MAP"
 #define COUNTERS_CRM_TABLE                  "CRM"
 #define COUNTERS_BUFFER_POOL_NAME_MAP       "COUNTERS_BUFFER_POOL_NAME_MAP"
 #define COUNTERS_SWITCH_NAME_MAP            "COUNTERS_SWITCH_NAME_MAP"
@@ -279,10 +280,13 @@ namespace swss {
 #define TUNNEL_ATTR_ID_LIST             "TUNNEL_ATTR_ID_LIST"
 #define ACL_COUNTER_ATTR_ID_LIST        "ACL_COUNTER_ATTR_ID_LIST"
 #define FLOW_COUNTER_ID_LIST            "FLOW_COUNTER_ID_LIST"
+#define POLICER_COUNTER_ID_LIST         "POLICER_COUNTER_ID_LIST"
 #define PLUGIN_TABLE                    "PLUGIN_TABLE"
 #define LUA_PLUGIN_TYPE                 "LUA_PLUGIN_TYPE"
 #define SAI_OBJECT_TYPE                 "SAI_OBJECT_TYPE"
 
+#define BULK_CHUNK_SIZE_FIELD               "BULK_CHUNK_SIZE"
+#define BULK_CHUNK_SIZE_PER_PREFIX_FIELD    "BULK_CHUNK_SIZE_PER_PREFIX"
 #define POLL_INTERVAL_FIELD                 "POLL_INTERVAL"
 #define STATS_MODE_FIELD                    "STATS_MODE"
 #define STATS_MODE_READ                     "STATS_MODE_READ"
@@ -481,6 +485,9 @@ namespace swss {
 #define CFG_PAC_GLOBAL_CONFIG_TABLE    "PAC_GLOBAL_CONFIG_TABLE"
 #define CFG_PAC_HOSTAPD_GLOBAL_CONFIG_TABLE    "HOSTAPD_GLOBAL_CONFIG_TABLE"
 
+#define CFG_SRV6_MY_SID_TABLE_NAME                  "SRV6_MY_SIDS"
+#define CFG_SRV6_MY_LOCATOR_TABLE_NAME              "SRV6_MY_LOCATORS"
+
 /***** STATE DATABASE *****/
 
 #define STATE_SWITCH_CAPABILITY_TABLE_NAME          "SWITCH_CAPABILITY"