Merge pull request #325 from amisiorek-akamai/dc_specific_pricing

Implement changes to existing endpoints for DC-specific pricing

Author: amisiorek-akamai

Makefile

@@ -28,7 +28,7 @@ release: build
 	twine upload dist/*
 
 @PHONEY: install
-install: clean
+install: clean requirements
 	python3 -m pip install .
 
 @PHONEY: requirements

linode_api4/objects/linode.py

@@ -232,6 +232,7 @@ class Type(Base):
         "label": Property(),
         "network_out": Property(),
         "price": Property(),
+        "region_prices": Property(),
         "addons": Property(),
         "memory": Property(),
         "transfer": Property(),

test/fixtures/account_transfer.json

@@ -0,0 +1,14 @@
+{
+    "quota": 471,
+    "used": 737373,
+    "billable": 0,
+
+    "region_transfers": [
+        {
+            "id": "ap-west",
+            "used": 1,
+            "quota": 5010,
+            "billable": 0
+        }
+    ]
+}

test/fixtures/linode_types.json

@@ -1,8 +1,8 @@
 {
-"results": 4,
-"pages": 1,
-"page": 1,
-"data": [
+  "results": 4,
+  "pages": 1,
+  "page": 1,
+  "data": [
     {
       "disk": 20480,
       "memory": 1024,
@@ -12,7 +12,19 @@
           "price": {
             "hourly": 0.003,
             "monthly": 2
-          }
+          },
+          "region_prices": [
+            {
+              "id": "ap-west",
+              "hourly": 0.02,
+              "monthly": 20
+            },
+            {
+              "id": "ap-northeast",
+              "hourly": 0.02,
+              "monthly": 20
+            }
+          ]
         }
       },
       "class": "nanode",
@@ -25,6 +37,18 @@
         "hourly": 0.0075,
         "monthly": 5
       },
+      "region_prices": [
+        {
+          "id": "us-east",
+          "hourly": 0.02,
+          "monthly": 20
+        },
+        {
+          "id": "ap-northeast",
+          "hourly": 0.02,
+          "monthly": 20
+        }
+      ],
       "successor": null
     },
     {
@@ -36,7 +60,19 @@
           "price": {
             "hourly": 0.008,
             "monthly": 5
-          }
+          },
+          "region_prices": [
+            {
+              "id": "ap-west",
+              "hourly": 0.02,
+              "monthly": 20
+            },
+            {
+              "id": "ap-northeast",
+              "hourly": 0.02,
+              "monthly": 20
+            }
+          ]
         }
       },
       "class": "highmem",
@@ -49,6 +85,18 @@
         "hourly": 0.09,
         "monthly": 60
       },
+      "region_prices": [
+        {
+          "id": "us-east",
+          "hourly": 0.02,
+          "monthly": 20
+        },
+        {
+          "id": "ap-northeast",
+          "hourly": 0.02,
+          "monthly": 20
+        }
+      ],
       "successor": null
     },
     {
@@ -60,7 +108,19 @@
           "price": {
             "hourly": 0.004,
             "monthly": 2.5
-          }
+          },
+          "region_prices": [
+            {
+              "id": "ap-west",
+              "hourly": 0.02,
+              "monthly": 20
+            },
+            {
+              "id": "ap-northeast",
+              "hourly": 0.02,
+              "monthly": 20
+            }
+          ]
         }
       },
       "class": "standard",
@@ -73,6 +133,18 @@
         "hourly": 0.015,
         "monthly": 10
       },
+      "region_prices": [
+        {
+          "id": "us-east",
+          "hourly": 0.02,
+          "monthly": 20
+        },
+        {
+          "id": "ap-northeast",
+          "hourly": 0.02,
+          "monthly": 20
+        }
+      ],
       "successor": null
     },
     {
@@ -84,7 +156,19 @@
           "price": {
             "hourly": 0.008,
             "monthly": 5
-          }
+          },
+          "region_prices": [
+            {
+              "id": "ap-west",
+              "hourly": 0.02,
+              "monthly": 20
+            },
+            {
+              "id": "ap-northeast",
+              "hourly": 0.02,
+              "monthly": 20
+            }
+          ]
         }
       },
       "class": "gpu",
@@ -97,7 +181,19 @@
         "hourly": 0.03,
         "monthly": 20
       },
+      "region_prices": [
+        {
+          "id": "us-east",
+          "hourly": 0.02,
+          "monthly": 20
+        },
+        {
+          "id": "ap-northeast",
+          "hourly": 0.02,
+          "monthly": 20
+        }
+      ],
       "successor": null
     }
   ]
-}
+}

test/integration/conftest.py

@@ -3,7 +3,7 @@
 
 import pytest
 
-from linode_api4.linode_client import LinodeClient, LongviewSubscription
+from linode_api4.linode_client import LinodeClient
 
 ENV_TOKEN_NAME = "LINODE_TOKEN"
 RUN_LONG_TESTS = "RUN_LONG_TESTS"

test/unit/linode_client_test.py

@@ -454,6 +454,22 @@ def test_join_beta_program(self):
             )
             self.assertEqual(m.call_url, join_beta_url)
 
+    def test_account_transfer(self):
+        """
+        Tests that payments can be retrieved
+        """
+        transfer = self.client.account.transfer()
+
+        self.assertEqual(transfer.quota, 471)
+        self.assertEqual(transfer.used, 737373)
+        self.assertEqual(transfer.billable, 0)
+
+        self.assertEqual(len(transfer.region_transfers), 1)
+        self.assertEqual(transfer.region_transfers[0].id, "ap-west")
+        self.assertEqual(transfer.region_transfers[0].used, 1)
+        self.assertEqual(transfer.region_transfers[0].quota, 5010)
+        self.assertEqual(transfer.region_transfers[0].billable, 0)
+
 
 class BetaProgramGroupTest(ClientBaseCase):
     """

test/unit/objects/linode_test.py

@@ -533,6 +533,8 @@ def test_get_types(self):
             self.assertIsNotNone(t.type_class)
             self.assertIsNotNone(t.gpus)
             self.assertIsNone(t.successor)
+            self.assertIsNotNone(t.region_prices)
+            self.assertIsNotNone(t.addons.backups.region_prices)
 
     def test_get_type_by_id(self):
         """
@@ -546,6 +548,7 @@ def test_get_type_by_id(self):
         self.assertEqual(t.label, "Linode 1024")
         self.assertEqual(t.disk, 20480)
         self.assertEqual(t.type_class, "nanode")
+        self.assertEqual(t.region_prices[0].id, "us-east")
 
     def test_get_type_gpu(self):
         """