Skip to content

Commit

Permalink
New approach to solve the issue with unit tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bacciotti
bacciotti committed Dec 14, 2023
1 parent 5fdf225 commit bf3450a
Show file tree
Hide file tree
Showing 2 changed files with 213 additions and 1 deletion.
14 changes: 13 additions & 1 deletion koku/api/report/queries.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,11 @@ def is_aws(self):
"""Determine if we are working with an AWS API."""
return "aws" in self.parameters.request.path

@property
def is_azure(self):
"""Determine if we are working with an Azure API."""
return "azure" in self.parameters.request.path

def initialize_totals(self):
"""Initialize the total response column values."""
query_sum = {}
Expand Down Expand Up @@ -1123,6 +1128,8 @@ def _group_by_ranks(self, query, data): # noqa: C901
)
if self.is_aws and "account" in self.parameters.url_data:
ranks = ranks.annotate(**{"account_alias": F("account_alias__account_alias")})
if self.is_azure and "subscription_guid" in self.parameters.url_data:
ranks = ranks.annotate(**{"subscription_name": F("subscription_name")})
if self.is_openshift:
ranks = ranks.annotate(clusters=ArrayAgg(Coalesce("cluster_alias", "cluster_id"), distinct=True))

Expand Down Expand Up @@ -1168,6 +1175,10 @@ def _ranked_list(self, data_list, ranks, rank_fields=None): # noqa C901
drop_columns.add("account_alias")
if self.is_aws and "account" not in group_by:
rank_data_frame.drop(columns=["account_alias"], inplace=True, errors="ignore")
if self.is_azure and "subscription_guid" in group_by:
drop_columns.add("subscription_name")
if self.is_azure and "subscription_guid" not in group_by:
rank_data_frame.drop(columns=["subscription_name"], errors="ignore")

agg_fields = {}
for col in [col for col in self.report_annotations if "units" in col]:
Expand Down Expand Up @@ -1227,7 +1238,6 @@ def _ranked_list(self, data_list, ranks, rank_fields=None): # noqa C901

# Finally replace any remaining NaN with None for JSON compatibility
data_frame = data_frame.replace({np.nan: None})

return data_frame.to_dict("records")

def _aggregate_ranks_over_limit(self, data_frame, group_by):
Expand Down Expand Up @@ -1265,6 +1275,8 @@ def _aggregate_ranks_over_limit(self, data_frame, group_by):
others_data_frame["default_project"] = "False"
if self.is_aws and "account" in group_by:
others_data_frame["account_alias"] = other_str
elif self.is_azure and "subscription_guid" in group_by:
others_data_frame["subscription_name"] = other_str
elif "gcp_project" in group_by:
others_data_frame["gcp_project_alias"] = other_str

Expand Down
200 changes: 200 additions & 0 deletions koku/api/report/test/azure/test_queries.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
#
# Copyright 2023 Red Hat Inc.
#
from unittest.mock import patch

from api.iam.test.iam_test_case import IamTestCase
from api.report.azure.query_handler import AzureReportQueryHandler
from api.report.azure.view import AzureCostView
from api.report.queries import ReportQueryHandler


class AzureReportQueryTest(IamTestCase):
"""Tests the Azure report queries."""

def test_null_subscription_name_azure_accounts(self):
with patch.object(ReportQueryHandler, "is_azure", return_value=True):
"""Test if Azure reports have not null subscription_name value."""

url = "?group_by[subscription_guid]=*&filter[limit]=100" # noqa: E501
query_params = self.mocked_query_params(url, AzureCostView)
handler = AzureReportQueryHandler(query_params)

ranks = [
{
"subscription_guid": "9999991",
"cost_total": "99",
"rank": 1,
"source_uuid": ["UUID('8888881')"],
"subscription_name": "azure_single_source_subs_name",
},
{
"subscription_guid": "9999992",
"cost_total": "88",
"rank": 2,
"source_uuid": ["UUID('8888882')"],
"subscription_name": "9999992",
},
]

