Merge pull request #113 from lhhyung/master

Add RI/SP cost display as list price in PAYG

Author: lhhyung

src/cloudforet/cost_analysis/connector/azure_cost_mgmt_connector.py

@@ -2,29 +2,23 @@
 import os
 import tempfile
 import time
-import requests
-import pandas as pd
-import numpy as np
-import re
-
 from datetime import datetime
 from functools import wraps
 from io import BytesIO
-from typing import get_type_hints, Union, Any, Generator
+from typing import get_type_hints, Union, Any
 
+import numpy as np
+import pandas as pd
+import requests
+from azure.core.exceptions import ResourceNotFoundError, HttpResponseError
 from azure.identity import DefaultAzureCredential
 from azure.mgmt.billing import BillingManagementClient
-from azure.mgmt.costmanagement import CostManagementClient
 from azure.mgmt.consumption import ConsumptionManagementClient
-from azure.core.exceptions import (
-    ResourceNotFoundError,
-    HttpResponseError,
-    ServiceResponseError,
-)
+from azure.mgmt.costmanagement import CostManagementClient
 from spaceone.core.connector import BaseConnector
 
-from cloudforet.cost_analysis.error.cost import *
 from cloudforet.cost_analysis.conf.cost_conf import *
+from cloudforet.cost_analysis.error.cost import *
 
 __all__ = ["AzureCostMgmtConnector"]
 
@@ -252,7 +246,8 @@ def list_by_billing_account(self):
 
     @staticmethod
     def get_retail_price(meter_id: str, currency: str = "USD"):
-        url = f"https://prices.azure.com/api/retail/prices?currencyCode={currency}&$filter=priceType eq 'Consumption' and meterId eq '{meter_id}'"
+        # url = f"https://prices.azure.com/api/retail/prices?currencyCode={currency}&$filter=priceType eq 'Consumption' and meterId eq '{meter_id}'"
+        url = f"https://prices.azure.com/api/retail/prices?currencyCode={currency}&$filter=meterId eq '{meter_id}'"
         try:
             response = requests.get(url=url)
             return response.json()

src/cloudforet/cost_analysis/manager/cost_manager.py

@@ -1,18 +1,18 @@
 import calendar
-import logging
 import json
+import logging
 import time
-import pandas as pd
-from typing import Union, Tuple, Any, Generator
 from datetime import datetime, timezone
+from typing import Union
 
+import pandas as pd
 from spaceone.core.error import *
 from spaceone.core.manager import BaseManager
 
+from cloudforet.cost_analysis.conf.cost_conf import *
 from cloudforet.cost_analysis.connector.azure_cost_mgmt_connector import (
     AzureCostMgmtConnector,
 )
-from cloudforet.cost_analysis.conf.cost_conf import *
 
 _LOGGER = logging.getLogger("spaceone")
 
@@ -462,6 +462,7 @@ def _make_benefit_cost_info(self, result: dict, billed_at: str) -> dict:
             result.get("UsageQuantity", 0.0)
         )
         actual_cost = self._convert_str_to_float_format(result.get("Cost", 0.0))
+
         data = {
             "cost": 0,
             "usage_quantity": usage_quantity,
@@ -474,6 +475,7 @@ def _make_benefit_cost_info(self, result: dict, billed_at: str) -> dict:
             },
             "additional_info": additional_info,
         }
+
         return data
 
     @staticmethod
@@ -517,14 +519,22 @@ def _get_cost_from_result_with_options(self, result: dict, options: dict) -> flo
             cost_pay_as_you_go = 0.0
 
         if options.get("include_reservation_cost_at_payg", False):
-            pricing_model = result.get("pricingmodel")
-            charge_type = result.get("chargetype")
-
-            if (
-                pricing_model in ["Reservation", "SavingsPlan"]
-                and charge_type == "Purchase"
-            ):
-                cost_pay_as_you_go = result.get("costinbillingcurrency", 0.0)
+            if options.get("cost_metric") == "AmortizedCost":
+                pricing_model = result.get("pricingmodel")
+                charge_type = result.get("chargetype")
+                if (
+                    pricing_model in ["Reservation", "SavingsPlan"]
+                    and charge_type == "Usage"
+                ):
+                    cost_pay_as_you_go = self._get_retail_cost(result)
+            elif options.get("cost_metric") == "ActualCost":
+                pricing_model = result.get("pricingmodel")
+                charge_type = result.get("chargetype")
+                if (
+                    pricing_model in ["Reservation", "SavingsPlan"]
+                    and charge_type == "Purchase"
+                ):
+                    cost_pay_as_you_go = self._get_retail_cost(result)
 
         return cost_pay_as_you_go
 
@@ -562,12 +572,11 @@ def _get_aggregate_data(self, result: dict, options: dict) -> dict:
 
         return aggregate_data
 
-    def _get_saved_cost(self, result: dict, cost: float) -> float:
+    def _get_retail_cost(self, result: dict) -> float:
         exchange_rate = 1.0
-        saved_cost = 0
-        currency = result.get("billingcurrency", "USD")
         meter_id = result.get("meterid")
         product_id = result.get("productid")
+        currency = result.get("billingcurrency", "USD")
         quantity = self._convert_str_to_float_format(result.get("quantity", 0.0))
 
         if not self.retail_price_map.get(f"{meter_id}:{product_id}"):
@@ -578,6 +587,13 @@ def _get_saved_cost(self, result: dict, cost: float) -> float:
 
         unit_price = self.retail_price_map[f"{meter_id}:{product_id}"]
 
+        retail_cost = exchange_rate * quantity * unit_price
+
+        return retail_cost
+
+    def _get_saved_cost(self, result: dict, cost: float) -> float:
+        saved_cost = 0
+
         # if currency != "USD" and quantity > 0:
         #     cost_in_billing_currency = self._convert_str_to_float_format(
         #         result.get("costinbillingcurrency", 0.0)
@@ -591,7 +607,7 @@ def _get_saved_cost(self, result: dict, cost: float) -> float:
         # else:
         #     exchange_rate = cost_in_billing_currency / cost_in_pricing_currency
 
-        retail_cost = exchange_rate * quantity * unit_price
+        retail_cost = self._get_retail_cost(result)
         if retail_cost:
             saved_cost = retail_cost - cost
 

src/cloudforet/cost_analysis/manager/data_source_manager.py

@@ -3,6 +3,7 @@
 
 from spaceone.core.error import ERROR_INVALID_ARGUMENT
 from spaceone.core.manager import BaseManager
+
 from cloudforet.cost_analysis.connector.azure_cost_mgmt_connector import (
     AzureCostMgmtConnector,
 )

src/cloudforet/cost_analysis/manager/job_manager.py

@@ -4,8 +4,8 @@
 from typing import Tuple, Union
 
 from dateutil.relativedelta import relativedelta
-
 from spaceone.core.manager import BaseManager
+
 from cloudforet.cost_analysis.conf.cost_conf import SECRET_TYPE_DEFAULT
 from cloudforet.cost_analysis.connector import AzureCostMgmtConnector
 from cloudforet.cost_analysis.error.cost import *