From a1dcfa291bcd700640563b721d51aafaebdec8b7 Mon Sep 17 00:00:00 2001 From: Marek Wolan Date: Thu, 21 Dec 2023 09:25:54 +0000 Subject: [PATCH] Update test configs with new action spec --- .../assets/configs/bad_primaite_session.yaml | 48 +++++----- .../configs/eval_only_primaite_session.yaml | 48 +++++----- tests/assets/configs/multi_agent_session.yaml | 90 +++++++++---------- .../assets/configs/test_primaite_session.yaml | 46 +++++----- .../configs/train_only_primaite_session.yaml | 46 +++++----- .../_file_system/test_file_actions.py | 2 +- 6 files changed, 136 insertions(+), 144 deletions(-) diff --git a/tests/assets/configs/bad_primaite_session.yaml b/tests/assets/configs/bad_primaite_session.yaml index 478cbfae..4c1d7ce7 100644 --- a/tests/assets/configs/bad_primaite_session.yaml +++ b/tests/assets/configs/bad_primaite_session.yaml @@ -29,7 +29,7 @@ agents: - type: DONOTHING options: nodes: - - node_ref: client_2 + - node_hostname: client_2 max_folders_per_node: 1 max_files_per_folder: 1 max_services_per_node: 1 @@ -64,9 +64,9 @@ agents: - type: NODE_OS_SCAN options: nodes: - - node_ref: client_1 + - node_hostname: client_1 applications: - - application_ref: data_manipulation_bot + - application_name: data_manipulation_bot max_folders_per_node: 1 max_files_per_folder: 1 max_services_per_node: 1 @@ -107,8 +107,6 @@ agents: files: - file_name: database.db - node_hostname: backup_server - # services: - # - service_ref: backup_service - node_hostname: security_suite - node_hostname: client_1 - node_hostname: client_2 @@ -128,21 +126,21 @@ agents: max_acl_rules: 10 router_hostname: router_1 ip_address_order: - - node_ref: domain_controller + - node_hostname: domain_controller nic_num: 1 - - node_ref: web_server + - node_hostname: web_server nic_num: 1 - - node_ref: database_server + - node_hostname: database_server nic_num: 1 - - node_ref: backup_server + - node_hostname: backup_server nic_num: 1 - - node_ref: security_suite + - node_hostname: security_suite nic_num: 1 - - node_ref: client_1 + - node_hostname: client_1 nic_num: 1 - - node_ref: client_2 + - node_hostname: client_2 nic_num: 1 - - node_ref: security_suite + - node_hostname: security_suite nic_num: 2 ics: null @@ -172,10 +170,10 @@ agents: - type: NODE_RESET - type: NETWORK_ACL_ADDRULE options: - target_router_ref: router_1 + target_router_hostname: router_1 - type: NETWORK_ACL_REMOVERULE options: - target_router_ref: router_1 + target_router_hostname: router_1 - type: NETWORK_NIC_ENABLE - type: NETWORK_NIC_DISABLE @@ -476,16 +474,16 @@ agents: options: nodes: - - node_ref: router_1 - - node_ref: switch_1 - - node_ref: switch_2 - - node_ref: domain_controller - - node_ref: web_server - - node_ref: database_server - - node_ref: backup_server - - node_ref: security_suite - - node_ref: client_1 - - node_ref: client_2 + - node_hostname: router_1 + - node_hostname: switch_1 + - node_hostname: switch_2 + - node_hostname: domain_controller + - node_hostname: web_server + - node_hostname: database_server + - node_hostname: backup_server + - node_hostname: security_suite + - node_hostname: client_1 + - node_hostname: client_2 max_folders_per_node: 2 max_files_per_folder: 2 max_services_per_node: 2 diff --git a/tests/assets/configs/eval_only_primaite_session.yaml b/tests/assets/configs/eval_only_primaite_session.yaml index ec6bfb63..29b7937b 100644 --- a/tests/assets/configs/eval_only_primaite_session.yaml +++ b/tests/assets/configs/eval_only_primaite_session.yaml @@ -34,7 +34,7 @@ agents: options: nodes: - - node_ref: client_2 + - node_name: client_2 max_folders_per_node: 1 max_files_per_folder: 1 max_services_per_node: 1 @@ -69,9 +69,9 @@ agents: - type: NODE_OS_SCAN options: nodes: - - node_ref: client_1 + - node_hostname: client_1 applications: - - application_ref: data_manipulation_bot + - application_name: data_manipulation_bot max_folders_per_node: 1 max_files_per_folder: 1 max_services_per_node: 1 @@ -111,8 +111,6 @@ agents: files: - file_name: database.db - node_hostname: backup_server - # services: - # - service_ref: backup_service - node_hostname: security_suite - node_hostname: client_1 - node_hostname: client_2 @@ -132,21 +130,21 @@ agents: max_acl_rules: 10 router_hostname: router_1 ip_address_order: - - node_ref: domain_controller + - node_hostname: domain_controller nic_num: 1 - - node_ref: web_server + - node_hostname: web_server nic_num: 1 - - node_ref: database_server + - node_hostname: database_server nic_num: 1 - - node_ref: backup_server + - node_hostname: backup_server nic_num: 1 - - node_ref: security_suite + - node_hostname: security_suite nic_num: 1 - - node_ref: client_1 + - node_hostname: client_1 nic_num: 1 - - node_ref: client_2 + - node_hostname: client_2 nic_num: 1 - - node_ref: security_suite + - node_hostname: security_suite nic_num: 2 ics: null @@ -176,10 +174,10 @@ agents: - type: NODE_RESET - type: NETWORK_ACL_ADDRULE options: - target_router_ref: router_1 + target_router_hostname: router_1 - type: NETWORK_ACL_REMOVERULE options: - target_router_ref: router_1 + target_router_hostname: router_1 - type: NETWORK_NIC_ENABLE - type: NETWORK_NIC_DISABLE @@ -480,16 +478,16 @@ agents: options: nodes: - - node_ref: router_1 - - node_ref: switch_1 - - node_ref: switch_2 - - node_ref: domain_controller - - node_ref: web_server - - node_ref: database_server - - node_ref: backup_server - - node_ref: security_suite - - node_ref: client_1 - - node_ref: client_2 + - node_hostname: router_1 + - node_hostname: switch_1 + - node_hostname: switch_2 + - node_hostname: domain_controller + - node_hostname: web_server + - node_hostname: database_server + - node_hostname: backup_server + - node_hostname: security_suite + - node_hostname: client_1 + - node_hostname: client_2 max_folders_per_node: 2 max_files_per_folder: 2 max_services_per_node: 2 diff --git a/tests/assets/configs/multi_agent_session.yaml b/tests/assets/configs/multi_agent_session.yaml index 3671b809..54727790 100644 --- a/tests/assets/configs/multi_agent_session.yaml +++ b/tests/assets/configs/multi_agent_session.yaml @@ -40,7 +40,7 @@ agents: options: nodes: - - node_ref: client_2 + - node_hostname: client_2 max_folders_per_node: 1 max_files_per_folder: 1 max_services_per_node: 1 @@ -75,9 +75,9 @@ agents: - type: NODE_OS_SCAN options: nodes: - - node_ref: client_1 + - node_hostname: client_1 applications: - - application_ref: data_manipulation_bot + - application_name: data_manipulation_bot max_folders_per_node: 1 max_files_per_folder: 1 max_services_per_node: 1 @@ -118,8 +118,6 @@ agents: files: - file_name: database.db - node_hostname: backup_server - # services: - # - service_ref: backup_service - node_hostname: security_suite - node_hostname: client_1 - node_hostname: client_2 @@ -139,21 +137,21 @@ agents: max_acl_rules: 10 router_hostname: router_1 ip_address_order: - - node_ref: domain_controller + - node_hostname: domain_controller nic_num: 1 - - node_ref: web_server + - node_hostname: web_server nic_num: 1 - - node_ref: database_server + - node_hostname: database_server nic_num: 1 - - node_ref: backup_server + - node_hostname: backup_server nic_num: 1 - - node_ref: security_suite + - node_hostname: security_suite nic_num: 1 - - node_ref: client_1 + - node_hostname: client_1 nic_num: 1 - - node_ref: client_2 + - node_hostname: client_2 nic_num: 1 - - node_ref: security_suite + - node_hostname: security_suite nic_num: 2 ics: null @@ -183,10 +181,10 @@ agents: - type: NODE_RESET - type: NETWORK_ACL_ADDRULE options: - target_router_ref: router_1 + target_router_hostname: router_1 - type: NETWORK_ACL_REMOVERULE options: - target_router_ref: router_1 + target_router_hostname: router_1 - type: NETWORK_NIC_ENABLE - type: NETWORK_NIC_DISABLE @@ -487,16 +485,16 @@ agents: options: nodes: - - node_ref: router_1 - - node_ref: switch_1 - - node_ref: switch_2 - - node_ref: domain_controller - - node_ref: web_server - - node_ref: database_server - - node_ref: backup_server - - node_ref: security_suite - - node_ref: client_1 - - node_ref: client_2 + - node_hostname: router_1 + - node_hostname: switch_1 + - node_hostname: switch_2 + - node_hostname: domain_controller + - node_hostname: web_server + - node_hostname: database_server + - node_hostname: backup_server + - node_hostname: security_suite + - node_hostname: client_1 + - node_hostname: client_2 max_folders_per_node: 2 max_files_per_folder: 2 max_services_per_node: 2 @@ -549,8 +547,6 @@ agents: files: - file_name: database.db - node_hostname: backup_server - # services: - # - service_ref: backup_service - node_hostname: security_suite - node_hostname: client_1 - node_hostname: client_2 @@ -570,21 +566,21 @@ agents: max_acl_rules: 10 router_hostname: router_1 ip_address_order: - - node_ref: domain_controller + - node_hostname: domain_controller nic_num: 1 - - node_ref: web_server + - node_hostname: web_server nic_num: 1 - - node_ref: database_server + - node_hostname: database_server nic_num: 1 - - node_ref: backup_server + - node_hostname: backup_server nic_num: 1 - - node_ref: security_suite + - node_hostname: security_suite nic_num: 1 - - node_ref: client_1 + - node_hostname: client_1 nic_num: 1 - - node_ref: client_2 + - node_hostname: client_2 nic_num: 1 - - node_ref: security_suite + - node_hostname: security_suite nic_num: 2 ics: null @@ -614,10 +610,10 @@ agents: - type: NODE_RESET - type: NETWORK_ACL_ADDRULE options: - target_router_ref: router_1 + target_router_hostname: router_1 - type: NETWORK_ACL_REMOVERULE options: - target_router_ref: router_1 + target_router_hostname: router_1 - type: NETWORK_NIC_ENABLE - type: NETWORK_NIC_DISABLE @@ -918,16 +914,16 @@ agents: options: nodes: - - node_ref: router_1 - - node_ref: switch_1 - - node_ref: switch_2 - - node_ref: domain_controller - - node_ref: web_server - - node_ref: database_server - - node_ref: backup_server - - node_ref: security_suite - - node_ref: client_1 - - node_ref: client_2 + - node_hostname: router_1 + - node_hostname: switch_1 + - node_hostname: switch_2 + - node_hostname: domain_controller + - node_hostname: web_server + - node_hostname: database_server + - node_hostname: backup_server + - node_hostname: security_suite + - node_hostname: client_1 + - node_hostname: client_2 max_folders_per_node: 2 max_files_per_folder: 2 max_services_per_node: 2 diff --git a/tests/assets/configs/test_primaite_session.yaml b/tests/assets/configs/test_primaite_session.yaml index cc198a64..f677b4e0 100644 --- a/tests/assets/configs/test_primaite_session.yaml +++ b/tests/assets/configs/test_primaite_session.yaml @@ -38,7 +38,7 @@ agents: options: nodes: - - node_ref: client_2 + - node_hostname: client_2 max_folders_per_node: 1 max_files_per_folder: 1 max_services_per_node: 1 @@ -73,9 +73,9 @@ agents: - type: NODE_OS_SCAN options: nodes: - - node_ref: client_1 + - node_hostname: client_1 applications: - - application_ref: data_manipulation_bot + - application_hostname: data_manipulation_bot max_folders_per_node: 1 max_files_per_folder: 1 max_services_per_node: 1 @@ -137,21 +137,21 @@ agents: max_acl_rules: 10 router_hostname: router_1 ip_address_order: - - node_ref: domain_controller + - node_hostname: domain_controller nic_num: 1 - - node_ref: web_server + - node_hostname: web_server nic_num: 1 - - node_ref: database_server + - node_hostname: database_server nic_num: 1 - - node_ref: backup_server + - node_hostname: backup_server nic_num: 1 - - node_ref: security_suite + - node_hostname: security_suite nic_num: 1 - - node_ref: client_1 + - node_hostname: client_1 nic_num: 1 - - node_ref: client_2 + - node_hostname: client_2 nic_num: 1 - - node_ref: security_suite + - node_hostname: security_suite nic_num: 2 ics: null @@ -181,10 +181,10 @@ agents: - type: NODE_RESET - type: NETWORK_ACL_ADDRULE options: - target_router_ref: router_1 + target_router_hostname: router_1 - type: NETWORK_ACL_REMOVERULE options: - target_router_ref: router_1 + target_router_hostname: router_1 - type: NETWORK_NIC_ENABLE - type: NETWORK_NIC_DISABLE @@ -485,16 +485,16 @@ agents: options: nodes: - - node_ref: router_1 - - node_ref: switch_1 - - node_ref: switch_2 - - node_ref: domain_controller - - node_ref: web_server - - node_ref: database_server - - node_ref: backup_server - - node_ref: security_suite - - node_ref: client_1 - - node_ref: client_2 + - node_hostname: router_1 + - node_hostname: switch_1 + - node_hostname: switch_2 + - node_hostname: domain_controller + - node_hostname: web_server + - node_hostname: database_server + - node_hostname: backup_server + - node_hostname: security_suite + - node_hostname: client_1 + - node_hostname: client_2 max_folders_per_node: 2 max_files_per_folder: 2 max_services_per_node: 2 diff --git a/tests/assets/configs/train_only_primaite_session.yaml b/tests/assets/configs/train_only_primaite_session.yaml index ebef7f6a..b788e33f 100644 --- a/tests/assets/configs/train_only_primaite_session.yaml +++ b/tests/assets/configs/train_only_primaite_session.yaml @@ -41,7 +41,7 @@ agents: options: nodes: - - node_ref: client_2 + - node_hostname: client_2 max_folders_per_node: 1 max_files_per_folder: 1 max_services_per_node: 1 @@ -76,9 +76,9 @@ agents: - type: NODE_OS_SCAN options: nodes: - - node_ref: client_1 + - node_hostname: client_1 applications: - - application_ref: data_manipulation_bot + - application_name: data_manipulation_bot max_folders_per_node: 1 max_files_per_folder: 1 max_services_per_node: 1 @@ -138,21 +138,21 @@ agents: max_acl_rules: 10 router_hostname: router_1 ip_address_order: - - node_ref: domain_controller + - node_hostname: domain_controller nic_num: 1 - - node_ref: web_server + - node_hostname: web_server nic_num: 1 - - node_ref: database_server + - node_hostname: database_server nic_num: 1 - - node_ref: backup_server + - node_hostname: backup_server nic_num: 1 - - node_ref: security_suite + - node_hostname: security_suite nic_num: 1 - - node_ref: client_1 + - node_hostname: client_1 nic_num: 1 - - node_ref: client_2 + - node_hostname: client_2 nic_num: 1 - - node_ref: security_suite + - node_hostname: security_suite nic_num: 2 ics: null @@ -182,10 +182,10 @@ agents: - type: NODE_RESET - type: NETWORK_ACL_ADDRULE options: - target_router_ref: router_1 + target_router_hostname: router_1 - type: NETWORK_ACL_REMOVERULE options: - target_router_ref: router_1 + target_router_hostname: router_1 - type: NETWORK_NIC_ENABLE - type: NETWORK_NIC_DISABLE @@ -486,16 +486,16 @@ agents: options: nodes: - - node_ref: router_1 - - node_ref: switch_1 - - node_ref: switch_2 - - node_ref: domain_controller - - node_ref: web_server - - node_ref: database_server - - node_ref: backup_server - - node_ref: security_suite - - node_ref: client_1 - - node_ref: client_2 + - node_hostname: router_1 + - node_hostname: switch_1 + - node_hostname: switch_2 + - node_hostname: domain_controller + - node_hostname: web_server + - node_hostname: database_server + - node_hostname: backup_server + - node_hostname: security_suite + - node_hostname: client_1 + - node_hostname: client_2 max_folders_per_node: 2 max_files_per_folder: 2 max_services_per_node: 2 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 aa8faa90..8590153a 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 @@ -25,7 +25,7 @@ def test_file_scan_request(populated_file_system): assert file.health_status == FileSystemItemHealthStatus.CORRUPT assert file.visible_health_status == FileSystemItemHealthStatus.GOOD - fs.apply_request(request=["file", file.uuid, "scan"]) + fs.apply_request(request=["file", file.name, "scan"]) assert file.health_status == FileSystemItemHealthStatus.CORRUPT assert file.visible_health_status == FileSystemItemHealthStatus.CORRUPT