Test submit OTSS and Syncd-ot code #8

sonic-otn · 2024-01-09T09:34:07Z

Why I did it

Work item tracking

Microsoft ADO (number only):

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

… otn device

jjin62 · 2024-01-10T22:38:00Z

Makefile

@@ -29,8 +29,9 @@ ifeq ($(NOBULLSEYE),0)
 BUILD_BULLSEYE=1
 endif

-PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
-PLATFORM_CHECKOUT := platform/checkout
+PLATFORM_ROOT := $(if $(shell echo $(PLATFORM) | grep 'ot-'),ot-platform,platform)


grep 'ot-' will pick up all the platform name include the substring "ot-", such as "slot-", "hot-"

jjin62 · 2024-01-10T23:13:53Z

Makefile

all platforms (total 9) in sonic are under 'platform' directory. ot-platform folder diverges from existing directory structure? I don't see any technical reason for that.

jjin62 · 2024-01-10T23:18:27Z

Makefile.work

@@ -136,7 +136,13 @@ endif
 rules/config.user:
 	$(Q)echo -n ""

+#include different configurations based on target platform
+ifneq ($(shell echo $(CONFIGURED_PLATFORM) | grep 'ot-'),)
+include rules/config-ot


rule/config is meant for each vendor to edit to fit their device features. We can always add more nobs, No need to introduce a new file config-ot. I don't see rules/config-ot file in this PR.

jjin62 · 2024-01-10T23:22:43Z

ot-platform/ot-vs/docker-syncd-ot-vs/Dockerfile

this is generated file, should not be checked in.

jjin62 · 2024-01-10T23:27:22Z

ot-platform/ot-vs/docker-syncd-ot-vs.mk

+                                $(LIBOTAIVS_DBG)
+
+$(DOCKER_SYNCD_BASE)_VERSION = 1.0.0
+$(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd-ot-vs


docker package name should not include platform name, as all platforms should have the same syncd-ot as image/package name. as in existing sonic, all platform has docker "syncd".

jjin62 · 2024-01-11T00:11:45Z

ot-platform/ot-vs/docker-syncd-ot-vs/buildinfo/config/buildinfo.config

should not check in buildinfo.

jjin62 · 2024-01-11T00:13:57Z

ot-platform/ot-vs/kvm-image.mk

Is this working in the demo? this is to generate a kvm image bounded with onie image. so you can start kvm sonic in one step. But I saw that ALi demo, still two steps: 1) start onie 2) install sonic-ot-vs.

jjin62 · 2024-01-11T00:16:10Z

ot-platform/ot-vs/kvm-image.mk

+SONIC_KVM_IMAGE = sonic-ot-vs.img.gz
+$(SONIC_KVM_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR) \
+                               $(KVM_4_SLOT_FACTORY_CONFIG)
+$(SONIC_KVM_IMAGE)_MACHINE = ot-vs


change name to ot-kvm, you need build an new onie. because we use existing onie for vs, so the kvm image has to be ended with "vs"

jjin62 · 2024-01-11T00:16:29Z

ot-platform/ot-vs/onie.mk

ONIE should be build by each device vendor to preinstall on their product.

In our case a new onie should be build for ot-kvm, see https://github.com/jjin62/onie/tree/2018.11br. you can compile it or just use the iso. (https://github.com/jjin62/onie/tree/2018.11br/build/images) ONIE for Molex device (based on x86): https://github.com/jjin62/onie/tree/2022.08br.

jjin62 · 2024-01-11T00:29:38Z

ot-platform/template/docker-syncd-base.mk

files in template directory are duplicated from /platform/template. Can we make a soft link to original directory?

jjin62 · 2024-01-11T03:18:59Z

ot-device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/topology.sh

this is for Mininet topology. remove?

… as global service on otn platform

jjin62 · 2024-01-11T20:14:19Z

rules/config-ot

No need to have a separate config file file for OT. This file is meant for vendor to customize. In reality, no one would build a SONiC as is, Vendors always have their own distribution.

…lder

