Merge remote-tracking branch 'origin/controller_frontend_split' into simple-mobility

Author: FerTV

app/main.py

@@ -4,8 +4,8 @@
 
 sys.path.append(os.path.join(os.path.dirname(__file__), ".."))  # Parent directory where is the NEBULA module
 import nebula
-from nebula.controller import Controller
-from nebula.scenarios import ScenarioManagement
+from nebula.controller.controller import Controller
+from nebula.controller.scenarios import ScenarioManagement
 
 argparser = argparse.ArgumentParser(description="Controller of NEBULA platform", add_help=False)
 
@@ -54,8 +54,6 @@
     help="Statistics port (default: 8080)",
 )
 
-argparser.add_argument("-t", "--test", dest="test", action="store_true", default=False, help="Run tests")
-
 argparser.add_argument(
     "-st",
     "--stop",

nebula/addons/gps/nebulagps.py

@@ -26,7 +26,7 @@ def __init__(self, config, addr, update_interval: float = 5.0, verbose=False):
         self._verbose = verbose
 
     async def start(self):
-        """Inicia el servicio de GPS, enviando y recibiendo ubicaciones."""
+        """Starts the GPS service, sending and receiving locations."""
         logging.info("Starting NebulaGPS service...")
         self.running = True
 
@@ -73,7 +73,7 @@ async def _send_location_loop(self):
             await asyncio.sleep(self.update_interval)
 
     async def _receive_location_loop(self):
-        """Escucha y almacena geolocalizaciones de otros nodos."""
+        """Listens to and stores geolocations from other nodes."""
         while self.running:
             try:
                 data, addr = await asyncio.get_running_loop().run_in_executor(
@@ -102,5 +102,7 @@ async def _notify_geolocs(self):
                 for addr, (lat, long) in geolocs.items():
                     dist = await self.calculate_distance(self_lat, self_long, lat, long)
                     distances[addr] = (dist, (lat, long))
+                
+                self._config.update_nodes_distance(distances)
                 gpsevent = GPSEvent(distances)
                 asyncio.create_task(EventManager.get_instance().publish_addonevent(gpsevent))

nebula/addons/reporter.py

@@ -54,7 +54,7 @@ def __init__(self, config, trainer):
         self.frequency = self.config.participant["reporter_args"]["report_frequency"]
         self.grace_time = self.config.participant["reporter_args"]["grace_time_reporter"]
         self.data_queue = asyncio.Queue()
-        self.url = f"http://{self.config.participant['scenario_args']['controller']}/platform/dashboard/{self.config.participant['scenario_args']['name']}/node/update"
+        self.url = f"http://{self.config.participant['scenario_args']['controller']}/nodes/{self.config.participant['scenario_args']['name']}/update"
         self.counter = 0
 
         self.first_net_metrics = True
@@ -167,7 +167,7 @@ async def report_scenario_finished(self):
               might be temporarily overloaded.
             - Logs exceptions if the connection attempt to the controller fails.
         """
-        url = f"http://{self.config.participant['scenario_args']['controller']}/platform/dashboard/{self.config.participant['scenario_args']['name']}/node/done"
+        url = f"http://{self.config.participant['scenario_args']['controller']}/nodes/{self.config.participant['scenario_args']['name']}/done"
         data = json.dumps({"idx": self.config.participant["device_args"]["idx"]})
         headers = {
             "Content-Type": "application/json",

nebula/config/config.py

@@ -184,6 +184,9 @@ def add_neighbor_from_config(self, addr):
                     self.participant["network_args"]["neighbors"] += " " + addr
                     self.participant["mobility_args"]["neighbors_distance"][addr] = None
 
+    def update_nodes_distance(self, distances: dict):
+        self.participant["mobility_args"]["neighbors_distance"] = {node: dist for node, (dist, _) in distances.items()}
+
     def update_neighbors_from_config(self, current_connections, dest_addr):
         final_neighbors = []
         for n in current_connections: