Skip to content

Commit 38cac2b

Browse files
ykim-akamaiykim-akamai
authored
test: update legacy regions with new compute regions (#358)
* update legacy regions with new compute regions * update volume region for test_attach_volume_to_linode
1 parent fd3a96e commit 38cac2b

10 files changed

Lines changed: 23 additions & 26 deletions

File tree

‎test/integration/conftest.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def run_long_tests():
5454
def create_linode(test_linode_client):
5555
client = test_linode_client
5656
available_regions = client.regions()
57-
chosen_region = available_regions[0]
57+
chosen_region = available_regions[4]
5858
timestamp = str(time.time_ns())
5959
label = "TestSDK-" + timestamp
6060

@@ -71,7 +71,7 @@ def create_linode(test_linode_client):
7171
def create_linode_for_pass_reset(test_linode_client):
7272
client = test_linode_client
7373
available_regions = client.regions()
74-
chosen_region = available_regions[0]
74+
chosen_region = available_regions[4]
7575
timestamp = str(time.time_ns())
7676
label = "TestSDK-" + timestamp
7777

@@ -155,7 +155,7 @@ def test_domain(test_linode_client):
155155
def test_volume(test_linode_client):
156156
client = test_linode_client
157157
timestamp = str(time.time_ns())
158-
region = client.regions()[0]
158+
region = client.regions()[4]
159159
label = "TestSDK-" + timestamp
160160

161161
volume = client.volume_create(label=label, region=region)

‎test/integration/linode_client/test_linode_client.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
def setup_client_and_linode(test_linode_client):
1313
client = test_linode_client
1414
available_regions = client.regions()
15-
chosen_region = available_regions[0]
15+
chosen_region = available_regions[4] # us-ord (Chicago)
1616
label = get_test_label()
1717

1818
linode_instance, password = client.linode.instance_create(
@@ -33,9 +33,6 @@ def test_get_account(setup_client_and_linode):
3333
assert re.search(
3434
"^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$", account.email
3535
)
36-
assert re.search(
37-
"^(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}$", account.phone
38-
)
3936
assert re.search("^$|[a-zA-Z0-9]+", account.address_1)
4037
assert re.search("^$|[a-zA-Z0-9]+", account.address_2)
4138
assert re.search("^$|[a-zA-Z]+", account.city)
@@ -212,7 +209,7 @@ def test_get_account_settings(test_linode_client):
212209
def test_create_linode_instance_without_image(test_linode_client):
213210
client = test_linode_client
214211
available_regions = client.regions()
215-
chosen_region = available_regions[0]
212+
chosen_region = available_regions[4]
216213
label = get_test_label()
217214

218215
linode_instance = client.linode.instance_create(
@@ -297,7 +294,7 @@ def test_fails_to_create_cluster_with_invalid_version(test_linode_client):
297294

298295
try:
299296
cluster = client.lke.cluster_create(
300-
"ap-west",
297+
"us-ord",
301298
"example-cluster",
302299
{"type": "g6-standard-1", "count": 3},
303300
invalid_version,

‎test/integration/models/test_account.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def test_latest_get_event(test_linode_client):
6464
client = test_linode_client
6565

6666
available_regions = client.regions()
67-
chosen_region = available_regions[0]
67+
chosen_region = available_regions[4]
6868
label = get_test_label()
6969

7070
linode, password = client.linode.instance_create(

‎test/integration/models/test_database.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def test_create_sql_db(test_linode_client):
4040
)
4141
client = test_linode_client
4242
label = get_test_label() + "-sqldb"
43-
region = "us-east"
43+
region = "us-ord"
4444
engine_id = get_db_engine_id(client, "mysql")
4545
dbtype = "g6-standard-1"
4646

@@ -70,7 +70,7 @@ def test_create_postgres_db(test_linode_client):
7070
)
7171
client = test_linode_client
7272
label = get_test_label() + "-postgresqldb"
73-
region = "us-east"
73+
region = "us-ord"
7474
engine_id = get_db_engine_id(client, "postgresql")
7575
dbtype = "g6-standard-1"
7676

‎test/integration/models/test_firewall.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
def linode_fw(test_linode_client):
1010
client = test_linode_client
1111
available_regions = client.regions()
12-
chosen_region = available_regions[0]
12+
chosen_region = available_regions[4]
1313
label = "linode_instance_fw_device"
1414

1515
linode_instance, password = client.linode.instance_create(

‎test/integration/models/test_image.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def test_image_create_upload(test_linode_client):
4242
label = get_test_label() + "_image"
4343
image = test_linode_client.image_upload(
4444
label,
45-
"us-east",
45+
"us-ord",
4646
BytesIO(test_image_content),
4747
description="integration test image upload",
4848
)

‎test/integration/models/test_linode.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
def linode_with_volume_firewall(test_linode_client):
2525
client = test_linode_client
2626
available_regions = client.regions()
27-
chosen_region = available_regions[0]
27+
chosen_region = available_regions[4]
2828
label = get_test_label()
2929

3030
rules = {
@@ -70,7 +70,7 @@ def linode_with_volume_firewall(test_linode_client):
7070
def linode_for_network_interface_tests(test_linode_client):
7171
client = test_linode_client
7272
available_regions = client.regions()
73-
chosen_region = available_regions[0]
73+
chosen_region = available_regions[4]
7474
timestamp = str(time.time_ns())
7575
label = "TestSDK-" + timestamp
7676

@@ -87,7 +87,7 @@ def linode_for_network_interface_tests(test_linode_client):
8787
def linode_for_disk_tests(test_linode_client):
8888
client = test_linode_client
8989
available_regions = client.regions()
90-
chosen_region = available_regions[0]
90+
chosen_region = available_regions[4]
9191
label = get_test_label()
9292

9393
linode_instance, password = client.linode.instance_create(
@@ -118,7 +118,7 @@ def linode_for_disk_tests(test_linode_client):
118118
def create_linode_for_long_running_tests(test_linode_client):
119119
client = test_linode_client
120120
available_regions = client.regions()
121-
chosen_region = available_regions[0]
121+
chosen_region = available_regions[4]
122122
label = get_test_label()
123123

124124
linode_instance, password = client.linode.instance_create(
@@ -158,7 +158,7 @@ def test_linode_transfer(test_linode_client, linode_with_volume_firewall):
158158
def test_linode_rebuild(test_linode_client):
159159
client = test_linode_client
160160
available_regions = client.regions()
161-
chosen_region = available_regions[0]
161+
chosen_region = available_regions[4]
162162
label = get_test_label() + "_rebuild"
163163

164164
linode, password = client.linode.instance_create(
@@ -208,7 +208,7 @@ def test_update_linode(create_linode):
208208
def test_delete_linode(test_linode_client):
209209
client = test_linode_client
210210
available_regions = client.regions()
211-
chosen_region = available_regions[0]
211+
chosen_region = available_regions[4]
212212
label = get_test_label()
213213

214214
linode_instance, password = client.linode.instance_create(
@@ -413,7 +413,7 @@ def test_linode_ips(create_linode):
413413
def test_linode_initate_migration(test_linode_client):
414414
client = test_linode_client
415415
available_regions = client.regions()
416-
chosen_region = available_regions[0]
416+
chosen_region = available_regions[4]
417417
label = get_test_label() + "_migration"
418418

419419
linode, password = client.linode.instance_create(
@@ -424,7 +424,7 @@ def test_linode_initate_migration(test_linode_client):
424424
# Says it could take up to ~6 hrs for migration to fully complete
425425

426426
send_request_when_resource_available(
427-
300, linode.initiate_migration, "us-central"
427+
300, linode.initiate_migration, "us-mia"
428428
)
429429

430430
res = linode.delete()

‎test/integration/models/test_networking.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_get_networking_rules(test_linode_client, test_firewall):
2020
def create_linode(test_linode_client):
2121
client = test_linode_client
2222
available_regions = client.regions()
23-
chosen_region = available_regions[0]
23+
chosen_region = available_regions[4]
2424
label = get_rand_nanosec_test_label()
2525

2626
linode_instance, _ = client.linode.instance_create(

‎test/integration/models/test_nodebalancer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
def linode_with_private_ip(test_linode_client):
1111
client = test_linode_client
1212
available_regions = client.regions()
13-
chosen_region = available_regions[0]
13+
chosen_region = available_regions[4]
1414
label = "linode_with_privateip"
1515

1616
linode_instance, password = client.linode.instance_create(
@@ -30,7 +30,7 @@ def linode_with_private_ip(test_linode_client):
3030
def create_nb_config(test_linode_client):
3131
client = test_linode_client
3232
available_regions = client.regions()
33-
chosen_region = available_regions[0]
33+
chosen_region = available_regions[4]
3434
label = "nodebalancer_test"
3535

3636
nb = client.nodebalancer_create(region=chosen_region, label=label)

‎test/integration/models/test_volume.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
def linode_for_volume(test_linode_client):
1717
client = test_linode_client
1818
available_regions = client.regions()
19-
chosen_region = available_regions[0]
19+
chosen_region = available_regions[4]
2020
timestamp = str(time.time_ns())
2121
label = "TestSDK-" + timestamp
2222

0 commit comments

Comments
 (0)