data_list = [
{
"subscription_guid": "9999991",
"date": "2023-11-22",
"infra_total": "99",
"infra_raw": "99",
"infra_usage": "0",
"infra_markup": "99",
"sup_raw": "0",
"sup_usage": "0",
"sup_markup": "0",
"sup_total": "0",
"cost_total": "99",
"cost_raw": "99",
"cost_usage": "0",
"cost_markup": "99",
"cost_units": "USD",
"source_uuid": ["UUID('8888881')"],
"subscription_name": "test_subscription_name_9999991",
},
{
"subscription_guid": "9999992",
"date": "2023-11-13",
"infra_total": "88",
"infra_raw": "88",
"infra_usage": "0",
"infra_markup": "88",
"sup_raw": "0",
"sup_usage": "0",
"sup_markup": "0",
"sup_total": "0",
"cost_total": "88",
"cost_raw": "88",
"cost_usage": "0",
"cost_markup": "44",
"cost_units": "USD",
"source_uuid": ["UUID('8888882')"],
"subscription_name": "test_subscription_name_9999992",
},
{
"subscription_guid": "9999993",
"date": "2023-11-14",
"infra_total": "Decimal('36.350995153')",
"infra_raw": "Decimal('36.350995153')",
"infra_usage": "0",
"infra_markup": "Decimal('0E-9')",
"sup_raw": "0",
"sup_usage": "0",
"sup_markup": "0",
"sup_total": "0",
"cost_total": "Decimal('36.350995153')",
"cost_raw": "Decimal('36.350995153')",
"cost_usage": "0",
"cost_markup": "Decimal('0E-9')",
"cost_units": "USD",
"source_uuid": ["UUID('8888882')"],
"subscription_name": "test_subscription_name_9999993",
},
]

ranked_list = handler._ranked_list(data_list, ranks)
for data in ranked_list:
self.assertIsNotNone(data["subscription_name"])

def test_cost_endpoint_with_group_by_subscription_guid(self):
with patch.object(ReportQueryHandler, "is_azure", return_value=True):
"""Test if Azure reports works properly without subscription_guid in group_by clause."""

url = "?group_by[service_name]=a&filter[limit]=100" # noqa: E501
query_params = self.mocked_query_params(url, AzureCostView)
handler = AzureReportQueryHandler(query_params)

ranks = [
{
"subscription_guid": "9999991",
"cost_total": "99",
"rank": 1,
"source_uuid": ["UUID('8888881')"],
"subscription_name": "azure_single_source_subs_name",
"service_name": "abc",
},
{
"subscription_guid": "9999992",
"cost_total": "88",
"rank": 2,
"source_uuid": ["UUID('8888882')"],
"subscription_name": "9999992",
},
]

data_list = [
{
"subscription_guid": "9999991",
"date": "2023-11-22",
"infra_total": "99",
"infra_raw": "99",
"infra_usage": "0",
"infra_markup": "99",
"sup_raw": "0",
"sup_usage": "0",
"sup_markup": "0",
"sup_total": "0",
"cost_total": "99",
"cost_raw": "99",
"cost_usage": "0",
"cost_markup": "99",
"cost_units": "USD",
"source_uuid": ["UUID('8888881')"],
"subscription_name": "test_subscription_name_9999991",
},
{
"subscription_guid": "9999992",
"date": "2023-11-13",
"infra_total": "88",
"infra_raw": "88",
"infra_usage": "0",
"infra_markup": "88",
"sup_raw": "0",
"sup_usage": "0",
"sup_markup": "0",
"sup_total": "0",
"cost_total": "88",
"cost_raw": "88",
"cost_usage": "0",
"cost_markup": "44",
"cost_units": "USD",
"source_uuid": ["UUID('8888882')"],
"subscription_name": "test_subscription_name_9999992",
"service_name": "abc",
},
{
"subscription_guid": "9999993",
"date": "2023-11-14",
"infra_total": "Decimal('36.350995153')",
"infra_raw": "Decimal('36.350995153')",
"infra_usage": "0",
"infra_markup": "Decimal('0E-9')",
"sup_raw": "0",
"sup_usage": "0",
"sup_markup": "0",
"sup_total": "0",
"cost_total": "Decimal('36.350995153')",
"cost_raw": "Decimal('36.350995153')",
"cost_usage": "0",
"cost_markup": "Decimal('0E-9')",
"cost_units": "USD",
"source_uuid": ["UUID('8888882')"],
"subscription_name": "test_subscription_name_9999993",
},
]

ranked_list = handler._ranked_list(data_list, ranks)
self.assertIsNotNone(ranked_list)

def test_group_by_ranks(self):
with patch.object(ReportQueryHandler, "is_azure", return_value=True):
url = "?group_by[subscription_guid]=*&filter[limit]=100"
query_params = self.mocked_query_params(url, AzureCostView)
handler = AzureReportQueryHandler(query_params)
query_output = handler.execute_query()
self.assertIsNotNone(query_output.get("data"))

0 comments on commit bf3450a

Please sign in to comment.