Skip to content

Commit e87498d

Browse files
taoyl-mstaoyl-ms
authored
Add platform config for 7050 and 6100 (#212)
* Add platform config for 7050 and 6100 * allow certain platform to have no sensors.conf file in sonic-cfggen
1 parent ac7de25 commit e87498d

File tree

7 files changed

+287
-6
lines changed

7 files changed

+287
-6
lines changed

‎dockers/docker-platform-monitor/config.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
mkdir -p /etc/sensors.d
44

55
hwsku=`sonic-cfggen -m /etc/sonic/minigraph.xml -v minigraph_hwsku`
6-
/bin/cp -rf /usr/share/sonic/$hwsku/sensors.conf /etc/sensors.d/
6+
7+
if [ -e /usr/share/sonic/$hwsku/sensors.conf ]
8+
then
9+
/bin/cp -rf /usr/share/sonic/$hwsku/sensors.conf /etc/sensors.d/
10+
fi
711

812
mkdir -p /var/sonic
913
echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status

‎src/sonic-config-engine/platform/Arista-7050-QX32/alias_map.json

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"Ethernet8": "Ethernet3/1",
3+
"Ethernet0": "Ethernet1/1",
4+
"Ethernet4": "Ethernet2/1",
5+
"Ethernet108": "Ethernet28",
6+
"Ethernet100": "Ethernet26",
7+
"Ethernet104": "Ethernet27",
8+
"Ethernet96": "Ethernet25",
9+
"Ethernet124": "Ethernet32",
10+
"Ethernet120": "Ethernet31",
11+
"Ethernet92": "Ethernet24/1",
12+
"Ethernet28": "Ethernet8/1",
13+
"Ethernet52": "Ethernet14/1",
14+
"Ethernet56": "Ethernet15/1",
15+
"Ethernet76": "Ethernet20/1",
16+
"Ethernet72": "Ethernet19/1",
17+
"Ethernet32": "Ethernet9/1",
18+
"Ethernet16": "Ethernet5/1",
19+
"Ethernet36": "Ethernet10/1",
20+
"Ethernet12": "Ethernet4/1",
21+
"Ethernet88": "Ethernet23/1",
22+
"Ethernet24": "Ethernet7/1",
23+
"Ethernet116": "Ethernet30",
24+
"Ethernet80": "Ethernet21/1",
25+
"Ethernet112": "Ethernet29",
26+
"Ethernet84": "Ethernet22/1",
27+
"Ethernet48": "Ethernet13/1",
28+
"Ethernet44": "Ethernet12/1",
29+
"Ethernet40": "Ethernet11/1",
30+
"Ethernet64": "Ethernet17/1",
31+
"Ethernet60": "Ethernet16/1",
32+
"Ethernet20": "Ethernet6/1",
33+
"Ethernet68": "Ethernet18/1"
34+
}

‎src/sonic-config-engine/platform/Arista-7050-QX32/port_config.ini

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# alias lanes
2+
Ethernet0 125,126,127,128
3+
Ethernet4 121,122,123,124
4+
Ethernet8 13,14,15,16
5+
Ethernet12 9,10,11,12
6+
Ethernet16 17,18,19,20
7+
Ethernet20 21,22,23,24
8+
Ethernet24 25,26,27,28
9+
Ethernet28 29,30,31,32
10+
Ethernet32 37,38,39,40
11+
Ethernet36 33,34,35,36
12+
Ethernet40 45,46,47,48
13+
Ethernet44 41,42,43,44
14+
Ethernet48 53,54,55,56
15+
Ethernet52 49,50,51,52
16+
Ethernet56 69,70,71,72
17+
Ethernet60 65,66,67,68
18+
Ethernet64 77,78,79,80
19+
Ethernet68 73,74,75,76
20+
Ethernet72 93,94,95,96
21+
Ethernet76 89,90,91,92
22+
Ethernet80 101,102,103,104
23+
Ethernet84 97,98,99,100
24+
Ethernet88 109,110,111,112
25+
Ethernet92 105,106,107,108
26+
Ethernet96 61,62,63,64
27+
Ethernet100 57,58,59,60
28+
Ethernet104 81,82,83,84
29+
Ethernet108 85,86,87,88
30+
Ethernet112 117,118,119,120
31+
Ethernet116 113,114,115,116
32+
Ethernet120 5,6,7,8
33+
Ethernet124 1,2,3,4

