Skip to content

Commit 7f8b0e6

Browse files
stephenxsstephenxs
authored
Merge branch 'Azure:master' into advance-swss
2 parents efcb187 + 2a467f8 commit 7f8b0e6

File tree

240 files changed

+11176
-2086
lines changed

Some content is hidden

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

240 files changed

+11176
-2086
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pr:
2323
- sonic-slave-stretch
2424
- sonic-slave-buster
2525
- sonic-slave-bullseye
26+
- src/sonic-build-hooks
2627

2728
parameters:
2829
- name: 'arches'

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,6 @@
9797
[submodule "src/linkmgrd"]
9898
path = src/linkmgrd
9999
url = https://github.com/Azure/sonic-linkmgrd.git
100+
[submodule "src/sonic-p4rt/sonic-pins"]
101+
path = src/sonic-p4rt/sonic-pins
102+
url = https://github.com/Azure/sonic-pins.git

‎Makefile.cache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
# Run the 'touch cache.skip.common' command in the base directory to exclude the common files from caching
6969
SONIC_COMMON_FILES_LIST := $(if $(wildcard cache.skip.common),, .platform slave.mk rules/functions Makefile.cache)
7070
SONIC_COMMON_FLAGS_LIST := $(CONFIGURED_PLATFORM) \
71+
$(BLDENV) \
7172
$(SONIC_DEBUGGING_ON) \
7273
$(SONIC_PROFILING_ON) $(SONIC_ENABLE_SYNCD_RPC)
7374
SONIC_COMMON_DPKG_LIST := debian/control debian/changelog debian/rules \

‎Makefile.work

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,10 @@ ifneq ($(SONIC_DPKG_CACHE_SOURCE),)
185185
endif
186186

187187
ifeq ($(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD), y)
188+
ifneq ($(MULTIARCH_QEMU_ENVIRON), y)
188189
DOCKER_RUN += -v /var/run/docker.sock:/var/run/docker.sock
189190
endif
191+
endif
190192

191193
ifeq ($(MULTIARCH_QEMU_ENVIRON), y)
192194
ifeq ($(DOCKER_DATA_ROOT_FOR_MULTIARCH),)
@@ -197,6 +199,11 @@ endif
197199
SONIC_NATIVE_DOCKERD_FOR_MUTLIARCH := dockerd --experimental=true --storage-driver=vfs \
198200
--data-root=$(DOCKER_DATA_ROOT_FOR_MULTIARCH) --exec-root=/var/run/march/docker/ \
199201
-H unix:///var/run/march/docker.sock -p /var/run/march/docker.pid
202+
203+
ifneq ($(DOCKER_CONFIG_FILE_FOR_MULTIARCH),)
204+
SONIC_NATIVE_DOCKERD_FOR_MUTLIARCH += --config-file=$(DOCKER_CONFIG_FILE_FOR_MULTIARCH)
205+
endif
206+
200207
DOCKER_RUN += -v /var/run/march/docker.sock:/var/run/docker.sock
201208
DOCKER_RUN += -v /var/run/march/docker.pid:/var/run/docker.pid
202209
DOCKER_RUN += -v /var/run/march/docker:/var/run/docker
@@ -206,7 +213,7 @@ endif
206213
#Override Native config to prevent docker service
207214
SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD=y
208215

209-
DOCKER_MULTIARCH_CHECK := docker inspect --type image multiarch/qemu-user-static:register &> /dev/null || (echo "multiarch docker not found ..."; docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes)
216+
DOCKER_MULTIARCH_CHECK := docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
210217

211218
DOCKER_SERVICE_SAFE_KILLER := (MARCH_PID=`ps -eo pid,cmd | grep "[0-9] dockerd.*march" | awk '{print $$1}'`; echo "Killing march docker $$MARCH_PID"; [ -z "$$MARCH_PID" ] || sudo kill -9 "$$MARCH_PID";)
212219
DOCKER_SERVICE_MULTIARCH_CHECK := ($(DOCKER_SERVICE_SAFE_KILLER); sudo rm -fr /var/run/march/; (echo "Starting docker march service..."; sudo $(SONIC_NATIVE_DOCKERD_FOR_MUTLIARCH) &) &>/dev/null ; sleep 2; sudo $(SONIC_USERFACL_DOCKERD_FOR_MUTLIARCH);)
@@ -331,6 +338,9 @@ sonic-build-hooks:
331338
@cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_DIR)/buildinfo
332339

333340
sonic-slave-base-build : sonic-build-hooks
341+
ifeq ($(MULTIARCH_QEMU_ENVIRON), y)
342+
@$(DOCKER_MULTIARCH_CHECK)
343+
endif
334344
@$(OVERLAY_MODULE_CHECK)
335345
@echo Checking sonic-slave-base image: $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
336346
@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \

