From a3eb0387ff59bebf9cc08370ac2998c21104a2c6 Mon Sep 17 00:00:00 2001 From: Nicholas Jones Date: Wed, 27 Sep 2017 10:44:36 -0500 Subject: [PATCH] Fix import paths in audit_server Appends appropriate paths to import statements Change-Id: Ib51da78e6a46a4f01a45deef6d9b5cb3bf05fb7a --- orm/services/audit_trail_manager/audit_server/app.py | 5 +++-- .../audit_trail_manager/audit_server/controllers/root.py | 2 +- .../audit_trail_manager/audit_server/controllers/v1/audit.py | 2 +- .../audit_server/controllers/v1/configuration.py | 3 ++- .../audit_trail_manager/audit_server/controllers/v1/root.py | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/orm/services/audit_trail_manager/audit_server/app.py b/orm/services/audit_trail_manager/audit_server/app.py index 339517ed..82f9e692 100644 --- a/orm/services/audit_trail_manager/audit_server/app.py +++ b/orm/services/audit_trail_manager/audit_server/app.py @@ -2,8 +2,9 @@ import logging import os -from audit_server import model -from audit_server.storage import factory +from orm.services.audit_trail_manager.audit_server import model +from orm.services.audit_trail_manager.audit_server.storage import factory + from pecan.commands import CommandRunner from pecan import make_app diff --git a/orm/services/audit_trail_manager/audit_server/controllers/root.py b/orm/services/audit_trail_manager/audit_server/controllers/root.py index fa554e96..81f3802c 100644 --- a/orm/services/audit_trail_manager/audit_server/controllers/root.py +++ b/orm/services/audit_trail_manager/audit_server/controllers/root.py @@ -1,7 +1,7 @@ """root controller module.""" -from audit_server.controllers.v1 import root as v1 +from orm.services.audit_trail_manager.audit_server.controllers.v1 import root as v1 class RootController(object): diff --git a/orm/services/audit_trail_manager/audit_server/controllers/v1/audit.py b/orm/services/audit_trail_manager/audit_server/controllers/v1/audit.py index a5cf18e3..001eacb5 100755 --- a/orm/services/audit_trail_manager/audit_server/controllers/v1/audit.py +++ b/orm/services/audit_trail_manager/audit_server/controllers/v1/audit.py @@ -1,6 +1,6 @@ """audit controller module.""" -from audit_server.controllers.v1 import configuration, logs, transaction +from orm.services.audit_trail_manager.audit_server.controllers.v1 import configuration, logs, transaction class AuditController(object): diff --git a/orm/services/audit_trail_manager/audit_server/controllers/v1/configuration.py b/orm/services/audit_trail_manager/audit_server/controllers/v1/configuration.py index c619f82d..b8b4cdda 100755 --- a/orm/services/audit_trail_manager/audit_server/controllers/v1/configuration.py +++ b/orm/services/audit_trail_manager/audit_server/controllers/v1/configuration.py @@ -2,7 +2,8 @@ import logging -from orm_common.utils import utils +from orm.common.orm_common.utils import utils + from pecan import conf, rest from wsmeext.pecan import wsexpose diff --git a/orm/services/audit_trail_manager/audit_server/controllers/v1/root.py b/orm/services/audit_trail_manager/audit_server/controllers/v1/root.py index f33a9a73..05fcd8e0 100644 --- a/orm/services/audit_trail_manager/audit_server/controllers/v1/root.py +++ b/orm/services/audit_trail_manager/audit_server/controllers/v1/root.py @@ -1,7 +1,7 @@ """v1 controller module.""" -from audit_server.controllers.v1 import audit +from orm.services.audit_trail_manager.audit_server.controllers.v1 import audit class V1Controller(object):