Merge pull request #68 from ImMin5/master

Add additional info data

Author: ImMin5

src/cloudforet/cost_analysis/manager/cost_manager.py

@@ -207,6 +207,9 @@ def _get_additional_info(self, result: dict, options: dict, tenant_id: str = Non
         if result.get("pricingmodel") != "" and result.get("pricingmodel"):
             additional_info["Pricing Model"] = result["pricingmodel"]
 
+        if result.get("reservationname") != "" and result.get("reservationname"):
+            additional_info["Reservation Name"] = result["reservationname"]
+
         if result.get("benefitname") != "" and result.get("benefitname"):
             benefit_name = result["benefitname"]
             additional_info["Benefit Name"] = benefit_name
@@ -244,6 +247,9 @@ def _get_additional_info(self, result: dict, options: dict, tenant_id: str = Non
         ):
             additional_info["Enrollment Account Name"] = result["enrollmentaccountname"]
 
+        if result.get("chargetype") != "" and result.get("chargetype"):
+            additional_info["Charge Type"] = result["chargetype"]
+
         collect_resource_id = options.get("collect_resource_id", False)
         if (
             collect_resource_id

src/cloudforet/cost_analysis/manager/data_source_manager.py

@@ -26,6 +26,10 @@ def init_response(options):
                 "name": "Amortized Cost",
                 "unit": options.get("currency", "KRW"),
             }
+            plugin_metadata.data_info["PayAsYouGo"] = {
+                "name": "PayAsYouGo",
+                "unit": options.get("currency", "KRW"),
+            }
         else:
             plugin_metadata.cost_info = {
                 "name": "Actual Cost",