Fix conflicts

Author: lgarber-akamai

test/fixtures/linode_instances_124_interfaces.json

@@ -26,12 +26,12 @@
         "ipv6": {
           "ranges": [
             {
-              "range": "2600:3cO9:e001:59::/64",
-              "route_target": "2600:3cO9::ff:feab:cdef"
+              "range": "2600:3c09:e001:59::/64",
+              "route_target": "2600:3c09::ff:feab:cdef"
             },
             {
-              "range": "2600:3cO9:e001:5a::/64",
-              "route_target": "2600:3cO9::ff:feab:cdef"
+              "range": "2600:3c09:e001:5a::/64",
+              "route_target": "2600:3c09::ff:feab:cdef"
             }
           ],
           "shared": [

test/fixtures/linode_instances_124_interfaces_123.json

@@ -34,7 +34,7 @@
       ],
       "shared": [
         {
-          "range": "2600:3cO9:e001:2a::/64",
+          "range": "2600:3c09:e001:2a::/64",
           "route_target": null
         }
       ],

test/fixtures/linode_instances_124_upgrade-interfaces.json

@@ -28,12 +28,12 @@
         "ipv6": {
           "ranges": [
             {
-              "range": "2600:3cO9:e001:59::/64",
-              "route_target": "2600:3cO9::ff:feab:cdef"
+              "range": "2600:3c09:e001:59::/64",
+              "route_target": "2600:3c09::ff:feab:cdef"
             },
             {
-              "range": "2600:3cO9:e001:5a::/64",
-              "route_target": "2600:3cO9::ff:feab:cdef"
+              "range": "2600:3c09:e001:5a::/64",
+              "route_target": "2600:3c09::ff:feab:cdef"
             }
           ],
           "shared": [

test/integration/conftest.py

@@ -407,7 +407,9 @@ def create_vpc(test_linode_client):
 
     vpc = client.vpcs.create(
         label=label,
-        region=get_region(test_linode_client, {"VPCs"}),
+        region=get_region(
+            test_linode_client, {"VPCs", "VPC IPv6 Stack", "Linode Interfaces"}
+        ),
         description="test description",
         ipv6=[{"range": "auto"}],
     )

test/integration/models/linode/interfaces/test_interfaces.py

@@ -263,7 +263,7 @@ def test_linode_interface_create_vpc(linode_interface_vpc):
     assert iface.version
 
     assert iface.default_route.ipv4
-    assert not iface.default_route.ipv6
+    assert iface.default_route.ipv6
 
     assert iface.vpc.vpc_id == vpc.id
     assert iface.vpc.subnet_id == subnet.id

test/integration/models/linode/test_linode.py

@@ -667,7 +667,7 @@ def __assert_vpc(iface: LinodeInterface):
         __assert_base(iface)
 
         assert iface.default_route.ipv4
-        assert not iface.default_route.ipv6
+        assert iface.default_route.ipv6
 
         assert iface.vpc.vpc_id == vpc.id
         assert iface.vpc.subnet_id == subnet.id
@@ -711,10 +711,6 @@ def __assert_vlan(iface: LinodeInterface):
     assert not result.dry_run
     assert result.config_id == config.id
 
-    __assert_public(result.interfaces[0])
-    __assert_vlan(result.interfaces[1])
-    __assert_vpc(result.interfaces[2])
-
     __assert_public(linode.linode_interfaces[0])
     __assert_vlan(linode.linode_interfaces[1])
     __assert_vpc(linode.linode_interfaces[2])

test/unit/objects/linode_interface_test.py

@@ -37,7 +37,7 @@ def build_interface_options_public():
             ipv6=LinodeInterfacePublicIPv6Options(
                 ranges=[
                     LinodeInterfacePublicIPv6RangeOptions(
-                        range="2600:3cO9:e001:59::/64"
+                        range="2600:3c09:e001:59::/64"
                     )
                 ]
             ),
@@ -106,22 +106,22 @@ def assert_linode_124_interface_123(iface: LinodeInterface):
         assert iface.public.ipv4.shared[0].linode_id == 125
 
         # public.ipv6 assertions
-        assert iface.public.ipv6.ranges[0].range == "2600:3cO9:e001:59::/64"
+        assert iface.public.ipv6.ranges[0].range == "2600:3c09:e001:59::/64"
         assert (
             iface.public.ipv6.ranges[0].route_target
-            == "2600:3cO9::ff:feab:cdef"
+            == "2600:3c09::ff:feab:cdef"
         )
 
-        assert iface.public.ipv6.ranges[1].range == "2600:3cO9:e001:5a::/64"
+        assert iface.public.ipv6.ranges[1].range == "2600:3c09:e001:5a::/64"
         assert (
             iface.public.ipv6.ranges[1].route_target
-            == "2600:3cO9::ff:feab:cdef"
+            == "2600:3c09::ff:feab:cdef"
         )
 
-        assert iface.public.ipv6.shared[0].range == "2600:3cO9:e001:2a::/64"
+        assert iface.public.ipv6.shared[0].range == "2600:3c09:e001:2a::/64"
         assert iface.public.ipv6.shared[0].route_target is None
 
-        assert iface.public.ipv6.slaac[0].address == "2600:3cO9::ff:feab:cdef"
+        assert iface.public.ipv6.slaac[0].address == "2600:3c09::ff:feab:cdef"
         assert iface.public.ipv6.slaac[0].prefix == 64
 
     @staticmethod
@@ -215,7 +215,7 @@ def test_update_public(self):
 
         iface.public.ipv6.ranges = [
             LinodeInterfacePublicIPv6RangeOptions(
-                range="2600:3cO9:e001:58::/64"
+                range="2600:3c09:e001:58::/64"
             )
         ]