From 426c0a668279840e99f83db148348bc91469922d Mon Sep 17 00:00:00 2001 From: Chris McCarthy Date: Tue, 13 Feb 2024 10:18:06 +0000 Subject: [PATCH] 2205 - Slimmed down the capability of the wireless router for now --- .../network/test_wireless_router.py | 57 ++----------------- 1 file changed, 5 insertions(+), 52 deletions(-) diff --git a/tests/integration_tests/network/test_wireless_router.py b/tests/integration_tests/network/test_wireless_router.py index 1b55c1b6..0e458974 100644 --- a/tests/integration_tests/network/test_wireless_router.py +++ b/tests/integration_tests/network/test_wireless_router.py @@ -74,61 +74,14 @@ def setup_network(): address="192.168.0.2", subnet_mask="255.255.255.0", next_hop_ip_address="192.168.1.1" ) - # Configure PC C - pc_c = Computer( - hostname="pc_c", - ip_address="192.168.3.2", - subnet_mask="255.255.255.0", - default_gateway="192.168.3.1", - start_up_duration=0, - ) - pc_c.power_on() - network.add_node(pc_c) - - # Configure Router 3 - router_3 = WirelessRouter(hostname="router_3", start_up_duration=0) - router_3.power_on() - network.add_node(router_3) - - # Configure the connection between PC C and Router 3 port 2 - router_3.configure_router_interface("192.168.3.1", "255.255.255.0") - network.connect(pc_c.network_interface[1], router_3.network_interface[2]) - - # Configure the wireless connection between Router 2 port 1 and Router 3 port 1 - router_3.configure_wireless_access_point("192.168.1.3", "255.255.255.0") - - # Configure Route from Router 1 to PC C subnet - router_1.route_table.add_route( - address="192.168.3.0", subnet_mask="255.255.255.0", next_hop_ip_address="192.168.1.3" - ) - - # Configure Route from Router 2 to PC C subnet - router_2.route_table.add_route( - address="192.168.3.0", subnet_mask="255.255.255.0", next_hop_ip_address="192.168.1.3" - ) - - # Configure Route from Router 3 to PC A and PC B subnets - router_3.route_table.add_route( - address="192.168.0.0", subnet_mask="255.255.255.0", next_hop_ip_address="192.168.1.1" - ) - router_3.route_table.add_route( - address="192.168.2.0", subnet_mask="255.255.255.0", next_hop_ip_address="192.168.1.2" - ) - - return pc_a, pc_b, pc_c, router_1, router_2, router_3 + return pc_a, pc_b, router_1, router_2 -def test_ping_default_gateways(setup_network): - pc_a, pc_b, pc_c, router_1, router_2, router_3 = setup_network - # Check if each PC can ping its default gateway +def test_cross_router_connectivity(setup_network): + pc_a, pc_b, router_1, router_2 = setup_network + # Ensure that PCs can ping across routers before any frequency change assert pc_a.ping(pc_a.default_gateway), "PC A should ping its default gateway successfully." assert pc_b.ping(pc_b.default_gateway), "PC B should ping its default gateway successfully." - assert pc_c.ping(pc_c.default_gateway), "PC C should ping its default gateway successfully." - -def test_cross_router_connectivity_pre_frequency_change(setup_network): - pc_a, pc_b, pc_c, router_1, router_2, router_3 = setup_network - # Ensure that PCs can ping across routers before any frequency change assert pc_a.ping(pc_b.network_interface[1].ip_address), "PC A should ping PC B across routers successfully." - assert pc_a.ping(pc_c.network_interface[1].ip_address), "PC A should ping PC C across routers successfully." - assert pc_b.ping(pc_c.network_interface[1].ip_address), "PC B should ping PC C across routers successfully." + assert pc_b.ping(pc_a.network_interface[1].ip_address), "PC B should ping PC A across routers successfully."