Skip to content

[gbsyncd] Enable debug shell for BRCM broncos PHY #12622

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

Merged
lguohan merged 6 commits into from
Nov 9, 2022
Merged

[gbsyncd] Enable debug shell for BRCM broncos PHY #12622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ed348b
Build docker-gbsyncd-broncos image
jimmyzhai Aug 16, 2022
4043f11
Correct typo in LIBSAI_BRONCOS_URL_PREFIX
jimmyzhai Aug 18, 2022
438b571
Update docker-gbsyncd-broncos/Dockerfile.j2
jimmyzhai Aug 22, 2022
4e2cd27
Merge remote-tracking branch 'origin/master' into broncos
jimmyzhai Nov 7, 2022
7d73318
Enable debug shell support on docker-gbsyncd-broncos
jimmyzhai Nov 7, 2022
ee0ef1c
Include bcmsh in docker-gbsyncd-broncos
jimmyzhai Nov 8, 2022
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
3 changes: 3 additions & 0 deletions platform/components/docker-gbsyncd-broncos/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,14 @@ debs/{{ deb }}{{' '}}

COPY ["docker-init.sh", "/usr/bin/"]
COPY ["start.sh", "/usr/bin/"]
COPY ["bcmsh", "/usr/bin/"]

COPY ["critical_processes.j2", "/usr/share/sonic/templates"]
COPY ["supervisord.conf.j2", "/usr/share/sonic/templates"]

COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
COPY ["files/dsserve", "/usr/bin/"]
RUN chmod +x /usr/bin/dsserve

## Clean up
RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
Expand Down
40 changes: 40 additions & 0 deletions platform/components/docker-gbsyncd-broncos/bcmsh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/bin/bash
usage="$(basename "$0") [-h] [-q] [-t timeout] -- interactive shell for bcm service

where:
-h show this help text
-t inactivity timeout in seconds (default 300 seconds, 0 for no timeout)
-q quite, no banner (default: verbose)"

banner="Press Enter to show prompt.
Press Ctrl+C to exit.
NOTICE: Only one bcmsh or bcmcmd can connect to the shell at same time.
"

# Default verbose
quiet=false
timeout=300

while getopts 'hqt:' option; do
case "$option" in
h) echo "$usage"
exit
;;
q) quiet=true
;;
t) timeout=$OPTARG
;;
\?) printf "illegal option: -%s\n" "$OPTARG" >&2
echo "$usage" >&2
exit 1
;;
esac
done
shift $((OPTIND - 1))

if [ "$quiet" = false ]; then
echo "$banner"
fi

/usr/bin/socat -T$timeout readline UNIX-CONNECT:/var/run/sswsyncd/sswgbsyncd.socket

1 change: 1 addition & 0 deletions platform/components/docker-gbsyncd-broncos/critical_processes.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
program:dsserve
program:syncd
2 changes: 1 addition & 1 deletion platform/components/docker-gbsyncd-broncos/supervisord.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependent_startup_wait_for=rsyslogd:running

[program:syncd]
environment=BRONCOS_DEVICE_PATH=/usr/lib
command=/usr/bin/syncd -s -p /etc/sai.d/psai.profile -x /usr/share/sonic/hwsku/context_config.json -g 1
command=/usr/bin/dsserve -f /var/run/sswsyncd/sswgbsyncd.socket /usr/bin/syncd --diag -s -p /etc/sai.d/psai.profile -x /usr/share/sonic/hwsku/context_config.json -g 1
priority=3
autostart=false
autorestart=false
Expand Down