Fix init switch (#180)

* Fix #158 - libsai delete operation failure and log msg. THe test for error code was backwards and log message used same write updateType string for all operations. I fixed the compare and used a dynamic enum print method. * Revert "Fix #158 - libsai delete operation failure and log msg. THe test for error code was backwards and log message used same write updateType string for all operations. I fixed the compare and used a dynamic enum print method." This reverts commit 820e08e. * Fix init-switch target, had stale path. ADd back to CI file to catch regressions. * Change order of tests to defer saithrift steps, allowing earlier detection of failure of faster steps, e.g. run-switch, init-switch. Co-authored-by: Chris Sommers <[email protected]>
sonic-net · Aug 7, 2022 · 14f5552 · 14f5552
1 parent 4722b09
commit 14f5552
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/dash-bmv2-ci.yml b/.github/workflows/dash-bmv2-ci.yml
@@ -55,10 +55,6 @@ jobs:
       run:  make docker-pull-saithrift-bldr
     - name: Generate SAI API
       run:  DOCKER_FLAGS=$docker_fg_flags make sai
-    - name: Generate saithrift-server
-      run:  DOCKER_FLAGS=$docker_fg_flags make saithrift-server
-    - name: Generate saithrift-client local docker
-      run:  DOCKER_FLAGS=$docker_fg_flags make docker-saithrift-client
     - name: Pull docker bmv2-bldr image
       run:  make docker-pull-bmv2-bldr
     - name: Build libsai c++ tests
@@ -67,8 +63,14 @@ jobs:
       run:  DOCKER_FLAGS=$docker_fg_flags make network
     - name: Run P4 software switch (bmv2) with P4Runtime
       run:  DOCKER_FLAGS=$docker_bg_flags make run-switch
+    - 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: Generate saithrift-server
+      run:  DOCKER_FLAGS=$docker_fg_flags make saithrift-server
+    - name: Generate saithrift-client local docker
+      run:  DOCKER_FLAGS=$docker_fg_flags make docker-saithrift-client
     - name: Run saithrift server
       run:  DOCKER_FLAGS=$docker_bg_flags make run-saithrift-server
     - name: Run PTF Tests

diff --git a/dash-pipeline/Makefile b/dash-pipeline/Makefile
@@ -276,7 +276,7 @@ init-switch:
 			t=`expr $$t - 1`; \
 		fi; \
 	done; \
-	docker exec -w /tests/init_switch simple_switch-$(USER) ./init_switch
+	docker exec -w /tests/libsai/init_switch simple_switch-$(USER) ./init_switch
 
 ###############################
 # DOCKER BUILD/PUBLISH TARGETS