‎check_install.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ def main():
1515

1616
args = parser.parse_args()
1717

18-
KEY_UP = '\x1b[A'
19-
KEY_DOWN = '\x1b[B'
20-
KEY_RIGHT = '\x1b[C'
21-
KEY_LEFT = '\x1b[D'
22-
2318
login_prompt = 'sonic login:'
2419
passwd_prompt = 'Password:'
2520
cmd_prompt = "{}@sonic:~\$ $".format(args.u)
@@ -37,22 +32,19 @@ def main():
3732
raise
3833
time.sleep(1)
3934

40-
# select ONIE embed
35+
# select default SONiC Image
4136
p.expect(grub_selection)
42-
p.sendline(KEY_DOWN)
37+
p.sendline()
4338

44-
# install sonic image
39+
# bootup sonic image
4540
while True:
46-
i = p.expect([login_prompt, passwd_prompt, grub_selection, cmd_prompt])
41+
i = p.expect([login_prompt, passwd_prompt, cmd_prompt])
4742
if i == 0:
4843
# send user name
4944
p.sendline(args.u)
5045
elif i == 1:
5146
# send password
5247
p.sendline(args.P)
53-
elif i == 2:
54-
# select onie install
55-
p.sendline()
5648
else:
5749
break
5850

‎device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/sfp.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def __init__(self, sfp_index=0):
151151
for x in range(self.PORT_START, self.PORT_END + 1):
152152
self.port_to_eeprom_mapping[x] = eeprom_path.format(self._port_to_i2c_mapping[x])
153153

154-
self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
154+
self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
155155
'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui']
156156

