Merge branch 'sonic-net:main' into dash_flow_test

.github/workflows/dash-bmv2-ci.yml

@@ -62,18 +62,24 @@ jobs:
       run:  make docker-bmv2-bldr
     - name: Generate SAI API
       run:  DOCKER_FLAGS=$docker_fg_flags make sai
+    - name: Pull/Build docker dpapp image
+      run:  make docker-dash-dpapp
+    - name: Build bmv2 dpapp
+      run:  DOCKER_FLAGS=$docker_fg_flags make dpapp
     - name: Check if SAI spec is updated
       run:  DOCKER_FLAGS=$docker_fg_flags make check-sai-spec
     - name: Build libsai c++ tests
       run:  DOCKER_FLAGS=$docker_fg_flags make test
     - name: Prepare network
-      run:  DOCKER_FLAGS=$docker_fg_flags make network
+      run:  DOCKER_FLAGS=$docker_fg_flags make network HAVE_DPAPP=y
     - name: Run P4 software switch (bmv2) with P4Runtime
-      run:  DOCKER_FLAGS=$docker_bg_flags make run-switch
+      run:  DOCKER_FLAGS=$docker_bg_flags make run-switch HAVE_DPAPP=y
     - name: Force bmv2 to load forwarding pipeline config via dummy libsai call
       run:  DOCKER_FLAGS=$docker_fg_flags make init-switch
     - name: Test SAI library over P4RT to switch
       run:  DOCKER_FLAGS=$docker_fg_flags make run-libsai-test
+    - name: Run dpapp
+      run:  DOCKER_FLAGS=$docker_bg_flags make run-dpapp HAVE_DPAPP=y
     - name: Generate saithrift-server
       run:  DOCKER_FLAGS=$docker_fg_flags make saithrift-server
     - name: Generate saithrift-client local docker

.wordlist.txt

@@ -559,6 +559,7 @@ sai
 saic
 SAIC
 saichallenger
+saidashdpapp
 saigen
 sairedis
 SAIRPC

dash-pipeline/Makefile

@@ -103,7 +103,7 @@ sai-submodule:
 # P4 Source code compile TARGETS
 ######################################
 
-P4_SRC=$(wildcard bmv2/**/*.p4)
+P4_SRC=$(wildcard bmv2/**/*.p4) $(wildcard bmv2/*.h)
 P4_MAIN=bmv2/dash_pipeline.p4
 P4_OUTDIR=bmv2/dash_pipeline.bmv2
 P4_ARTIFACTS=$(P4_OUTDIR)/dash_pipeline.json $(P4_OUTDIR)/dash_pipeline_p4rt.txt

dash-pipeline/SAI/sai_api_gen.py

@@ -16,7 +16,7 @@
     from utils.dash_p4 import DashP4SAIExtensions
     from utils.p4ir import P4IRTree, P4VarRefGraph
     from utils.sai_spec import SaiSpec
-    from utils.sai_gen import SAIGenerator, SaiHeaderGenerator
+    from utils.sai_gen import SAIGenerator, SaiHeaderGenerator, SaiImplGenerator
 except ImportError as ie:
     print("Import failed for " + ie.name)
     exit(1)
@@ -75,3 +75,4 @@
     # Generate and update all SAI files
     SAIGenerator(dash_sai_exts).generate()
     SaiHeaderGenerator(sai_spec).generate()
+    SaiImplGenerator(sai_spec).generate()