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.

Sign up for GitHub

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

Jump to bottom

[Multi-ASIC] To pass the asic instance ID to orchagent, Advance the swss, swss-common submodules. #4465

Merged
merged 5 commits into from
Apr 29, 2020
Merged

[Multi-ASIC] To pass the asic instance ID to orchagent, Advance the swss, swss-common submodules. #4465

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
386f92c
Multi-ASIC platforms will have the ID field in the DEVICE_METADATA, w…
judyjoseph Apr 22, 2020
ec96135
Making the asic instance ID passing global across asics/platforms.
judyjoseph Apr 23, 2020
dd3767e
Minor updates
judyjoseph Apr 23, 2020
85acffc
Advance sonic-swss submodule
judyjoseph Apr 24, 2020
38bfdbf
Advance swss_common submodule as well due to dependencies
judyjoseph Apr 25, 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
16 changes: 16 additions & 0 deletions dockers/docker-orchagent/orchagent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,23 @@ ORCHAGENT_ARGS+="-b 8192 "

# Add platform specific arguments if necessary
if [ "$platform" == "broadcom" ]; then
# Check if there is an "id field" in the DEVICE_METADATA in configDB.
#"DEVICE_METADATA": {
# "localhost": {
# ....
# "id": "0",
# }
#},
# ID field could be integers just to denote the asic instance like 0,1,2...
# OR could be PCI device ID's which will be strings like "03:00.0"
# depending on what the SAI/SDK expects.
inst_id=`sonic-cfggen -d -v DEVICE_METADATA.localhost.id`
lguohan marked this conversation as resolved.
Show resolved Hide resolved
if [ -n "$inst_id" ]
then
ORCHAGENT_ARGS+="-i $inst_id "
fi
lguohan marked this conversation as resolved.
Show resolved Hide resolved
ORCHAGENT_ARGS+="-m $MAC_ADDRESS"

elif [ "$platform" == "cavium" ]; then
ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
elif [ "$platform" == "nephos" ]; then
Expand Down