‎src/sonic-config-engine/platform/Arista-7050-QX32/sensors.conf

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# libsensors configuration file
2+
# ----------------------------------------------
3+
#
4+
5+
bus "i2c-2" "SCD SMBus master 0 bus 0"
6+
bus "i2c-3" "SCD SMBus master 0 bus 1"
7+
bus "i2c-5" "SCD SMBus master 0 bus 3"
8+
bus "i2c-6" "SCD SMBus master 0 bus 4"
9+
bus "i2c-7" "SCD SMBus master 0 bus 5"
10+
11+
chip "k10temp-pci-00c3"
12+
label temp1 "Cpu temp sensor"
13+
14+
chip "lm73-i2c-3-48"
15+
label temp1 "Rear Temp Sensor"
16+
set temp1_max 65
17+
#set temp1_max_alarm 75 # read-only
18+
19+
chip "lm86-i2c-2-4c"
20+
label temp1 "Board Temp Sensor"
21+
set temp1_max 65
22+
set temp1_crit 75
23+
24+
label temp2 "Front-panel Temp Sensor"
25+
set temp2_max 65
26+
set temp2_crit 75
27+
28+
chip "pmbus-i2c-3-4e"
29+
label temp1 "Power Controller Sensor 1"
30+
set temp1_max 60
31+
set temp1_crit 70
32+
33+
label temp2 "Power Controller Sensor 2"
34+
set temp2_max 60
35+
set temp2_crit 70
36+
37+
ignore curr1
38+
39+
chip "pmbus-i2c-5-58"
40+
label temp1 "Power Supply 1 Sensor 1"
41+
set temp1_max 60
42+
set temp1_crit 70
43+
44+
label temp2 "Power Supply 1 Sensor 2"
45+
set temp2_max 60
46+
set temp2_crit 70
47+
48+
ignore temp3
49+
50+
set in1_max 250
51+
set in1_crit 255
52+
set power1_max 525
53+
set power2_max 460
54+
set power2_crit 462
55+
set curr1_max 5.28
56+
set curr1_crit 5.30
57+
set curr2_max 36
58+
set curr2_crit 37
59+
60+
chip "pmbus-i2c-6-58"
61+
label temp1 "Power Supply 2 Sensor 1"
62+
set temp1_max 60
63+
set temp1_crit 70
64+
65+
label temp2 "Power Supply 2 Sensor 2"
66+
set temp2_max 60
67+
set temp2_crit 70
68+
69+
ignore temp3
70+
71+
set in1_max 250
72+
set in1_crit 255
73+
set power1_max 525
74+
set power2_max 460
75+
set power2_crit 462
76+
set curr1_max 5.28
77+
set curr1_crit 5.30
78+
set curr2_max 36
79+
set curr2_crit 37

‎src/sonic-config-engine/platform/Force10-S6100/alias_map.json

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"Ethernet0": "fortyGigE1/1/1",
3+
"Ethernet1": "fortyGigE1/1/2",
4+
"Ethernet2": "fortyGigE1/1/3",
5+
"Ethernet3": "fortyGigE1/1/4",
6+
"Ethernet4": "fortyGigE1/1/5",
7+
"Ethernet5": "fortyGigE1/1/6",
8+
"Ethernet6": "fortyGigE1/1/7",
9+
"Ethernet7": "fortyGigE1/1/8",
10+
"Ethernet8": "fortyGigE1/1/9",
11+
"Ethernet9": "fortyGigE1/1/10",
12+
"Ethernet10": "fortyGigE1/1/11",
13+
"Ethernet11": "fortyGigE1/1/12",
14+
"Ethernet12": "fortyGigE1/1/13",
15+
"Ethernet13": "fortyGigE1/1/14",
16+
"Ethernet14": "fortyGigE1/1/15",
17+
"Ethernet15": "fortyGigE1/1/16",
18+
"Ethernet16": "fortyGigE1/2/1",
19+
"Ethernet17": "fortyGigE1/2/2",
20+
"Ethernet18": "fortyGigE1/2/3",
21+
"Ethernet19": "fortyGigE1/2/4",
22+
"Ethernet20": "fortyGigE1/2/5",
23+
"Ethernet21": "fortyGigE1/2/6",
24+
"Ethernet22": "fortyGigE1/2/7",
25+
"Ethernet23": "fortyGigE1/2/8",
26+
"Ethernet24": "fortyGigE1/2/9",
27+
"Ethernet25": "fortyGigE1/2/10",
28+
"Ethernet26": "fortyGigE1/2/11",
29+
"Ethernet27": "fortyGigE1/2/12",
30+
"Ethernet28": "fortyGigE1/2/13",
31+
"Ethernet29": "fortyGigE1/2/14",
32+
"Ethernet30": "fortyGigE1/2/15",
33+
"Ethernet31": "fortyGigE1/2/16",
34+
"Ethernet32": "fortyGigE1/3/1",
35+
"Ethernet33": "fortyGigE1/3/2",
36+
"Ethernet34": "fortyGigE1/3/3",
37+
"Ethernet34": "fortyGigE1/3/4",
38+
"Ethernet36": "fortyGigE1/3/5",
39+
"Ethernet37": "fortyGigE1/3/6",
40+
"Ethernet38": "fortyGigE1/3/7",
41+
"Ethernet39": "fortyGigE1/3/8",
42+
"Ethernet40": "fortyGigE1/3/9",
43+
"Ethernet41": "fortyGigE1/3/10",
44+
"Ethernet42": "fortyGigE1/3/11",
45+
"Ethernet43": "fortyGigE1/3/12",
46+
"Ethernet44": "fortyGigE1/3/13",
47+
"Ethernet45": "fortyGigE1/3/14",
48+
"Ethernet46": "fortyGigE1/3/15",
49+
"Ethernet47": "fortyGigE1/3/16",
50+
"Ethernet48": "fortyGigE1/4/1",
51+
"Ethernet49": "fortyGigE1/4/2",
52+
"Ethernet50": "fortyGigE1/4/3",
53+
"Ethernet51": "fortyGigE1/4/4",
54+
"Ethernet52": "fortyGigE1/4/5",
55+
"Ethernet53": "fortyGigE1/4/6",
56+
"Ethernet54": "fortyGigE1/4/7",
57+
"Ethernet55": "fortyGigE1/4/8",
58+
"Ethernet56": "fortyGigE1/4/9",
59+
"Ethernet57": "fortyGigE1/4/10",
60+
"Ethernet58": "fortyGigE1/4/11",
61+
"Ethernet59": "fortyGigE1/4/12",
62+
"Ethernet60": "fortyGigE1/4/13",
63+
"Ethernet61": "fortyGigE1/4/14",
64+
"Ethernet62": "fortyGigE1/4/15",
65+
"Ethernet63": "fortyGigE1/4/16"
66+
}

