Skip to content

Commit be018af

Browse files
azmy98azmyali98
authored andcommitted
Merge branch 'master' into dev-reset-local-users-password
2 parents e5233e0 + 3750752 commit be018af

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.azure-pipelines/test-docker-sonic-vs-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
# install packages for vs test
6565
sudo apt-get install -y net-tools bridge-utils vlan
6666
sudo apt-get install -y python3-pip
67-
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
67+
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
6868
displayName: "Install dependencies"
6969
7070
- script: |

common/schema.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ namespace swss {
2323
#define CHASSIS_APP_DB 12
2424
#define CHASSIS_STATE_DB 13
2525
#define APPL_STATE_DB 14
26+
#define EVENT_DB 19
2627

2728
/***** APPLICATION DATABASE *****/
2829

@@ -441,7 +442,6 @@ namespace swss {
441442

442443
#define CFG_TWAMP_SESSION_TABLE_NAME "TWAMP_SESSION"
443444
#define CFG_BANNER_MESSAGE_TABLE_NAME "BANNER_MESSAGE"
444-
445445
#define CFG_LOCAL_USERS_PASSWORDS_RESET "LOCAL_USERS_PASSWORDS_RESET"
446446

447447
#define CFG_DHCP_TABLE "DHCP_RELAY"
@@ -569,6 +569,12 @@ namespace swss {
569569
#define APP_FABRIC_MONITOR_DATA_TABLE_NAME "FABRIC_MONITOR_TABLE"
570570
#define APP_FABRIC_MONITOR_PORT_TABLE_NAME "FABRIC_PORT_TABLE"
571571

572+
#define EVENT_HISTORY_TABLE_NAME "EVENT"
573+
#define EVENT_CURRENT_ALARM_TABLE_NAME "ALARM"
574+
#define EVENT_STATS_TABLE_NAME "EVENT_STATS"
575+
#define EVENT_ALARM_STATS_TABLE_NAME "ALARM_STATS"
576+
577+
572578
#ifdef __cplusplus
573579
}
574580
#endif

0 commit comments

Comments
 (0)