diff options
Diffstat (limited to 'onap-client/onap_client/client/clients.py')
-rw-r--r-- | onap-client/onap_client/client/clients.py | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/onap-client/onap_client/client/clients.py b/onap-client/onap_client/client/clients.py index 86c069a..a8202e4 100644 --- a/onap-client/onap_client/client/clients.py +++ b/onap-client/onap_client/client/clients.py @@ -34,16 +34,9 @@ # limitations under the License. # # ============LICENSE_END============================================ - -import importlib -import logging -import onap_client -import pkgutil -import inspect import sys from onap_client.client.catalog import Catalog -from onap_client import config CACHED_CLIENT = None @@ -59,17 +52,6 @@ class Client(Catalog): """Base class for the ONAP client. Subclasses are dynamically loaded and added as attributes. Instantiate and use this class to interact with ONAP.""" - def __init__(self, config_file=None, **kwargs): - self.config = config.APP_CONFIG - self.modules = import_submodules(onap_client) - self._config_overrides = kwargs - - super().__init__(**kwargs) - - if config_file: - logging.debug("Overriding ONAP Client configuration: {}".format(config_file)) - self.set_config(config_file) - @property def namespace(self): return "onap" @@ -77,47 +59,3 @@ class Client(Catalog): @property def catalog_resources(self): return {} - - @property - def utility_functions(self): - utility_functions = {} - for module_name, module in self.modules.items(): - all_functions = inspect.getmembers(module, inspect.isfunction) - for func in all_functions: - function = func[1] - if hasattr(function, "utility_function"): - utility_functions[func[0]] = func[1] - return utility_functions - - def set_config(self, config_file): - self.config = config.load_config(config_file, "onap_client") - for attr_name, attr in self.__dict__.items(): - if isinstance(attr, Client): - logging.debug("Reloading {} {}".format(attr_name, attr)) - attr.set_config(config_file) - for k, v in attr.catalog_resources.items(): - attr.load(k, v) - - def override(override_key): - def decorator(func): - def override_check(self): - o = self._config_overrides.get(override_key) - return o if o else func(self) - return override_check - return decorator - - -def import_submodules(package, recursive=True): - """Import all the modules in onap-client, except for those starting - with tests*. This is needed so that the Client object can register child classes""" - if isinstance(package, str): - package = importlib.import_module(package) - results = {} - for loader, name, is_pkg in pkgutil.walk_packages(package.__path__): - full_name = package.__name__ + "." + name - if full_name.find("tests") == -1: - results[full_name] = importlib.import_module(full_name) - if recursive and is_pkg: - results.update(import_submodules(full_name)) - - return results |