From ba061b5ee05059953f0e306334bb039faacb4756 Mon Sep 17 00:00:00 2001 From: ImMin5 Date: Thu, 10 Oct 2024 15:20:50 +0900 Subject: [PATCH] feat: rollback function for 'settings' domain config for set 'default unified cost config' --- src/spaceone/config/conf/global_conf.py | 14 -------------- .../config/service/domain_config_service.py | 16 +--------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/src/spaceone/config/conf/global_conf.py b/src/spaceone/config/conf/global_conf.py index 56c6790..28230d4 100644 --- a/src/spaceone/config/conf/global_conf.py +++ b/src/spaceone/config/conf/global_conf.py @@ -39,17 +39,3 @@ # System Token Settings TOKEN = "" - -# Default Domain Unified Cost Configuration -DEFAULT_UNIFIED_COST_CONFIG = { - - "run_hour": 0, - "aggregation_day": 15, - "is_last_day": False, - "exchange_source": "Yahoo Finance!", - "exchange_date": 15, - "is_exchange_last_day": False, - "exchange_rate_mode": "AUTO", - # "custom_exchange_rate": {}, - "currency": "KRW", -} diff --git a/src/spaceone/config/service/domain_config_service.py b/src/spaceone/config/service/domain_config_service.py index 74eb1de..4e404a7 100644 --- a/src/spaceone/config/service/domain_config_service.py +++ b/src/spaceone/config/service/domain_config_service.py @@ -2,7 +2,6 @@ from spaceone.core.service import * -from spaceone.core import config from spaceone.config.manager.domain_config_manager import DomainConfigManager from spaceone.config.model import DomainConfig @@ -118,15 +117,10 @@ def get(self, params: dict) -> DomainConfig: domain_config_vo (object) """ - domain_config_vo = self.domain_config_mgr.get_domain_config( + return self.domain_config_mgr.get_domain_config( params["name"], params["domain_id"] ) - if domain_config_vo.name == "settings": - domain_config_vo = self._get_config_vo_with_default_unified_cost_config(domain_config_vo) - - return domain_config_vo - @transaction(permission="config:DomainConfig.read", role_types=["DOMAIN_ADMIN"]) @check_required(["domain_id"]) @append_query_filter(["name", "domain_id"]) @@ -168,11 +162,3 @@ def stat(self, params: dict) -> dict: query = params.get("query", {}) return self.domain_config_mgr.state_domain_configs(query) - - def _get_config_vo_with_default_unified_cost_config(self, domain_config_vo) -> DomainConfig: - domain_config_data: dict = domain_config_vo.data - if not domain_config_data.get("unified_cost_config", {}): - domain_config_data["unified_cost_config"] = config.get_global("DEFAULT_UNIFIED_COST_CONFIG", {}) - domain_config_vo = self.domain_config_mgr.update_domain_config_by_vo({"data": domain_config_data}, - domain_config_vo) - return domain_config_vo