diff --git a/tests/assets/configs/bad_primaite_session.yaml b/tests/assets/configs/bad_primaite_session.yaml index d07a0376..19cad586 100644 --- a/tests/assets/configs/bad_primaite_session.yaml +++ b/tests/assets/configs/bad_primaite_session.yaml @@ -136,16 +136,16 @@ agents: label: LINKS options: link_references: - - router_1___switch_1 - - router_1___switch_2 - - switch_1___domain_controller - - switch_1___web_server - - switch_1___database_server - - switch_1___backup_server - - switch_1___security_suite - - switch_2___client_1 - - switch_2___client_2 - - switch_2___security_suite + - router_1:eth-1<->switch_1:eth-8 + - router_1:eth-2<->switch_2:eth-8 + - switch_1:eth-1<->domain_controller:eth-1 + - switch_1:eth-2<->web_server:eth-1 + - switch_1:eth-3<->database_server:eth-1 + - switch_1:eth-4<->backup_server:eth-1 + - switch_1:eth-7<->security_suite:eth-1 + - switch_2:eth-1<->client_1:eth-1 + - switch_2:eth-2<->client_2:eth-1 + - switch_2:eth-7<->security_suite:eth-2 - type: "NONE" label: ICS options: {} @@ -687,53 +687,43 @@ simulation: type: DNSClient links: - - ref: router_1___switch_1 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 1 endpoint_b_ref: switch_1 endpoint_b_port: 8 - - ref: router_1___switch_2 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 2 endpoint_b_ref: switch_2 endpoint_b_port: 8 - - ref: switch_1___domain_controller - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 1 endpoint_b_ref: domain_controller endpoint_b_port: 1 - - ref: switch_1___web_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 2 endpoint_b_ref: web_server endpoint_b_port: 1 - - ref: switch_1___database_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 3 endpoint_b_ref: database_server endpoint_b_port: 1 - - ref: switch_1___backup_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 4 endpoint_b_ref: backup_server endpoint_b_port: 1 - - ref: switch_1___security_suite - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 1 - - ref: switch_2___client_1 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 1 endpoint_b_ref: client_1 endpoint_b_port: 1 - - ref: switch_2___client_2 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 2 endpoint_b_ref: client_2 endpoint_b_port: 1 - - ref: switch_2___security_suite - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 2 diff --git a/tests/assets/configs/basic_switched_network.yaml b/tests/assets/configs/basic_switched_network.yaml index 9dfeae06..009f239a 100644 --- a/tests/assets/configs/basic_switched_network.yaml +++ b/tests/assets/configs/basic_switched_network.yaml @@ -162,13 +162,11 @@ simulation: # pre installed services and applications links: - - ref: switch_1___client_1 - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 1 endpoint_b_ref: client_1 endpoint_b_port: 1 - - ref: switch_1___client_2 - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 2 endpoint_b_ref: client_2 endpoint_b_port: 1 diff --git a/tests/assets/configs/eval_only_primaite_session.yaml b/tests/assets/configs/eval_only_primaite_session.yaml index 8723ae38..c342ed72 100644 --- a/tests/assets/configs/eval_only_primaite_session.yaml +++ b/tests/assets/configs/eval_only_primaite_session.yaml @@ -152,16 +152,16 @@ agents: label: LINKS options: link_references: - - router_1___switch_1 - - router_1___switch_2 - - switch_1___domain_controller - - switch_1___web_server - - switch_1___database_server - - switch_1___backup_server - - switch_1___security_suite - - switch_2___client_1 - - switch_2___client_2 - - switch_2___security_suite + - router_1:eth-1<->switch_1:eth-8 + - router_1:eth-2<->switch_2:eth-8 + - switch_1:eth-1<->domain_controller:eth-1 + - switch_1:eth-2<->web_server:eth-1 + - switch_1:eth-3<->database_server:eth-1 + - switch_1:eth-4<->backup_server:eth-1 + - switch_1:eth-7<->security_suite:eth-1 + - switch_2:eth-1<->client_1:eth-1 + - switch_2:eth-2<->client_2:eth-1 + - switch_2:eth-7<->security_suite:eth-2 - type: "NONE" label: ICS options: {} @@ -703,53 +703,43 @@ simulation: type: DNSClient links: - - ref: router_1___switch_1 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 1 endpoint_b_ref: switch_1 endpoint_b_port: 8 - - ref: router_1___switch_2 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 2 endpoint_b_ref: switch_2 endpoint_b_port: 8 - - ref: switch_1___domain_controller - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 1 endpoint_b_ref: domain_controller endpoint_b_port: 1 - - ref: switch_1___web_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 2 endpoint_b_ref: web_server endpoint_b_port: 1 - - ref: switch_1___database_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 3 endpoint_b_ref: database_server endpoint_b_port: 1 - - ref: switch_1___backup_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 4 endpoint_b_ref: backup_server endpoint_b_port: 1 - - ref: switch_1___security_suite - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 1 - - ref: switch_2___client_1 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 1 endpoint_b_ref: client_1 endpoint_b_port: 1 - - ref: switch_2___client_2 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 2 endpoint_b_ref: client_2 endpoint_b_port: 1 - - ref: switch_2___security_suite - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 2 diff --git a/tests/assets/configs/firewall_actions_network.yaml b/tests/assets/configs/firewall_actions_network.yaml index 203ea3ea..cf10505e 100644 --- a/tests/assets/configs/firewall_actions_network.yaml +++ b/tests/assets/configs/firewall_actions_network.yaml @@ -101,7 +101,7 @@ agents: label: LINKS options: link_references: - - client_1___switch_1 + - client_1:eth-1<->switch_1:eth-1 - type: "NONE" label: ICS options: {} diff --git a/tests/assets/configs/multi_agent_session.yaml b/tests/assets/configs/multi_agent_session.yaml index dd416523..35431064 100644 --- a/tests/assets/configs/multi_agent_session.yaml +++ b/tests/assets/configs/multi_agent_session.yaml @@ -147,16 +147,16 @@ agents: label: LINKS options: link_references: - - router_1___switch_1 - - router_1___switch_2 - - switch_1___domain_controller - - switch_1___web_server - - switch_1___database_server - - switch_1___backup_server - - switch_1___security_suite - - switch_2___client_1 - - switch_2___client_2 - - switch_2___security_suite + - router_1:eth-1<->switch_1:eth-8 + - router_1:eth-2<->switch_2:eth-8 + - switch_1:eth-1<->domain_controller:eth-1 + - switch_1:eth-2<->web_server:eth-1 + - switch_1:eth-3<->database_server:eth-1 + - switch_1:eth-4<->backup_server:eth-1 + - switch_1:eth-7<->security_suite:eth-1 + - switch_2:eth-1<->client_1:eth-1 + - switch_2:eth-2<->client_2:eth-1 + - switch_2:eth-7<->security_suite:eth-2 - type: "NONE" label: ICS options: {} @@ -613,16 +613,16 @@ agents: label: LINKS options: link_references: - - router_1___switch_1 - - router_1___switch_2 - - switch_1___domain_controller - - switch_1___web_server - - switch_1___database_server - - switch_1___backup_server - - switch_1___security_suite - - switch_2___client_1 - - switch_2___client_2 - - switch_2___security_suite + - router_1:eth-1<->switch_1:eth-8 + - router_1:eth-2<->switch_2:eth-8 + - switch_1:eth-1<->domain_controller:eth-1 + - switch_1:eth-2<->web_server:eth-1 + - switch_1:eth-3<->database_server:eth-1 + - switch_1:eth-4<->backup_server:eth-1 + - switch_1:eth-7<->security_suite:eth-1 + - switch_2:eth-1<->client_1:eth-1 + - switch_2:eth-2<->client_2:eth-1 + - switch_2:eth-7<->security_suite:eth-2 - type: "NONE" label: ICS options: {} @@ -1162,53 +1162,43 @@ simulation: type: DNSClient links: - - ref: router_1___switch_1 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 1 endpoint_b_ref: switch_1 endpoint_b_port: 8 - - ref: router_1___switch_2 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 2 endpoint_b_ref: switch_2 endpoint_b_port: 8 - - ref: switch_1___domain_controller - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 1 endpoint_b_ref: domain_controller endpoint_b_port: 1 - - ref: switch_1___web_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 2 endpoint_b_ref: web_server endpoint_b_port: 1 - - ref: switch_1___database_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 3 endpoint_b_ref: database_server endpoint_b_port: 1 - - ref: switch_1___backup_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 4 endpoint_b_ref: backup_server endpoint_b_port: 1 - - ref: switch_1___security_suite - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 1 - - ref: switch_2___client_1 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 1 endpoint_b_ref: client_1 endpoint_b_port: 1 - - ref: switch_2___client_2 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 2 endpoint_b_ref: client_2 endpoint_b_port: 1 - - ref: switch_2___security_suite - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 2 diff --git a/tests/assets/configs/shared_rewards.yaml b/tests/assets/configs/shared_rewards.yaml index 4b925844..9cf4d17d 100644 --- a/tests/assets/configs/shared_rewards.yaml +++ b/tests/assets/configs/shared_rewards.yaml @@ -226,16 +226,16 @@ agents: label: LINKS options: link_references: - - router_1___switch_1 - - router_1___switch_2 - - switch_1___domain_controller - - switch_1___web_server - - switch_1___database_server - - switch_1___backup_server - - switch_1___security_suite - - switch_2___client_1 - - switch_2___client_2 - - switch_2___security_suite + - router_1:eth-1<->switch_1:eth-8 + - router_1:eth-2<->switch_2:eth-8 + - switch_1:eth-1<->domain_controller:eth-1 + - switch_1:eth-2<->web_server:eth-1 + - switch_1:eth-3<->database_server:eth-1 + - switch_1:eth-4<->backup_server:eth-1 + - switch_1:eth-7<->security_suite:eth-1 + - switch_2:eth-1<->client_1:eth-1 + - switch_2:eth-2<->client_2:eth-1 + - switch_2:eth-7<->security_suite:eth-2 - type: "NONE" label: ICS options: {} @@ -921,53 +921,43 @@ simulation: links: - - ref: router_1___switch_1 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 1 endpoint_b_ref: switch_1 endpoint_b_port: 8 - - ref: router_1___switch_2 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 2 endpoint_b_ref: switch_2 endpoint_b_port: 8 - - ref: switch_1___domain_controller - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 1 endpoint_b_ref: domain_controller endpoint_b_port: 1 - - ref: switch_1___web_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 2 endpoint_b_ref: web_server endpoint_b_port: 1 - - ref: switch_1___database_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 3 endpoint_b_ref: database_server endpoint_b_port: 1 - - ref: switch_1___backup_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 4 endpoint_b_ref: backup_server endpoint_b_port: 1 - - ref: switch_1___security_suite - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 1 - - ref: switch_2___client_1 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 1 endpoint_b_ref: client_1 endpoint_b_port: 1 - - ref: switch_2___client_2 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 2 endpoint_b_ref: client_2 endpoint_b_port: 1 - - ref: switch_2___security_suite - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 2 diff --git a/tests/assets/configs/test_application_install.yaml b/tests/assets/configs/test_application_install.yaml index ccd2228c..d2e85f30 100644 --- a/tests/assets/configs/test_application_install.yaml +++ b/tests/assets/configs/test_application_install.yaml @@ -226,16 +226,16 @@ agents: label: LINKS options: link_references: - - router_1___switch_1 - - router_1___switch_2 - - switch_1___domain_controller - - switch_1___web_server - - switch_1___database_server - - switch_1___backup_server - - switch_1___security_suite - - switch_2___client_1 - - switch_2___client_2 - - switch_2___security_suite + - router_1:eth-1<->switch_1:eth-8 + - router_1:eth-2<->switch_2:eth-8 + - switch_1:eth-1<->domain_controller:eth-1 + - switch_1:eth-2<->web_server:eth-1 + - switch_1:eth-3<->database_server:eth-1 + - switch_1:eth-4<->backup_server:eth-1 + - switch_1:eth-7<->security_suite:eth-1 + - switch_2:eth-1<->client_1:eth-1 + - switch_2:eth-2<->client_2:eth-1 + - switch_2:eth-7<->security_suite:eth-2 - type: "NONE" label: ICS options: {} @@ -953,53 +953,43 @@ simulation: links: - - ref: router_1___switch_1 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 1 endpoint_b_ref: switch_1 endpoint_b_port: 8 - - ref: router_1___switch_2 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 2 endpoint_b_ref: switch_2 endpoint_b_port: 8 - - ref: switch_1___domain_controller - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 1 endpoint_b_ref: domain_controller endpoint_b_port: 1 - - ref: switch_1___web_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 2 endpoint_b_ref: web_server endpoint_b_port: 1 - - ref: switch_1___database_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 3 endpoint_b_ref: database_server endpoint_b_port: 1 - - ref: switch_1___backup_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 4 endpoint_b_ref: backup_server endpoint_b_port: 1 - - ref: switch_1___security_suite - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 1 - - ref: switch_2___client_1 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 1 endpoint_b_ref: client_1 endpoint_b_port: 1 - - ref: switch_2___client_2 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 2 endpoint_b_ref: client_2 endpoint_b_port: 1 - - ref: switch_2___security_suite - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 2 diff --git a/tests/assets/configs/test_primaite_session.yaml b/tests/assets/configs/test_primaite_session.yaml index 8bad2f0b..1fd489ec 100644 --- a/tests/assets/configs/test_primaite_session.yaml +++ b/tests/assets/configs/test_primaite_session.yaml @@ -160,16 +160,16 @@ agents: label: LINKS options: link_references: - - router_1___switch_1 - - router_1___switch_2 - - switch_1___domain_controller - - switch_1___web_server - - switch_1___database_server - - switch_1___backup_server - - switch_1___security_suite - - switch_2___client_1 - - switch_2___client_2 - - switch_2___security_suite + - router_1:eth-1<->switch_1:eth-8 + - router_1:eth-2<->switch_2:eth-8 + - switch_1:eth-1<->domain_controller:eth-1 + - switch_1:eth-2<->web_server:eth-1 + - switch_1:eth-3<->database_server:eth-1 + - switch_1:eth-4<->backup_server:eth-1 + - switch_1:eth-7<->security_suite:eth-1 + - switch_2:eth-1<->client_1:eth-1 + - switch_2:eth-2<->client_2:eth-1 + - switch_2:eth-7<->security_suite:eth-2 - type: "NONE" label: ICS options: {} @@ -743,53 +743,43 @@ simulation: protocol: ICMP links: - - ref: router_1___switch_1 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 1 endpoint_b_ref: switch_1 endpoint_b_port: 8 - - ref: router_1___switch_2 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 2 endpoint_b_ref: switch_2 endpoint_b_port: 8 - - ref: switch_1___domain_controller - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 1 endpoint_b_ref: domain_controller endpoint_b_port: 1 - - ref: switch_1___web_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 2 endpoint_b_ref: web_server endpoint_b_port: 1 - - ref: switch_1___database_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 3 endpoint_b_ref: database_server endpoint_b_port: 1 - - ref: switch_1___backup_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 4 endpoint_b_ref: backup_server endpoint_b_port: 1 - - ref: switch_1___security_suite - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 1 - - ref: switch_2___client_1 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 1 endpoint_b_ref: client_1 endpoint_b_port: 1 - - ref: switch_2___client_2 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 2 endpoint_b_ref: client_2 endpoint_b_port: 1 - - ref: switch_2___security_suite - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 2 diff --git a/tests/assets/configs/train_only_primaite_session.yaml b/tests/assets/configs/train_only_primaite_session.yaml index fcfbaf15..ca26fc62 100644 --- a/tests/assets/configs/train_only_primaite_session.yaml +++ b/tests/assets/configs/train_only_primaite_session.yaml @@ -160,16 +160,16 @@ agents: label: LINKS options: link_references: - - router_1___switch_1 - - router_1___switch_2 - - switch_1___domain_controller - - switch_1___web_server - - switch_1___database_server - - switch_1___backup_server - - switch_1___security_suite - - switch_2___client_1 - - switch_2___client_2 - - switch_2___security_suite + - router_1:eth-1<->switch_1:eth-8 + - router_1:eth-2<->switch_2:eth-8 + - switch_1:eth-1<->domain_controller:eth-1 + - switch_1:eth-2<->web_server:eth-1 + - switch_1:eth-3<->database_server:eth-1 + - switch_1:eth-4<->backup_server:eth-1 + - switch_1:eth-7<->security_suite:eth-1 + - switch_2:eth-1<->client_1:eth-1 + - switch_2:eth-2<->client_2:eth-1 + - switch_2:eth-7<->security_suite:eth-2 - type: "NONE" label: ICS options: {} @@ -710,53 +710,43 @@ simulation: type: DNSClient links: - - ref: router_1___switch_1 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 1 endpoint_b_ref: switch_1 endpoint_b_port: 8 - - ref: router_1___switch_2 - endpoint_a_ref: router_1 + - endpoint_a_ref: router_1 endpoint_a_port: 2 endpoint_b_ref: switch_2 endpoint_b_port: 8 - - ref: switch_1___domain_controller - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 1 endpoint_b_ref: domain_controller endpoint_b_port: 1 - - ref: switch_1___web_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 2 endpoint_b_ref: web_server endpoint_b_port: 1 - - ref: switch_1___database_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 3 endpoint_b_ref: database_server endpoint_b_port: 1 - - ref: switch_1___backup_server - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 4 endpoint_b_ref: backup_server endpoint_b_port: 1 - - ref: switch_1___security_suite - endpoint_a_ref: switch_1 + - endpoint_a_ref: switch_1 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 1 - - ref: switch_2___client_1 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 1 endpoint_b_ref: client_1 endpoint_b_port: 1 - - ref: switch_2___client_2 - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 2 endpoint_b_ref: client_2 endpoint_b_port: 1 - - ref: switch_2___security_suite - endpoint_a_ref: switch_2 + - endpoint_a_ref: switch_2 endpoint_a_port: 7 endpoint_b_ref: security_suite endpoint_b_port: 2 diff --git a/tests/integration_tests/game_layer/observations/test_link_observations.py b/tests/integration_tests/game_layer/observations/test_link_observations.py index 3eee72e8..dce7b23d 100644 --- a/tests/integration_tests/game_layer/observations/test_link_observations.py +++ b/tests/integration_tests/game_layer/observations/test_link_observations.py @@ -69,8 +69,8 @@ def test_link_observation(): assert link_1 is not None assert link_2 is not None - link_1_observation = LinkObservation(where=["network", "links", link_1.uuid]) - link_2_observation = LinkObservation(where=["network", "links", link_2.uuid]) + link_1_observation = LinkObservation(where=["network", "links", "switch:eth-1<->computer_1:eth-1"]) + link_2_observation = LinkObservation(where=["network", "links", "switch:eth-2<->computer_2:eth-1"]) state = sim.describe_state() link_1_obs = link_1_observation.observe(state)