Skip to content

Commit

Permalink
test: update all legacy compute regions in integration tests (#555)
Browse files Browse the repository at this point in the history
  • Loading branch information
ykim-akamai authored Jan 18, 2024
1 parent a7207e7 commit 11f9981
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 25 deletions.
6 changes: 3 additions & 3 deletions tests/integration/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ def linode_with_label():
"--type",
"g6-nanode-1",
"--region",
"us-east",
"us-ord",
"--image",
DEFAULT_TEST_IMAGE,
"--label",
Expand Down Expand Up @@ -233,7 +233,7 @@ def linode_min_req():
"--type",
"g6-nanode-1",
"--region",
"us-east",
"us-ord",
"--root_pass",
DEFAULT_RANDOM_PASS,
"--no-defaults",
Expand Down Expand Up @@ -356,7 +356,7 @@ def nodebalancer_with_default_conf():
+ [
"create",
"--region",
"us-east",
"us-ord",
"--text",
"--delimiter",
",",
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/linodes/helpers_linodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.stdout.decode()
.rstrip()
)
DEFAULT_REGION = "us-east"
DEFAULT_REGION = "us-ord"

DEFAULT_TEST_IMAGE = (
exec_test_command(
Expand Down Expand Up @@ -188,7 +188,7 @@ def create_linode_and_wait(
"--type",
linode_type,
"--region",
"us-east",
"us-ord",
"--image",
test_image,
"--root_pass",
Expand Down
10 changes: 5 additions & 5 deletions tests/integration/linodes/test_linodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def setup_linodes():
"--type",
"g6-nanode-1",
"--region",
"us-east",
"us-ord",
"--image",
DEFAULT_TEST_IMAGE,
"--label",
Expand Down Expand Up @@ -68,7 +68,7 @@ def test_create_linodes_with_a_label(linode_with_label):
result = linode_with_label

assert re.search(
"^cli(.*),us-east,g6-nanode-1," + DEFAULT_TEST_IMAGE, result
"^cli(.*),us-ord,g6-nanode-1," + DEFAULT_TEST_IMAGE, result
)


Expand All @@ -94,15 +94,15 @@ def test_view_linode_configuration(setup_linodes):
linode_id
+ ","
+ linode_label
+ ",us-east,g6-nanode-1,"
+ ",us-ord,g6-nanode-1,"
+ DEFAULT_TEST_IMAGE,
result,
)


def test_create_linode_with_min_required_props(linode_min_req):
result = linode_min_req
assert re.search("[0-9]+,us-east,g6-nanode-1", result)
assert re.search("[0-9]+,us-ord,g6-nanode-1", result)


def test_create_linodes_fails_without_a_root_pass():
Expand All @@ -113,7 +113,7 @@ def test_create_linodes_fails_without_a_root_pass():
"--type",
"g6-nanode-1",
"--region",
"us-east",
"us-ord",
"--image",
DEFAULT_TEST_IMAGE,
"--text",
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/lke/test_clusters.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_deploy_an_lke_cluster():
+ [
"cluster-create",
"--region",
"us-east",
"us-ord",
"--label",
label,
"--node_pools.type",
Expand All @@ -58,7 +58,7 @@ def test_deploy_an_lke_cluster():
]
).stdout.decode()

assert label + ",us-east," + lke_version in result
assert label + ",us-ord," + lke_version in result

# Sleep needed here for proper deletion of linodes that are related to lke cluster
time.sleep(15)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/networking/test_networking.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def test_linode_id():

@pytest.fixture(scope="package")
def test_linode_id_shared_ipv4():
target_region = "us-southeast"
target_region = "us-mia"

linode_ids = (
create_linode(test_region=target_region),
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/nodebalancers/test_node_balancers.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from tests.integration.linodes.helpers_linodes import DEFAULT_TEST_IMAGE

BASE_CMD = ["linode-cli", "nodebalancers"]
nodebalancer_created = "[0-9]+,balancer[0-9]+,us-east,[0-9]+-[0-9]+-[0-9]+-[0-9]+.ip.linodeusercontent.com,0"
nodebalancer_created = "[0-9]+,balancer[0-9]+,us-ord,[0-9]+-[0-9]+-[0-9]+-[0-9]+.ip.linodeusercontent.com,0"


@pytest.fixture(scope="package")
Expand All @@ -22,7 +22,7 @@ def test_node_balancers():
+ [
"create",
"--region",
"us-east",
"us-ord",
"--text",
"--delimiter",
",",
Expand Down Expand Up @@ -64,7 +64,7 @@ def test_node_balancers():
"--booted",
"true",
"--region",
"us-east",
"us-ord",
"--type",
"g6-nanode-1",
"--private_ip",
Expand Down Expand Up @@ -133,7 +133,7 @@ def create_linode_to_add():
"--booted",
"true",
"--region",
"us-east",
"us-ord",
"--type",
"g6-nanode-1",
"--private_ip",
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/stackscripts/test_stackscripts.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def test_fail_to_deploy_stackscript_to_linode_from_incompatible_image(
):
private_stackscript = test_stackscript_id
linode_plan = "g6-standard-1"
linode_region = "us-east"
linode_region = "us-ord"

result = exec_failing_test_command(
[
Expand Down Expand Up @@ -227,7 +227,7 @@ def test_deploy_linode_from_stackscript(test_stackscript_id):
private_stackscript = test_stackscript_id
images = get_linode_image_lists()
linode_plan = "g6-standard-1"
linode_region = "us-east"
linode_region = "us-ord"

result = exec_test_command(
[
Expand Down
10 changes: 5 additions & 5 deletions tests/integration/volumes/test_volumes.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def test_volume_id():
"--label",
"A" + timestamp,
"--region",
"us-east",
"us-ord",
"--size",
"10",
"--text",
Expand Down Expand Up @@ -53,7 +53,7 @@ def test_fail_to_create_volume_under_10gb():
"--label",
"A" + timestamp,
"--region",
"us-east",
"us-ord",
"--size",
"5",
"--text",
Expand Down Expand Up @@ -92,7 +92,7 @@ def test_fail_to_create_volume_without_label():
+ [
"create",
"--region",
"us-east",
"us-ord",
"--size",
"10",
"--text",
Expand All @@ -111,7 +111,7 @@ def test_fail_to_create_volume_over_1024gb_in_size():
"--label",
"A" + timestamp,
"--region",
"us-east",
"us-ord",
"--size",
"10241",
"--text",
Expand All @@ -134,7 +134,7 @@ def test_fail_to_create_volume_with_all_numberic_label():
"--label",
"11111",
"--region",
"us-east",
"us-ord",
"--size",
"10",
"--text",
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/volumes/test_volumes_resize.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def test_volume_id():
"--label",
"A" + timestamp,
"--region",
"us-east",
"us-ord",
"--size",
"10",
"--text",
Expand Down

0 comments on commit 11f9981

Please sign in to comment.