diff --git a/src/primaite/simulator/network/container.py b/src/primaite/simulator/network/container.py index 1dadd9e2..8989a60f 100644 --- a/src/primaite/simulator/network/container.py +++ b/src/primaite/simulator/network/container.py @@ -260,7 +260,7 @@ class Network(SimComponent): :type node: Node """ if node not in self: - _LOGGER.warning(f"Can't remove node {node.uuid}. It's not in the network.") + _LOGGER.warning(f"Can't remove node {node.hostname}. It's not in the network.") return self.nodes.pop(node.uuid) for i, _node in self._node_id_map.items(): @@ -268,8 +268,8 @@ class Network(SimComponent): self._node_id_map.pop(i) break node.parent = None - _LOGGER.info(f"Removed node {node.uuid} from network {self.uuid}") - self._node_request_manager.remove_request(name=node.uuid) + self._node_request_manager.remove_request(name=node.hostname) + _LOGGER.info(f"Removed node {node.hostname} from network {self.uuid}") def connect( self, endpoint_a: Union[NIC, SwitchPort], endpoint_b: Union[NIC, SwitchPort], **kwargs diff --git a/tests/integration_tests/component_creation/test_action_integration.py b/tests/integration_tests/component_creation/test_action_integration.py index a2be923b..b506544d 100644 --- a/tests/integration_tests/component_creation/test_action_integration.py +++ b/tests/integration_tests/component_creation/test_action_integration.py @@ -48,8 +48,6 @@ def test_passing_actions_down(monkeypatch) -> None: assert not action_invoked # call the patched method - sim.apply_request( - ["network", "node", pc1.uuid, "file_system", "folder", pc1.file_system.get_folder("downloads").uuid, "repair"] - ) + sim.apply_request(["network", "node", pc1.hostname, "file_system", "folder", "downloads", "repair"]) assert action_invoked diff --git a/tests/unit_tests/_primaite/_simulator/_file_system/test_file_actions.py b/tests/unit_tests/_primaite/_simulator/_file_system/test_file_actions.py index 8590153a..f43652d8 100644 --- a/tests/unit_tests/_primaite/_simulator/_file_system/test_file_actions.py +++ b/tests/unit_tests/_primaite/_simulator/_file_system/test_file_actions.py @@ -35,12 +35,12 @@ def test_file_checkhash_request(populated_file_system): """Test that an agent can request a file hash check.""" fs, folder, file = populated_file_system - fs.apply_request(request=["file", file.uuid, "checkhash"]) + fs.apply_request(request=["file", file.name, "checkhash"]) assert file.health_status == FileSystemItemHealthStatus.GOOD file.sim_size = 0 - fs.apply_request(request=["file", file.uuid, "checkhash"]) + fs.apply_request(request=["file", file.name, "checkhash"]) assert file.health_status == FileSystemItemHealthStatus.CORRUPT @@ -52,7 +52,7 @@ def test_file_repair_request(populated_file_system): file.corrupt() assert file.health_status == FileSystemItemHealthStatus.CORRUPT - fs.apply_request(request=["file", file.uuid, "repair"]) + fs.apply_request(request=["file", file.name, "repair"]) assert file.health_status == FileSystemItemHealthStatus.GOOD @@ -69,7 +69,7 @@ def test_file_restore_request(populated_file_system): assert fs.get_file(folder_name=folder.name, file_name=file.name) is not None assert fs.get_file(folder_name=folder.name, file_name=file.name).deleted is False - fs.apply_request(request=["file", file.uuid, "corrupt"]) + fs.apply_request(request=["file", file.name, "corrupt"]) assert fs.get_file(folder_name=folder.name, file_name=file.name).health_status == FileSystemItemHealthStatus.CORRUPT fs.apply_request(request=["restore", "file", folder.uuid, file.uuid]) @@ -79,7 +79,7 @@ def test_file_restore_request(populated_file_system): def test_file_corrupt_request(populated_file_system): """Test that an agent can request a file corruption.""" fs, folder, file = populated_file_system - fs.apply_request(request=["file", file.uuid, "corrupt"]) + fs.apply_request(request=["file", file.name, "corrupt"]) assert file.health_status == FileSystemItemHealthStatus.CORRUPT @@ -88,7 +88,7 @@ def test_deleted_file_cannot_be_interacted_with(populated_file_system): fs, folder, file = populated_file_system assert fs.get_file(folder_name=folder.name, file_name=file.name) is not None - fs.apply_request(request=["file", file.uuid, "corrupt"]) + fs.apply_request(request=["file", file.name, "corrupt"]) assert fs.get_file(folder_name=folder.name, file_name=file.name).health_status == FileSystemItemHealthStatus.CORRUPT assert ( fs.get_file(folder_name=folder.name, file_name=file.name).visible_health_status @@ -98,8 +98,8 @@ def test_deleted_file_cannot_be_interacted_with(populated_file_system): fs.apply_request(request=["delete", "file", folder.uuid, file.uuid]) assert fs.get_file(folder_name=folder.name, file_name=file.name) is None - fs.apply_request(request=["file", file.uuid, "repair"]) - fs.apply_request(request=["file", file.uuid, "scan"]) + fs.apply_request(request=["file", file.name, "repair"]) + fs.apply_request(request=["file", file.name, "scan"]) file = folder.deleted_files.get(file.uuid) diff --git a/tests/unit_tests/_primaite/_simulator/_file_system/test_folder_actions.py b/tests/unit_tests/_primaite/_simulator/_file_system/test_folder_actions.py index efa74e1f..398af0cc 100644 --- a/tests/unit_tests/_primaite/_simulator/_file_system/test_folder_actions.py +++ b/tests/unit_tests/_primaite/_simulator/_file_system/test_folder_actions.py @@ -31,7 +31,7 @@ def test_folder_scan_request(populated_file_system): assert file1.visible_health_status == FileSystemItemHealthStatus.GOOD assert file2.visible_health_status == FileSystemItemHealthStatus.GOOD - fs.apply_request(request=["folder", folder.uuid, "scan"]) + fs.apply_request(request=["folder", folder.name, "scan"]) folder.apply_timestep(timestep=0) @@ -53,12 +53,12 @@ def test_folder_checkhash_request(populated_file_system): """Test that an agent can request a folder hash check.""" fs, folder, file = populated_file_system - fs.apply_request(request=["folder", folder.uuid, "checkhash"]) + fs.apply_request(request=["folder", folder.name, "checkhash"]) assert folder.health_status == FileSystemItemHealthStatus.GOOD file.sim_size = 0 - fs.apply_request(request=["folder", folder.uuid, "checkhash"]) + fs.apply_request(request=["folder", folder.name, "checkhash"]) assert folder.health_status == FileSystemItemHealthStatus.CORRUPT @@ -70,7 +70,7 @@ def test_folder_repair_request(populated_file_system): assert file.health_status == FileSystemItemHealthStatus.CORRUPT assert folder.health_status == FileSystemItemHealthStatus.CORRUPT - fs.apply_request(request=["folder", folder.uuid, "repair"]) + fs.apply_request(request=["folder", folder.name, "repair"]) assert file.health_status == FileSystemItemHealthStatus.GOOD assert folder.health_status == FileSystemItemHealthStatus.GOOD @@ -116,7 +116,7 @@ def test_folder_restore_request(populated_file_system): assert fs.get_file_by_id(folder_uuid=folder.uuid, file_uuid=file.uuid, include_deleted=True).deleted is False # corrupt folder - fs.apply_request(request=["folder", folder.uuid, "corrupt"]) + fs.apply_request(request=["folder", folder.name, "corrupt"]) assert fs.get_folder(folder_name=folder.name).health_status == FileSystemItemHealthStatus.CORRUPT assert fs.get_file(folder_name=folder.name, file_name=file.name).health_status == FileSystemItemHealthStatus.CORRUPT @@ -143,7 +143,7 @@ def test_folder_restore_request(populated_file_system): def test_folder_corrupt_request(populated_file_system): """Test that an agent can request a folder corruption.""" fs, folder, file = populated_file_system - fs.apply_request(request=["folder", folder.uuid, "corrupt"]) + fs.apply_request(request=["folder", folder.name, "corrupt"]) assert file.health_status == FileSystemItemHealthStatus.CORRUPT assert folder.health_status == FileSystemItemHealthStatus.CORRUPT @@ -153,13 +153,13 @@ def test_deleted_folder_and_its_files_cannot_be_interacted_with(populated_file_s fs, folder, file = populated_file_system assert fs.get_file(folder_name=folder.name, file_name=file.name) is not None - fs.apply_request(request=["file", file.uuid, "corrupt"]) + fs.apply_request(request=["file", file.name, "corrupt"]) assert fs.get_file(folder_name=folder.name, file_name=file.name).health_status == FileSystemItemHealthStatus.CORRUPT fs.apply_request(request=["delete", "folder", folder.uuid]) assert fs.get_file(folder_name=folder.name, file_name=file.name) is None - fs.apply_request(request=["file", file.uuid, "repair"]) + fs.apply_request(request=["file", file.name, "repair"]) deleted_folder = fs.deleted_folders.get(folder.uuid) deleted_file = deleted_folder.deleted_files.get(file.uuid)