Weird test race to investigate tomorrow :)

Author: lgarber-akamai

linode_api4/objects/linode.py

@@ -671,7 +671,7 @@ class InterfaceGeneration(StrEnum):
 class UpgradeInterfacesResult(JSONObject):
     dry_run: bool = False
     config_id: int = 0
-    interfaces: List[ConfigInterface] = field(default_factory=list)
+    interfaces: List[LinodeInterface] = field(default_factory=list)
 
 
 class Instance(Base):
@@ -1963,7 +1963,7 @@ def upgrade_interfaces(
         :returns: Information about the newly upgraded interfaces.
         :rtype: UpgradeInterfacesResult
         """
-        params = {"config_id": config, dry_run: dry_run}
+        params = {"config_id": config, "dry_run": dry_run}
 
         result = self._client.post(
             "{}/upgrade-interfaces".format(Instance.api_endpoint),
@@ -1974,14 +1974,14 @@ def upgrade_interfaces(
         self.invalidate()
 
         # We don't convert interface dicts to LinodeInterface objects on dry runs
-        # actual API entities aren't created
+        # actual API entities aren't created.
         if dry_run:
             result["interfaces"] = [
                 MappedObject(**iface) for iface in result["interfaces"]
             ]
         else:
             result["interfaces"] = [
-                LinodeInterface(self._client, self.id, iface["id"], iface)
+                LinodeInterface(self._client, iface["id"], self.id, iface)
                 for iface in result["interfaces"]
             ]
 

test/fixtures/linode_instances_124_upgrade-interfaces.json

@@ -0,0 +1,105 @@
+{
+  "dry_run": true,
+  "config_id": 123,
+  "interfaces": [
+    {
+      "created": "2025-01-01T00:01:01",
+      "default_route": {
+        "ipv4": true,
+        "ipv6": true
+      },
+      "id": 123,
+      "mac_address": "22:00:AB:CD:EF:01",
+      "public": {
+        "ipv4": {
+          "addresses": [
+            {
+              "address": "172.30.0.50",
+              "primary": true
+            }
+          ],
+          "shared": [
+            {
+              "address": "172.30.0.51",
+              "linode_id": 125
+            }
+          ]
+        },
+        "ipv6": {
+          "ranges": [
+            {
+              "range": "2600:3cO9:e001:59::/64",
+              "route_target": "2600:3cO9::ff:feab:cdef"
+            },
+            {
+              "range": "2600:3cO9:e001:5a::/64",
+              "route_target": "2600:3cO9::ff:feab:cdef"
+            }
+          ],
+          "shared": [
+            {
+              "range": "2600:3cO9:e001:2a::/64",
+              "route_target": null
+            }
+          ],
+          "slaac": [
+            {
+              "address": "2600:3cO9::ff:feab:cdef",
+              "prefix": 64
+            }
+          ]
+        }
+      },
+      "updated": "2025-01-01T00:01:01",
+      "version": 1,
+      "vlan": null,
+      "vpc": null
+    },
+    {
+      "id": 456,
+      "mac_address": "22:00:AB:CD:EF:01",
+      "created": "2024-01-01T00:01:01",
+      "updated": "2024-01-01T00:01:01",
+      "default_route": {
+        "ipv4": true
+      },
+      "version": 1,
+      "vpc": {
+        "vpc_id": 123456,
+        "subnet_id": 789,
+        "ipv4": {
+          "addresses": [
+            {
+              "address": "192.168.22.3",
+              "primary": true
+            }
+          ],
+          "ranges": [
+            {
+              "range": "192.168.22.16/28"
+            },
+            {
+              "range": "192.168.22.32/28"
+            }
+          ]
+        }
+      },
+      "public": null,
+      "vlan": null
+    },
+    {
+      "id": 789,
+      "mac_address": "22:00:AB:CD:EF:01",
+      "created": "2024-01-01T00:01:01",
+      "updated": "2024-01-01T00:01:01",
+      "default_route": {},
+      "version": 1,
+      "vpc": null,
+      "public": null,
+      "vlan": {
+        "vlan_label": "my_vlan",
+        "ipam_address": "10.0.0.1/24"
+      }
+    }
+  ]
+}

test/unit/objects/linode_test.py

@@ -523,6 +523,61 @@ def test_update_interfaces_settings(self):
                 },
             }
 
+    def test_upgrade_interfaces(self):
+        # Local import to avoid circular dependency
+        from linode_interface_test import (  # pylint: disable=import-outside-toplevel
+            LinodeInterfaceTest,
+        )
+
+        instance = Instance(self.client, 124)
+
+        with self.mock_post("/linode/instances/124/upgrade-interfaces") as m:
+            result = instance.upgrade_interfaces(123)
+
+            assert m.called
+            assert m.call_data == {"config_id": 123, "dry_run": False}
+
+        assert result.config_id == 123
+        assert result.dry_run
+
+        # We don't use the assertion helpers here because dry runs return
+        # a MappedObject.
+        LinodeInterfaceTest.assert_linode_124_interface_123(
+            result.interfaces[0]
+        )
+        LinodeInterfaceTest.assert_linode_124_interface_456(
+            result.interfaces[1]
+        )
+        LinodeInterfaceTest.assert_linode_124_interface_789(
+            result.interfaces[2]
+        )
+
+    def test_upgrade_interfaces_dry(self):
+        instance = Instance(self.client, 124)
+
+        with self.mock_post("/linode/instances/124/upgrade-interfaces") as m:
+            result = instance.upgrade_interfaces(123, dry_run=True)
+
+            assert m.called
+            assert m.call_data == {
+                "config_id": 123,
+                "dry_run": True,
+            }
+
+        assert result.config_id == 123
+        assert result.dry_run
+
+        # We don't use the assertion helpers here because dry runs return
+        # a MappedObject.
+        assert result.interfaces[0].id == 123
+        assert result.interfaces[0].public is not None
+
+        assert result.interfaces[1].id == 456
+        assert result.interfaces[1].vpc is not None
+
+        assert result.interfaces[2].id == 789
+        assert result.interfaces[2].vlan is not None
+
 
 class DiskTest(ClientBaseCase):
     """