Merge branch 'dev' into dev

Author: srbhaakamai

linode_api4/objects/linode.py

@@ -2006,15 +2006,18 @@ def interfaces_settings(self) -> LinodeInterfacesSettings:
         return self._interfaces_settings
 
     @property
-    def interfaces(self) -> List[LinodeInterface]:
+    def linode_interfaces(self) -> Optional[list[LinodeInterface]]:
         """
         All interfaces for this Linode.
 
         API Documentation: https://techdocs.akamai.com/linode-api/reference/get-linode-interface
 
-        :returns: An ordered list of interfaces under this Linode.
+        :returns: An ordered list of linode interfaces under this Linode. If the linode is with legacy config interfaces, returns None.
+        :rtype: Optional[list[LinodeInterface]]
         """
 
+        if self.interface_generation != InterfaceGeneration.LINODE:
+            return None
         if not hasattr(self, "_interfaces"):
             result = self._client.get(
                 "{}/interfaces".format(Instance.api_endpoint),

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

@@ -79,15 +79,15 @@ def __assert_vlan(iface: LinodeInterface):
         assert iface.vlan.vlan_label == "test-vlan"
         assert iface.vlan.ipam_address == "10.0.0.5/32"
 
-    __assert_public(instance.interfaces[0])
-    __assert_vpc(instance.interfaces[1])
-    __assert_vlan(instance.interfaces[2])
+    __assert_public(instance.linode_interfaces[0])
+    __assert_vpc(instance.linode_interfaces[1])
+    __assert_vlan(instance.linode_interfaces[2])
 
     instance.invalidate()
 
-    __assert_public(instance.interfaces[0])
-    __assert_vpc(instance.interfaces[1])
-    __assert_vlan(instance.interfaces[2])
+    __assert_public(instance.linode_interfaces[0])
+    __assert_vpc(instance.linode_interfaces[1])
+    __assert_vlan(instance.linode_interfaces[2])
 
 
 @pytest.fixture

test/integration/models/linode/test_linode.py

@@ -706,37 +706,46 @@ def __assert_vlan(iface: LinodeInterface):
     __assert_vlan(result.interfaces[1])
     __assert_vpc(result.interfaces[2])
 
-    __assert_public(linode.interfaces[0])
-    __assert_vlan(linode.interfaces[1])
-    __assert_vpc(linode.interfaces[2])
+    __assert_public(linode.linode_interfaces[0])
+    __assert_vlan(linode.linode_interfaces[1])
+    __assert_vpc(linode.linode_interfaces[2])
 
 
 def test_linode_interfaces_settings(linode_with_linode_interfaces):
     linode = linode_with_linode_interfaces
     settings = linode.interfaces_settings
 
     assert settings.network_helper is not None
-    assert settings.default_route.ipv4_interface_id == linode.interfaces[0].id
+    assert (
+        settings.default_route.ipv4_interface_id
+        == linode.linode_interfaces[0].id
+    )
     assert settings.default_route.ipv4_eligible_interface_ids == [
-        linode.interfaces[0].id,
-        linode.interfaces[1].id,
+        linode.linode_interfaces[0].id,
+        linode.linode_interfaces[1].id,
     ]
 
-    assert settings.default_route.ipv6_interface_id == linode.interfaces[0].id
+    assert (
+        settings.default_route.ipv6_interface_id
+        == linode.linode_interfaces[0].id
+    )
     assert settings.default_route.ipv6_eligible_interface_ids == [
-        linode.interfaces[0].id
+        linode.linode_interfaces[0].id
     ]
 
     # Arbitrary updates
     settings.network_helper = True
-    settings.default_route.ipv4_interface_id = linode.interfaces[1].id
+    settings.default_route.ipv4_interface_id = linode.linode_interfaces[1].id
 
     settings.save()
     settings.invalidate()
 
     # Assert updates
     assert settings.network_helper is not None
-    assert settings.default_route.ipv4_interface_id == linode.interfaces[1].id
+    assert (
+        settings.default_route.ipv4_interface_id
+        == linode.linode_interfaces[1].id
+    )
 
 
 def test_config_update_interfaces(create_linode):

test/unit/objects/linode_test.py

@@ -481,7 +481,7 @@ def test_get_interfaces(self):
 
         assert instance.interface_generation == InterfaceGeneration.LINODE
 
-        interfaces = instance.interfaces
+        interfaces = instance.linode_interfaces
 
         LinodeInterfaceTest.assert_linode_124_interface_123(
             next(iface for iface in interfaces if iface.id == 123)