Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sonic cfg mgmt merge2 #62

Merged
merged 68 commits into from
Mar 27, 2020
Merged
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
48f8a8d
[Mellanox] platform api support firmware install (#3931)
stephenxs Jan 29, 2020
ee9295c
[grub]: Allow ONiE oneshoot boot for FW update. (#3935)
nazariig Jan 21, 2020
651f4a0
[mellanox] Add fwutil platform components. (#3999)
nazariig Jan 24, 2020
af4e842
Start RestAPI container when sonic boots (#4140)
sumukhatv Feb 13, 2020
bc30442
[sfputil]fix an syntax error (#4141)
stephenxs Feb 13, 2020
f6d69ae
[interfaces-config.sh] Do not bring 'lo' interface down and up (#4150)
jleveque Feb 14, 2020
6740b2d
Fix service and container name to be same (#4151)
prsunny Feb 14, 2020
91e64f0
Update SDK to 4.3.3052 (#4153)
keboliu Feb 16, 2020
bb73687
[Device]: Add new CIG device CS6436-54P and CS5435-54P, also update c…
michealylj1 Feb 17, 2020
20510d5
Sleep done before mismatch handler (#4165)
prsunny Feb 20, 2020
4f3d399
[orchagent] Use mac address from config_db instead of from eth0 (#4166)
prsunny Feb 21, 2020
3156632
Made Change to have Configurable option to enable/disable docker imag…
abdosi Feb 21, 2020
398929c
[mgmt-framework] start after syncd (#4174)
stepanblyschak Feb 20, 2020
4cadca4
[Mellanox]Fix issue that syncd rpc docker unable to start (#4181)
stephenxs Feb 23, 2020
fe9baad
Updated the file permission mode to include +x (#4183)
abdosi Feb 22, 2020
1aac153
[Submodule Update] sonic-swss
abdosi Feb 24, 2020
1edb696
[sonic-ztp]: Build sonic-ztp package (#3299)
rajendra-dendukuri Dec 4, 2019
69879e4
[sonic-ztp]: Add Azure/sonic-ztp as a submodule to Azure/sonic-buildi…
rajendra-dendukuri Dec 16, 2019
c495dc3
[broadcom]: Updated BRCM SAI Debian package revision number to 3.7.3.…
abdosi Feb 25, 2020
5c8c4b2
[Services] Restart BGP service upon unexpected critical process exit.…
yozhao101 Mar 4, 2020
d2c10ba
[snmp] remove hostname change as it share uts namespace with host (#4…
stepanblyschak Feb 28, 2020
bd99464
[sonic-cfggen] Load JSON files before minigraph file (#4202)
jleveque Feb 28, 2020
aef5263
[Mellanox] Update MFT version to 4.13.5 (#4199)
noaOrMlnx Feb 28, 2020
0050cc1
filter out CPU ports to avoid any operation on them (#4197)
keboliu Mar 3, 2020
c603ed3
cherrypick [Mellanox] update hw-mgmt patch for SimX (#4180)
mykolaf Feb 25, 2020
11503c7
[image]: Add SSD maintenance utility - hdparm. (#4177)
nazariig Feb 26, 2020
8581a52
ZTP infrastructure changes to support DHCP discovery provisioning dat…
rajendra-dendukuri Dec 10, 2019
cc2d497
Fixing Bad Cherry-pick
abdosi Mar 4, 2020
42e3996
[Submodule-Update] sonic-swss. Following changes:
abdosi Mar 4, 2020
d6abe35
[Submodule Update] sonic-Utilities with following changes:
abdosi Mar 4, 2020
bf4a282
[libteam]: Disregard current state when considering port enablement (…
lguohan Mar 4, 2020
950926a
[arista]: Add support for Arista Lodoga (#4232)
byu343 Mar 11, 2020
a6533a5
fix build error in sonic-mgmt-framework
rlhui Mar 14, 2020
774487b
[Mellanox] Calculate the buffer size based on the latest excel and wi…
stephenxs Mar 11, 2020
c700127
[Mellanox]Take advantage of sdk variable to customize the location wh…
stephenxs Mar 9, 2020
102cb83
[Services] Restart NAT service upon unexpected critical process exit.…
jleveque Mar 5, 2020
bcfc3d1
[Mellanox]the port index in port_config.ini should starts from 0 (#4152)
jleveque Mar 5, 2020
53eb0bc
[Mellanox] Add sdk 4.4.0542 (#4227)
Junchao-Mellanox Mar 9, 2020
a8baca0
[kernel]: security kernel update to 4.9.189 (#3913)
olivier-singla Feb 13, 2020
8e36068
[sonic-cfggen] Loading the configuration from init_cfg.json and then …
jleveque Mar 5, 2020
9eb3a1b
[Mellanox]Integrate hw-mgmt 7.0000.3012 and advance the linux kernel …
lguohan Mar 4, 2020
9f2664e
[Submodule-Update] sonic-swss with following changes:
abdosi Mar 15, 2020
505d4bf
[Submodule-Update] sonic-swss with following changes:
abdosi Mar 15, 2020
055d7cd
[BFN] Updated Barefoot DEBs to 20200205 (#4261)
akokhan Mar 16, 2020
ba42bde
[arista]: Fix symbolic links for arista lodoga (#4283)
byu343 Mar 19, 2020
39889a3
[Service] Added NAT entry into CONTAINER_FEATURE. Fixes #4247. (#4250)
akokhan Mar 12, 2020
444c450
[syncd-rpc.mk] install ptf dependancy (#4279)
mykolaf Mar 18, 2020
d97051d
[mgmt-framework]: Removing explicit libyang plugin path settings (#4144)
dutta-partha Feb 13, 2020
7c1220e
[Mellanox] update hw-mgmt patch (#4288)
mykolaf Mar 21, 2020
de2afc4
[mgmt-framework]: Update submodule to take build break fix. (#4302)
renukamanavalan Mar 21, 2020
3585703
[Monit] Delay start of monitoring for 5 minutes (#4281)
yozhao101 Mar 19, 2020
384055a
[NTP] Revert change in PR 2598 (#4265)
yxieca Mar 19, 2020
7b4b124
[ntp]: Add "tinker panic 0" in ntp.conf to avoid ntpd from panic (#4263)
SuvarnaMeenakshi Mar 22, 2020
d793cc8
[vs] Add dependencies for NAT to docker-sonic-vs (#4259)
daall Mar 15, 2020
d0bae82
[minigraph.py] Add support for 'OutAcl' keyword and attaching ACLs to…
jleveque Mar 20, 2020
fcb5b41
[arista] Update platform drivers submodules (#4200)
Staphylo Mar 17, 2020
ee84dca
[docker_image_ctl.j2] Share UTS namespace with host OS (#4169)
stepanblyschak Feb 26, 2020
cf1dd5b
[platform/nephos] Upgrade nephos-modules from 1.0.0 to 1.0.1 (#4267) …
simonJi2018 Mar 24, 2020
ca8ac9d
[Mellanox] Add a new Mellanox platform x86_64-mlnx_msn4700 and new S…
keboliu Mar 24, 2020
da92d8f
[mellanox]: Align platform API: change CPLD version representation (#…
nazariig Mar 23, 2020
75437bd
[Mellanox] Update MFT version to 4.14.0 (#4262)
noaOrMlnx Mar 23, 2020
8969b7c
[telemetry]: move default certs location from device metadata to tele…
lguohan Mar 24, 2020
9385e02
[DellEMC] Fix Z9100 port index issue (#4309)
aravindmani-1 Mar 24, 2020
4a99a76
[SubModule Update] sonic-swsss . Following changes:
abdosi Mar 24, 2020
1ba8944
[Submodule Update] sonic-utilities Following Changes:
abdosi Mar 24, 2020
03f43e5
Merge branch 'azure-201911' into sonic-cfg-mgmt-merge2
zhenggen-xu Mar 26, 2020
83c7770
[submodule]: Update sonic-mgmt-framework to fix a build break fix. (#…
renukamanavalan Mar 25, 2020
dd52413
Merge branch 'azure-201911' into sonic-cfg-mgmt-merge2
zhenggen-xu Mar 27, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Mellanox] update hw-mgmt patch (sonic-net#4288)
Master and 201911 use the same version of hw-mgmt 2f65914 , but the hw-mgmt patch was cherry-picked to 201911 badly, the file contents have some diff, and it does not apply on 201911

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
mykolaf authored Mar 21, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 7c1220eabd968f2e19941d9d08a3b21c58ec338f
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6aecc8fed8cc78c1fb5c6b52bdfa3d07ca66e652 Mon Sep 17 00:00:00 2001
From ebb17bd1f6996f73cb67313846a63c789e74c4f4 Mon Sep 17 00:00:00 2001
From: Mykola Faryma <mykolaf@mellanox.com>
Date: Fri, 21 Feb 2020 12:28:54 +0200
Subject: [PATCH 1/1] Make hw-mgmt SimX compatiable
@@ -9,35 +9,35 @@ Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
1 file changed, 29 insertions(+)

diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
index cff10fe..7f3c295 100755
index 1b5b18a..3dfd4b1 100755
--- a/usr/usr/bin/hw-management.sh
+++ b/usr/usr/bin/hw-management.sh
@@ -646,6 +646,35 @@ do_chip_down()
@@ -943,6 +943,35 @@ do_chip_down()
/usr/bin/hw-management-thermal-events.sh change hotplug_asic down %S %p
}

+handle_simx()
+{
+ local -r onie_platform="$(cat /host/machine.conf | grep onie_platform | cut -d= -f2)"
+ local -r onie_platform="$(cat /host/machine.conf | grep onie_platform | cut -d= -f2)"
+
+ local -r syseeprom_cache_path="/var/cache/sonic/decode-syseeprom/syseeprom_cache"
+ local -r syseeprom_hex_path="/usr/share/sonic/device/${onie_platform}/syseeprom.hex"
+ local -r syseeprom_vpd_path="/var/run/hw-management/eeprom/vpd_info"
+ local -r syseeprom_cache_path="/var/cache/sonic/decode-syseeprom/syseeprom_cache"
+ local -r syseeprom_hex_path="/usr/share/sonic/device/${onie_platform}/syseeprom.hex"
+ local -r syseeprom_vpd_path="/var/run/hw-management/eeprom/vpd_info"
+
+ case $ACTION in
+ start)
+ /bin/bash -c "/bin/rm -f ${syseeprom_cache_path}"
+ /bin/bash -c "/bin/mkdir -p ${eeprom_path}"
+ /bin/bash -c "/usr/bin/xxd -r -p ${syseeprom_hex_path} ${syseeprom_vpd_path}"
+ ;;
+ stop)
+ /bin/bash -c "/bin/rm -fr ${hw_management_path}"
+ ;;
+ *)
+ echo "Usage: `basename $0` {start|stop}"
+ exit 1
+ ;;
+ esac
+ case $ACTION in
+ start)
+ /bin/bash -c "/bin/rm -f ${syseeprom_cache_path}"
+ /bin/bash -c "/bin/mkdir -p ${eeprom_path}"
+ /bin/bash -c "/usr/bin/xxd -r -p ${syseeprom_hex_path} ${syseeprom_vpd_path}"
+ ;;
+ stop)
+ /bin/bash -c "/bin/rm -fr ${hw_management_path}"
+ ;;
+ *)
+ echo "Usage: `basename $0` {start|stop}"
+ exit 1
+ ;;
+ esac
+}
+
+if [[ "$(cat /sys/devices/virtual/dmi/id/sys_vendor)" = "QEMU" ]]; then
@@ -47,7 +47,7 @@ index cff10fe..7f3c295 100755
+
case $ACTION in
start)
do_start
if [ -d /var/run/hw-management ]; then
--
1.9.1