Add int tests for VPC subnet with NAT Gateway

Author: mawilk90

test/integration/conftest.py

@@ -17,6 +17,7 @@
 from requests.exceptions import ConnectionError, RequestException
 
 from linode_api4 import (
+    Capability,
     Instance,
     InterfaceGeneration,
     IPAddress,
@@ -25,6 +26,7 @@
     LinodeInterfacePublicOptions,
     LinodeInterfaceVLANOptions,
     LinodeInterfaceVPCOptions,
+    NATGateway,
     PlacementGroupPolicy,
     PlacementGroupType,
     PostgreSQLDatabase,
@@ -815,3 +817,51 @@ def create_reserved_ip_assigned(test_linode_client, create_linode):
         IPAddress.address == reserved_ip.address
     ):
         address[0].delete()
+
+
+@pytest.fixture
+def create_nat_gateway(request, test_linode_client):
+    client = test_linode_client
+    label = "nat-gateway-" + get_test_label(length=8)
+    autoscaling = getattr(request, "param", True)
+    region = get_region(
+        client,
+        {
+            Capability.firewall,
+            Capability.linodes,
+            Capability.linode_interfaces,
+            Capability.natgateway,
+            Capability.vpcs,
+            Capability.vpc_dual_stack,
+            Capability.vpc_ipv6_stack,
+        },
+    )
+
+    gateway = client.networking.natgateway_create(
+        label=label,
+        region=region,
+        use_autoscaling=autoscaling,
+    )
+
+    yield gateway
+
+    # Delete only if NAT Gateway exists (some tests may delete it earlier)
+    if client.load(NATGateway, gateway.id):
+        gateway.delete()
+
+
+@pytest.fixture
+def create_nat_vpc(test_linode_client, create_nat_gateway):
+    client = test_linode_client
+    gateway = create_nat_gateway
+    label = get_test_label(length=10)
+
+    vpc = client.vpcs.create(
+        label=label,
+        region=gateway.region,
+        description="test NAT Gateway VPC",
+        ipv6=[{"range": "auto"}],
+    )
+    yield vpc
+
+    vpc.delete()

test/integration/models/networking/test_networking.py

@@ -52,22 +52,6 @@
     site_type="core",
 )
 
-TEST_NAT_REGION = get_region(
-    LinodeClient(
-        token=get_token(),
-        base_url=get_api_url(),
-        ca_path=get_api_ca_file(),
-    ),
-    {
-        Capability.firewall,
-        Capability.linodes,
-        Capability.linode_interfaces,
-        Capability.natgateway,
-        Capability.vpcs,
-    },
-    site_type="core",
-)
-
 
 def create_linode_func(test_linode_client):
     client = test_linode_client
@@ -156,22 +140,6 @@ def create_firewall_with_device(create_linode_without_firewall):
     firewall.delete()
 
 
