Merge branch 'sonic-net:main' into dash_flow_test

sonic-net · Nov 7, 2024 · 7339c9b · 7339c9b
2 parents 1bb2492 + 07bc9ae
commit 7339c9b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/dash-pipeline/bmv2/dash_pipeline.p4 b/dash-pipeline/bmv2/dash_pipeline.p4
@@ -234,7 +234,6 @@ control dash_ingress(
     }
 
     apply {
-        meta.flow_enabled = false;
 
 #ifndef TARGET_DPDK_PNA
         meta.rx_encap.setValid();

diff --git a/dash-pipeline/bmv2/stages/pre_pipeline.p4 b/dash-pipeline/bmv2/stages/pre_pipeline.p4
@@ -25,21 +25,23 @@ control pre_pipeline_stage(inout headers_t hdr,
         const default_action = accept;
     }
 
-    action set_underlay_mac(EthernetAddress neighbor_mac,
-                            EthernetAddress mac) {
+    action set_internal_config(EthernetAddress neighbor_mac,
+                            EthernetAddress mac,
+                            bit<1> flow_enabled) {
         meta.u0_encap_data.underlay_dmac = neighbor_mac;
         meta.u0_encap_data.underlay_smac = mac;
+        meta.flow_enabled = (bool)flow_enabled;
     }
 
-    /* This table API should be implemented manually using underlay SAI */
+    /* This table API should be implemented manually using SAI */
     @SaiTable[ignored = "true"]
-    table underlay_mac {
+    table internal_config {
         key = {
             meta.appliance_id : ternary;
         }
 
         actions = {
-            set_underlay_mac;
+            set_internal_config;
         }
     }
 
@@ -120,7 +122,7 @@ control pre_pipeline_stage(inout headers_t hdr,
         }
 
         appliance.apply();
-        underlay_mac.apply();
+        internal_config.apply();
     }
 }
 

diff --git a/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client b/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client
@@ -11,15 +11,15 @@ ADD SAI/rpc/saithrift-0.9.tar.gz /
 
 # Install the python libraries
 RUN cd /saithrift-0.9 && \
-        python3 setup.py install && \
+        pip3 install . && \
     cd / && \
         rm -rf saithrift-0.9 &&\
     cd thrift-0.11.0 && \
-        python3 setup.py install && \
+        pip3 install . && \
     cd / &&\
         rm -rf thrift-0.11.0 && \
     cd /SAI/test/ptf && \
-        python3 setup.py install && \
+        pip3 install . && \
     ln -s ${DASH_PATH}/test/test-cases/scale/saic ${SAI_CHALLENGER_PATH}/dash_tests
 
 CMD ["/usr/bin/supervisord"]
-Original file line number
+Diff line change
@@ Expand Up / @@ -234,7 +234,6 @@ control dash_ingress( @@
         }
         apply {
-            meta.flow_enabled = false;
     #ifndef TARGET_DPDK_PNA
             meta.rx_encap.setValid();
@@ Expand Down @@