Merge branch 'main' into pdr_telemetry

Mellanox · Sep 16, 2024 · 99dbffd · 99dbffd
2 parents df3bbb3 + ceeb2a4
commit 99dbffd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/.ci/jenkinsfile_hub_uploader.groovy b/.ci/jenkinsfile_hub_uploader.groovy
@@ -4,7 +4,7 @@ pipeline{
             // if the docker file changes it should be build and uploaded manually
             image 'harbor.mellanox.com/swx-storage/ci-demo/x86_64/swx-dockerhub-uploader:20240221'
             label 'DOCKER'
-            args '-v /auto/mswg:/auto/mswg -v /mswg:/mswg -v /var/run/docker.sock:/var/run/docker.sock --privileged'
+            args '-v /auto/mswg:/auto/mswg -v /auto/sw/:/auto/sw -v /mswg:/mswg -v /var/run/docker.sock:/var/run/docker.sock --privileged'
         }
     }
     stages {

diff --git a/plugins/pdr_deterministic_plugin/build/Dockerfile b/plugins/pdr_deterministic_plugin/build/Dockerfile
@@ -10,14 +10,8 @@ ARG CONF_PATH=${BASE_PATH}/conf
 ARG SCRIPTS_PATH=${BASE_PATH}/scripts
 
 EXPOSE 8000
-EXPOSE 8982
 EXPOSE 443
 EXPOSE 9002
-EXPOSE 9003
-EXPOSE 9004
-EXPOSE 9005
-EXPOSE 9006
-EXPOSE 9007
 
 RUN apt-get update && apt-get -y install supervisor python3 python3-pip rsyslog vim curl sudo
 

diff --git a/plugins/pdr_deterministic_plugin/ufm_sim_web_service/isolation_mgr.py b/plugins/pdr_deterministic_plugin/ufm_sim_web_service/isolation_mgr.py
@@ -312,10 +312,8 @@ def main_flow(self):
                     for isolated_port in list(self.isolated_ports.values()):
                         if self.pdr_alg.check_deisolation_conditions(isolated_port):
                             self.eval_deisolate(isolated_port.name)
-                ports_updated = self.update_ports_data()
-                if ports_updated:
-                    self.update_telemetry_session()
-                self.data_store.clean_old_files()
+
+                self.update_ports_data()
                 t_end = time.time()
             #pylint: disable=broad-except
             except Exception as exception: