matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[gearbox] use credo sai v0.7.2 (#9365)

Browse Source 
Sonic master has moved to use SAI v1.9.1. For consistency, use the latest credo sai v0.7.2 package, built with
SAI header v1.9.1 too.

How I did it
Update credo sai url for v0.7.2
Add a debug tool crshell
This commit is contained in:
Junhua Zhai 2021-11-25 03:09:51 +08:00 committed by GitHub
parent 002827f08e
commit fb2d8eed29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/components/docker-gbsyncd-credo.mk
View File

@ -1,9 +1,9 @@
DOCKER_GBSYNCD_PLATFORM_CODE = credo
LIBSAI_CREDO = libsaicredo_0.5.2_amd64.deb
$(LIBSAI_CREDO)_URL = "https://sonicstorage.blob.core.windows.net/packages/credosai/libsaicredo_0.5.2_amd64.deb?st=2021-08-20T01%3A39%3A58Z&se=2100-08-21T01%3A39%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=H3Ew%2Be17i9VN%2BZ6cmAmLuTEDDK%2FsJ65WUHiINTzB9eE%3D"
LIBSAI_CREDO_OWL = libsaicredo-owl_0.5.2_amd64.deb
$(LIBSAI_CREDO_OWL)_URL = "https://sonicstorage.blob.core.windows.net/packages/credosai/libsaicredo-owl_0.5.2_amd64.deb?st=2021-08-20T01%3A39%3A09Z&se=2100-08-21T01%3A39%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=YB%2BnILFF2Z4tIbu3utcCG857Y6ae7vS5Qmyk3pzscIw%3D"
LIBSAI_CREDO = libsaicredo_0.7.2_amd64.deb
$(LIBSAI_CREDO)_URL = "https://sonicstorage.blob.core.windows.net/packages/credosai/libsaicredo_0.7.2_amd64.deb?sv=2020-08-04&st=2021-11-23T03%3A17%3A40Z&se=2100-11-24T03%3A17%3A00Z&sr=b&sp=r&sig=q1hj3YHdkSnaKkN%2Bv0SYw01keE4ottLffuxSGre9mu0%3D"
LIBSAI_CREDO_OWL = libsaicredo-owl_0.7.2_amd64.deb
$(LIBSAI_CREDO_OWL)_URL = "https://sonicstorage.blob.core.windows.net/packages/credosai/libsaicredo-owl_0.7.2_amd64.deb?sv=2020-08-04&st=2021-11-23T03%3A50%3A31Z&se=2100-11-24T03%3A50%3A00Z&sr=b&sp=r&sig=mhiqfhHsBwa5AZOuNSj0U8uLsr46Tet6OGC41Mx5B6I%3D"
ifneq ($($(LIBSAI_CREDO)_URL),)
include $(PLATFORM_PATH)/../template/docker-gbsyncd-base.mk

1
platform/components/docker-gbsyncd-credo/Dockerfile.j2
View File

@ -27,6 +27,7 @@ debs/{{ deb }}{{' '}}
COPY ["docker-init.sh", "/usr/bin/"]
COPY ["start.sh", "/usr/bin/"]
COPY ["crshell", "/usr/bin/"]
COPY ["critical_processes.j2", "/usr/share/sonic/templates"]
COPY ["supervisord.conf.j2", "/usr/share/sonic/templates"]

24
platform/components/docker-gbsyncd-credo/crshell Executable file
View File

@ -0,0 +1,24 @@
#!/usr/bin/env python3
import socket
import time
from subprocess import call
HOST = '127.0.0.1' # Standard loopback interface address (localhost)
PORT = 8299 # Port to listen on (non-privileged ports are > 1023)
def main() -> None:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect((HOST, PORT))
s.send(b'debug_shell')
time.sleep(1)
call(["/usr/bin/crcli"])
s.close()
return
if __name__ == '__main__':
main()