From 97266edf61ff498ad0477c72501889476f1971d5 Mon Sep 17 00:00:00 2001
From: Roman <zajic@zajic.net>
Date: Tue, 7 Jan 2025 13:13:11 +0800
Subject: [PATCH] test: add container name for DNS

---
 src/node/docker_mananger.py   | 3 ++-
 src/node/nomos_node.py        | 6 ++++--
 tests/e2e/test_2node_alive.py | 9 ++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/node/docker_mananger.py b/src/node/docker_mananger.py
index a1a5276..8337b55 100644
--- a/src/node/docker_mananger.py
+++ b/src/node/docker_mananger.py
@@ -35,7 +35,7 @@ class DockerManager:
         logger.debug(f"Network {network_name} created")
         return network
 
-    def start_container(self, image_name, port_bindings, args, log_path, container_ip, volumes, entrypoint, remove_container=True):
+    def start_container(self, image_name, port_bindings, args, log_path, container_ip, volumes, entrypoint, remove_container=True, name=None):
         cli_args = []
         for key, value in args.items():
             if isinstance(value, list):  # Check if value is a list
@@ -58,6 +58,7 @@ class DockerManager:
             auto_remove=remove_container,
             volumes=volumes,
             entrypoint=entrypoint,
+            name=name,
         )
 
         network = self._client.networks.get(NETWORK_NAME)
diff --git a/src/node/nomos_node.py b/src/node/nomos_node.py
index e1945ba..d9a2511 100644
--- a/src/node/nomos_node.py
+++ b/src/node/nomos_node.py
@@ -21,15 +21,16 @@ def sanitize_docker_flags(input_flags):
 
 
 class NomosNode:
-    def __init__(self, node_type, docker_log_prefix=""):
+    def __init__(self, node_type, container_name=""):
         logger.debug(f"Node is going to be initialized with this config {nomos_nodes[node_type]}")
         self._image_name = nomos_nodes[node_type]["image"]
         self._internal_ports = nomos_nodes[node_type]["ports"]
         self._volumes = nomos_nodes[node_type]["volumes"]
         self._entrypoint = nomos_nodes[node_type]["entrypoint"]
 
-        self._log_path = os.path.join(DOCKER_LOG_DIR, f"{docker_log_prefix}__{self._image_name.replace('/', '_')}.log")
+        self._log_path = os.path.join(DOCKER_LOG_DIR, f"{container_name}__{self._image_name.replace('/', '_')}.log")
         self._docker_manager = DockerManager(self._image_name)
+        self._container_name = container_name
         self._container = None
 
         cwd = os.getcwd()
@@ -77,6 +78,7 @@ class NomosNode:
             volumes=self._volumes,
             entrypoint=self._entrypoint,
             remove_container=True,
+            name=self._container_name,
         )
         logger.debug(f"Container returned  {self._container}")
         logger.debug(f"Started container from image {self._image_name}")
diff --git a/tests/e2e/test_2node_alive.py b/tests/e2e/test_2node_alive.py
index 31fcbf0..3a564b5 100644
--- a/tests/e2e/test_2node_alive.py
+++ b/tests/e2e/test_2node_alive.py
@@ -1,14 +1,17 @@
 from src.env_vars import CFGSYNC, NOMOS, NOMOS_EXECUTOR
 from src.node.nomos_node import NomosNode
+from src.libs.common import delay
 
 
 class Test2NodeClAlive:
     def test_cluster_start(self):
 
-        self.node1 = NomosNode(CFGSYNC, f"node1_{1}")
-        self.node2 = NomosNode(NOMOS, f"node2_{2}")
-        self.node3 = NomosNode(NOMOS_EXECUTOR, f"node3_{3}")
+        self.node1 = NomosNode(CFGSYNC, "cfgsync")
+        self.node2 = NomosNode(NOMOS, "nomos_node_0")
+        self.node3 = NomosNode(NOMOS_EXECUTOR, "nomos_node_0")
 
         self.node1.start()
         self.node2.start()
         self.node3.start()
+
+        delay(60)