saithrift client & server integration with DASH bmv2 (Fix #131,158)

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

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "**" ]
     paths:
-      - '.github/workflows/dash-ci.yml'
+      - '.github/workflows/dash-bmv2-ci.yml'
       - 'test/**.py'
       - 'test/**requirements.txt'
       - 'test/**.sh'
@@ -19,7 +19,7 @@ on:
   pull_request:
     branches: [ "main" ]
     paths:
-      - '.github/workflows/dash-ci.yml'
+      - '.github/workflows/dash-bmv2-ci.yml'
       - 'test/**.py'
       - 'test/**requirements.txt'
       - 'test/**.sh'
@@ -35,7 +35,7 @@ on:
 
 jobs:
   build:
-    name: Build and Test Sirius Pipeline
+    name: Build and Test DASH Pipeline
     runs-on: ubuntu-20.04
     env:
       docker_fg_flags: -u root --privileged
@@ -46,25 +46,35 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Pull docker p4c image
-      run: make docker-pull-dash-p4c
+      run:  make docker-pull-dash-p4c
     - name: Build P4 software switch (bmv2) and P4Info
-      run: DOCKER_FLAGS=$docker_fg_flags make p4
+      run:  DOCKER_FLAGS=$docker_fg_flags make p4
     - name: Install SAI submodule
-      run: git submodule update --init
+      run:  git submodule update --init
     - name: Pull docker saithrift-bldr image
-      run: make docker-pull-saithrift-bldr
+      run:  make docker-pull-saithrift-bldr
     - name: Generate SAI API
-      run: DOCKER_FLAGS=$docker_fg_flags make sai
+      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
+      run:  make docker-pull-bmv2-bldr
     - name: Build libsai c++ tests
-      run: DOCKER_FLAGS=$docker_fg_flags make test
+      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
     - name: Run P4 software switch (bmv2) with P4Runtime
-      run: DOCKER_FLAGS=$docker_bg_flags make run-switch
-    - name: Test SAI library
-      run: DOCKER_FLAGS=$docker_fg_flags make run-test
-    - name: Ixia-c Traffic Generator test
-      run:  make run-ixiac-test
+      run:  DOCKER_FLAGS=$docker_bg_flags make run-switch
+    - name: Test SAI library over P4RT to switch
+      run:  DOCKER_FLAGS=$docker_fg_flags make run-libsai-test
+    - name: Run saithrift server
+      run:  DOCKER_FLAGS=$docker_bg_flags make run-saithrift-server
+    - name: Run PTF Tests
+      run:  DOCKER_FLAGS=$docker_fg_flags make run-saithrift-ptftests
+    - name: Deploy ixia-c Traffic Generator
+      run:  DOCKER_FLAGS=$docker_fg_flags make deploy-ixiac
+    - name: Run Pytests
+      run:  DOCKER_FLAGS=$docker_fg_flags make run-saithrift-pytests
 

.github/workflows/dash-saithrift-client-bldr-docker.yml

@@ -0,0 +1,50 @@
+name: DASH-docker-saithrift-client-bldr-image
+
+on:
+  push:
+    branches: [ "**" ]
+    paths:
+      - '.github/workflows/dash-saithrift-client-bldr-docker.yml'
+      - '.github/workflows/dash-saithrift-client-bldr-docker.yml'
+      - 'dash-pipeline/Makefile'
+      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift-bldr'
+      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift-client-bldr'
+      - 'dash-pipeline/.dockerignore'
+      - 'dash-pipeline/dockerfiles/.dockerignore'
+  pull_request:
+    branches: [ "main" ]
+    paths:
+      - '.github/workflows/dash-saithrift-client-bldr-docker.yml'
+      - 'dash-pipeline/Makefile'
+      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift-bldr'
+      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift-client-bldr'
+      - 'dash-pipeline/.dockerignore'
+      - 'dash-pipeline/dockerfiles/.dockerignore'
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build dash-saithrift-client-bldr-image
+    runs-on: ubuntu-20.04
+    env:
+      docker_fg_flags: -u root --privileged
+      docker_bg_flags: -d -u root --privileged
+    defaults:
+      run:
+        working-directory: ./dash-pipeline
+    steps:
+    - uses: actions/checkout@v3
+    - name: Pull docker p4c image
+      run:  make docker-pull-dash-p4c
+    - name: Build P4 software switch (bmv2) and P4Info
+      run:  DOCKER_FLAGS=$docker_fg_flags make p4
+    - name: Install SAI submodule
+      run:  git submodule update --init
+    - name: Build docker saithrift-bldr image
+      run:  make docker-saithrift-bldr
+    - name: Generate SAI API
+      run:  DOCKER_FLAGS=$docker_fg_flags make sai
+    - name: Generate SAI-Thrift client and server code and libs
+      run:  DOCKER_FLAGS=$docker_fg_flags make saithrift-server
+    - name: Build saithrift client docker image 
+      run:  DOCKER_FLAGS=$docker_fg_flags make docker-saithrift-client-bldr

