From 11f9981b16b6930ab1f1937ee98061fd059671f4 Mon Sep 17 00:00:00 2001 From: Youjung Kim <126618609+ykim-1@users.noreply.github.com> Date: Thu, 18 Jan 2024 08:15:26 -0800 Subject: [PATCH] test: update all legacy compute regions in integration tests (#555) --- tests/integration/conftest.py | 6 +++--- tests/integration/linodes/helpers_linodes.py | 4 ++-- tests/integration/linodes/test_linodes.py | 10 +++++----- tests/integration/lke/test_clusters.py | 4 ++-- tests/integration/networking/test_networking.py | 2 +- tests/integration/nodebalancers/test_node_balancers.py | 8 ++++---- tests/integration/stackscripts/test_stackscripts.py | 4 ++-- tests/integration/volumes/test_volumes.py | 10 +++++----- tests/integration/volumes/test_volumes_resize.py | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 1c5125cd0..e85c06e88 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -196,7 +196,7 @@ def linode_with_label(): "--type", "g6-nanode-1", "--region", - "us-east", + "us-ord", "--image", DEFAULT_TEST_IMAGE, "--label", @@ -233,7 +233,7 @@ def linode_min_req(): "--type", "g6-nanode-1", "--region", - "us-east", + "us-ord", "--root_pass", DEFAULT_RANDOM_PASS, "--no-defaults", @@ -356,7 +356,7 @@ def nodebalancer_with_default_conf(): + [ "create", "--region", - "us-east", + "us-ord", "--text", "--delimiter", ",", diff --git a/tests/integration/linodes/helpers_linodes.py b/tests/integration/linodes/helpers_linodes.py index 35d45500f..546078e6c 100644 --- a/tests/integration/linodes/helpers_linodes.py +++ b/tests/integration/linodes/helpers_linodes.py @@ -7,7 +7,7 @@ .stdout.decode() .rstrip() ) -DEFAULT_REGION = "us-east" +DEFAULT_REGION = "us-ord" DEFAULT_TEST_IMAGE = ( exec_test_command( @@ -188,7 +188,7 @@ def create_linode_and_wait( "--type", linode_type, "--region", - "us-east", + "us-ord", "--image", test_image, "--root_pass", diff --git a/tests/integration/linodes/test_linodes.py b/tests/integration/linodes/test_linodes.py index 6db77d88e..40c6b93a3 100644 --- a/tests/integration/linodes/test_linodes.py +++ b/tests/integration/linodes/test_linodes.py @@ -30,7 +30,7 @@ def setup_linodes(): "--type", "g6-nanode-1", "--region", - "us-east", + "us-ord", "--image", DEFAULT_TEST_IMAGE, "--label", @@ -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 ) @@ -94,7 +94,7 @@ 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, ) @@ -102,7 +102,7 @@ def test_view_linode_configuration(setup_linodes): 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(): @@ -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", diff --git a/tests/integration/lke/test_clusters.py b/tests/integration/lke/test_clusters.py index 6b1d0e8cf..ba46c609b 100644 --- a/tests/integration/lke/test_clusters.py +++ b/tests/integration/lke/test_clusters.py @@ -37,7 +37,7 @@ def test_deploy_an_lke_cluster(): + [ "cluster-create", "--region", - "us-east", + "us-ord", "--label", label, "--node_pools.type", @@ -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) diff --git a/tests/integration/networking/test_networking.py b/tests/integration/networking/test_networking.py index 18837be27..267e03c29 100644 --- a/tests/integration/networking/test_networking.py +++ b/tests/integration/networking/test_networking.py @@ -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), diff --git a/tests/integration/nodebalancers/test_node_balancers.py b/tests/integration/nodebalancers/test_node_balancers.py index 62db12163..aec1bc126 100644 --- a/tests/integration/nodebalancers/test_node_balancers.py +++ b/tests/integration/nodebalancers/test_node_balancers.py @@ -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") @@ -22,7 +22,7 @@ def test_node_balancers(): + [ "create", "--region", - "us-east", + "us-ord", "--text", "--delimiter", ",", @@ -64,7 +64,7 @@ def test_node_balancers(): "--booted", "true", "--region", - "us-east", + "us-ord", "--type", "g6-nanode-1", "--private_ip", @@ -133,7 +133,7 @@ def create_linode_to_add(): "--booted", "true", "--region", - "us-east", + "us-ord", "--type", "g6-nanode-1", "--private_ip", diff --git a/tests/integration/stackscripts/test_stackscripts.py b/tests/integration/stackscripts/test_stackscripts.py index 73db90d52..07ecd2965 100644 --- a/tests/integration/stackscripts/test_stackscripts.py +++ b/tests/integration/stackscripts/test_stackscripts.py @@ -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( [ @@ -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( [ diff --git a/tests/integration/volumes/test_volumes.py b/tests/integration/volumes/test_volumes.py index bae9ea0ca..7430c1157 100644 --- a/tests/integration/volumes/test_volumes.py +++ b/tests/integration/volumes/test_volumes.py @@ -25,7 +25,7 @@ def test_volume_id(): "--label", "A" + timestamp, "--region", - "us-east", + "us-ord", "--size", "10", "--text", @@ -53,7 +53,7 @@ def test_fail_to_create_volume_under_10gb(): "--label", "A" + timestamp, "--region", - "us-east", + "us-ord", "--size", "5", "--text", @@ -92,7 +92,7 @@ def test_fail_to_create_volume_without_label(): + [ "create", "--region", - "us-east", + "us-ord", "--size", "10", "--text", @@ -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", @@ -134,7 +134,7 @@ def test_fail_to_create_volume_with_all_numberic_label(): "--label", "11111", "--region", - "us-east", + "us-ord", "--size", "10", "--text", diff --git a/tests/integration/volumes/test_volumes_resize.py b/tests/integration/volumes/test_volumes_resize.py index 9622876d3..b5afd1dc8 100644 --- a/tests/integration/volumes/test_volumes_resize.py +++ b/tests/integration/volumes/test_volumes_resize.py @@ -24,7 +24,7 @@ def test_volume_id(): "--label", "A" + timestamp, "--region", - "us-east", + "us-ord", "--size", "10", "--text",