refactor(tools): refactored out commmon logic for finding node offsets for experiments on cloudlab

asap-tools/experiments/experiment_only_ingest_path.py

@@ -119,9 +119,7 @@ def main(cfg: DictConfig):
         raise ValueError("Invalid exporter config: {}".format(rejection_reason))
 
     # Initialize services
-    system_exporters_service = SystemExportersService(
-        provider, args.num_nodes, args.node_offset
-    )
+    system_exporters_service = SystemExportersService(provider, args)
     prometheus_service = create_prometheus_service(
         cfg, provider, args.num_nodes, args.node_offset
     )
@@ -130,9 +128,8 @@ def main(cfg: DictConfig):
     exporter_service = ExporterServiceFactory.create_exporter_service(
         args.fake_exporter_language,
         provider,
-        num_nodes_in_experiment,
+        args,
         use_container=args.use_container_fake_exporter,
-        node_offset=args.node_offset,
     )
 
     # Initialize V2-specific services (always initialize to allow cleanup from previous runs)

asap-tools/experiments/experiment_run_e2e.py

@@ -140,9 +140,7 @@ def main(cfg: DictConfig):
         use_container=args.use_container_query_engine,
         node_offset=args.node_offset,
     )
-    system_exporters_service = SystemExportersService(
-        provider, args.num_nodes, args.node_offset
-    )
+    system_exporters_service = SystemExportersService(provider, args)
     prometheus_service = create_prometheus_service(
         cfg, provider, args.num_nodes, args.node_offset
     )
@@ -154,9 +152,7 @@ def main(cfg: DictConfig):
         use_container=args.use_container_arroyo,
         node_offset=args.node_offset,
     )
-    deathstar_service = DeathstarService(
-        provider, num_nodes_in_experiment, args.node_offset
-    )
+    deathstar_service = DeathstarService(provider, args)
     controller_service = ControllerService(
         provider,
         use_container=args.use_container_controller,
@@ -169,20 +165,14 @@ def main(cfg: DictConfig):
         node_offset=args.node_offset,
     )
     remote_monitor_service = RemoteMonitorService(provider, args.node_offset)
-    avalanche_service = AvalancheExporterService(
-        provider,
-        num_nodes_in_experiment,
-        use_container=False,
-        node_offset=args.node_offset,
-    )
+    avalanche_service = AvalancheExporterService(provider, args, use_container=False)
 
     # Initialize exporter service based on language
     exporter_service = ExporterServiceFactory.create_exporter_service(
         args.fake_exporter_language,
         provider,
-        num_nodes_in_experiment,
+        args,
         use_container=args.use_container_fake_exporter,
-        node_offset=args.node_offset,
     )
 
     # Initialize cluster data exporter service if configured

asap-tools/experiments/experiment_run_exporters_and_prometheus.py

@@ -76,9 +76,7 @@ def main(cfg: DictConfig):
         raise ValueError("Invalid exporter config: {}".format(rejection_reason))
 
     # Initialize services
-    system_exporters_service = SystemExportersService(
-        provider, args.num_nodes, args.node_offset
-    )
+    system_exporters_service = SystemExportersService(provider, args)
     prometheus_service = create_prometheus_service(
         cfg, provider, args.num_nodes, args.node_offset
     )
@@ -87,9 +85,8 @@ def main(cfg: DictConfig):
     exporter_service = ExporterServiceFactory.create_exporter_service(
         args.fake_exporter_language,
         provider,
-        num_nodes_in_experiment,
+        args,
         use_container=args.use_container_fake_exporter,
-        node_offset=args.node_offset,
     )
 
     # Stop any existing services to ensure clean state

asap-tools/experiments/experiment_run_grafana_demo.py

@@ -125,9 +125,7 @@ def main(cfg: DictConfig):
         use_container=args.use_container_query_engine,
         node_offset=args.node_offset,
     )
