fix minor details

Author: AlejandroAvilesSerrano

nebula/controller/federation/controllers/docker_federation_controller.py

@@ -222,10 +222,9 @@ async def update_nodes(self, scenario_name: str, request: Request):
                             if index == idx:
                                 if index in additionals:
                                     self.logger.info(f"Deploying additional participant: {index}")
-                                    deployed_successfully = self._start_node(node, nebula_federation.network_name, nebula_federation.base_network_name, nebula_federation.base, nebula_federation.last_index_deployed, nebula_federation)
+                                    deployed_successfully = self._start_node(nebula_federation.scenario_name, node, nebula_federation.network_name, nebula_federation.base_network_name, nebula_federation.base, nebula_federation.last_index_deployed, nebula_federation)
                                     if deployed_successfully:
                                         self.logger.info(f"Deployment successfully for additional participant: {index}")
-                                        nebula_federation.participants_alive += 1
                                     nebula_federation.last_index_deployed += 1
                                     #additionals.remove(index)
                                     adds_deployed.add(index)
@@ -522,12 +521,12 @@ def _start_initial_nodes(self, sb: ScenarioBuilder, federation: NebulaFederation
                 # deploy initial nodes
                 self.logger.info(f"Deployment starting for participant {idx}")
                 federation.round_per_participant[idx] = 0
-                deployed_successfully = self._start_node(sb, node, federation.network_name, federation.base_network_name, federation.base, federation.last_index_deployed, federation)
+                deployed_successfully = self._start_node(sb.get_scenario_name(), node, federation.network_name, federation.base_network_name, federation.base, federation.last_index_deployed, federation)
                 if deployed_successfully:
                     federation.last_index_deployed += 1
                     federation.participants_alive += 1
 
-    def _start_node(self, sb: ScenarioBuilder, node, network_name, base_network_name, base, i, federation: NebulaFederationDocker):
+    def _start_node(self, scenario_name, node, network_name, base_network_name, base, i, federation: NebulaFederationDocker):
         success = True
         client = docker.from_env()
 
@@ -536,7 +535,7 @@ def _start_node(self, sb: ScenarioBuilder, node, network_name, base_network_name
         container_names = []  # Track names for metadata
 
         image = "nebula-core"
-        name = self._get_participant_container_name(sb.get_scenario_name(), node["device_args"]["idx"])
+        name = self._get_participant_container_name(scenario_name, node["device_args"]["idx"])
         if node["device_args"]["accelerator"] == "gpu":
             environment = {
                 "NVIDIA_DISABLE_REQUIRE": True,
@@ -562,7 +561,7 @@ def _start_node(self, sb: ScenarioBuilder, node, network_name, base_network_name
         command = [
             "/bin/bash",
             "-c",
-            f"{start_command} && ifconfig && echo '{base}.1 host.docker.internal' >> /etc/hosts && python /nebula/nebula/core/node.py /nebula/app/config/{sb.get_scenario_name()}/participant_{node['device_args']['idx']}.json",
+            f"{start_command} && ifconfig && echo '{base}.1 host.docker.internal' >> /etc/hosts && python /nebula/nebula/core/node.py /nebula/app/config/{scenario_name}/participant_{node['device_args']['idx']}.json",
         ]
         networking_config = client.api.create_networking_config({
             network_name: client.api.create_endpoint_config(
@@ -571,9 +570,9 @@ def _start_node(self, sb: ScenarioBuilder, node, network_name, base_network_name
             base_network_name: client.api.create_endpoint_config(),
         })
         node["tracking_args"]["log_dir"] = "/nebula/app/logs"
-        node["tracking_args"]["config_dir"] = f"/nebula/app/config/{sb.get_scenario_name()}"
+        node["tracking_args"]["config_dir"] = f"/nebula/app/config/{scenario_name}"
         node["scenario_args"]["controller"] = self.url
-        node["scenario_args"]["deployment"] = sb.get_deployment()
+        node["scenario_args"]["deployment"] = "docker"
         node["security_args"]["certfile"] = f"/nebula/app/certs/participant_{node['device_args']['idx']}_cert.pem"
         node["security_args"]["keyfile"] = f"/nebula/app/certs/participant_{node['device_args']['idx']}_key.pem"
         node["security_args"]["cafile"] = "/nebula/app/certs/ca_cert.pem"

nebula/controller/federation/controllers/processes_federation_controller.py

@@ -134,7 +134,7 @@ async def stop_scenario(self, federation_id: str = ""):
                 nebula_base_dir = os.path.abspath(os.path.join(current_dir, "..", ".."))
                 nebula_config_dir = os.path.join(nebula_base_dir, "app", "config")
                 self.logger.info(f"NEBULA_CONFIG_DIR not found. Using default path: {nebula_config_dir}")
-            if id:
+            if federation_id:
                 if os.environ.get("NEBULA_HOST_PLATFORM") == "windows":
                     scenario_commands_file = os.path.join(
                         nebula_config_dir, federation_name, "current_scenario_commands.ps1"

nebula/controller/federation/federation_api.py

@@ -10,7 +10,7 @@
 from nebula.utils import LoggerUtils
 from nebula.controller.federation.federation_controller import FederationController 
 from nebula.controller.federation.factory_federation_controller import federation_controller_factory
-from nebula.controller.federation.utils_requests import InitFederationRequest, RunScenarioRequest, StopScenarioRequest
+from nebula.controller.federation.utils_requests import RunScenarioRequest, StopScenarioRequest
 
 #TODO  Route the request to the right controller
 
@@ -54,25 +54,6 @@ async def read_root():
     logger.info("Test curl succesfull")
     return {"message": "Welcome to the NEBULA Federation Controller API"}
 
-# @app.post("/init")
-# async def init_federation_experiment(ifr: InitFederationRequest):
-#     global fed_controller
-
-#     experiment_type = ifr.experiment_type
-#     logger = logging.getLogger("Federation-Controller")
-#     logger.info(f"Experiment type received: {experiment_type}")
-    
-#     #TODO Modify when deploying controllers on differents systems
-#     hub_port = os.environ.get("NEBULA_CONTROLLER_PORT")
-#     controller_host = os.environ.get("NEBULA_CONTROLLER_HOST")
-    
-#     hub_url = f"http://{controller_host}:{hub_port}"
-#     logger.info(f"Docker Hub URL => {hub_url}")
-#     fed_controller = federation_controller_factory(str(experiment_type), hub_url, logger)
-#     logger.info("Federation controller created.")
-
-#     return {"message": f"{experiment_type} controller initialized"}
-
 @app.post("/scenarios/run")
 async def run_scenario(run_scenario_request: RunScenarioRequest):
     global fed_controllers

nebula/controller/federation/utils_requests.py

@@ -1,9 +1,6 @@
 from pydantic import BaseModel
 from typing import Dict, Any
 
-class InitFederationRequest(BaseModel):
-    experiment_type: str
-
 class RunScenarioRequest(BaseModel):
     scenario_data: Dict[str, Any]
     user: str

nebula/controller/web_app_controller.py

@@ -25,7 +25,7 @@
 )
 from nebula.controller.http_helpers import remote_get, remote_post_form
 from nebula.utils import DockerUtils, APIUtils
-from nebula.controller.federation.utils_requests import RunScenarioRequest, InitFederationRequest, StopScenarioRequest, factory_requests_path
+from nebula.controller.federation.utils_requests import RunScenarioRequest, StopScenarioRequest, factory_requests_path
 
 
 # Setup controller logger
@@ -107,6 +107,7 @@ def configure_logger(controller_log):
         handler.setFormatter(logging.Formatter("[%(asctime)s] [%(name)s] [%(levelname)s] %(message)s"))
         logger.addHandler(handler)
 
+id_counter = 1
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
@@ -317,15 +318,16 @@ async def run_scenario(
     """
 
     import subprocess
-
+    global id_counter
     from nebula.controller.scenarios import ScenarioManagement
     try:
         fed_controller_port = os.environ.get("NEBULA_FEDERATION_CONTROLLER_PORT")
         fed_controller_host = os.environ.get("NEBULA_CONTROLLER_HOST")
         url_init_fed_controller = f"http://{fed_controller_host}:{fed_controller_port}" + factory_requests_path("init")
         url_run_scenario = f"http://{fed_controller_host}:{fed_controller_port}" + factory_requests_path("run")
         #init_fed_req = InitFederationRequest(experiment_type="docker")
-        run_scenario_req = RunScenarioRequest(scenario_data=scenario_data, federation_id="id_nebula", user=user) #TODO ID per experiment
+        run_scenario_req = RunScenarioRequest(scenario_data=scenario_data, federation_id=f"id_nebula_{id_counter}", user=user) #TODO ID per experiment
+        id_counter += 1
         #await APIUtils.post(url_init_fed_controller, init_fed_req.model_dump())
         await APIUtils.post(url_run_scenario, run_scenario_req.model_dump())
     except Exception as e: