Merge branch 'master' into qiluo/pubsubchannel

Author: qiluo-msft

common/schema.h

@@ -539,6 +539,7 @@ namespace swss {
 
 #define STATE_COPP_GROUP_TABLE_NAME                 "COPP_GROUP_TABLE"
 #define STATE_COPP_TRAP_TABLE_NAME                  "COPP_TRAP_TABLE"
+#define STATE_COPP_TRAP_CAPABILITY_TABLE_NAME       "COPP_TRAP_CAPABILITY_TABLE"
 #define STATE_FG_ROUTE_TABLE_NAME                   "FG_ROUTE_TABLE"
 
 #define STATE_DASH_HA_SET_STATE_TABLE_NAME              "DASH_HA_SET_STATE_TABLE"
@@ -587,6 +588,9 @@ namespace swss {
 
 #define STATE_VNET_MONITOR_TABLE_NAME          "VNET_MONITOR_TABLE"
 
+#define STATE_BGP_SESSION_TRACKER_TABLE_NAME        "BGP_SESSION_TRACKER_TABLE"
+#define STATE_LINK_STATE_TRACKER_TABLE_NAME         "LINK_STATE_TRACKER_TABLE"
+
 #define STATE_TRANSCEIVER_INFO_TABLE_NAME           "TRANSCEIVER_INFO"
 
 #define STATE_ASIC_SDK_HEALTH_EVENT_TABLE_NAME      "ASIC_SDK_HEALTH_EVENT_TABLE"