…et#21095) Adding the below fix from FRR FRRouting/frr#17297 This is to fix the following crash which is a statistical issue [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_nl -M snmp'. Program terminated with signal SIGABRT, Aborted. #0 0x00007fccd7351e2c in ?? () from /lib/x86_64-linux-gnu/libc.so.6 [Current thread is 1 (Thread 0x7fccd6faf7c0 (LWP 36))] (gdb) bt #0 0x00007fccd7351e2c in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007fccd7302fb2 in raise () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x00007fccd72ed472 in abort () from /lib/x86_64-linux-gnu/libc.so.6 #3 0x00007fccd75bb3a9 in _zlog_assert_failed (xref=xref@entry=0x7fccd7652380 <_xref.16>, extra=extra@entry=0x0) at ../lib/zlog.c:678 #4 0x00007fccd759b2fe in route_node_delete (node=<optimized out>) at ../lib/table.c:352 #5 0x00007fccd759b445 in route_unlock_node (node=0x0) at ../lib/table.h:258 #6 route_next (node=<optimized out>) at ../lib/table.c:436 #7 route_next (node=node@entry=0x56029d89e560) at ../lib/table.c:410 #8 0x000056029b6b6b7a in if_lookup_by_name_per_ns (ns=ns@entry=0x56029d873d90, ifname=ifname@entry=0x7fccc0029340 "PortChannel1020") at ../zebra/interface.c:312 #9 0x000056029b6b8b36 in zebra_if_dplane_ifp_handling (ctx=0x7fccc0029310) at ../zebra/interface.c:1867 #10 zebra_if_dplane_result (ctx=0x7fccc0029310) at ../zebra/interface.c:2221 #11 0x000056029b7137a9 in rib_process_dplane_results (thread=<optimized out>) at ../zebra/zebra_rib.c:4810 #12 0x00007fccd75a0e0d in thread_call (thread=thread@entry=0x7ffe8e553cc0) at ../lib/thread.c:1990 sonic-net#13 0x00007fccd7559368 in frr_run (master=0x56029d65a040) at ../lib/libfrr.c:1198 sonic-net#14 0x000056029b6ac317 in main (argc=9, argv=0x7ffe8e5540d8) at ../zebra/main.c:478

sonic-otn and others added 30 commits October 7, 2023 14:32

support ot-vs platform and device

0540f20

update otairedis submodule

5a5683e

support optical transport state service(otss)

796c940

Create sonic-otn-ot-vs-build.yml

54c33eb

update sonic-swss-common submodule

e915fb1

update otairedis and otss submodule

f66b4ed

update sonic-otss submodule

964350f

add otss and syncd-ot service

d64fbae

update build workflows

5f63586

Update sonic-otn-ot-pre-202411-vs-build.yml

1940ed3

update build flow

8d6a2f9

update build flow

f89a046

fix build flow error

463b889

change jobs workspace

c50af7e

test change workspce

ca94d9e

test change workspce and build

dc684b4

upload artifact in github actions

4f3d383

support make multiple asic kvm image

b2c2de4

Update sonic-otn-ot-pre-202411-vs-build.yml

bec6c5d

run otss and syncd-ot services on otn platform

38d604a

support otss and syncd-ot services

cf683ad

submit the otss and syncd-ot service shell

2eb6be8

update device-data and otn config_setup

779c517

udate otss and syncd-ot script

c6de161

disable swss and syncd servce, and run one lldp and bgp instance

edabf27

update swss-common and otairedis submodule; add orchagent script

6643576

update otn device configuration and otairedis submodule

8fc8d7a

update openssh to 8.4p1-5+deb11u3

4228759

disable caclmgrd and enable bgp service

6ccba2b

bgp start after otss in otn device; no localhost table in metadata on…

0ce1a5f

… otn device

jjin62 reviewed Jan 11, 2024

View reviewed changes

ot-device/virtual/x86_64-kvm_x86_64_4_asic-r0/msft_four_asic_vs/topology.sh Outdated

Copy link

jjin62 Jan 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is for Mininet topology. remove?

generate otn linecards configuration at boot time and set bgp service…

f9c078f

… as global service on otn platform

jjin62 reviewed Jan 11, 2024

View reviewed changes

sonic-otn and others added 13 commits January 16, 2024 15:10

move otn device and platform into native sonic device and platform fo…

3741d2d

…lder

change the ot-orchagent name to orchagent-ot

4a20965

supports otss and syncd-ot services

82af0b3

Update sonic-otn-ot-pre-202411-vs-build.yml

e45910b

Update sonic-otn-ot-pre-202411-vs-build.yml

ae7946a

add ot_kvm onie and update platform configuration

0b5ee46

fix merge conflict

bca0fc3

Create sync_upstream_otn.yml

6f0cd69

Update sync_upstream_otn.yml

52d0ff3

Update sync_upstream_otn.yml

4aa15a1

Update sync_upstream_otn.yml

4251d2b

Update sync_upstream_otn.yml

970d527

Update sync_upstream_otn.yml

120450d

sonic-otn closed this Jan 31, 2024

Weitang-Zheng deleted the otn_pre_202411 branch January 31, 2024 12:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Test submit OTSS and Syncd-ot code #8

Test submit OTSS and Syncd-ot code #8

sonic-otn commented Jan 9, 2024

jjin62 Jan 10, 2024

jjin62 Jan 10, 2024

jjin62 Jan 10, 2024

jjin62 Jan 10, 2024

jjin62 Jan 10, 2024

jjin62 Jan 11, 2024

jjin62 Jan 11, 2024

jjin62 Jan 11, 2024

jjin62 Jan 11, 2024

jjin62 Jan 11, 2024

jjin62 Jan 11, 2024

jjin62 Jan 11, 2024

Test submit OTSS and Syncd-ot code #8

Test submit OTSS and Syncd-ot code #8

Conversation

sonic-otn commented Jan 9, 2024

Why I did it

Work item tracking

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment