Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ These tests are run regularly against our public infrastructure as well as our i
| | [test_public_network_ipv4_only_on_all_images](./test_public_network.py#L186) | all |
| | [test_reverse_ptr_record_of_server](./test_public_network.py#L207) | default |
| | [test_reverse_ptr_record_of_floating_ip](./test_public_network.py#L231) | default |
| **Router** | [test_internet_gateway](./test_router.py#L16) | default |
| | [test_router_connected_private_networks](./test_router.py#L84) | default |
| **Router** | [test_internet_gateway](./test_router.py#L15) | default |
| | [test_router_connected_private_networks](./test_router.py#L82) | default |
| **Server** | [test_change_flavor_from_flex_to_flex](./test_server.py#L21) | default |
| | [test_change_flavor_from_flex_to_plus](./test_server.py#L43) | default |
| | [test_change_flavor_from_plus_to_flex](./test_server.py#L65) | default |
Expand Down
16 changes: 7 additions & 9 deletions test_router.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
private networks to the internet through routers acting as internet gateways:

"""
import time

from constants import PUBLIC_PING_TARGETS
from util import in_parallel, assert_reverse_pointer
Expand Down Expand Up @@ -46,8 +45,9 @@ def test_internet_gateway(
jump_host=jumpost,
)

# Ping a public IP: Verifies that the server cat access the internet
private_server.ping(PUBLIC_PING_TARGETS[4], tries=5, wait=1)
# Ping a public IP: Verifies that the server cat access the internet.
# Wait up to 30 seconds (wait * tries) for the gateway port to come UP.
private_server.ping(PUBLIC_PING_TARGETS[4], tries=30, wait=1)

# Verify initial reverse pointers were published
initial_public_addresses = internet_gateway.internet_gateway_addresses
Expand All @@ -56,7 +56,7 @@ def test_internet_gateway(
# Disable the internet gateway
internet_gateway.update(internet_gateway=False)

# Ping a public IP: Verifies that the server cannot access the internet
# Ping a public IP: Verifies that the server cannot access the internet.
private_server.ping(
PUBLIC_PING_TARGETS[4],
tries=5,
Expand All @@ -74,11 +74,9 @@ def test_internet_gateway(
updated_public_addresses = internet_gateway.internet_gateway_addresses
assert_reverse_pointer(updated_public_addresses)

# Wait a bit for the internet gateway port to come up
time.sleep(5)

# Ping a public IP: Verifies that the server can access the internet again
private_server.ping(PUBLIC_PING_TARGETS[4], tries=5, wait=1)
# Ping a public IP: Verifies that the server can access the internet again.
# Wait up to 30 seconds (wait * tries) for the gateway port to come UP.
private_server.ping(PUBLIC_PING_TARGETS[4], tries=30, wait=1)


def test_router_connected_private_networks(
Expand Down
Loading