From b9b955c0c2875effc1ce02d5576f0d2a59284c5d Mon Sep 17 00:00:00 2001 From: Alex Shatov Date: Thu, 8 Mar 2018 13:12:23 -0500 Subject: 2.2.0 policy-handler - customization per company - added etc_customize/ folder and customize.sh script = customize.sh script is expected to be overridden by company to customize Docker image build = the whole etc_customize/ folder is copied into docker image = it is up to the company what to put into that folder - any files - added customize/ folder with CustomizeBase and Customize classes = CustomizeBase defines the interface and the default=ONAP behavior = CustomizeBase is owned by ONAP and should not be changed by the company = Customize inherits CustomizeBase = policy-handler instantiates Customize to get the customized behavior = Customize is owned by the company and should be changed by the company = ONAP is not going to change Customize = the methods of Customize are expected to be overridden by the company to change the behavior of the policy-handler = sample Customize class can be found in README.md = Company is allowed to add more files to customize/ folder if that is required for better structuring of their code as soon as it is invoked by the methods of Customize Change-Id: I46f8170afaaa48e1005e4398a768a781db0a0e6c Signed-off-by: Alex Shatov Issue-ID: DCAEGEN2-379 --- policyhandler/config.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'policyhandler/config.py') diff --git a/policyhandler/config.py b/policyhandler/config.py index d7768fa..8a8f418 100644 --- a/policyhandler/config.py +++ b/policyhandler/config.py @@ -18,11 +18,11 @@ """read and use the config""" -import os -import json import copy +import json import logging import logging.config +import os from .discovery import DiscoveryClient @@ -78,7 +78,7 @@ class Config(object): discovery_key, json.dumps(new_config)) Config._logger.debug("config before merge from discovery: %s", json.dumps(Config.config)) Config.merge(new_config.get(Config.SERVICE_NAME_POLICY_HANDLER)) - Config._logger.debug("merged config from discovery: %s", json.dumps(Config.config)) + Config._logger.info("merged config from discovery: %s", json.dumps(Config.config)) @staticmethod def load_from_file(file_path=None): @@ -92,7 +92,7 @@ class Config(object): loaded_config = json.load(config_json) if not loaded_config: - Config._logger.info("config not loaded from file: %s", file_path) + Config._logger.warn("config not loaded from file: %s", file_path) return Config._logger.info("config loaded from file: %s", file_path) @@ -102,4 +102,5 @@ class Config(object): Config.wservice_port = loaded_config.get(Config.FIELD_WSERVICE_PORT, Config.wservice_port) Config.merge(loaded_config.get(Config.SERVICE_NAME_POLICY_HANDLER)) + Config._logger.info("config loaded from file: %s", json.dumps(Config.config)) return True -- cgit 1.2.3-korg