Skip to content

Commit 865cf0b

Browse files
author
Arthi Sivanantham
committed
Merge branch 'master' into sonic_warmrestart
2 parents 0eec5eb + 5c2d4dd commit 865cf0b

File tree

335 files changed

+13580
-7158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

335 files changed

+13580
-7158
lines changed

‎.azure-pipelines/docker-sonic-slave.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ parameters:
4646
default: sonicdev
4747

4848
variables:
49-
- ${{ if eq(variables['Build.SourceBranchName'], '202012' }}:
49+
- ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
5050
- name: BUILD_OPTIONS
5151
value: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
5252

‎Makefile.work

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ SONIC_BUILD_INSTRUCTION := make \
280280
SONIC_ENABLE_IMAGE_SIGNATURE=$(ENABLE_IMAGE_SIGNATURE) \
281281
ENABLE_HOST_SERVICE_ON_START=$(ENABLE_HOST_SERVICE_ON_START) \
282282
SLAVE_DIR=$(SLAVE_DIR) \
283+
BUILD_MULTIASIC_KVM=$(BUILD_MULTIASIC_KVM) \
283284
$(SONIC_OVERRIDE_BUILD_VARS)
284285

285286
.PHONY: sonic-slave-build sonic-slave-bash init reset

‎azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ stages:
107107
- job:
108108
pool: sonictest
109109
displayName: "kvmtest-t0"
110-
timeoutInMinutes: 240
110+
timeoutInMinutes: 300
111111

112112
steps:
113113
- template: .azure-pipelines/run-test-template.yml

‎build_image.sh

Lines changed: 48 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,47 @@ fi
2525

2626
IMAGE_VERSION="${SONIC_IMAGE_VERSION}"
2727

28+
generate_kvm_image()
29+
{
30+
NUM_ASIC=$1
31+
if [ $NUM_ASIC == 4 ]; then
32+
KVM_IMAGE=$OUTPUT_KVM_4ASIC_IMAGE
33+
RECOVERY_ISO=$onie_recovery_kvm_4asic_image
34+
elif [ $NUM_ASIC == 6 ]; then
35+
KVM_IMAGE=$OUTPUT_KVM_6ASIC_IMAGE
36+
RECOVERY_ISO=$onie_recovery_kvm_6asic_image
37+
else
38+
KVM_IMAGE=$OUTPUT_KVM_IMAGE
39+
RECOVERY_ISO=$onie_recovery_image
40+
NUM_ASIC=1
41+
fi
42+
43+
echo "Build $NUM_ASIC-asic KVM image"
44+
KVM_IMAGE_DISK=${KVM_IMAGE%.gz}
45+
sudo rm -f $KVM_IMAGE_DISK $KVM_IMAGE_DISK.gz
46+
47+
SONIC_USERNAME=$USERNAME PASSWD=$PASSWORD sudo -E ./scripts/build_kvm_image.sh $KVM_IMAGE_DISK $RECOVERY_ISO $OUTPUT_ONIE_IMAGE $KVM_IMAGE_DISK_SIZE
48+
49+
if [ $? -ne 0 ]; then
50+
echo "Error : build kvm image failed"
51+
exit 1
52+
fi
53+
54+
[ -r $KVM_IMAGE_DISK ] || {
55+
echo "Error : $KVM_IMAGE_DISK not generated!"
56+
exit 1
57+
}
58+
59+
gzip $KVM_IMAGE_DISK
60+
61+
[ -r $KVM_IMAGE_DISK.gz ] || {
62+
echo "Error : gzip $KVM_IMAGE_DISK failed!"
63+
exit 1
64+
}
65+
66+
echo "The compressed kvm image is in $KVM_IMAGE_DISK.gz"
67+
}
68+
2869
generate_onie_installer_image()
2970
{
3071
# Copy platform-specific ONIE installer config files where onie-mk-demo.sh expects them
@@ -93,32 +134,16 @@ elif [ "$IMAGE_TYPE" = "raw" ]; then
93134

94135
elif [ "$IMAGE_TYPE" = "kvm" ]; then
95136

96-
echo "Build KVM image"
97-
KVM_IMAGE_DISK=${OUTPUT_KVM_IMAGE%.gz}
98-
sudo rm -f $KVM_IMAGE_DISK $KVM_IMAGE_DISK.gz
99-
100137
generate_onie_installer_image
101-
102-
SONIC_USERNAME=$USERNAME PASSWD=$PASSWORD sudo -E ./scripts/build_kvm_image.sh $KVM_IMAGE_DISK $onie_recovery_image $OUTPUT_ONIE_IMAGE $KVM_IMAGE_DISK_SIZE
103-
104-
if [ $? -ne 0 ]; then
105-
echo "Error : build kvm image failed"
106-
exit 1
138+
# Generate single asic KVM image
139+
generate_kvm_image
140+
if [ "$BUILD_MULTIASIC_KVM" == "y" ]; then
141+
# Genrate 4-asic KVM image
142+
generate_kvm_image 4
143+
# Generate 6-asic KVM image
144+
generate_kvm_image 6
107145
fi
108146

109-
[ -r $KVM_IMAGE_DISK ] || {
110-
echo "Error : $KVM_IMAGE_DISK not generated!"
111-
exit 1
112-
}
113-
114-
gzip $KVM_IMAGE_DISK
115-
116-
[ -r $KVM_IMAGE_DISK.gz ] || {
117-
echo "Error : gzip $KVM_IMAGE_DISK failed!"
118-
exit 1
119-
}
120-
121-
echo "The compressed kvm image is in $KVM_IMAGE_DISK.gz"
122147

123148
## Use 'aboot' as target machine category which includes Aboot as bootloader
124149
elif [ "$IMAGE_TYPE" = "aboot" ]; then

‎device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/hwsku.json

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

‎device/arista/x86_64-arista_7800_sup/chassisdb.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
start_chassis_db=1
22
chassis_db_address=127.100.1.1
3+
4+
lag_id_start=1
5+
lag_id_end=128

‎device/arista/x86_64-arista_7800r3_48cq2_lc/default_sku

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Arista-7800R3-48CQ2-C48 t1

‎device/arista/x86_64-arista_7800r3_48cqm2_lc/default_sku

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Arista-7800R3-48CQM2-C48 t1

‎device/arista/x86_64-arista_common/system_health_monitoring_config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"devices_to_ignore": [
44
"asic",
55
"psu.temperature",
6+
"psu.voltage",
67
"PSU2 Fan",
78
"PSU1 Fan"
89
],

‎device/barefoot/x86_64-accton_as9516_32d-r0/platform_components.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"chassis": {
3+
"Newport": {
4+
"component": {
5+
}
6+
}
7+
}
8+
}

‎device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform_components.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"chassis": {
3+
"Wedge100BF-32X-O-AC-F-BF": {
4+
"component": {
5+
}
6+
}
7+
}
8+
}

