Merge branch 'proj/enhanced-interfaces' into new/enhanced-interfaces-vpc

Author: lgarber-akamai

linode_api4/objects/account.py

@@ -16,6 +16,7 @@
 from linode_api4.objects.networking import Firewall
 from linode_api4.objects.nodebalancer import NodeBalancer
 from linode_api4.objects.profile import PersonalAccessToken
+from linode_api4.objects.serializable import StrEnum
 from linode_api4.objects.support import SupportTicket
 from linode_api4.objects.volume import Volume
 from linode_api4.objects.vpc import VPC
@@ -179,6 +180,24 @@ class Login(Base):
     }
 
 
+class AccountSettingsInterfacesForNewLinodes(StrEnum):
+    """
+    A string enum corresponding to valid values
+    for the AccountSettings(...).interfaces_for_new_linodes field.
+
+    NOTE: This feature may not currently be available to all users.
+    """
+
+    legacy_config_only = "legacy_config_only"
+    legacy_config_default_but_linode_allowed = (
+        "legacy_config_default_but_linode_allowed"
+    )
+    linode_default_but_legacy_config_allowed = (
+        "linode_default_but_legacy_config_allowed"
+    )
+    linode_only = "linode_only"
+
+
 class AccountSettings(Base):
     """
     Information related to your Account settings.
@@ -197,6 +216,7 @@ class AccountSettings(Base):
         ),
         "object_storage": Property(),
         "backups_enabled": Property(mutable=True),
+        "interfaces_for_new_linodes": Property(mutable=True),
     }
 
 

test/fixtures/account.json

@@ -16,7 +16,8 @@
     "Linodes",
     "NodeBalancers",
     "Block Storage",
-    "Object Storage"
+    "Object Storage",
+    "Linode Interfaces"
   ],
   "active_promotions": [
     {

test/fixtures/account_settings.json

@@ -3,5 +3,6 @@
   "managed": false,
   "network_helper": false,
   "object_storage": "active",
-  "backups_enabled": true
+  "backups_enabled": true,
+  "interfaces_for_new_linodes": "linode_default_but_legacy_config_allowed"
 }

test/integration/models/account/test_account.py

@@ -59,6 +59,7 @@ def test_get_account_settings(test_linode_client):
     assert "longview_subscription" in str(account_settings._raw_json)
     assert "backups_enabled" in str(account_settings._raw_json)
     assert "object_storage" in str(account_settings._raw_json)
+    assert isinstance(account_settings.interfaces_for_new_linodes, str)
 
 
 @pytest.mark.smoke

test/unit/linode_client_test.py

@@ -44,7 +44,13 @@ def test_get_account(self):
         self.assertEqual(a.balance, 0)
         self.assertEqual(
             a.capabilities,
-            ["Linodes", "NodeBalancers", "Block Storage", "Object Storage"],
+            [
+                "Linodes",
+                "NodeBalancers",
+                "Block Storage",
+                "Object Storage",
+                "Linode Interfaces",
+            ],
         )
 
     def test_get_regions(self):

test/unit/objects/account_test.py

@@ -3,6 +3,7 @@
 from datetime import datetime
 from test.unit.base import ClientBaseCase
 
+from linode_api4 import AccountSettingsInterfacesForNewLinodes
 from linode_api4.objects import (
     Account,
     AccountAvailability,
@@ -97,6 +98,7 @@ def test_get_account(self):
         self.assertEqual(account.balance_uninvoiced, 145)
         self.assertEqual(account.billing_source, "akamai")
         self.assertEqual(account.euuid, "E1AF5EEC-526F-487D-B317EBEB34C87D71")
+        self.assertIn("Linode Interfaces", account.capabilities)
 
     def test_get_login(self):
         """
@@ -121,6 +123,31 @@ def test_get_account_settings(self):
         self.assertEqual(settings.network_helper, False)
         self.assertEqual(settings.object_storage, "active")
         self.assertEqual(settings.backups_enabled, True)
+        self.assertEqual(
+            settings.interfaces_for_new_linodes,
+            AccountSettingsInterfacesForNewLinodes.linode_default_but_legacy_config_allowed,
+        )
+
+    def test_post_account_settings(self):
+        """
+        Tests that account settings can be updated successfully
+        """
+        settings = self.client.account.settings()
+
+        settings.network_helper = True
+        settings.backups_enabled = False
+        settings.interfaces_for_new_linodes = (
+            AccountSettingsInterfacesForNewLinodes.linode_only
+        )
+
+        with self.mock_put("/account/settings") as m:
+            settings.save()
+
+            assert m.call_data == {
+                "network_helper": True,
+                "backups_enabled": False,
+                "interfaces_for_new_linodes": AccountSettingsInterfacesForNewLinodes.linode_only,
+            }
 
     def test_get_event(self):
         """