Merge branch 'main' into tunnel_rwrite

sonic-net · Jan 9, 2024 · a803cea · a803cea
2 parents 3ec2d37 + fbad264
commit a803cea
Show file tree

Hide file tree

Showing 27 changed files with 2,800 additions and 790 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 **.swp
 .DS_STORE
 .idea
+.vscode
 *.bkp
 *.log
 *.pcap

diff --git a/.wordlist.txt b/.wordlist.txt
@@ -1,3 +1,4 @@
+ABI
 ABNF
 accessor
 accessors
@@ -90,7 +91,9 @@ conf
 CONFDB
 confgen
 config
+configurated
 configs
+Conntrack
 Containerlab
 CP
 CreatedHalfOpenFlow
@@ -134,6 +137,9 @@ de
 deallocating
 Decap
 decap
+decap'ed
+decap'ing
+decaps
 deliverables
 DemoDays
 designator
@@ -199,6 +205,7 @@ DUT's
 EasyCLA
 ECMP
 encap
+encaps
 ENI
 eni
 Eni
@@ -208,6 +215,7 @@ entrypoints
 enum
 EPUs
 EPYC
+ethernet
 executables
 ExpressRoute
 failover
@@ -267,6 +275,7 @@ INET
 INIT
 Init
 initializer
+initialization
 integrations
 integrators
 interoperable
@@ -324,6 +333,7 @@ Makefile
 Makefiles
 makefiles
 MAPs
+maprouting
 MatchedHalfOpenFlow
 MatchedOtherFlow
 MatchedTcpFlow
@@ -346,7 +356,9 @@ MTU
 MUX
 MUXes
 natively
+nat
 natted
+NAT'ing
 nb
 nd
 netdevs
@@ -358,6 +370,7 @@ noautoconsole
 NonSynStateful
 NorthBound
 Novus
+NPL
 NPUS
 NSG
 NSGs
@@ -367,6 +380,7 @@ NVA
 NVidia
 nvgre
 Nvgre
+NvGRE
 NVMe
 observability
 OCP
@@ -447,6 +461,7 @@ qos
 QoS
 qos
 Radv
+recirculation
 rdpty
 reachability
 reconvergence
@@ -459,6 +474,7 @@ redis
 renderer
 repo
 repos
+resimulated
 resimulation
 responder
 Resttapi

diff --git a/dash-pipeline/Makefile b/dash-pipeline/Makefile
@@ -116,12 +116,12 @@ $(P4_OUTDIR)/dash_pipeline_p4rt.txt: $(P4_SRC)
 	$(DOCKER_FLAGS) \
 	-v $(PWD)/bmv2:/bmv2 \
 	-w / \
-	$(DOCKER_P4C_BMV2_IMG) p4c \
+	$(DOCKER_P4C_BMV2_IMG) p4c-bm2-ss \
 		-DTARGET_BMV2_V1MODEL \
 	    $(P4_MAIN) \
-		-b bmv2 \
-		-o $(P4_OUTDIR) \
-	    --p4runtime-files $(P4_OUTDIR)/dash_pipeline_p4rt.json,$(P4_OUTDIR)/dash_pipeline_p4rt.txt
+        -o $(P4_OUTDIR)/dash_pipeline.json \
+	    --p4runtime-files $(P4_OUTDIR)/dash_pipeline_p4rt.json,$(P4_OUTDIR)/dash_pipeline_p4rt.txt \
+        --toJSON $(P4_OUTDIR)/dash_pipeline_ir.json
 
 # DPDK - experimental/WIP
 

diff --git a/dash-pipeline/SAI/Makefile b/dash-pipeline/SAI/Makefile
@@ -2,6 +2,7 @@
 all: copysrc
 	./sai_api_gen.py \
 		/bmv2/dash_pipeline.bmv2/dash_pipeline_p4rt.json \
+		--ir /bmv2/dash_pipeline.bmv2/dash_pipeline_ir.json \
 		--ignore-tables=appliance,eni_meter,slb_decap \
 		dash
 

diff --git a/dash-pipeline/SAI/SAI b/dash-pipeline/SAI/SAI
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     **.swp
     .DS_STORE
     .idea
+    .vscode
     *.bkp
     *.log
     *.pcap
@@ Expand Down @@
+2 −0		.gitignore
+26 −0		doc/SAI-Proposal-CMIS-Module-Management.md
+27 −0		experimental/saiexperimentaldasheni.h
+69 −4		experimental/saiexperimentaldashoutboundcatopa.h
+6 −0		inc/sai.h
+5 −5		inc/saifdb.h
+27 −0		inc/saiport.h
+9 −1		inc/saitypes.h
+0 −1		meta/ancestry.9f8efee.history
+1 −0		meta/ancestry.eaf2812.history
+1 −0		meta/aspell.en.pws
+2 −2		meta/checkancestry.sh
+40 −8		meta/parse.pl
+18 −13		meta/saidepgraphgen.cpp
+39 −1		meta/saisanitycheck.c
+6 −6		meta/saiserializetest.c
+14 −7		meta/serialize.pm
+3 −0		test/saithrift/src/switch_sai.thrift
+115 −0		test/saithrift/src/switch_sai_rpc_server.cpp
+23 −0		test/saithrift/tests/switch.py