Merge remote-tracking branch 'refs/remotes/origin/master'

Author: Kim-Hammar

emulation-system/envs/0.10.0/level_10/config.py

@@ -883,7 +883,7 @@ def default_resource_constraints_config(network_id: int, level: int) -> Resource
                  ))], disk_space_gb=10),
         NodeResourcesConfig(
             container_name=f"{constants.CSLE.NAME}-"
-                           f"{constants.CONTAINER_IMAGES.ROUTER_1}_1-{constants.CSLE.LEVEL}{level}",
+                           f"{constants.CONTAINER_IMAGES.ROUTER_2}_1-{constants.CSLE.LEVEL}{level}",
             num_cpus=1, available_memory_gb=4,
             ips_and_network_configs=[
                 (f"{constants.CSLE.CSLE_SUBNETMASK_PREFIX}{network_id}.2.10",

emulation-system/envs/0.10.0/level_7/config.py

@@ -814,7 +814,7 @@ def default_resource_constraints_config(network_id: int, level: int) -> Resource
                  ))], disk_space_gb=10),
         NodeResourcesConfig(
             container_name=f"{constants.CSLE.NAME}-"
-                           f"{constants.CONTAINER_IMAGES.ROUTER_1}_1-{constants.CSLE.LEVEL}{level}",
+                           f"{constants.CONTAINER_IMAGES.ROUTER_2}_1-{constants.CSLE.LEVEL}{level}",
             num_cpus=1, available_memory_gb=4,
             ips_and_network_configs=[
                 (f"{constants.CSLE.CSLE_SUBNETMASK_PREFIX}{network_id}.2.10",

emulation-system/envs/0.10.0/level_8/config.py

@@ -1428,7 +1428,7 @@ def default_resource_constraints_config(network_id: int, level: int) -> Resource
                  ))], disk_space_gb=10),
         NodeResourcesConfig(
             container_name=f"{constants.CSLE.NAME}-"
-                           f"{constants.CONTAINER_IMAGES.ROUTER_1}_1-{constants.CSLE.LEVEL}{level}",
+                           f"{constants.CONTAINER_IMAGES.ROUTER_2}_1-{constants.CSLE.LEVEL}{level}",
             num_cpus=1, available_memory_gb=4,
             ips_and_network_configs=[
                 (f"{constants.CSLE.CSLE_SUBNETMASK_PREFIX}{network_id}.2.10",
@@ -2049,7 +2049,7 @@ def default_resource_constraints_config(network_id: int, level: int) -> Resource
             ], disk_space_gb=10),
         NodeResourcesConfig(
             container_name=f"{constants.CSLE.NAME}-"
-                           f"{constants.CONTAINER_IMAGES.CVE_2015_5602_1}_1-{constants.CSLE.LEVEL}"
+                           f"{constants.CONTAINER_IMAGES.CVE_2015_5602_1}_2-{constants.CSLE.LEVEL}"
                            f"{level}",
             num_cpus=1, available_memory_gb=4,
             ips_and_network_configs=[