157157
self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
@@ -234,7 +234,7 @@ def get_transceiver_info(self):
234234
keys |Value Format |Information
235235
---------------------------|---------------|----------------------------
236236
type |1*255VCHAR |type of SFP
237-
hardware_rev |1*255VCHAR |hardware version of SFP
237+
vendor_rev |1*255VCHAR |vendor revision of SFP
238238
serial |1*255VCHAR |serial number of the SFP
239239
manufacturer |1*255VCHAR |SFP vendor name
240240
model |1*255VCHAR |SFP model name
@@ -321,7 +321,7 @@ def get_transceiver_info(self):
321321
transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[
322322
'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A'
323323
transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
324-
transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
324+
transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
325325
transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
326326
transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A'
327327
transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[

‎device/accton/x86_64-accton_as5835_54x-r0/sonic_platform/sfp.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def __init__(self, sfp_index=0):
205205
for x in range(self.PORT_START, self.PORT_END + 1):
206206
self.port_to_eeprom_mapping[x] = eeprom_path.format(self._port_to_i2c_mapping[x])
207207

208-
self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
208+
self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
209209
'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui',
210210
'application_advertisement', 'type_abbrv_name']
211211

@@ -286,7 +286,7 @@ def get_transceiver_info(self):
286286
keys |Value Format |Information
287287
---------------------------|---------------|----------------------------
288288
type |1*255VCHAR |type of SFP
289-
hardware_rev |1*255VCHAR |hardware version of SFP
289+
vendor_rev |1*255VCHAR |vendor revision of SFP
290290
serial |1*255VCHAR |serial number of the SFP
291291
manufacturer |1*255VCHAR |SFP vendor name
292292
model |1*255VCHAR |SFP model name
@@ -372,7 +372,7 @@ def get_transceiver_info(self):
372372
transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[
373373
'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A'
374374
transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
375-
transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
375+
transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
376376
transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
377377
transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A'
378378
transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[

‎device/accton/x86_64-accton_as7116_54x-r0/sonic_platform/sfp.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def __init__(self, sfp_index, sfp_type):
192192
self.port_to_eeprom_mapping[p_num] = eeprom_path.format(
193193
self.port_to_i2c_mapping[p_num])
194194

195-
self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
195+
self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
196196
'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui']
197197

198198
self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
@@ -305,7 +305,7 @@ def get_sfp_transceiver_info(self):
305305
keys |Value Format |Information
306306
---------------------------|---------------|----------------------------
307307
type |1*255VCHAR |type of SFP
308-
hardware_rev |1*255VCHAR |hardware version of SFP
308+
vendor_rev |1*255VCHAR |vendor revision of SFP
309309
serial |1*255VCHAR |serial number of the SFP
310310
manufacturer |1*255VCHAR |SFP vendor name
311311
model |1*255VCHAR |SFP model name
@@ -377,7 +377,7 @@ def get_sfp_transceiver_info(self):
377377
transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[
378378
'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A'
379379
transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
380-
transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
380+
transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
381381
transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
382382
transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A'
383383
transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[
@@ -559,7 +559,7 @@ def get_qsfp_transceiver_info(self):
559559
keys |Value Format |Information
560560
---------------------------|---------------|----------------------------
561561
type |1*255VCHAR |type of SFP
562-
hardware_rev |1*255VCHAR |hardware version of SFP
562+
vendor_rev |1*255VCHAR |hardware version of SFP
563563
serial |1*255VCHAR |serial number of the SFP
564564
manufacturer |1*255VCHAR |SFP vendor name
565565
model |1*255VCHAR |SFP model name
@@ -631,7 +631,7 @@ def get_qsfp_transceiver_info(self):
631631
transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[
632632
'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A'
633633
transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
634-
transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
634+
transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
635635
transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
636636
transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A'
637637
transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[

‎device/accton/x86_64-accton_as7312_54x-r0/sonic_platform/sfp.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def __init__(self, sfp_index=0):
205205
for x in range(self.PORT_START, self.PORT_END + 1):
206206
self.port_to_eeprom_mapping[x] = eeprom_path.format(self._port_to_i2c_mapping[x])
207207

208-
self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
208+
self.info_dict_keys = ['type', 'vendor_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
209209
'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui']
210210

211211
self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
@@ -300,7 +300,7 @@ def get_transceiver_info(self):
300300
keys |Value Format |Information
301301
---------------------------|---------------|----------------------------
302302
type |1*255VCHAR |type of SFP
303-
hardware_rev |1*255VCHAR |hardware version of SFP
303+
vendor_rev |1*255VCHAR |vendor revision of SFP
304304
serial |1*255VCHAR |serial number of the SFP
305305
manufacturer |1*255VCHAR |SFP vendor name
306306
model |1*255VCHAR |SFP model name
@@ -385,7 +385,7 @@ def get_transceiver_info(self):
385385
transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[
386386
'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A'
387387
transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
388-
transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
388+
transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
389389
transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
390390
transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A'
391391
transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[

‎device/accton/x86_64-accton_as9726_32d-r0/sonic_platform/sfp.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
)
211211

212212
info_dict_keys = [
213-
'type', 'hardware_rev', 'serial', 'manufacturer',
213+
'type', 'vendor_rev', 'serial', 'manufacturer',
214214
'model', 'connector', 'encoding', 'ext_identifier',
215215
'ext_rateselect_compliance', 'cable_type', 'cable_length',
216216
'nominal_bit_rate', 'specification_compliance', 'vendor_date',
@@ -551,7 +551,7 @@ def get_transceiver_info(self):
551551
keys |Value Format |Information
552552
---------------------------|---------------|----------------------------
553553
type |1*255VCHAR |type of SFP
554-
hardware_rev |1*255VCHAR |hardware version of SFP
554+
vendor_rev |1*255VCHAR |vendor revision of SFP
555555
serial |1*255VCHAR |serial number of the SFP
556556
manufacturer |1*255VCHAR |SFP vendor name
557557
model |1*255VCHAR |SFP model name
@@ -627,7 +627,7 @@ def get_transceiver_info(self):
627627
transceiver_info_dict['type'] = sfp_type_data['data']['type']['value']
628628
transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value']
629629
transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value']
630-
transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
630+
transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
631631
transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value']
632632

633633
elif self.sfp_type == QSFP_TYPE:
@@ -770,7 +770,7 @@ def get_transceiver_info(self):
770770
sfp_vendor_name_data['data']['Vendor Name']['value'])
771771
transceiver_info_dict['model'] = str(
772772
sfp_vendor_pn_data['data']['Vendor PN']['value'])
773-
transceiver_info_dict['hardware_rev'] = str(
773+
transceiver_info_dict['vendor_rev'] = str(
774774
sfp_vendor_rev_data['data']['Vendor Rev']['value'])
775775
transceiver_info_dict['serial'] = str(
776776
sfp_vendor_sn_data['data']['Vendor SN']['value'])
@@ -845,7 +845,7 @@ def get_transceiver_info(self):
845845
transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
846846
transceiver_info_dict['manufacturer'] = sfp_vendor_name_data['data']['Vendor Name']['value']
847847
transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value']
848-
transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
848+
transceiver_info_dict['vendor_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value']
849849
transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value']
850850
transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value']
851851
transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[

0 commit comments

Comments
 (0)