Skip to content

Commit fa70ac3

Browse files
lakshmi-nexthopPterosaur
authored andcommitted
Orchagent changes needed to support single ASIC VOQ Fixed-System (sonic-net#3847)
What I did Portorch, Neighorch, Intfsorch are updated to not access chassis app DB. Chassis app DB is accessed only if the chassisdb.conf is present indicating its a real chassis (not a FS VOQ) For lag creation, system lags are created as the switch is a VOQ swtich. Why I did it For a fixed system, there is no chassis DB present How I verified it Ran sonic-mgmt tests to verify BGP, LAG, functionality
1 parent bab04ed commit fa70ac3

2 files changed

Lines changed: 102 additions & 0 deletions

File tree

tests/conftest.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,6 +1704,11 @@ def create_vct_ctn(self, ctndir):
17041704
vol = {}
17051705
vol[chassis_config_dir] = {"bind": "/usr/share/sonic/virtual_chassis", "mode": "ro"}
17061706

1707+
# Mount database_config.json when connect_to_chassis_db is set to 1
1708+
if defcfg.get("connect_to_chassis_db") == 1:
1709+
database_config_file = cwd + "/virtual_chassis/database_config.json"
1710+
vol[database_config_file] = {"bind": "/etc/sonic/database_config.json", "mode": "ro"}
1711+
17071712
# pass self.ns into the vs to be use for vs restarts by swss conftest.
17081713
# connection to chassbr is setup by chassis_connect.py within the vs
17091714
data = {}
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
{
2+
"INSTANCES": {
3+
"redis":{
4+
"hostname" : "127.0.0.1",
5+
"port" : 6379,
6+
"unix_socket_path" : "/var/run/redis/redis.sock"
7+
},
8+
"redis_chassis":{
9+
"hostname" : "10.8.1.200",
10+
"port" : 6380,
11+
"unix_socket_path" : "/var/run/redis/redis_chassis.sock"
12+
}
13+
},
14+
"DATABASES" : {
15+
"APPL_DB" : {
16+
"id" : 0,
17+
"separator": ":",
18+
"instance" : "redis"
19+
},
20+
"ASIC_DB" : {
21+
"id" : 1,
22+
"separator": ":",
23+
"instance" : "redis"
24+
},
25+
"COUNTERS_DB" : {
26+
"id" : 2,
27+
"separator": ":",
28+
"instance" : "redis"
29+
},
30+
"CONFIG_DB" : {
31+
"id" : 4,
32+
"separator": "|",
33+
"instance" : "redis"
34+
},
35+
"PFC_WD_DB" : {
36+
"id" : 5,
37+
"separator": ":",
38+
"instance" : "redis"
39+
},
40+
"FLEX_COUNTER_DB" : {
41+
"id" : 5,
42+
"separator": ":",
43+
"instance" : "redis"
44+
},
45+
"STATE_DB" : {
46+
"id" : 6,
47+
"separator": "|",
48+
"instance" : "redis"
49+
},
50+
"SNMP_OVERLAY_DB" : {
51+
"id" : 7,
52+
"separator": "|",
53+
"instance" : "redis"
54+
},
55+
"GB_ASIC_DB" : {
56+
"id" : 9,
57+
"separator": ":",
58+
"instance" : "redis"
59+
},
60+
"GB_COUNTERS_DB" : {
61+
"id" : 10,
62+
"separator": ":",
63+
"instance" : "redis"
64+
},
65+
"GB_FLEX_COUNTER_DB" : {
66+
"id" : 11,
67+
"separator": ":",
68+
"instance" : "redis"
69+
},
70+
"CHASSIS_APP_DB" : {
71+
"id" : 12,
72+
"separator": "|",
73+
"instance" : "redis_chassis"
74+
},
75+
"APPL_STATE_DB" : {
76+
"id" : 14,
77+
"separator": ":",
78+
"instance" : "redis"
79+
},
80+
"DPU_APPL_DB" : {
81+
"id" : 15,
82+
"separator": ":",
83+
"instance" : "redis"
84+
},
85+
"DPU_APPL_STATE_DB" : {
86+
"id" : 16,
87+
"separator": "|",
88+
"instance" : "redis"
89+
},
90+
"DPU_STATE_DB": {
91+
"id": 17,
92+
"separator": "|",
93+
"instance": "redis"
94+
}
95+
},
96+
"VERSION" : "1.0"
97+
}

0 commit comments

Comments
 (0)