From de161a287ecb910c35b2a33f89a827519417cb75 Mon Sep 17 00:00:00 2001 From: Andriy Kokhan Date: Thu, 1 Jun 2023 21:11:00 +0300 Subject: [PATCH] Updated SAI-C to enable SaiObjType autogen (#381) Signed-off-by: Andriy Kokhan --- .../dockerfiles/DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG.env | 2 +- dash-pipeline/dockerfiles/Dockerfile.saichallenger-client | 2 +- .../dockerfiles/Dockerfile.saichallenger-client-bldr | 2 +- test/SAI-Challenger | 2 +- test/test-cases/functional/saic/conftest.py | 7 +++++++ test/test-cases/scale/saic/conftest.py | 7 +++++++ 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dash-pipeline/dockerfiles/DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG.env b/dash-pipeline/dockerfiles/DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG.env index a379a0ae3..09edddf07 100644 --- a/dash-pipeline/dockerfiles/DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG.env +++ b/dash-pipeline/dockerfiles/DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG.env @@ -2,4 +2,4 @@ # Changing this will cause build/publish to occur in CI actions export DASH_ACR_REGISTRY=sonicdash.azurecr.io export DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG_NAME=${DASH_ACR_REGISTRY}/dash-saichallenger-client-bldr -export DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG_CTAG?=230530 +export DOCKER_SAI_CHALLENGER_CLIENT_BLDR_IMG_CTAG?=230601 diff --git a/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client b/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client index d6e52055d..1a308d570 100644 --- a/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client +++ b/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client @@ -1,4 +1,4 @@ -FROM sonicdash.azurecr.io/dash-saichallenger-client-bldr:230530 +FROM sonicdash.azurecr.io/dash-saichallenger-client-bldr:230601 ENV SAI_CHALLENGER_PATH /sai-challenger ENV DASH_PATH /dash diff --git a/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client-bldr b/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client-bldr index 67a1d6f19..6b2c2aa48 100644 --- a/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client-bldr +++ b/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client-bldr @@ -1,5 +1,5 @@ # Requires or something -# sc-client:230530 +# sc-client:230601 FROM sc-client ADD tests/ /tests/ diff --git a/test/SAI-Challenger b/test/SAI-Challenger index 8fe5256fe..1cb47c2a8 160000 --- a/test/SAI-Challenger +++ b/test/SAI-Challenger @@ -1 +1 @@ -Subproject commit 8fe5256feadcf28742445a2f6121b7dc38ac73b4 +Subproject commit 1cb47c2a8704a37f94d33f4f133471a89178d0b5 diff --git a/test/test-cases/functional/saic/conftest.py b/test/test-cases/functional/saic/conftest.py index e5b67b19d..adfdefe56 100644 --- a/test/test-cases/functional/saic/conftest.py +++ b/test/test-cases/functional/saic/conftest.py @@ -6,6 +6,13 @@ from saichallenger.common.sai_dpu import SaiDpu from saichallenger.common.sai_testbed import SaiTestbed +from saichallenger.common.sai_data import SaiObjType + + +def pytest_sessionstart(session): + SaiObjType.generate_from_thrift() + SaiObjType.generate_from_json() + def pytest_addoption(parser): parser.addoption("--traffic", action="store_true", default=False, help="run tests with traffic") diff --git a/test/test-cases/scale/saic/conftest.py b/test/test-cases/scale/saic/conftest.py index e5b67b19d..adfdefe56 100644 --- a/test/test-cases/scale/saic/conftest.py +++ b/test/test-cases/scale/saic/conftest.py @@ -6,6 +6,13 @@ from saichallenger.common.sai_dpu import SaiDpu from saichallenger.common.sai_testbed import SaiTestbed +from saichallenger.common.sai_data import SaiObjType + + +def pytest_sessionstart(session): + SaiObjType.generate_from_thrift() + SaiObjType.generate_from_json() + def pytest_addoption(parser): parser.addoption("--traffic", action="store_true", default=False, help="run tests with traffic")