Skip to content

Commit dbe1d42

Browse files
samaitysamaity
committed
adding platform.json file capability to VS docker
Signed-off-by: Sangita Maity <[email protected]>
1 parent 8d2908c commit dbe1d42

File tree

3 files changed

+34
-33
lines changed

3 files changed

+34
-33
lines changed

‎platform/vs/docker-sonic-vs/Dockerfile.j2

+1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ COPY ["files/sonic_version.yml", "/etc/sonic/"]
130130
COPY ["database_config.json", "/etc/default/sonic-db/"]
131131
COPY ["platform.json", "/usr/share/sonic/device/x86_64-kvm_x86_64-r0/"]
132132
COPY ["hwsku.json", "/usr/share/sonic/device/x86_64-kvm_x86_64-r0/Force10-S6000/"]
133+
COPY ["platform.json", "/usr/share/sonic/platform/"]
133134

134135
# Workaround the tcpdump issue
135136
RUN mv /usr/sbin/tcpdump /usr/bin/tcpdump

‎platform/vs/docker-sonic-vs/platform.json

+32-32
Original file line numberDiff line numberDiff line change
@@ -3,193 +3,193 @@
33
"Ethernet0": {
44
"index": "0,0,0,0",
55
"lanes": "25,26,27,28",
6-
"alias_at_lanes": "Eth0/1,Eth0/2,Eth0/3,Eth0/4",
6+
"alias_at_lanes": "fortyGig0/0,fortyGig0/1,fortyGig0/2,fortyGig0/3",
77
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
88
},
99
"Ethernet4": {
1010
"index": "1,1,1,1",
1111
"lanes": "29,30,31,32",
12-
"alias_at_lanes": "Eth1/1,Eth1/2,Eth1/3,Eth1/4",
12+
"alias_at_lanes": "fortyGig0/4,fortyGig0/5,fortyGig0/6,fortyGig0/7",
1313
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
1414
},
1515
"Ethernet8": {
1616
"index": "2,2,2,2",
1717
"lanes": "33,34,35,36",
18-
"alias_at_lanes": "Eth2/1,Eth2/2,Eth2/3,Eth2/4",
18+
"alias_at_lanes": "fortyGig0/8,fortyGig0/9,fortyGig0/10,fortyGig0/11",
1919
"breakout_modes": "1x100G[40G],2x50G,2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
2020
},
2121
"Ethernet12": {
2222
"index": "3,3,3,3",
2323
"lanes": "37,38,39,40",
24-
"alias_at_lanes": "Eth3/1,Eth3/2,Eth3/3,Eth3/4",
24+
"alias_at_lanes": "fortyGig0/12,fortyGig0/13,fortyGig0/14,fortyGig0/15",
2525
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
2626
},
2727
"Ethernet16": {
2828
"index": "4,4,4,4",
2929
"lanes": "45,46,47,48",
30-
"alias_at_lanes": "Eth4/1,Eth4/2,Eth4/3,Eth4/4",
30+
"alias_at_lanes": "fortyGig0/16,fortyGig0/17,fortyGig0/18,fortyGig0/19",
3131
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
3232
},
3333
"Ethernet20": {
3434
"index": "5,5,5,5",
3535
"lanes": "41,42,43,44",
36-
"alias_at_lanes": "Eth5/1,Eth5/2,Eth5/3,Eth5/4",
36+
"alias_at_lanes": "fortyGig0/20,fortyGig0/21,fortyGig0/22,fortyGig0/23",
3737
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
3838
},
3939
"Ethernet24": {
4040
"index": "6,6,6,6",
4141
"lanes": "1,2,3,4",
42-
"alias_at_lanes": "Eth6/1,Eth6/2,Eth6/3,Eth6/4",
42+
"alias_at_lanes": "fortyGig0/24,fortyGig0/25,fortyGig0/26,fortyGig0/27",
4343
"breakout_modes": "1x100G[40G],4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
4444
},
4545
"Ethernet28": {
4646
"index": "7,7,7,7",
4747
"lanes": "5,6,7,8",
48-
"alias_at_lanes": "Eth7/1,Eth7/2,Eth7/3,Eth7/4",
48+
"alias_at_lanes": "fortyGig0/28,fortyGig0/29,fortyGig0/30,fortyGig0/31",
4949
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
5050
},
5151
"Ethernet32": {
5252
"index": "8,8,8,8",
5353
"lanes": "13,14,15,16",
54-
"alias_at_lanes": "Eth8/1,Eth8/2,Eth8/3,Eth8/4",
54+
"alias_at_lanes": "fortyGig0/32,fortyGig0/33,fortyGig0/34,fortyGig0/35",
5555
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
5656
},
5757
"Ethernet36": {
5858
"index": "9,9,9,9",
5959
"lanes": "9,10,11,12",
60-
"alias_at_lanes": "Eth9/1,Eth9/2,Eth9/3,Eth9/4",
60+
"alias_at_lanes": "fortyGig0/36,fortyGig0/37,fortyGig0/38,fortyGig0/39",
6161
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
6262
},
6363
"Ethernet40": {
6464
"index": "10,10,10,10",
6565
"lanes": "17,18,19,20",
66-
"alias_at_lanes": "Eth10/1,Eth10/2,Eth10/3,Eth10/4",
66+
"alias_at_lanes": "fortyGig0/40,fortyGig0/41,fortyGig0/42,fortyGig0/43",
6767
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
6868
},
6969
"Ethernet44": {
7070
"index": "11,11,11,11",
7171
"lanes": "21,22,23,24",
72-
"alias_at_lanes": "Eth11/1,Eth11/2,Eth11/3,Eth11/4",
72+
"alias_at_lanes": "fortyGig0/44,fortyGig0/45,fortyGig0/46,fortyGig0/47",
7373
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
7474
},
7575
"Ethernet48": {
7676
"index": "12,12,12,12",
7777
"lanes": "53,54,55,56",
78-
"alias_at_lanes": "Eth12/1,Eth12/2,Eth12/3,Eth12/4",
78+
"alias_at_lanes": "fortyGig0/48,fortyGig0/49,fortyGig0/50,fortyGig0/51",
7979
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
8080
},
8181
"Ethernet52": {
8282
"index": "13,13,13,13",
8383
"lanes": "49,50,51,52",
84-
"alias_at_lanes": "Eth13/1,Eth13/2,Eth13/3,Eth13/4",
84+
"alias_at_lanes": "fortyGig0/52,fortyGig0/53,fortyGig0/54,fortyGig0/55",
8585
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
8686
},
8787
"Ethernet56": {
8888
"index": "14,14,14,14",
8989
"lanes": "57,58,59,60",
90-
"alias_at_lanes": "Eth14/1,Eth14/2,Eth14/3,Eth14/4",
90+
"alias_at_lanes": "fortyGig0/56,fortyGig0/57,fortyGig0/58,fortyGig0/59",
9191
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
9292
},
9393
"Ethernet60": {
9494
"index": "15,15,15,15",
9595
"lanes": "61,62,63,64",
96-
"alias_at_lanes": "Eth15/1,Eth15/2,Eth15/3,Eth15/4",
96+
"alias_at_lanes": "fortyGig0/60,fortyGig0/61,fortyGig0/62,fortyGig0/63",
9797
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
9898
},
9999
"Ethernet64": {
100100
"index": "16,16,16,16",
101101
"lanes": "69,70,71,72",
102-
"alias_at_lanes": "Eth16/1,Eth16/2,Eth16/3,Eth16/4",
102+
"alias_at_lanes": "fortyGig0/64,fortyGig0/65,fortyGig0/66,fortyGig0/67",
103103
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
104104
},
105105
"Ethernet68": {
106106
"index": "17,17,17,17",
107107
"lanes": "65,66,67,68",
108-
"alias_at_lanes": "Eth17/1,Eth17/2,Eth17/3,Eth17/4",
108+
"alias_at_lanes": "fortyGig0/68,fortyGig0/69,fortyGig0/70,fortyGig0/71",
109109
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
110110
},
111111
"Ethernet72": {
112112
"index": "18,18,18,18",
113113
"lanes": "73,74,75,76",
114-
"alias_at_lanes": "Eth18/1,Eth18/2,Eth18/3,Eth18/4",
114+
"alias_at_lanes": "fortyGig0/72,fortyGig0/73,fortyGig0/74,fortyGig0/75",
115115
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
116116
},
117117
"Ethernet76": {
118118
"index": "19,19,19,19",
119119
"lanes": "77,78,79,80",
120-
"alias_at_lanes": "Eth19/1,Eth19/2,Eth19/3,Eth19/4",
120+
"alias_at_lanes": "fortyGig0/76,fortyGig0/77,fortyGig0/78,fortyGig0/79",
121121
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
122122
},
123123
"Ethernet80": {
124124
"index": "20,20,20,20",
125125
"lanes": "109,110,111,112",
126-
"alias_at_lanes": "Eth20/1,Eth20/2,Eth20/3,Eth20/4",
126+
"alias_at_lanes": "fortyGig0/80,fortyGig0/81,fortyGig0/82,fortyGig0/83",
127127
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
128128
},
129129
"Ethernet84": {
130130
"index": "21,21,21,21",
131131
"lanes": "105,106,107,108",
132-
"alias_at_lanes": "Eth21/1,Eth21/2,Eth21/3,Eth21/4",
132+
"alias_at_lanes": "fortyGig0/84,fortyGig0/85,fortyGig0/86,fortyGig0/87",
133133
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
134134
},
135135
"Ethernet88": {
136136
"index": "22,22,22,22",
137137
"lanes": "113,114,115,116",
138-
"alias_at_lanes": "Eth22/1,Eth22/2,Eth22/3,Eth22/4",
138+
"alias_at_lanes": "fortyGig0/88,fortyGig0/89,fortyGig0/90,fortyGig0/91",
139139
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
140140
},
141141
"Ethernet92": {
142142
"index": "23,23,23,23",
143143
"lanes": "117,118,119,120",
144-
"alias_at_lanes": "Eth23/1,Eth23/2,Eth23/3,Eth23/4",
144+
"alias_at_lanes": "fortyGig0/92,fortyGig0/93,fortyGig0/94,fortyGig0/95",
145145
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
146146
},
147147
"Ethernet96": {
148148
"index": "24,24,24,24",
149149
"lanes": "125,126,127,128",
150-
"alias_at_lanes": "Eth24/1,Eth24/2,Eth24/3,Eth24/4",
150+
"alias_at_lanes": "fortyGig0/96,fortyGig0/97,fortyGig0/98,fortyGig0/99",
151151
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
152152
},
153153
"Ethernet100": {
154154
"index": "25,25,25,25",
155155
"lanes": "121,122,123,124",
156-
"alias_at_lanes": "Eth25/1,Eth25/2,Eth25/3,Eth25/4",
156+
"alias_at_lanes": "fortyGig0/100,fortyGig0/101,fortyGig0/102,fortyGig0/103",
157157
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
158158
},
159159
"Ethernet104": {
160160
"index": "26,26,26,26",
161161
"lanes": "81,82,83,84",
162-
"alias_at_lanes": "Eth26/1,Eth26/2,Eth26/3,Eth26/4",
162+
"alias_at_lanes": "fortyGig0/104,fortyGig0/105,fortyGig0/106,fortyGig0/107",
163163
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
164164
},
165165
"Ethernet108": {
166166
"index": "27,27,27,27",
167167
"lanes": "85,86,87,88",
168-
"alias_at_lanes": "Eth27/1,Eth27/2,Eth27/3,Eth27/4",
168+
"alias_at_lanes": "fortyGig0/108,fortyGig0/109,fortyGig0/110,fortyGig0/111",
169169
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
170170
},
171171
"Ethernet112": {
172172
"index": "28,28,28,28",
173173
"lanes": "93,94,95,96",
174-
"alias_at_lanes": "Eth28/1,Eth28/2,Eth28/3,Eth28/4",
174+
"alias_at_lanes": "fortyGig0/112,fortyGig0/113,fortyGig0/114,fortyGig0/115",
175175
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
176176
},
177177
"Ethernet116": {
178178
"index": "29,29,29,29",
179179
"lanes": "89,90,91,92",
180-
"alias_at_lanes": "Eth29/1,Eth29/2,Eth29/3,Eth29/4",
180+
"alias_at_lanes": "fortyGig0/116,fortyGig0/117,fortyGig0/118,fortyGig0/119",
181181
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
182182
},
183183
"Ethernet120": {
184184
"index": "30,30,30,30",
185185
"lanes": "101,102,103,104",
186-
"alias_at_lanes": "Eth30/1,Eth30/2,Eth30/3,Eth30/4",
186+
"alias_at_lanes": "fortyGig0/120,fortyGig0/121,fortyGig0/122,fortyGig0/123",
187187
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
188188
},
189189
"Ethernet124": {
190190
"index": "31,31,31,31",
191191
"lanes": "97,98,99,100",
192-
"alias_at_lanes": "Eth31/1,Eth31/2,Eth31/3,Eth31/4",
192+
"alias_at_lanes": "fortyGig0/124,fortyGig0/125,fortyGig0/126,fortyGig0/127",
193193
"breakout_modes": "1x100G[40G],2x50G,4x25G[10G],2x25G(2)+1x50G(2),1x50G(2)+2x25G(2)"
194194
}
195195
}

‎platform/vs/docker-sonic-vs/start.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ else
3636
# generate and merge buffers configuration into config file
3737
sonic-cfggen -k $HWSKU -p /usr/share/sonic/hwsku/port_config.ini -t /usr/share/sonic/hwsku/buffers.json.j2 > /tmp/buffers.json
3838
sonic-cfggen -j /etc/sonic/init_cfg.json -t /usr/share/sonic/hwsku/qos.json.j2 > /tmp/qos.json
39-
sonic-cfggen -p /usr/share/sonic/hwsku/port_config.ini -k $HWSKU --print-data > /tmp/ports.json
39+
sonic-cfggen -p /usr/share/sonic/device/$PLATFORM/platform.json -k $HWSKU --print-data > /tmp/ports.json
4040
sonic-cfggen -j /etc/sonic/init_cfg.json -j /tmp/buffers.json -j /tmp/qos.json -j /tmp/ports.json --print-data > /etc/sonic/config_db.json
4141
fi
4242

0 commit comments

Comments
 (0)