diff --git a/test/integration/filters/fixtures.py b/test/integration/filters/fixtures.py index 344303eee..31b7edcbf 100644 --- a/test/integration/filters/fixtures.py +++ b/test/integration/filters/fixtures.py @@ -23,9 +23,7 @@ def lke_cluster_instance(test_linode_client): node_type = test_linode_client.linode.types()[1] # g6-standard-1 version = test_linode_client.lke.versions()[0] - region = get_region( - test_linode_client, {"Kubernetes", "LA Disk Encryption"} - ) + region = get_region(test_linode_client, {"Kubernetes", "Disk Encryption"}) node_pools = test_linode_client.lke.node_pool(node_type, 3) label = get_test_label() + "_cluster" diff --git a/test/integration/models/image/test_image.py b/test/integration/models/image/test_image.py index 9124ddf97..58da0a56f 100644 --- a/test/integration/models/image/test_image.py +++ b/test/integration/models/image/test_image.py @@ -1,22 +1,46 @@ from io import BytesIO -from test.integration.conftest import get_region, get_regions +from test.integration.conftest import get_regions from test.integration.helpers import get_test_label import polling import pytest +from linode_api4 import LinodeClient from linode_api4.objects import Image +DISALLOWED_IMAGE_REGIONS = { + "gb-lon", + "au-mel", + "sg-sin-2", + "jp-tyo-3", +} + + +def get_image_upload_regions(client: LinodeClient): + """ + This is necessary because the API does not currently expose + a capability for regions that allow custom image uploads. + + In the future, we should remove this if the API exposes a custom images capability or + if all Object Storage regions support custom images. + """ + + return [ + region + for region in get_regions( + client, + capabilities={"Linodes", "Object Storage"}, + site_type="core", + ) + if region.id not in DISALLOWED_IMAGE_REGIONS + ] + @pytest.fixture(scope="session") def image_upload_url(test_linode_client): label = get_test_label() + "_image" - region = get_region( - test_linode_client, - capabilities={"Linodes", "Object Storage"}, - site_type="core", - ) + region = get_image_upload_regions(test_linode_client)[0] test_linode_client.image_create_upload( label, region.id, "integration test image upload" @@ -38,9 +62,7 @@ def test_uploaded_image(test_linode_client): label = get_test_label() + "_image" - regions = get_regions( - test_linode_client, capabilities={"Object Storage"}, site_type="core" - ) + regions = get_image_upload_regions(test_linode_client) image = test_linode_client.image_upload( label, diff --git a/test/integration/models/linode/test_linode.py b/test/integration/models/linode/test_linode.py index 52d948d26..e13903e4f 100644 --- a/test/integration/models/linode/test_linode.py +++ b/test/integration/models/linode/test_linode.py @@ -180,7 +180,7 @@ def create_linode_for_long_running_tests(test_linode_client, e2e_test_firewall): def linode_with_disk_encryption(test_linode_client, request): client = test_linode_client - target_region = get_region(client, {"LA Disk Encryption"}) + target_region = get_region(client, {"Disk Encryption"}) label = get_test_label(length=8) disk_encryption = request.param @@ -235,7 +235,7 @@ def test_linode_transfer(test_linode_client, linode_with_volume_firewall): def test_linode_rebuild(test_linode_client): client = test_linode_client - region = get_region(client, {"LA Disk Encryption"}) + region = get_region(client, {"Disk Encryption"}) label = get_test_label() + "_rebuild" diff --git a/test/integration/models/lke/test_lke.py b/test/integration/models/lke/test_lke.py index 3486485d6..241117442 100644 --- a/test/integration/models/lke/test_lke.py +++ b/test/integration/models/lke/test_lke.py @@ -32,9 +32,7 @@ def lke_cluster(test_linode_client): node_type = test_linode_client.linode.types()[1] # g6-standard-1 version = test_linode_client.lke.versions()[0] - region = get_region( - test_linode_client, {"Kubernetes", "LA Disk Encryption"} - ) + region = get_region(test_linode_client, {"Kubernetes", "Disk Encryption"}) node_pools = test_linode_client.lke.node_pool(node_type, 3) label = get_test_label() + "_cluster" @@ -117,9 +115,7 @@ def lke_cluster_with_labels_and_taints(test_linode_client): def lke_cluster_with_apl(test_linode_client): version = test_linode_client.lke.versions()[0] - region = get_region( - test_linode_client, {"Kubernetes", "LA Disk Encryption"} - ) + region = get_region(test_linode_client, {"Kubernetes", "Disk Encryption"}) # NOTE: g6-dedicated-4 is the minimum APL-compatible Linode type node_pools = test_linode_client.lke.node_pool("g6-dedicated-4", 3) @@ -149,7 +145,7 @@ def lke_cluster_enterprise(test_linode_client): )[0] region = get_region( - test_linode_client, {"Kubernetes Enterprise", "LA Disk Encryption"} + test_linode_client, {"Kubernetes Enterprise", "Disk Encryption"} ) node_pools = test_linode_client.lke.node_pool( diff --git a/test/integration/models/networking/test_networking.py b/test/integration/models/networking/test_networking.py index b92cdfadc..87a0e5842 100644 --- a/test/integration/models/networking/test_networking.py +++ b/test/integration/models/networking/test_networking.py @@ -235,7 +235,7 @@ def test_create_and_delete_vlan(test_linode_client, linode_for_vlan_tests): config.interfaces = [] config.save() - vlan_label = "testvlan" + vlan_label = f"{get_test_label(8)}-testvlan" interface = config.interface_create_vlan( label=vlan_label, ipam_address="10.0.0.2/32" ) diff --git a/test/integration/models/nodebalancer/test_nodebalancer.py b/test/integration/models/nodebalancer/test_nodebalancer.py index df07de215..9e7537897 100644 --- a/test/integration/models/nodebalancer/test_nodebalancer.py +++ b/test/integration/models/nodebalancer/test_nodebalancer.py @@ -167,7 +167,9 @@ def test_update_nb(test_linode_client, create_nb): create_nb.id, ) - nb.label = "ThisNewLabel" + new_label = f"{nb.label}-ThisNewLabel" + + nb.label = new_label nb.client_udp_sess_throttle = 5 nb.save() @@ -176,7 +178,7 @@ def test_update_nb(test_linode_client, create_nb): create_nb.id, ) - assert "ThisNewLabel" == nb_updated.label + assert new_label == nb_updated.label assert 5 == nb_updated.client_udp_sess_throttle @@ -215,7 +217,10 @@ def test_update_nb_node(test_linode_client, create_nb_config): create_nb_config.nodebalancer_id, ) node = config.nodes[0] - node.label = "ThisNewLabel" + + new_label = f"{node.label}-ThisNewLabel" + + node.label = new_label node.weight = 50 node.mode = "accept" node.save() @@ -226,7 +231,7 @@ def test_update_nb_node(test_linode_client, create_nb_config): (create_nb_config.id, create_nb_config.nodebalancer_id), ) - assert "ThisNewLabel" == node_updated.label + assert new_label == node_updated.label assert 50 == node_updated.weight assert "accept" == node_updated.mode