.github/workflows/dash-saithrift-client-docker.yml

@@ -0,0 +1,51 @@
+name: DASH-docker-saithrift-client-image
+
+on:
+  push:
+    branches: [ "**" ]
+    paths:
+      - '.github/workflows/dash-saithrift-client-docker.yml'
+      - 'dash-pipeline/Makefile'
+      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift-bldr'
+      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift-client-bldr'
+      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift-client'
+      - 'dash-pipeline/.dockerignore'
+      - 'dash-pipeline/dockerfiles/.dockerignore'
+  pull_request:
+    branches: [ "main" ]
+    paths:
+      - '.github/workflows/dash-saithrift-client-docker.yml'
+      - 'dash-pipeline/Makefile'
+      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift-bldr'
+      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift-client-bldr'
+      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift-client'
+      - 'dash-pipeline/.dockerignore'
+      - 'dash-pipeline/dockerfiles/.dockerignore'
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build dash-saithrift-client-image
+    runs-on: ubuntu-20.04
+    env:
+      docker_fg_flags: -u root --privileged
+      docker_bg_flags: -d -u root --privileged
+    defaults:
+      run:
+        working-directory: ./dash-pipeline
+    steps:
+    - uses: actions/checkout@v3
+    - name: Pull docker p4c image
+      run:  make docker-pull-dash-p4c
+    - name: Build P4 software switch (bmv2) and P4Info
+      run:  DOCKER_FLAGS=$docker_fg_flags make p4
+    - name: Install SAI submodule
+      run:  git submodule update --init
+    - name: Build docker saithrift-bldr image
+      run:  make docker-saithrift-bldr
+    - name: Generate SAI API
+      run:  DOCKER_FLAGS=$docker_fg_flags make sai
+    - name: Generate SAI-Thrift client and server code and libs
+      run:  DOCKER_FLAGS=$docker_fg_flags make saithrift-server
+    - name: Build saithrift client docker image 
+      run:  DOCKER_FLAGS=$docker_fg_flags make docker-saithrift-client

.github/workflows/dash-saithrift-docker.yml

@@ -1,25 +1,25 @@
-name: DASH-docker-saithrift-build-image
+name: DASH-docker-saithrift-bldr-build-image
 
 on:
   push:
     branches: [ "**" ]
     paths:
       - '.github/workflows/dash-saithrift-docker.yml'
-      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift'
+      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift-bldr'
       - 'dash-pipeline/.dockerignore'
       - 'dash-pipeline/dockerfiles/.dockerignore'
   pull_request:
     branches: [ "main" ]
     paths:
       - '.github/workflows/dash-saithrift-docker.yml'
-      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift'
+      - 'dash-pipeline/dockerfiles/Dockerfile.saithrift-bldr'
       - 'dash-pipeline/.dockerignore'
       - 'dash-pipeline/dockerfiles/.dockerignore'
   workflow_dispatch:
 
 jobs:
   build:
-    name: Build docker dash-saithrift image
+    name: Build docker dash-saithrift-bldr image
     runs-on: ubuntu-20.04
     defaults:
       run:

.gitignore

@@ -1,5 +1,8 @@
 *.bkp
 *.log
+*.pcap
 __pycache__/
+.pytest_cache/
 dash-pipeline/bmv2/dash_pipeline.bmv2/
-dash-pipeline/SAI/lib/
+dash-pipeline/SAI/lib/
+dash-pipeline/SAI/rpc/

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "SAI"]
 	path = dash-pipeline/SAI/SAI
 	url = https://github.com/chrispsommers/SAI.git
-	branch = add-gensairpc-flags
+	branch = saithriftv2-check-null-sai-apis

dash-pipeline/.dockerignore

@@ -1 +1,5 @@
-*
+*.bkp
+*.log
+*.pcap
+__pycache__/
+.pytest_cache/