From: krishnaa96 Date: Fri, 12 Mar 2021 10:35:16 +0000 (+0530) Subject: Fix HAS startup issue X-Git-Tag: 2.1.5~1 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=93972c4561950830029d2bfe9b006833641067cf;p=optf%2Fhas.git Fix HAS startup issue HAS is not able to override user, password from SMS onto the existing config, since the groups are not registered to the oslo_config. This will be done when modules are loaded during startup Issue-ID: OPTFRA-929 Signed-off-by: krishnaa96 Change-Id: Ic6b98ce4f1c04b23769a47ab1982ad3d1c6694a3 --- diff --git a/conductor/conductor/common/sms.py b/conductor/conductor/common/sms.py index 49f6411..5a7c528 100644 --- a/conductor/conductor/common/sms.py +++ b/conductor/conductor/common/sms.py @@ -18,13 +18,17 @@ # '''Secret Management Service Integration''' -from conductor.common import config_loader from onapsmsclient import Client from oslo_config import cfg from oslo_log import log - +import conductor.api.controllers.v1.plans +from conductor.common import config_loader +import conductor.common.music.api from conductor.common.utils import cipherUtils +import conductor.data.plugins.inventory_provider.aai +import conductor.data.plugins.service_controller.sdnc + LOG = log.getLogger(__name__) diff --git a/conductor/tox.ini b/conductor/tox.ini index c6cc39f..6556f0c 100644 --- a/conductor/tox.ini +++ b/conductor/tox.ini @@ -65,7 +65,7 @@ max-line-length = 119 exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,install-guide,*/tests/*,__init__.py,conductor/data/service.py show-source = True ignore = W503 H904 #conflict with W504 -per-file-ignores = conductor/data/plugins/inventory_provider/aai.py:F821 +per-file-ignores = conductor/data/plugins/inventory_provider/aai.py:F821, conductor/common/sms.py:F401 [hacking] import_exceptions = conductor.common.i18n