‎src/sonic-config-engine/platform/Force10-S6100/port_config.ini

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# alias lanes
2+
Ethernet0 1,2
3+
Ethernet1 3,4
4+
Ethernet2 5,6
5+
Ethernet3 7,8
6+
Ethernet4 9,10
7+
Ethernet5 11,12
8+
Ethernet6 13,14
9+
Ethernet7 15,16
10+
Ethernet8 17,18
11+
Ethernet9 19,20
12+
Ethernet10 21,22
13+
Ethernet11 23,24
14+
Ethernet12 25,26
15+
Ethernet13 27,28
16+
Ethernet14 29,30
17+
Ethernet15 31,32
18+
Ethernet16 33,34
19+
Ethernet17 35,36
20+
Ethernet18 37,38
21+
Ethernet19 39,40
22+
Ethernet20 41,42
23+
Ethernet21 43,44
24+
Ethernet22 45,46
25+
Ethernet23 47,48
26+
Ethernet24 49,50
27+
Ethernet25 51,52
28+
Ethernet26 53,54
29+
Ethernet27 55,56
30+
Ethernet28 57,58
31+
Ethernet29 59,60
32+
Ethernet30 61,62
33+
Ethernet31 63,64
34+
Ethernet32 65,66
35+
Ethernet33 67,68
36+
Ethernet34 69,70
37+
Ethernet35 71,72
38+
Ethernet36 73,74
39+
Ethernet37 75,76
40+
Ethernet38 77,78
41+
Ethernet39 79,80
42+
Ethernet40 81,82
43+
Ethernet41 83,84
44+
Ethernet42 85,86
45+
Ethernet43 87,88
46+
Ethernet44 89,90
47+
Ethernet45 91,92
48+
Ethernet46 93,94
49+
Ethernet47 95,96
50+
Ethernet48 97,98
51+
Ethernet49 99,100
52+
Ethernet50 101,102
53+
Ethernet51 103,104
54+
Ethernet52 105,106
55+
Ethernet53 107,108
56+
Ethernet54 109,110
57+
Ethernet55 111,112
58+
Ethernet56 113,114
59+
Ethernet57 115,116
60+
Ethernet58 117,118
61+
Ethernet59 119,120
62+
Ethernet60 121,122
63+
Ethernet61 123,124
64+
Ethernet62 125,126
65+
Ethernet63 127,128

‎src/sonic-config-engine/setup.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ def get_platform_file_list():
99
data_path = os.path.join(repo_path, 'platform')
1010
platforms = os.listdir(data_path)
1111
for platform in platforms:
12-
data_files.append( (os.path.join('/usr/share/sonic', platform),
13-
['platform/' + platform + '/alias_map.json',
14-
'platform/' + platform + '/port_config.ini',
15-
'platform/' + platform + '/sensors.conf']
16-
))
12+
files = ['platform/' + platform + '/alias_map.json',
13+
'platform/' + platform + '/port_config.ini']
14+
if os.path.isfile( os.path.join(data_path, platform, 'sensors.conf') ):
15+
files.append('platform/' + platform + '/sensors.conf') #Not all platforms need to have a sensors.conf file
16+
data_files.append( (os.path.join('/usr/share/sonic', platform), files) )
1717
return data_files
1818

1919
setup(name='sonic-config-engine',

0 commit comments

Comments
 (0)