Skip to content

Fix data field of CostResponse type convert error #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 31, 2024
Merged

Fix data field of CostResponse type convert error #93

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
057186f
fix: fix data field of CostResponse type convert error
ImMin5 Aug 30, 2024
949a7e8
feat: modify condition for usage type details for bandwidth
ImMin5 Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/cloudforet/cost_analysis/manager/cost_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ def _make_data_info(
options: dict,
tenant_id: str = None,
agreement_type: str = None,
):
) -> dict:
additional_info: dict = self._get_additional_info(result, options, tenant_id)
cost: float = self._get_cost_from_result_with_options(result, options)
usage_quantity: float = self._convert_str_to_float_format(
Expand All @@ -331,7 +331,9 @@ def _make_data_info(
product: str = self._get_product_from_result(result)
tags: dict = self._convert_tags_str_to_dict(result.get("tags"))

aggregate_data = self._get_aggregate_data(result, options, additional_info)
aggregate_data, additional_info = self._get_aggregate_data(
result, options, additional_info
)

# Set Network Traffic Cost at Additional Info
additional_info: dict = self._set_network_traffic_cost(
Expand Down Expand Up @@ -819,6 +821,7 @@ def _set_network_traffic_cost(
additional_info: dict, result: dict, usage_type: str
) -> dict:
meter_category = result.get("metercategory", "")
meter_name = result.get("metername", "")
result_additional_info = result.get("additional_info", {}) or {}
data_transfer_direction = result_additional_info.get("DataTransferDirection")

Expand All @@ -829,10 +832,16 @@ def _set_network_traffic_cost(
additional_info["Usage Type Details"] = "Transfer Out"
else:
additional_info["Usage Type Details"] = "Transfer Etc"

elif meter_category in ["Bandwidth"]:
additional_info["Usage Type Details"] = "Transfer Etc"
if "Data Transfer In" in meter_name:
additional_info["Usage Type Details"] = "Transfer In"
elif "Data Transfer Out" in meter_name:
additional_info["Usage Type Details"] = "Transfer Out"
else:
additional_info["Usage Type Details"] = "Transfer Etc"

elif meter_category in ["Azure Front Door Service"]:
meter_name = result.get("metername")
if meter_name == "Standard Data Transfer In":
additional_info["Usage Type Details"] = "Transfer In"
elif meter_name == "Standard Data Transfer Out":
Expand Down
Loading