Don't expect total_cost field from Azure API (#38)

alan-turing-institute · Sep 5, 2024 · db8228c · db8228c
1 parent fa1a7bd
commit db8228c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/usage_function/tests/test_utils.py b/usage_function/tests/test_utils.py
@@ -206,14 +206,12 @@ def test_retrieve_usage_1(self) -> None:
         datum_1 = DummyAzureUsage()
         datum_1.quantity = 1
         datum_1.cost = 1
-        datum_1.total_cost = 1
         datum_1.unit_price = 1
         datum_1.effective_price = 1
 
         datum_2 = DummyAzureUsage()
         datum_2.quantity = 1
         datum_2.cost = 1
-        datum_2.total_cost = 1
         datum_2.unit_price = 1
         datum_2.effective_price = 1
 

diff --git a/usage_function/utils/usage.py b/usage_function/utils/usage.py
@@ -123,12 +123,14 @@ def retrieve_usage(
         if i % 200 == 0:
             logging.warning("Requesting item %d", i)
 
-        usage_item = models.Usage(**vars(item))
+        item_dict = dict(vars(item))
 
         # When AmortizedCost metric is being used, the cost and effective_price values
         # for reserved instances are not zero, thus the cost value is moved to
         # amortised_cost
-        usage_item.total_cost = usage_item.cost
+        item_dict["total_cost"] = item_dict["cost"]
+
+        usage_item = models.Usage(**item_dict)
 
         if usage_item.reservation_id is not None:
             usage_item.amortised_cost = usage_item.cost