improve naming between frontend/controller

Author: enriquetomasmb

nebula/addons/attacks/attacks.py

@@ -129,8 +129,10 @@ def create_attack(engine) -> Attack:
     }
 
     # Get attack name and parameters from the engine configuration
-    attack_name = engine.config.participant["adversarial_args"]["attacks"]
-    attack_params = engine.config.participant["adversarial_args"].get("attack_params", {}).items()
+    attack_params = engine.config.participant["adversarial_args"].get("attack_params", {})
+    attack_name = attack_params.get("attacks", None)
+    if attack_name is None:
+        raise AttackException("No attack specified")
 
     # Look up the attack class based on the attack name
     attack = ATTACK_MAP.get(attack_name)

nebula/controller/controller.py

@@ -25,7 +25,6 @@
 from nebula.config.config import Config
 from nebula.config.mender import Mender
 from nebula.controller.database import scenario_set_all_status_to_finished, scenario_set_status_to_finished
-from nebula.controller.scenarios import Scenario, ScenarioManagement
 from nebula.utils import DockerUtils, FileUtils, SocketUtils
 
 
@@ -313,6 +312,7 @@ async def remove_scenario(
         dict: A message indicating successful removal.
     """
     from nebula.controller.database import remove_scenario_by_name
+    from nebula.controller.scenarios import ScenarioManagement
 
     try:
         remove_scenario_by_name(scenario_name)
@@ -396,6 +396,7 @@ async def update_scenario(
         dict: A message confirming the update.
     """
     from nebula.controller.database import scenario_update_record
+    from nebula.controller.scenarios import Scenario
 
     try:
         scenario = Scenario.from_dict(scenario)
@@ -1631,6 +1632,8 @@ def stop():
         - Handles any exceptions during PID reading or killing by logging them.
         - Exits the program with status code 0.
         """
+        from nebula.controller.scenarios import ScenarioManagement
+        
         logging.info("Closing NEBULA (exiting from components)... Please wait")
         DockerUtils.remove_containers_by_prefix(f"{os.environ['USER']}_")
         ScenarioManagement.stop_blockchain()

nebula/controller/database.py

@@ -141,10 +141,6 @@ async def initialize_databases(databases_dir):
                 network_subnet TEXT,
                 network_gateway TEXT,
                 epochs TEXT,
-                attacks TEXT,
-                poisoned_node_percent TEXT,
-                poisoned_sample_percent TEXT,
-                poisoned_noise_percent TEXT,
                 attack_params TEXT,
                 with_reputation TEXT,
                 random_geo TEXT,
@@ -193,10 +189,6 @@ async def initialize_databases(databases_dir):
             "network_subnet": "TEXT",
             "network_gateway": "TEXT",
             "epochs": "TEXT",
-            "attacks": "TEXT",
-            "poisoned_node_percent": "TEXT",
-            "poisoned_sample_percent": "TEXT",
-            "poisoned_noise_percent": "TEXT",
             "attack_params": "TEXT",
             "with_reputation": "TEXT",
             "random_geo": "TEXT",
@@ -592,10 +584,6 @@ def scenario_update_record(
                     network_subnet,
                     network_gateway,
                     epochs,
-                    attacks,
-                    poisoned_node_percent,
-                    poisoned_sample_percent,
-                    poisoned_noise_percent,
                     attack_params,
                     with_reputation,
                     random_geo,
@@ -613,7 +601,7 @@ def scenario_update_record(
                     role,
                     username
                 ) VALUES (
-                    ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+                    ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
                 );
             """
             c.execute(insert_command, (
@@ -644,10 +632,6 @@ def scenario_update_record(
                 scenario.network_subnet,
                 scenario.network_gateway,
                 scenario.epochs,
-                json.dumps(scenario.attacks),
-                scenario.poisoned_node_percent,
-                scenario.poisoned_sample_percent,
-                scenario.poisoned_noise_percent,
                 json.dumps(scenario.attack_params),
                 scenario.with_reputation,
                 scenario.random_geo,
@@ -694,10 +678,6 @@ def scenario_update_record(
                     network_subnet = ?,
                     network_gateway = ?,
                     epochs = ?,
-                    attacks = ?,
-                    poisoned_node_percent = ?,
-                    poisoned_sample_percent = ?,
-                    poisoned_noise_percent = ?,
                     attack_params = ?,
                     with_reputation = ?,
                     random_geo = ?,
@@ -743,7 +723,6 @@ def scenario_update_record(
                 scenario.network_subnet,
                 scenario.network_gateway,
                 scenario.epochs,
-                json.dumps(scenario.attacks),
                 scenario.poisoned_node_percent,
                 scenario.poisoned_sample_percent,
                 scenario.poisoned_noise_percent,