Merge branch 'master' into dev-reset-local-users-password

sonic-net · May 27, 2024 · be018af · be018af
2 parents e5233e0 + 3750752
commit be018af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml
@@ -64,7 +64,7 @@ jobs:
       # install packages for vs test
       sudo apt-get install -y net-tools bridge-utils vlan
       sudo apt-get install -y python3-pip
-      sudo pip3 install pytest==4.6.2 attrs==19.1.0 exabgp==4.0.10 distro==1.5.0 docker>=4.4.1 redis==3.3.4 flaky==3.7.0
+      sudo pip3 install pytest==4.6.2 attrs==19.1.0 exabgp==4.0.10 distro==1.5.0 docker>=4.4.1 redis==3.3.4 flaky==3.7.0 requests==2.31.0
     displayName: "Install dependencies"
 
   - script: |

diff --git a/common/schema.h b/common/schema.h
@@ -23,6 +23,7 @@ namespace swss {
 #define CHASSIS_APP_DB      12
 #define CHASSIS_STATE_DB    13
 #define APPL_STATE_DB       14
+#define EVENT_DB            19
 
 /***** APPLICATION DATABASE *****/
 
@@ -441,7 +442,6 @@ namespace swss {
 
 #define CFG_TWAMP_SESSION_TABLE_NAME                "TWAMP_SESSION"
 #define CFG_BANNER_MESSAGE_TABLE_NAME               "BANNER_MESSAGE"
-
 #define CFG_LOCAL_USERS_PASSWORDS_RESET             "LOCAL_USERS_PASSWORDS_RESET"
 
 #define CFG_DHCP_TABLE                              "DHCP_RELAY"
@@ -569,6 +569,12 @@ namespace swss {
 #define APP_FABRIC_MONITOR_DATA_TABLE_NAME	"FABRIC_MONITOR_TABLE"
 #define APP_FABRIC_MONITOR_PORT_TABLE_NAME	"FABRIC_PORT_TABLE"
 
+#define EVENT_HISTORY_TABLE_NAME          "EVENT"
+#define EVENT_CURRENT_ALARM_TABLE_NAME    "ALARM"
+#define EVENT_STATS_TABLE_NAME            "EVENT_STATS"
+#define EVENT_ALARM_STATS_TABLE_NAME      "ALARM_STATS"
+
+
 #ifdef __cplusplus
 }
 #endif