‎device/barefoot/x86_64-accton_wedge100bf_65x-r0/platform_components.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"chassis": {
3+
"Wedge100BF-65X-O-AC-F-BF": {
4+
"component": {
5+
}
6+
}
7+
}
8+
}

‎device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,3 +520,4 @@ serdes_lane_config_media_type_24=copper
520520

521521
sai_preinit_cmd_file=/usr/share/sonic/hwsku/sai_preinit_cmd.soc
522522
sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
523+
led_fw_path=/usr/share/sonic/hwsku/

‎device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
{# Generate list of ports #}
55
{%- for port_idx in range(0,12) %}
66
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
7-
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
8-
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
9-
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
7+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 2) %}{%- endif %}
8+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 4) %}{%- endif %}
9+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 6) %}{%- endif %}
1010
{%- endfor %}
1111
{%- for port_idx in range(12,16) %}
1212
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
1313
{%- endfor %}
1414
{%- for port_idx in range(16,20) %}
1515
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
16-
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
17-
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
18-
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
16+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 2) %}{%- endif %}
17+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 4) %}{%- endif %}
18+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 6) %}{%- endif %}
1919
{%- endfor %}
2020
{%- for port_idx in range(20,32) %}
2121
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}

‎device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
{# Generate list of ports #}
55
{%- for port_idx in range(0,12) %}
66
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
7-
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
8-
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
9-
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
7+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 2) %}{%- endif %}
8+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 4) %}{%- endif %}
9+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 6) %}{%- endif %}
1010
{%- endfor %}
1111
{%- for port_idx in range(12,16) %}
1212
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
1313
{%- endfor %}
1414
{%- for port_idx in range(16,20) %}
1515
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}
16-
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 2) %}{%- endif %}
17-
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 4) %}{%- endif %}
18-
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 2) + 6) %}{%- endif %}
16+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 2) %}{%- endif %}
17+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 4) %}{%- endif %}
18+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8) + 6) %}{%- endif %}
1919
{%- endfor %}
2020
{%- for port_idx in range(20,32) %}
2121
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 8)) %}{%- endif %}

0 commit comments

Comments
 (0)