From a997a34f10e887b5f0c2235e17814807cdee65ed Mon Sep 17 00:00:00 2001 From: hosingh000 Date: Tue, 26 Sep 2017 16:27:36 -0500 Subject: [PATCH] Fix package import identify at time of sanity check Change-Id: I84ab65d04322769e177a474722b0e311ce1fafef --- orm/base_config.py | 5 ++++- orm/orm_client/ormcli/config.py | 14 ++++++++------ orm/services/customer_manager/config.py | 6 +++--- orm/services/image_manager/config.py | 6 +++--- .../ims/di_providers/mock_providers.py | 10 +++++----- .../external_mock/orm_common/injector/injector.py | 2 +- .../orm_common/utils/cross_api_utils.py | 2 +- .../ims/external_mock/orm_common/utils/utils.py | 2 +- .../image_manager/ims/hooks/service_hooks.py | 4 ++-- 9 files changed, 28 insertions(+), 23 deletions(-) diff --git a/orm/base_config.py b/orm/base_config.py index 0f23d14d..db30752f 100644 --- a/orm/base_config.py +++ b/orm/base_config.py @@ -7,7 +7,7 @@ db_user = 'root' db_pass = 'stack' db_host = '127.0.0.1' ssl_verify = False -token_auth_enabled = True +token_auth_enabled = False token_auth_user = 'admin' token_auth_pass = 'nova' token_auth_tenant = 'admin' @@ -65,3 +65,6 @@ rds = { 'base_url': '{}://{}:{}/'.format(orm_protocal, orm_host, rds_port), 'log': log_location.format('rds.log') } +cli = { + 'base_region': 'local' +} diff --git a/orm/orm_client/ormcli/config.py b/orm/orm_client/ormcli/config.py index dbbb218f..90e262df 100755 --- a/orm/orm_client/ormcli/config.py +++ b/orm/orm_client/ormcli/config.py @@ -1,8 +1,10 @@ # these values are used by ormcli to retrieve auth_token which is sent, # along with region, with each cms and fms api request -tenant_name = '' -username = '' -password = False -auth_region = '' -orm_base_url = 'http://127.0.0.1' -verify = False +import orm.base_config as config + +tenant_name = config.token_auth_tenant +username = config.token_auth_user +password = config.token_auth_pass +auth_region = config.cli['base_region'] +orm_base_url = config.rms['base_url'] +verify = config.ssl_verify diff --git a/orm/services/customer_manager/config.py b/orm/services/customer_manager/config.py index 7f5c4559..e897271c 100755 --- a/orm/services/customer_manager/config.py +++ b/orm/services/customer_manager/config.py @@ -1,7 +1,7 @@ import orm.base_config as config -from orm_common.hooks.api_error_hook import APIErrorHook -from orm_common.hooks.security_headers_hook import SecurityHeadersHook -from orm_common.hooks.transaction_id_hook import TransactionIdHook +from orm.common.orm_common.hooks.api_error_hook import APIErrorHook +from orm.common.orm_common.hooks.security_headers_hook import SecurityHeadersHook +from orm.common.orm_common.hooks.transaction_id_hook import TransactionIdHook global TransactionIdHook global APIErrorHook global SecurityHeadersHook diff --git a/orm/services/image_manager/config.py b/orm/services/image_manager/config.py index 8acabf3b..c8f87efb 100755 --- a/orm/services/image_manager/config.py +++ b/orm/services/image_manager/config.py @@ -1,7 +1,7 @@ -from ims.hooks.service_hooks import TransIdHook import orm.base_config as config -from orm_common.hooks.api_error_hook import APIErrorHook -from orm_common.hooks.security_headers_hook import SecurityHeadersHook +from orm.common.orm_common.hooks.api_error_hook import APIErrorHook +from orm.common.orm_common.hooks.security_headers_hook import SecurityHeadersHook +from orm.services.image_manager.ims.hooks.service_hooks import TransIdHook global TransIdHook global APIErrorHook global SecurityHeadersHook diff --git a/orm/services/image_manager/ims/di_providers/mock_providers.py b/orm/services/image_manager/ims/di_providers/mock_providers.py index d833adaa..3a6a4d79 100755 --- a/orm/services/image_manager/ims/di_providers/mock_providers.py +++ b/orm/services/image_manager/ims/di_providers/mock_providers.py @@ -1,8 +1,8 @@ -from ims.ims_mocks import audit_mock, requests_mock -from ims.logic import image_logic, metadata_logic -from ims.persistency.sql_alchemy.data_manager import DataManager -from ims.proxies import rds_proxy -from orm_common.utils import utils +from orm.common.orm_common.utils import utils +from orm.services.image_manager.ims.ims_mocks import audit_mock, requests_mock +from orm.services.image_manager.ims.logic import image_logic, metadata_logic +from orm.services.image_manager.ims.persistency.sql_alchemy.data_manager import DataManager +from orm.services.image_manager.ims.proxies import rds_proxy providers = [ ('rds_proxy', rds_proxy), diff --git a/orm/services/image_manager/ims/external_mock/orm_common/injector/injector.py b/orm/services/image_manager/ims/external_mock/orm_common/injector/injector.py index de6ce891..c2a26847 100755 --- a/orm/services/image_manager/ims/external_mock/orm_common/injector/injector.py +++ b/orm/services/image_manager/ims/external_mock/orm_common/injector/injector.py @@ -1,7 +1,7 @@ import imp import os -from orm_common.injector import fang +from orm.common.orm_common.injector import fang _di = fang.Di() logger = None diff --git a/orm/services/image_manager/ims/external_mock/orm_common/utils/cross_api_utils.py b/orm/services/image_manager/ims/external_mock/orm_common/utils/cross_api_utils.py index b2183133..3b54abce 100755 --- a/orm/services/image_manager/ims/external_mock/orm_common/utils/cross_api_utils.py +++ b/orm/services/image_manager/ims/external_mock/orm_common/utils/cross_api_utils.py @@ -2,7 +2,7 @@ import time import requests -from orm_common.logger import get_logger +from orm.common.orm_common.logger import get_logger from pecan import conf logger = get_logger(__name__) diff --git a/orm/services/image_manager/ims/external_mock/orm_common/utils/utils.py b/orm/services/image_manager/ims/external_mock/orm_common/utils/utils.py index 0bdf312e..150ad2a4 100755 --- a/orm/services/image_manager/ims/external_mock/orm_common/utils/utils.py +++ b/orm/services/image_manager/ims/external_mock/orm_common/utils/utils.py @@ -4,7 +4,7 @@ import time import requests from audit_client.api import audit -from orm_common.logger import get_logger +from orm.common.orm_common.logger import get_logger from pecan import conf logger = get_logger(__name__) diff --git a/orm/services/image_manager/ims/hooks/service_hooks.py b/orm/services/image_manager/ims/hooks/service_hooks.py index 235b31d4..daac041c 100755 --- a/orm/services/image_manager/ims/hooks/service_hooks.py +++ b/orm/services/image_manager/ims/hooks/service_hooks.py @@ -1,5 +1,5 @@ -from orm_common.hooks.transaction_id_hook import TransactionIdHook -from orm_common.utils import utils +from orm.common.orm_common.hooks.transaction_id_hook import TransactionIdHook +from orm.common.orm_common.utils import utils class TransIdHook(TransactionIdHook):