-@pytest.fixture
-def create_nat_vpc(test_linode_client):
-    client = test_linode_client
-    label = get_test_label(length=10)
-
-    vpc = client.vpcs.create(
-        label=label,
-        region=TEST_NAT_REGION,
-        description="test NAT Gateway VPC",
-        ipv6=[{"range": "auto"}],
-    )
-    yield vpc
-
-    vpc.delete()
-
-
 @pytest.fixture
 def create_nat_vpc_with_subnet(test_linode_client, create_nat_vpc):
     subnet = create_nat_vpc.subnet_create(
@@ -205,25 +173,6 @@ def create_nat_vpc_with_subnet_and_linode(
     instance.delete()
 
 
-@pytest.fixture
-def create_nat_gateway(request, test_linode_client):
-    client = test_linode_client
-    label = "nat-gateway-" + get_test_label(length=8)
-    autoscaling = getattr(request, "param", True)
-
-    natgateway = client.networking.natgateway_create(
-        label=label,
-        region=TEST_NAT_REGION,
-        use_autoscaling=autoscaling,
-    )
-
-    yield natgateway
-
-    # Delete only if NAT Gateway exists (some tests may delete it earlier)
-    if client.load(NATGateway, natgateway.id):
-        natgateway.delete()
-
-
 def test_get_networking_rule_versions(test_linode_client, test_firewall):
     firewall = test_linode_client.load(Firewall, test_firewall.id)
 
@@ -654,6 +603,14 @@ def test_convert_unassigned_reserved_ip_to_ephemeral(
     assert len(reserved_ips_list) == 0
 
 
+def verify_nat_gateway_ifaces(gateway_ifaces, linode, reserved_ip):
+    assert len(gateway_ifaces) == 1
+    assert gateway_ifaces[0].id == linode.linode_interfaces[0].id
+    assert gateway_ifaces[0].linode.id == linode.id
+    assert gateway_ifaces[0].addresses[0] == reserved_ip.address
+    assert gateway_ifaces[0].portsets[0].address == reserved_ip.address
+
+
 @pytest.mark.smoke
 def test_create_nat_gateway(test_linode_client, create_nat_gateway):
     client = test_linode_client
@@ -682,7 +639,7 @@ def test_update_nat_gateway_with_ip_address(
     test_linode_client, create_nat_gateway, create_reserved_ip
 ):
     client = test_linode_client
-    gateway = client.load(NATGateway, create_nat_gateway.id)
+    gateway = create_nat_gateway
     reserved_ip = create_reserved_ip
 
     gateway.address_assignment_create(reserved_ip.address)
@@ -701,7 +658,7 @@ def test_get_nat_gateway_linode_ifaces(
     create_reserved_ip,
 ):
     client = test_linode_client
-    gateway = client.load(NATGateway, create_nat_gateway.id)
+    gateway = create_nat_gateway
     vpc, subnet, linode = create_nat_vpc_with_subnet_and_linode
     reserved_ip = create_reserved_ip
 
@@ -732,16 +689,13 @@ def test_get_nat_gateway_linode_ifaces(
             ),
         ),
     )
+    linode = client.load(Instance, linode.id)
 
     gateway_ifaces = gateway.interfaces()
-    linode = client.load(Instance, linode.id)
+    verify_nat_gateway_ifaces(gateway_ifaces, linode, reserved_ip)
 
-    assert len(gateway_ifaces) == 1
-    assert gateway.vpc_subnet.id == subnet.id
-    assert gateway_ifaces[0].id == linode.linode_interfaces[0].id
-    assert gateway_ifaces[0].linode.id == linode.id
-    assert gateway_ifaces[0].addresses[0] == reserved_ip.address
-    assert gateway_ifaces[0].portsets[0].address == reserved_ip.address
+    gateway_ifaces = gateway.address_interfaces(reserved_ip.address)
+    verify_nat_gateway_ifaces(gateway_ifaces, linode, reserved_ip)
 
 
 def test_get_nat_gateway_types(test_linode_client):

test/integration/models/vpc/test_vpc.py

@@ -2,7 +2,13 @@
 
 import pytest
 
-from linode_api4 import VPC, ApiError, VPCIPv4DefaultRange, VPCSubnet
+from linode_api4 import (
+    VPC,
+    ApiError,
+    VPCIPv4DefaultRange,
+    VPCSubnet,
+)
+from linode_api4.objects import VPCSubnetNATGatewayOptions
 
 
 @pytest.mark.smoke
@@ -169,3 +175,23 @@ def test_vpc_with_ipv4(test_linode_client, create_vpc_with_ipv4):
 
     updated_vpc = client.load(VPC, vpc.id)
     assert updated_vpc.ipv4[0].range == "192.168.0.0/17"
+
+
+def test_vpc_subnet_with_nat_gateway(
+    request, test_linode_client, create_nat_gateway, create_nat_vpc
+):
+    client = test_linode_client
+    gateway = create_nat_gateway
+    vpc = create_nat_vpc
+
+    subnet = create_nat_vpc.subnet_create(
+        label="test-nat-subnet",
+        ipv4="10.0.0.0/24",
+        ipv6=[{"range": "auto"}],
+        natgateway=VPCSubnetNATGatewayOptions(id=gateway.id),
+    )
+    request.addfinalizer(subnet.delete)
+
+    subnet = client.load(VPCSubnet, subnet.id, vpc.id)
+
+    assert subnet.natgateway.id == gateway.id