From b2502740e735377d75c028f909d6c1313233b628 Mon Sep 17 00:00:00 2001 From: Roman Date: Mon, 6 Jan 2025 19:13:40 +0800 Subject: [PATCH] fix: absolute path for volumes - IP range --- src/node/docker_mananger.py | 2 +- src/node/node_vars.py | 6 +++--- src/node/nomos_node.py | 4 ++++ tests/e2e/test_2node_alive.py | 8 ++++---- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/node/docker_mananger.py b/src/node/docker_mananger.py index e9576f9..a1a5276 100644 --- a/src/node/docker_mananger.py +++ b/src/node/docker_mananger.py @@ -112,7 +112,7 @@ class DockerManager: @staticmethod def generate_random_ext_ip(): - base_ip_fragments = ["172", "18"] + base_ip_fragments = ["172", "19"] ext_ip = ".".join(base_ip_fragments + [str(random.randint(0, 255)) for _ in range(2)]) logger.debug(f"Generated random external IP {ext_ip}") return ext_ip diff --git a/src/node/node_vars.py b/src/node/node_vars.py index 6cdf94e..1f51c03 100644 --- a/src/node/node_vars.py +++ b/src/node/node_vars.py @@ -1,19 +1,19 @@ nomos_nodes = { "nomos": { "image": "ghcr.io/logos-co/nomos-node:testnet", - "volumes": ["./cl_config:/etc/nomos", "./kzgrs/kzgrs_test_params.bin:/kzgrs_test_params:z"], + "volumes": ["cl_config:/etc/nomos", "./kzgrs/kzgrs_test_params.bin:/kzgrs_test_params:z"], "ports": ["3000/udp", "18080/tcp"], "entrypoint": "/etc/nomos/scripts/run_nomos_node.sh", }, "nomos_executor": { "image": "ghcr.io/logos-co/nomos-node:testnet", - "volumes": ["./cl_config:/etc/nomos", "./kzgrs/kzgrs_test_params.bin:/kzgrs_test_params:z"], + "volumes": ["cl_config:/etc/nomos", "./kzgrs/kzgrs_test_params.bin:/kzgrs_test_params:z"], "ports": ["3000/udp", "18080/tcp"], "entrypoint": "/etc/nomos/scripts/run_nomos_executor.sh", }, "cfgsync": { "image": "ghcr.io/logos-co/nomos-node:testnet", - "volumes": ["./cl_config:/etc/nomos"], + "volumes": ["cl_config:/etc/nomos"], "ports": "", "entrypoint": "/etc/nomos/scripts/run_cfgsync.sh", }, diff --git a/src/node/nomos_node.py b/src/node/nomos_node.py index e2f6cef..e1945ba 100644 --- a/src/node/nomos_node.py +++ b/src/node/nomos_node.py @@ -32,6 +32,10 @@ class NomosNode: self._docker_manager = DockerManager(self._image_name) self._container = None + cwd = os.getcwd() + for i, volume in enumerate(self._volumes): + self._volumes[i] = cwd + "/" + volume + logger.debug(f"NomosNode instance initialized with log path {self._log_path}") @retry(stop=stop_after_delay(60), wait=wait_fixed(0.1), reraise=True) diff --git a/tests/e2e/test_2node_alive.py b/tests/e2e/test_2node_alive.py index 98c1bb2..31fcbf0 100644 --- a/tests/e2e/test_2node_alive.py +++ b/tests/e2e/test_2node_alive.py @@ -5,10 +5,10 @@ from src.node.nomos_node import NomosNode class Test2NodeClAlive: def test_cluster_start(self): - # self.node1 = NomosNode(CFGSYNC, f"node1_{1}") + self.node1 = NomosNode(CFGSYNC, f"node1_{1}") self.node2 = NomosNode(NOMOS, f"node2_{2}") - # self.node3 = NomosNode(NOMOS_EXECUTOR, f"node3_{3}") + self.node3 = NomosNode(NOMOS_EXECUTOR, f"node3_{3}") - # self.node1.start() + self.node1.start() self.node2.start() - # self.node3.start() + self.node3.start()