Skip to content

Commit 2a0c695

Browse files
authored
Merge pull request #247 from ImMin5/master
Add v-workspace-id filter at cost stat service
2 parents 9dd9db8 + 1edcab2 commit 2a0c695

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/spaceone/cost_analysis/service/cost_service.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -315,19 +315,25 @@ def stat(self, params):
315315
"""
316316

317317
domain_id = params["domain_id"]
318+
data_source_id = params.get("data_source_id", "global")
318319
query = params.get("query", {})
319320

321+
if data_source_id and data_source_id != "global":
322+
query = self.cost_mgr.change_filter_v_workspace_id(
323+
query, domain_id, data_source_id
324+
)
325+
320326
if self._is_distinct_query(query):
321327
page, query = self._get_page_from_query(query)
322328
search, query = self._get_search_value_from_query(query)
323329
query_hash = utils.dict_to_hash(query)
324330

325331
self.cost_mgr.create_cost_query_history(
326-
query, query_hash, domain_id, "global"
332+
query, query_hash, domain_id, data_source_id
327333
)
328334

329335
response = self.cost_mgr.stat_monthly_costs_with_cache(
330-
query, query_hash, domain_id, "global"
336+
query, query_hash, domain_id, data_source_id
331337
)
332338

333339
if search:

0 commit comments

Comments
 (0)