-    system_exporters_service = SystemExportersService(
-        provider, args.num_nodes, args.node_offset
-    )
+    system_exporters_service = SystemExportersService(provider, args)
     prometheus_service = create_prometheus_service(
         cfg, provider, args.num_nodes, args.node_offset
     )
@@ -136,9 +134,7 @@ def main(cfg: DictConfig):
         use_container=args.use_container_arroyo,
         node_offset=args.node_offset,
     )
-    deathstar_service = DeathstarService(
-        provider, num_nodes_in_experiment, args.node_offset
-    )
+    deathstar_service = DeathstarService(provider, args)
     controller_service = ControllerService(
         provider,
         use_container=args.use_container_controller,
@@ -154,20 +150,14 @@ def main(cfg: DictConfig):
     grafana_service = GrafanaService(
         provider, num_nodes_in_experiment, args.node_offset
     )
-    avalanche_service = AvalancheExporterService(
-        provider,
-        num_nodes_in_experiment,
-        use_container=False,
-        node_offset=args.node_offset,
-    )
+    avalanche_service = AvalancheExporterService(provider, args, use_container=False)
 
     # Initialize exporter service based on language
     exporter_service = ExporterServiceFactory.create_exporter_service(
         args.fake_exporter_language,
         provider,
-        num_nodes_in_experiment,
+        args,
         use_container=args.use_container_fake_exporter,
-        node_offset=args.node_offset,
     )
 
     sync.copy_experiment_config(cfg.experiment_params, local_experiment_root_dir)

asap-tools/experiments/experiment_teardown_everything.py

@@ -79,9 +79,7 @@ def main(cfg: DictConfig):
         provider, use_container=False, node_offset=args.node_offset
     )
 
-    system_exporters_service = SystemExportersService(
-        provider, num_nodes_in_experiment, args.node_offset
-    )
+    system_exporters_service = SystemExportersService(provider, args)
     prometheus_service = create_prometheus_service(
         cfg, provider, num_nodes_in_experiment, args.node_offset
     )
@@ -96,9 +94,7 @@ def main(cfg: DictConfig):
         provider, use_container=False, node_offset=args.node_offset
     )
 
-    deathstar_service = DeathstarService(
-        provider, num_nodes_in_experiment, args.node_offset
-    )
+    deathstar_service = DeathstarService(provider, args)
 
     controller_service_container = ControllerService(
         provider, use_container=True, node_offset=args.node_offset
@@ -122,42 +118,21 @@ def main(cfg: DictConfig):
         provider, num_nodes_in_experiment, args.node_offset
     )
 
-    avalanche_service = AvalancheExporterService(
-        provider,
-        num_nodes_in_experiment,
-        use_container=False,
-        node_offset=args.node_offset,
-    )
+    avalanche_service = AvalancheExporterService(provider, args, use_container=False)
 
     # Initialize both exporter languages
     fake_exporter_service_rust = ExporterServiceFactory.create_exporter_service(
-        "rust",
-        provider,
-        num_nodes_in_experiment,
-        use_container=True,
-        node_offset=args.node_offset,
+        "rust", provider, args, use_container=True
     )
     fake_exporter_service_python = ExporterServiceFactory.create_exporter_service(
-        "python",
-        provider,
-        num_nodes_in_experiment,
-        use_container=True,
-        node_offset=args.node_offset,
+        "python", provider, args, use_container=True
     )
     fake_exporter_service_rust_native = ExporterServiceFactory.create_exporter_service(
-        "rust",
-        provider,
-        num_nodes_in_experiment,
-        use_container=False,
-        node_offset=args.node_offset,
+        "rust", provider, args, use_container=False
     )
     fake_exporter_service_python_native = (
         ExporterServiceFactory.create_exporter_service(
-            "python",
-            provider,
-            num_nodes_in_experiment,
-            use_container=False,
-            node_offset=args.node_offset,
+            "python", provider, args, use_container=False
         )
     )