cr_api_client 5.1.2__tar.gz → 5.1.7__tar.gz

{cr_api_client-5.1.2 → cr_api_client-5.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cr_api_client
-Version: 5.1.2
+Version: 5.1.7
 Summary: M&NTIS Cyber Range client API
 License: MIT
 License-File: AUTHORS
@@ -21,7 +21,7 @@ Requires-Dist: humanize (>=3.13.1,<4.0.0)
 Requires-Dist: jsonschema (==3.0.2)
 Requires-Dist: mantis-catalog (>=0.2.3,<0.3.0)
 Requires-Dist: mantis-logger (>=0.2.0,<0.3.0)
-Requires-Dist: mantis-models (>=3.4.23,<4.0.0)
+Requires-Dist: mantis-models (==3.4.27)
 Requires-Dist: markupsafe (==2.0.1)
 Requires-Dist: omegaconf (>=2.2.2,<3.0.0)
 Requires-Dist: pydantic (>=2.10.3,<3.0.0)

{cr_api_client-5.1.2 → cr_api_client-5.1.7}/cr_api_client/core_api.py

@@ -821,7 +821,19 @@ def create_simulation_from_basebox(
             f"Cannot find basebox in database from basebox ID '{basebox_id}'"
         )
 
-    node_name = "basebox"
+    # Get dependent baseboxes
+    depends_on = basebox.get("depends_on") or []  # Fallback if field is set to None
+    dependent_baseboxes = []
+    for dep_id in depends_on:
+        try:
+            dep_basebox = fetch_basebox(dep_id)
+            dependent_baseboxes.append(dep_basebox)
+        except Exception:
+            raise Exception(
+                f"Cannot find dependent basebox in database from basebox ID '{dep_id}'"
+            )
+
+    node_name = basebox.get("hostname") or "basebox"  # Fallback if field is set to None
     role = basebox["role"]
     nb_proc = basebox["nb_proc"]
     memory_size = basebox["memory_size"]
@@ -847,6 +859,26 @@ nodes:
     roles: ["{role}"]
 """
 
+    # Add dependent baseboxes as nodes
+    ip_offset = 3  # Start at 192.168.2.3 (2 is used by main basebox)
+    for dep_basebox in dependent_baseboxes:
+        dep_id = dep_basebox["id"]
+        dep_name = (
+            dep_basebox.get("hostname") or dep_id.split("/")[-1].replace("_", "")
+        )  # Fallback if field is set to None, and ensure the derived name is consistent (we only keep the last part of the basebox ID, withouth the underscore)
+        dep_role = dep_basebox["role"]
+        dep_nb_proc = dep_basebox["nb_proc"]
+        dep_memory_size = dep_basebox["memory_size"]
+        yaml_content += f"""
+  - &depends_{dep_id.replace("/", "_").replace(".", "_")}
+    type: virtual_machine
+    name: "{dep_name}"
+    basebox_id: "{dep_id}"
+    nb_proc: {dep_nb_proc}
+    memory_size: {dep_memory_size}
+    roles: ["{dep_role}"]
+"""
+
     if add_host:
         yaml_content += """
   - &host_machine
@@ -893,12 +925,33 @@ links:
       ip: "192.168.2.2/24"
 """
 
+    # Add links for dependent baseboxes
+    ip_offset = 3
+    for dep_basebox in dependent_baseboxes:
+        dep_name = dep_basebox["id"]
+        anchor_name = f"depends_{dep_name.replace('/', '_').replace('.', '_')}"
+        yaml_content += f"""
+  - switch: *switch
+    node: *{anchor_name}
+    params:
+      ip: "192.168.2.{ip_offset}/24"
+"""
+        ip_offset += 1
+
+    # Calculate IP for host machine (after all dependent baseboxes if any)
+    host_ip_offset = (
+        ip_offset if add_host and dependent_baseboxes else (3 if add_host else None)
+    )
+
     if add_host:
-        yaml_content += """
+        host_ip = (
+            f"192.168.2.{host_ip_offset}/24" if host_ip_offset else "192.168.2.3/24"
+        )
+        yaml_content += f"""
   - switch: *switch
     node: *host_machine
     params:
-      ip: "192.168.2.3/24"
+      ip: "{host_ip}"
 """
 
     if add_internet:

{cr_api_client-5.1.2 → cr_api_client-5.1.7}/cr_api_client/provisioning_api.py

@@ -62,7 +62,7 @@ def _post(route: str, **kwargs: Any) -> Any:
         f"{cr_api_client_config.provisioning_api_url}{route}",
         verify=cr_api_client_config.cacert,
         cert=(cr_api_client_config.cert, cr_api_client_config.key),
-        timeout=60,  # Set 60s to allow transfer of large zip files
+        timeout=300,  # Set 300s to allow transfer of large zip files
         **kwargs,
     )
 

{cr_api_client-5.1.2 → cr_api_client-5.1.7}/cr_api_client/topology/TopologyNodeGenerator.py

@@ -9,12 +9,13 @@
 #
 from random import choice
 
+from mantis_scenario_model.common import RoleEnum
+from mantis_scenario_model.node import TypeEnum
+
 from cr_api_client.topology.TopologyElements import PhysicalGateway
 from cr_api_client.topology.TopologyElements import Router
 from cr_api_client.topology.TopologyElements import Switch
 from cr_api_client.topology.TopologyElements import VirtualMachine
-from mantis_scenario_model.common import RoleEnum
-from mantis_scenario_model.node import TypeEnum
 
 
 MIN_NODE_COUNT = 3  # 1 switch, 1 router and 1 machine (client or server)

{cr_api_client-5.1.2 → cr_api_client-5.1.7}/cr_api_client/topology/TopologyNodesGenerator.py

@@ -9,10 +9,11 @@
 #
 from random import choice
 
-from cr_api_client.topology.TopologyNodeGenerator import NodeGenerator
 from mantis_scenario_model.common import RoleEnum
 from mantis_scenario_model.node import TypeEnum
 
+from cr_api_client.topology.TopologyNodeGenerator import NodeGenerator
+
 
 class NodesGenerator:
     def __init__(self, os_container):

{cr_api_client-5.1.2 → cr_api_client-5.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cr_api_client"
-version = "5.1.2"
+version = "5.1.7"
 description = "M&NTIS Cyber Range client API"
 readme = "README.md"
 authors = ["AMOSSYS"]
@@ -23,7 +23,7 @@ markupsafe = "2.0.1"                                      # Need to fix version
 omegaconf = "^2.2.2"
 types-jinja2 = "^2.11.9"                                  # Needed for typing and mypy, remove when updating to Jinja2 version 3 or more
 jsonschema = "3.0.2"                                      # Needed to fix importlib not found error
-mantis-models = { version = "^3.4.23", source = "gitlab" }
+mantis-models = {version = "3.4.27", source = "gitlab"}
 mantis-logger = { version = "^0.2.0", source = "gitlab" }
 mantis-catalog = { version = "^0.2.3", source = "gitlab" }