Update sai challenger staging directory

.gitmodules

@@ -2,10 +2,10 @@
 	path = dash-pipeline/SAI/SAI
 	url = https://github.com/reshmaintel/SAI.git
 	branch = dash-ptf-ci
-[submodule "test/SAI-Challenger.OCP"]
-	path = test/SAI-Challenger.OCP
-	url = https://github.com/plvisiondevs/SAI-Challenger.OCP
-	branch = dash-testing
+[submodule "test/SAI-Challenger"]
+	path = test/SAI-Challenger
+	url = https://github.com/opencomputeproject/SAI-Challenger
+	branch = multiple-api-support
 [submodule "dash-pipeline/cgyang"]
 	path = dash-pipeline/cgyang
 	url = https://github.com/mgheorghe/cgyang

dash-pipeline/Makefile

@@ -520,7 +520,7 @@ undeploy-ixiac:
 # SAI-CHALLENGER TARGETS
 ###############################
 
-SAI_CHALLENGER_PATH = $(PWD)/../test/SAI-Challenger.OCP
+SAI_CHALLENGER_PATH = $(PWD)/../test/SAI-Challenger
 
 CONTAINER_SAI_CHALLENGER_CLIENT_NAME = dash-saichallenger-client-$(USER)
 
@@ -553,7 +553,7 @@ docker-publish-saichallenger-client:
 
 DOCKER_RUN_SAI_CHALLENGER_CLIENT=docker run \
 	-v $(SAI_CHALLENGER_PATH):/sai-challenger \
-	-v $(SAI_CHALLENGER_PATH)/../test-cases/test_vector_example/:/sai-challenger/dash_tests \
+	-v $(SAI_CHALLENGER_PATH)/../test-cases/scale/saic/:/sai-challenger/dash_tests \
 	-v $(PWD)/../:/dash \
 	--cap-add=NET_ADMIN \
 	--device /dev/net/tun:/dev/net/tun \

dash-pipeline/dockerfiles/Dockerfile.saichallenger-client

@@ -34,7 +34,7 @@ RUN python3 -m pip install -r /tests/requirements.txt && \
     cd /SAI/test/ptf && \
         python3 setup.py install && \
     ln -s ${SAI_CHALLENGER_PATH} /usr/local/lib/python3.7/dist-packages/saichallenger && \
-    ln -s ${DASH_PATH}/test/test-cases/test_vector_example ${SAI_CHALLENGER_PATH}/test_vector_example && \
+    ln -s ${DASH_PATH}/test/test-cases/scale/saic ${SAI_CHALLENGER_PATH}/dash_tests && \
     ln -s ${DASH_PATH}/dash-pipeline/cgyang/saigen /usr/local/lib/python3.7/dist-packages/saigen
 
 CMD ["/usr/bin/supervisord"]

dash-pipeline/tests/saithrift/ptf/vnet/test_saithrift_vnet.py

@@ -1,8 +1,3 @@
-import pytest
-import snappi
-import scapy
-import time
-
 from sai_thrift.sai_headers import *
 from sai_base_test import *
 # TODO - when switch APIs implemented:

test/docs/dash-test-sai-challenger.md

@@ -1,12 +1,12 @@
 # General changes
-* Added [SAI-Challenger](https://github.com/PLVision/SAI-Challenger.OCP) submodule by path: `DASH/test/SAI-Challenger.OCP`.
+* Added [SAI-Challenger](https://github.com/opencomputeproject/SAI-Challenger.OCP) submodule by path: `DASH/test/SAI-Challenger`.
 * Added [saigen](https://github.com/mgheorghe/cgyang) submodule by path: `DASH/test/third-party/cgyang/saigen`.
-* Added test cases for SAI-Challenger by path: `DASH/test/test-cases/test_vector_example`
+* Added test cases for SAI-Challenger by path: `DASH/test/test-cases/scale/saic`
 
 # New make targets:
 **`docker-saichallenger-client`**: Build SAI-Challenger docker image and docker image based on SAI-Challenger client docker image with sai_thrift, saigen and DASH files.
 
-**`run-saichallenger-client`**: Start Ixia-C and docker container `sc-client-thrift-run` from image built on `docker-saichallenger-client` target. SAI-Challenger tests (`DASH/test/SAI-Challenger.OCP/tests`) folder replaced by `DASH/test/test-cases/test_vector_example` folder inside of container. Bound mount volume with DASH folder.
+**`run-saichallenger-client`**: Start Ixia-C and docker container `sc-client-thrift-run` from image built on `docker-saichallenger-client` target. To the original SAI-Challenger tests (`DASH/test/SAI-Challenger/tests`) folder a new folder `dash_tests` mounted from `DASH/test/test-cases/scale/saic` folder inside of container. Bound mount volume with DASH folder.
 
 **`kill-saichallenger-client`**: Stop Ixia-C and `sc-client-thrift-run` container.
 

test/test-cases/README.md

@@ -3,6 +3,20 @@ This contains a hierarchical set of directories containing DASH test cases organ
 
 # Contents
 
-| Folder                                         | Description                                               |
-| ---------------------------------------------- | --------------------------------------------------------- |
-| [vnet2vnet](vnet2vnet/README.md)                  | DASH vnet2vnet Tests 
+| Folder | Description |
+| --- | --- |
+| functional | Tests to verify essential functionality using low-rate traffic (SAI PTF).
+| scale | Tests with high-rate traffic and complex configuration to verify scaling real-world scenarios.
+
+## functional
+
+| Folder/File | Description |
+| --- | --- |
+| `saidashvnet.py` | VNET-to-VNET test cases
+
+
+## scale
+
+| Folder/File | Description |
+| --- | --- |
+| [vnet2vnet](vnet2vnet/README.md) | DASH vnet2vnet Tests