Fixed sai-v1.15 runtime issues

Signed-off-by: Andriy Kokhan <andriy.kokhan@plvision.eu>

Author: andriy-kokhan

dockerfiles/bookworm/Dockerfile.saithrift-client

@@ -52,8 +52,8 @@ RUN apt-get -o Acquire::Check-Valid-Until=false update \
         && rm -rf /var/lib/apt/lists/*
 
 # Temporary workaround fix until the OCP community fixes the sai_adapter.py generation
-ENV SAI_ADAPTER_PY /usr/local/lib/python3.11/dist-packages/saithrift-0.9-py3.11.egg/sai_thrift/sai_adapter.py
-RUN sed -i 's/(=object_type)/(s32=object_type)/g' ${SAI_ADAPTER_PY} \
+RUN SAI_ADAPTER_PY=$(find / -name sai_adapter.py 2>/dev/null | head -n 1) \
+        && sed -i 's/(=object_type)/(s32=object_type)/g' ${SAI_ADAPTER_PY} \
         && sed -i 's/attr\.value\.$/attr.value.s32/' ${SAI_ADAPTER_PY}
 
 # Install PTF dependencies

dockerfiles/buster/Dockerfile.saithrift-client

@@ -32,8 +32,8 @@ RUN apt-get -o Acquire::Check-Valid-Until=false update \
         && rm -rf /var/lib/apt/lists/*
 
 # Temporary workaround fix until the OCP community fixes the sai_adapter.py generation
-ENV SAI_ADAPTER_PY /usr/local/lib/python3.11/dist-packages/saithrift-0.9-py3.11.egg/sai_thrift/sai_adapter.py
-RUN sed -i 's/(=object_type)/(s32=object_type)/g' ${SAI_ADAPTER_PY} \
+RUN SAI_ADAPTER_PY=$(find / -name sai_adapter.py 2>/dev/null | head -n 1) \
+        && sed -i 's/(=object_type)/(s32=object_type)/g' ${SAI_ADAPTER_PY} \
         && sed -i 's/attr\.value\.$/attr.value.s32/' ${SAI_ADAPTER_PY}
 
 # Install PTF dependencies

npu/broadcom/BCM56850/saivs/Dockerfile.saithrift

@@ -70,8 +70,8 @@ RUN git clone https://github.com/sonic-net/sonic-sairedis.git \
         && mv /sai/tests /sai/sonic-sairedis/
 
 # Temporary workaround fix until the OCP community fixes the sai_adapter.py generation
-ENV SAI_ADAPTER_PY /usr/local/lib/python3.11/dist-packages/saithrift-0.9-py3.11.egg/sai_thrift/sai_adapter.py
-RUN sed -i 's/(=object_type)/(s32=object_type)/g' ${SAI_ADAPTER_PY} \
+RUN SAI_ADAPTER_PY=$(find / -name sai_adapter.py 2>/dev/null | head -n 1) \
+        && sed -i 's/(=object_type)/(s32=object_type)/g' ${SAI_ADAPTER_PY} \
         && sed -i 's/attr\.value\.$/attr.value.s32/' ${SAI_ADAPTER_PY}
 
 # Build SAI attributes metadata JSON generator and generate /etc/sai/sai.json