X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Foom-platform-cert-service%2Fpostprocessor%2Flibraries%2FPostProcessorDockerContainerUtils.py;fp=tests%2Foom-platform-cert-service%2Fpostprocessor%2Flibraries%2FTrustMergerManager.py;h=e0563b3faabbfe49dc0f035fcfddfa6329ca801a;hb=refs%2Fchanges%2F46%2F113146%2F3;hp=f7a493c451cbfab5be01453438c0affeca35bb8c;hpb=acec2db0967b0a78ecbe163549119f709beb4058;p=integration%2Fcsit.git

diff --git a/tests/oom-platform-cert-service/postprocessor/libraries/TrustMergerManager.py b/tests/oom-platform-cert-service/postprocessor/libraries/PostProcessorDockerContainerUtils.py
similarity index 78%
rename from tests/oom-platform-cert-service/postprocessor/libraries/TrustMergerManager.py
rename to tests/oom-platform-cert-service/postprocessor/libraries/PostProcessorDockerContainerUtils.py
index f7a493c4..e0563b3f 100644
--- a/tests/oom-platform-cert-service/postprocessor/libraries/TrustMergerManager.py
+++ b/tests/oom-platform-cert-service/postprocessor/libraries/PostProcessorDockerContainerUtils.py
@@ -7,20 +7,20 @@ from docker.types import Mount
 ARCHIVES_PATH = os.getenv("WORKSPACE") + "/archives/"
 
 
-class TrustMergerManager:
+class PostProcessorDockerContainerUtils:
 
   def __init__(self, mount_path, truststores_path):
     self.mount_path = mount_path
     self.truststores_path = truststores_path
 
-  def run_merger_container(self, merger_image, merger_name, path_to_env):
+  def run_container(self, docker_image, image_name, path_to_env):
     self.remove_mount_dir()
     shutil.copytree(self.truststores_path, self.mount_path)
     client = docker.from_env()
     environment = EnvsReader().read_env_list_from_file(path_to_env)
     container = client.containers.run(
-        image=merger_image,
-        name=merger_name,
+        image=docker_image,
+        name=image_name,
         environment=environment,
         user='root',  # Run container as root to avoid permission issues with volume mount access
         mounts=[Mount(target='/var/certs', source=self.mount_path, type='bind')],
@@ -37,10 +37,10 @@ class TrustMergerManager:
     if os.path.exists(self.mount_path):
       shutil.rmtree(self.mount_path)
 
-  def remove_merger_container_and_save_logs(self, container_name, log_file_name):
+  def remove_container_and_save_logs(self, container_name, log_file_name):
     client = docker.from_env()
     container = client.containers.get(container_name)
-    text_file = open(ARCHIVES_PATH + "merger_container_" + log_file_name + ".log", "w")
+    text_file = open(ARCHIVES_PATH + "certservice_postprocessor_container_" + log_file_name + ".log", "w")
     text_file.write(container.logs())
     text_file.close()
     container.remove()