Merge branch 'dev' into dc_specific_pricing

Author: amisiorek-akamai

linode_api4/groups/account.py

@@ -1,8 +1,12 @@
+from typing import Union
+
 from linode_api4.errors import UnexpectedResponseError
 from linode_api4.groups import Group
 from linode_api4.objects import (
     Account,
+    AccountBetaProgram,
     AccountSettings,
+    BetaProgram,
     Event,
     Invoice,
     Login,
@@ -448,3 +452,34 @@ def user_create(self, email, username, restricted=True):
 
         u = User(self.client, result["username"], result)
         return u
+
+    def enrolled_betas(self, *filters):
+        """
+        Returns a list of all Beta Programs an account is enrolled in.
+
+        API doc: TBD
+
+        :returns: a list of Beta Programs.
+        :rtype: PaginatedList of AccountBetaProgram
+        """
+        return self.client._get_and_filter(AccountBetaProgram, *filters)
+
+    def join_beta_program(self, beta: Union[str, BetaProgram]):
+        """
+        Enrolls an account into a beta program.
+
+        API doc: TBD
+
+        :param beta: The object or id of a beta program to join.
+        :type beta: BetaProgram or str
+
+        :returns: A boolean indicating whether the account joined a beta program successfully.
+        :rtype: bool
+        """
+
+        self.client.post(
+            "/account/betas",
+            data={"id": beta.id if isinstance(beta, BetaProgram) else beta},
+        )
+
+        return True

linode_api4/objects/account.py

@@ -637,3 +637,20 @@ def save(self):
         self._populate(result)
 
         return True
+
+
+class AccountBetaProgram(Base):
+    """
+    The details and enrollment information of a Beta program that an account is enrolled in.
+    """
+
+    api_endpoint = "/account/betas/{id}"
+
+    properties = {
+        "id": Property(identifier=True),
+        "label": Property(),
+        "description": Property(),
+        "started": Property(is_datetime=True),
+        "ended": Property(is_datetime=True),
+        "enrolled": Property(is_datetime=True),
+    }

test/fixtures/account_betas.json

@@ -0,0 +1,15 @@
+{
+   "data": [
+        {
+            "id": "cool", 
+            "label": "\r\n\r\nRepellat consequatur sunt qui.", 
+            "enrolled": "2018-01-02T03:04:05",
+            "description": "Repellat consequatur sunt qui. Fugit eligendi ipsa et assumenda ea aspernatur esse. A itaque iste distinctio qui voluptas eum enim ipsa.", 
+            "started": "2018-01-02T03:04:05", 
+            "ended": "2018-01-02T03:04:05"
+        }
+   ],
+   "page": 1, 
+   "pages": 1, 
+   "results": 1
+}

test/fixtures/account_betas_cool.json

@@ -0,0 +1,8 @@
+{
+    "id": "cool", 
+    "label": "\r\n\r\nRepellat consequatur sunt qui.", 
+    "enrolled": "2018-01-02T03:04:05",
+    "description": "Repellat consequatur sunt qui. Fugit eligendi ipsa et assumenda ea aspernatur esse. A itaque iste distinctio qui voluptas eum enim ipsa.", 
+    "started": "2018-01-02T03:04:05", 
+    "ended": "2018-01-02T03:04:05"
+}

test/unit/linode_client_test.py

@@ -2,6 +2,7 @@
 from test.unit.base import ClientBaseCase
 
 from linode_api4 import LongviewSubscription
+from linode_api4.objects.beta import BetaProgram
 from linode_api4.objects.linode import Instance
 from linode_api4.objects.networking import IPAddress
 from linode_api4.objects.object_storage import (
@@ -411,6 +412,48 @@ def test_payments(self):
         self.assertEqual(payment.date, datetime(2015, 1, 1, 5, 1, 2))
         self.assertEqual(payment.usd, 1000)
 
+    def test_enrolled_betas(self):
+        """
+        Tests that enrolled beta programs can be retrieved
+        """
+        enrolled_betas = self.client.account.enrolled_betas()
+
+        self.assertEqual(len(enrolled_betas), 1)
+        beta = enrolled_betas[0]
+
+        self.assertEqual(beta.id, "cool")
+        self.assertEqual(beta.enrolled, datetime(2018, 1, 2, 3, 4, 5))
+        self.assertEqual(beta.started, datetime(2018, 1, 2, 3, 4, 5))
+        self.assertEqual(beta.ended, datetime(2018, 1, 2, 3, 4, 5))
+
+    def test_join_beta_program(self):
+        """
+        Tests that user can join a beta program
+        """
+        join_beta_url = "/account/betas"
+        with self.mock_post({}) as m:
+            self.client.account.join_beta_program("cool_beta")
+            self.assertEqual(
+                m.call_data,
+                {
+                    "id": "cool_beta",
+                },
+            )
+            self.assertEqual(m.call_url, join_beta_url)
+
+        # Test that user can join a beta program with an BetaProgram object
+        with self.mock_post({}) as m:
+            self.client.account.join_beta_program(
+                BetaProgram(self.client, "cool_beta")
+            )
+            self.assertEqual(
+                m.call_data,
+                {
+                    "id": "cool_beta",
+                },
+            )
+            self.assertEqual(m.call_url, join_beta_url)
+
     def test_account_transfer(self):
         """
         Tests that payments can be retrieved
@@ -427,7 +470,7 @@ def test_account_transfer(self):
         self.assertEqual(transfer.region_transfers[0].quota, 5010)
         self.assertEqual(transfer.region_transfers[0].billable, 0)
 
-
+        
 class BetaProgramGroupTest(ClientBaseCase):
     """
     Tests methods of the BetaProgramGroup

test/unit/objects/account_test.py

@@ -3,6 +3,7 @@
 
 from linode_api4.objects import (
     Account,
+    AccountBetaProgram,
     AccountSettings,
     Database,
     Domain,
@@ -240,3 +241,22 @@ def test_service_transfer_accept(self):
             self.assertEqual(
                 m.call_url, "/account/service-transfers/12345/accept"
             )
+
+
+class AccountBetaProgramTest(ClientBaseCase):
+    """
+    Tests methods of the AccountBetaProgram
+    """
+
+    def test_account_beta_program_api_get(self):
+        beta_id = "cool"
+        account_beta_url = "/account/betas/{}".format(beta_id)
+
+        with self.mock_get(account_beta_url) as m:
+            beta = AccountBetaProgram(self.client, beta_id)
+            self.assertEqual(beta.id, beta_id)
+            self.assertEqual(beta.enrolled, datetime(2018, 1, 2, 3, 4, 5))
+            self.assertEqual(beta.started, datetime(2018, 1, 2, 3, 4, 5))
+            self.assertEqual(beta.ended, datetime(2018, 1, 2, 3, 4, 5))
+
+            self.assertEqual(m.call_url, account_beta_url)