Kdt 17: Update docker environment (sonic-net#8)

* Added cgyang submodule
* Updated docker env for thrift tests
* Makefile refactor

Signed-off-by: Maksym Hedeon <maksym.hedeon@plvision.eu>

Author: maksymhedeon

.gitmodules

@@ -5,4 +5,10 @@
 [submodule "test/SAI-Challenger.OCP"]
 	path = test/SAI-Challenger.OCP
 	url = https://github.com/plvisiondevs/SAI-Challenger.OCP
-	branch = dash-testing
+	branch = dash-testing
+[submodule "test/third-party/cgyang"]
+	path = test/third-party/cgyang
+	url = https://github.com/mgheorghe/cgyang
+[submodule "dash-pipeline/test/third-party/cgyang"]
+	path = dash-pipeline/test/third-party/cgyang
+	url = https://github.com/mgheorghe/cgyang

dash-pipeline/Makefile

@@ -506,33 +506,17 @@ DOCKER_SAI_CHALLENGER_CLIENT = sc-client-thrift
 
 CONTAINER_SAI_CHALLENGER_CLIENT_NAME = $(DOCKER_SAI_CHALLENGER_CLIENT)-run
 
-# SAI-C SERVER STAFF IS TEMPORARY AND WILL BE REMOVED LATER
-CONTAINER_SAI_CHALLENGER_SERVER_NAME = sc-server-trident2-saivs-run
+CONTAINER_SAI_CHALLENGER_CLIENT_EXEC = docker exec $(CONTAINER_SAI_CHALLENGER_CLIENT_NAME)
 
-# SAI-C SERVER STAFF IS TEMPORARY AND WILL BE REMOVED LATER
-sai-challenger-build:sai-challenger-client-build sai-challenger-server-build
-
-# SAI-C SERVER STAFF IS TEMPORARY AND WILL BE REMOVED LATER
-sai-challenger-start:sai-challenger-client-start sai-challenger-server-start sai-challenger-create-veth
-
-# SAI-C SERVER STAFF IS TEMPORARY AND WILL BE REMOVED LATER
-sai-challenger-stop:sai-challenger-client-stop sai-challenger-server-stop
-
-sai-challenger-test:
-	docker exec $(CONTAINER_SAI_CHALLENGER_CLIENT_NAME) pytest --setup=../setups/sai_dpu_client_server.json -v -k "test_dpu_basic"
-
-sai-challenger-test-ixiac:deploy-ixiac
-	docker exec $(CONTAINER_SAI_CHALLENGER_CLIENT_NAME) pytest --setup=../setups/snappi_bmv2_client_server.json -v -k "test_dpu_basic"
-
-sai-challenger-client-build:
+build-saic-client:
 	cd $(SAI_CHALLENGER_PATH) && ./build.sh -i client
 	docker build \
 		-f dockerfiles/Dockerfile.saic-saithrift-client \
 		-t $(DOCKER_SAI_CHALLENGER_CLIENT) \
 		.
 
-sai-challenger-client-start:
-	docker run --name $(CONTAINER_SAI_CHALLENGER_CLIENT_NAME) \
+run-saic-client:
+	docker run \
 		-v $(SAI_CHALLENGER_PATH):/sai-challenger \
 		--cap-add=NET_ADMIN \
 		--device /dev/net/tun:/dev/net/tun \
@@ -544,25 +528,11 @@ sai-challenger-client-start:
 		--name $(CONTAINER_SAI_CHALLENGER_CLIENT_NAME) \
 		$(DOCKER_SAI_CHALLENGER_CLIENT)
 
-sai-challenger-client-stop:
-#	cd $(SAI_CHALLENGER_PATH) && ./run.sh -i client -c stop
+kill-saic-client: undeploy-ixiac
 	docker container stop $(CONTAINER_SAI_CHALLENGER_CLIENT_NAME)
 
-# SAI-C SERVER STAFF IS TEMPORARY AND WILL BE REMOVED LATER
-sai-challenger-server-build:
-	cd $(SAI_CHALLENGER_PATH) && ./build.sh -i server -a trident2 -t saivs
-
-# SAI-C SERVER STAFF IS TEMPORARY AND WILL BE REMOVED LATER
-sai-challenger-server-start:
-	cd $(SAI_CHALLENGER_PATH) && ./run.sh -i server -a trident2 -t saivs -r
-
-# SAI-C SERVER STAFF IS TEMPORARY AND WILL BE REMOVED LATER
-sai-challenger-server-stop:
-	cd $(SAI_CHALLENGER_PATH) && ./run.sh -i server -a trident2 -t saivs -c stop
-
-# SAI-C SERVER STAFF IS TEMPORARY AND WILL BE REMOVED LATER
-sai-challenger-create-veth:
-	sudo $(SAI_CHALLENGER_PATH)/veth-create-host.sh $(CONTAINER_SAI_CHALLENGER_SERVER_NAME) $(CONTAINER_SAI_CHALLENGER_CLIENT_NAME)
+run-saic-test-thrift: deploy-ixiac
+	$(CONTAINER_SAI_CHALLENGER_CLIENT_EXEC) pytest -sv --setup=sai_dpu_client_server.json test_sai_vnet_inbound.py
 
 ###############################
 # ENVIRONMENT SETUP TARGETS

dash-pipeline/dockerfiles/Dockerfile.saic-saithrift-client

@@ -1,28 +1,40 @@
 FROM sc-client
 
-ADD tests/ /tests/
+ENV SAI_CHALLENGER_PATH /sai-challenger
+ENV DASH_PATH /dash
 
-RUN python3 -m pip install -r /tests/requirements.txt && \
-        pip3 install scapy pysubnettree
+ADD tests/ /tests/
 
 # Copy distro PTF submodule and tools from SAI repo
 ADD SAI/SAI/test/ptf /SAI/test/ptf
+
 # Install PTF test framework & test-cases from SAI repo
 ADD SAI/SAI/ptf /SAI/ptf/
+
 # Copy thrift python distro 
 ADD SAI/rpc/thrift-0.11.0.tar.gz /
+
 # Copy autogenerated saithrift library built from SAI headers for DASH dataplane
 ADD SAI/rpc/saithrift-0.9.tar.gz /
+
 # Install the python libraries
-RUN cd /saithrift-0.9 && \
-    python3 setup.py install && \
+RUN python3 -m pip install -r /tests/requirements.txt && \
+    pip3 install scapy \
+                 pysubnettree \
+                 macaddress \
+                 munch && \
+    cd /saithrift-0.9 && \
+        python3 setup.py install && \
     cd / && \
-    rm -rf saithrift-0.9 &&\
+        rm -rf saithrift-0.9 &&\
     cd thrift-0.11.0 && \
-    python3 setup.py install && \
+        python3 setup.py install && \
     cd / &&\
-    rm -rf thrift-0.11.0 && \
+        rm -rf thrift-0.11.0 && \
     cd /SAI/test/ptf && \
-    python3 setup.py install
+        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/third-party/cgyang/saigen /usr/local/lib/python3.7/dist-packages/saigen
 
 CMD ["/usr/bin/supervisord"]