Updated SAI-C to enable SaiObjType autogen (#381)

Signed-off-by: Andriy Kokhan <[email protected]>
sonic-net · Jun 1, 2023 · de161a2 · de161a2
1 parent 3d45b5f
commit de161a2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 # Requires <url of sai-challenger branch> <commit sha> or something
-# sc-client:230530
+# sc-client:230601
 FROM sc-client
 
 ADD tests/ /tests/

diff --git a/test/SAI-Challenger b/test/SAI-Challenger
diff --git 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
@@ -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")
+46 −125		common/sai_data.py
+1 −1		dockerfiles/Dockerfile
+4 −2		dockerfiles/Dockerfile.client
+1 −0		scripts/gen_attr_list/generate_attrs.cpp
+6 −0		tests/conftest.py