fix scenarios

Author: willcl-ark

src/services/dns_seed.py

@@ -14,7 +14,7 @@ def __init__(self, docker_network, templates, config_dir):
         self.docker_network = docker_network
         self.templates = templates
         self.service = {
-            "container_name": DNS_SEED_NAME,
+            "container_name": f"{self.docker_network}_{DNS_SEED_NAME}",
             "ports": [f"{PORT}:53/udp", f"{PORT}:53/tcp"],
             "build": {
                 "context": ".",

src/services/fork_observer.py

@@ -9,7 +9,7 @@ def __init__(self, docker_network, fork_observer_config):
         self.fork_observer_config = fork_observer_config
         self.service = {
             "image": "b10c/fork-observer:latest",
-            "container_name": "fork-observer",
+            "container_name": f"{self.docker_network}_fork-observer",
             "ports": [f"{PORT}:2323"],
             "volumes": [f"{self.fork_observer_config}:/app/config.toml"],
             "networks": [self.docker_network],

src/services/grafana.py

@@ -8,7 +8,7 @@ def __init__(self, docker_network):
         super().__init__(docker_network)
         self.service = {
             "image": "grafana/grafana:latest",
-            "container_name": "grafana",
+            "container_name": f"{self.docker_network}_grafana",
             "ports": [f"3000:{PORT}"],
             "volumes": ["grafana-storage:/var/lib/grafana"],
             "networks": [self.docker_network],

src/services/node_exporter.py

@@ -6,7 +6,7 @@ def __init__(self, docker_network):
         super().__init__(docker_network)
         self.service = {
             "image": "prom/node-exporter:latest",
-            "container_name": "node-exporter",
+            "container_name": f"{self.docker_network}_node-exporter",
             "volumes": ["/proc:/host/proc:ro", "/sys:/host/sys:ro", "/:/rootfs:ro"],
             "command": ["--path.procfs=/host/proc", "--path.sysfs=/host/sys"],
             "networks": [self.docker_network],

src/services/prometheus.py

@@ -1,3 +1,4 @@
+import docker
 from .base_service import BaseService
 
 PORT = 9090
@@ -8,7 +9,7 @@ def __init__(self, docker_network, config_dir):
         super().__init__(docker_network, config_dir)
         self.service = {
             "image": "prom/prometheus:latest",
-            "container_name": "prometheus",
+            "container_name": f"{self.docker_network}_prometheus",
             "ports": [f"{PORT}:9090"],
             "volumes": [
                 f"{self.config_dir / 'prometheus.yml'}:/etc/prometheus/prometheus.yml"

src/services/tor.py

@@ -13,7 +13,7 @@ def __init__(self, docker_network, templates):
                 "context": str(self.templates),
                 "dockerfile": DOCKERFILE,
             },
-            "container_name": "tor",
+            "container_name": f"{self.docker_network}_tor",
             "networks": {
                 self.docker_network: {
                     "ipv4_address": DIRECTORY_AUTHORITY_IP,

src/warnet/cli.py

@@ -176,14 +176,17 @@ def list():
         print(f"Error listing scenarios: {e}")
 
 
-@scenarios.command()
+@scenarios.command(context_settings={"ignore_unknown_options": True})
 @click.argument("scenario", type=str)
-def run(scenario):
+@click.argument("additional_args", nargs=-1, type=click.UNPROCESSED) 
+@click.option("--network", default="warnet", show_default=True)
+def run(scenario, network, additional_args):
     """
     Run <scenario> from the Warnet Test Framework
     """
     try:
-        res = rpc_call("run", {"scenario": scenario})
+        params = {"scenario": scenario, "additional_args": additional_args, "network": network}
+        res = rpc_call("run", params)
         print(res)
     except Exception as e:
         print(f"Error running scenario: {e}")

src/warnet/tank.py

@@ -129,7 +129,7 @@ def container_name(self):
     @property
     def exporter_name(self):
         if self._exporter_name is None:
-            self._exporter_name = f"{CONTAINER_PREFIX_PROMETHEUS}_{self.suffix}"
+            self._exporter_name = f"{self.docker_network}_{CONTAINER_PREFIX_PROMETHEUS}_{self.suffix}"
         return self._exporter_name
 
     @property

src/warnet/warnetd.py

@@ -9,7 +9,7 @@
 import threading
 from datetime import datetime
 from logging.handlers import RotatingFileHandler
-
+from typing import List
 from flask import Flask
 from flask_jsonrpc.app import JSONRPC
 
@@ -129,7 +129,7 @@ def list() -> list[str]:
 
 
 @jsonrpc.method("run")
-def run(scenario: str, network: str = "warnet") -> str:
+def run(scenario: str, additional_args: List[str], network: str = "warnet") -> str:
     """
     Run <scenario> from the Warnet Test Framework
     """
@@ -140,7 +140,7 @@ def run(scenario: str, network: str = "warnet") -> str:
         return f"Scenario {scenario} not found at {scenario_path}."
 
     try:
-        run_cmd = [sys.executable, scenario_path] + [f"--network={network}"]
+        run_cmd = [sys.executable, scenario_path] + additional_args + [f"--network={network}"]
         logger.debug(f"Running {run_cmd}")
         subprocess.Popen(run_cmd, shell=False)
         return f"Running scenario {scenario} in the background..."