From a141c8d2122dc237774568f2edc52418b956702d Mon Sep 17 00:00:00 2001 From: Chris McCarthy Date: Tue, 30 Apr 2024 14:08:12 +0100 Subject: [PATCH] #2266 - fixed typos from PR suggestions --- .../simulation/nodes/network_examples.rst | 12 ++++++------ .../multi_lan_internet_network_example.yaml | 2 +- .../test_multi_lan_internet_example_network.py | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/source/configuration/simulation/nodes/network_examples.rst b/docs/source/configuration/simulation/nodes/network_examples.rst index a9df63eb..c1036c97 100644 --- a/docs/source/configuration/simulation/nodes/network_examples.rst +++ b/docs/source/configuration/simulation/nodes/network_examples.rst @@ -7,10 +7,10 @@ ``Network Examples`` ==================== -The below examples demonstrate how to configure different types of network in PrimAITE. They examples all have network -topology diagrams. Each rectangle represents a single Node, with the hostname inside of the rectangle. Physical inks are +The below examples demonstrate how to configure different types of network in PrimAITE. These examples all have network +topology diagrams. Each rectangle represents a single Node, with the hostname inside of the rectangle. Physical links are represented by lines between two nodes. At each end of the line is the network interface number on the node the link is -connected to. Where the network interface is alsoa layer-3 device, the label also contains the ip address and subnet +connected to. Where the network interface is also a layer-3 device, the label also contains the ip address and subnet mask in CIDR format (``/``). All network diagrams on this page use the following node type colour key: @@ -167,7 +167,7 @@ Finally, once the network is configured as expected, a connectivity test should pc_1.ping("192.168.1.13) If SysLog capture is toggled on and the simulation log level is set to INFO, the `pc_1` the result of the ping should be -captures in the `pc_1` SysLog: +captured in the `pc_1` SysLog: .. code-block:: text @@ -392,7 +392,7 @@ connections, but the ACL that allows the nodes in the LAN to communicate with th pc_1.sys_log.show() If SysLog capture is toggled on and the simulation log level is set to INFO, the `pc_1` the result of the ping should be -captures in the `pc_1` SysLog: +captured in the `pc_1` SysLog: .. code-block:: text @@ -739,7 +739,7 @@ Each node is configured to ensure it meets the specific security and operational 10: # Permit all internal outbound traffic action: PERMIT dmz_inbound_acl: - 7: # Permit Database service on some_tech_db_srv to respong to some_tech_web_srv + 7: # Permit Database service on some_tech_db_srv to respond to some_tech_web_srv action: PERMIT src_ip: 10.10.1.11 src_port: POSTGRES_SERVER diff --git a/src/primaite/config/_package_data/multi_lan_internet_network_example.yaml b/src/primaite/config/_package_data/multi_lan_internet_network_example.yaml index 5f2f36e8..8b97c6df 100644 --- a/src/primaite/config/_package_data/multi_lan_internet_network_example.yaml +++ b/src/primaite/config/_package_data/multi_lan_internet_network_example.yaml @@ -142,7 +142,7 @@ simulation: 10: # Permit all internal outbound traffic action: PERMIT dmz_inbound_acl: - 7: # Permit Database service on some_tech_db_srv to respong to some_tech_web_srv + 7: # Permit Database service on some_tech_db_srv to respond to some_tech_web_srv action: PERMIT src_ip: 10.10.1.11 src_port: POSTGRES_SERVER diff --git a/tests/integration_tests/network/test_multi_lan_internet_example_network.py b/tests/integration_tests/network/test_multi_lan_internet_example_network.py index 06d6e308..f56fcbf2 100644 --- a/tests/integration_tests/network/test_multi_lan_internet_example_network.py +++ b/tests/integration_tests/network/test_multi_lan_internet_example_network.py @@ -20,7 +20,7 @@ def test_all_with_configured_dns_server_ip_can_resolve_url(): assert dns_client.check_domain_exists("sometech.ai") -def test_external_pcs_can_access_sometect_website(): +def test_external_pcs_can_access_sometech_website(): network = multi_lan_internet_network_example() pc_1_browser: WebBrowser = network.get_node_by_hostname("pc_1").software_manager.software["WebBrowser"] @@ -161,7 +161,7 @@ def test_sometech_jnr_dev_cannot_access_ftp_on_sometech_storage_server(): ) -def test_sometech_hr_pc_can_access_sometect_website(): +def test_sometech_hr_pc_can_access_sometech_website(): network = multi_lan_internet_network_example() some_tech_hr_pc: Computer = network.get_node_by_hostname("some_tech_hr_1")