Merge branch 'dev' into feature/TPT-4010-python-sdk-add-region-capability-enum

Author: mgwoj

.github/pull_request_template.md

@@ -7,7 +7,3 @@
 **What are the steps to reproduce the issue or verify the changes?**
 
 **How do I run the relevant unit/integration tests?**
-
-## 📷 Preview
-
-**If applicable, include a screenshot or code snippet of this change. Otherwise, please remove this section.**

linode_api4/groups/linode.py

@@ -335,8 +335,6 @@ def instance_create(
         :type network_helper: bool
         :param maintenance_policy: The slug of the maintenance policy to apply during maintenance.
                                       If not provided, the default policy (linode/migrate) will be applied.
-                                      NOTE: This field is in beta and may only
-                            function if base_url is set to `https://api.linode.com/v4beta`.
         :type maintenance_policy: str
 
         :returns: A new Instance object, or a tuple containing the new Instance and

linode_api4/groups/maintenance.py

@@ -9,8 +9,6 @@ class MaintenanceGroup(Group):
 
     def maintenance_policies(self):
         """
-        .. note:: This endpoint is in beta. This will only function if base_url is set to `https://api.linode.com/v4beta`.
-
         Returns a collection of MaintenancePolicy objects representing
         available maintenance policies that can be applied to Linodes
 

linode_api4/objects/account.py

@@ -218,9 +218,7 @@ class AccountSettings(Base):
         "object_storage": Property(),
         "backups_enabled": Property(mutable=True),
         "interfaces_for_new_linodes": Property(mutable=True),
-        "maintenance_policy": Property(
-            mutable=True
-        ),  # Note: This field is only available when using v4beta.
+        "maintenance_policy": Property(mutable=True),
     }
 
 
@@ -249,7 +247,7 @@ class Event(Base):
         "duration": Property(),
         "secondary_entity": Property(),
         "message": Property(),
-        "maintenance_policy_set": Property(),  # Note: This field is only available when using v4beta.
+        "maintenance_policy_set": Property(),
         "description": Property(),
         "source": Property(),
         "not_before": Property(is_datetime=True),

linode_api4/objects/linode.py

@@ -800,9 +800,7 @@ class Instance(Base):
         "lke_cluster_id": Property(),
         "capabilities": Property(unordered=True),
         "interface_generation": Property(),
-        "maintenance_policy": Property(
-            mutable=True
-        ),  # Note: This field is only available when using v4beta.
+        "maintenance_policy": Property(mutable=True),
         "locks": Property(unordered=True),
     }
 

linode_api4/objects/nodebalancer.py

@@ -252,6 +252,7 @@ class NodeBalancer(Base):
         "transfer": Property(),
         "tags": Property(mutable=True, unordered=True),
         "client_udp_sess_throttle": Property(mutable=True),
+        "locks": Property(unordered=True),
     }
 
     # create derived objects

test/fixtures/nodebalancers.json

@@ -10,7 +10,8 @@
       "updated": "2018-01-01T00:01:01",
       "label": "balancer123456",
       "client_conn_throttle": 0,
-      "tags": ["something"]
+      "tags": ["something"],
+      "locks": ["cannot_delete_with_subresources"]
     },
     {
       "created": "2018-01-01T00:01:01",
@@ -22,7 +23,8 @@
       "updated": "2018-01-01T00:01:01",
       "label": "balancer123457",
       "client_conn_throttle": 0,
-      "tags": []
+      "tags": [],
+      "locks": []
     }
   ],
   "results": 2,

test/fixtures/nodebalancers_123456.json

@@ -10,5 +10,8 @@
   "client_conn_throttle": 0,
   "tags": [
     "something"
+  ],
+  "locks": [
+    "cannot_delete_with_subresources"
   ]
 }

test/integration/linode_client/test_linode_client.py

@@ -328,10 +328,10 @@ def test_cluster_create_with_api_objects(test_linode_client):
     node_type = client.linode.types()[1]  # g6-standard-1
     version = client.lke.versions()[0]
     region = get_region(client, {"Kubernetes"})
-    node_pools = client.lke.node_pool(node_type, 3)
+    node_pool = client.lke.node_pool(node_type, 3)
     label = get_test_label()
 
-    cluster = client.lke.cluster_create(region, label, node_pools, version)
+    cluster = client.lke.cluster_create(region, label, version, [node_pool])
 
     assert cluster.region.id == region.id
     assert cluster.k8s_version.id == version.id

test/integration/models/linode/test_linode.py

@@ -1101,8 +1101,7 @@ def test_delete_interface_containing_vpc(
 
 def test_create_linode_with_maintenance_policy(test_linode_client):
     client = test_linode_client
-    # TODO: Replace with random region after GA
-    region = "ap-south"
+    region = get_region(client, {"Linodes", "Cloud Firewall"}, site_type="core")
     label = get_test_label()
 
     policies = client.maintenance.maintenance_policies()