diff options
-rw-r--r-- | src/software/lmi/software/cimom_entry.py | 4 | ||||
-rw-r--r-- | src/software/lmi/software/util/SoftwareConfiguration.py | 2 | ||||
-rw-r--r-- | src/software/lmi/software/util/cmpi_logging.py | 6 | ||||
-rw-r--r-- | src/software/lmi/software/yumdb/__init__.py | 4 | ||||
-rw-r--r-- | src/software/lmi/software/yumdb/jobmanager.py | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/software/lmi/software/cimom_entry.py b/src/software/lmi/software/cimom_entry.py index 9c90d46..27c9820 100644 --- a/src/software/lmi/software/cimom_entry.py +++ b/src/software/lmi/software/cimom_entry.py @@ -26,8 +26,8 @@ Entry module for OpenLMI Software providers. from multiprocessing import Queue -from lmi.common import JobManager -from lmi.common.IndicationManager import IndicationManager +from lmi.providers import JobManager +from lmi.providers.IndicationManager import IndicationManager from lmi.software import util from lmi.software.core import Job from lmi.software.LMI_SoftwareIdentity import LMI_SoftwareIdentity diff --git a/src/software/lmi/software/util/SoftwareConfiguration.py b/src/software/lmi/software/util/SoftwareConfiguration.py index 85e10da..1534ee9 100644 --- a/src/software/lmi/software/util/SoftwareConfiguration.py +++ b/src/software/lmi/software/util/SoftwareConfiguration.py @@ -27,7 +27,7 @@ SoftwareConfiguration """ -from lmi.common.BaseConfiguration import BaseConfiguration +from lmi.base.BaseConfiguration import BaseConfiguration class SoftwareConfiguration(BaseConfiguration): """ diff --git a/src/software/lmi/software/util/cmpi_logging.py b/src/software/lmi/software/util/cmpi_logging.py index 14802c5..6ff001e 100644 --- a/src/software/lmi/software/util/cmpi_logging.py +++ b/src/software/lmi/software/util/cmpi_logging.py @@ -28,7 +28,7 @@ import logging import logging.config import os -from lmi.common import cmpi_logging +from lmi.providers import cmpi_logging DEFAULT_LOGGING_CONFIG = { "version" : 1, @@ -53,7 +53,7 @@ DEFAULT_LOGGING_CONFIG = { "formatter": "default", }, "cmpi" : { - "()" : "lmi.common.cmpi_logging.CMPILogHandler", + "()" : "lmi.providers.cmpi_logging.CMPILogHandler", # this must be filled with broker env logger "cmpi_logger" : None, "level" : "ERROR", @@ -257,7 +257,7 @@ def setup(env, config): defaults["root"]["level"] = level logging.config.dictConfig(defaults) # needed for shared code under lmi.common - cmpi_logging.logger = logging.getLogger('lmi.common') + cmpi_logging.logger = logging.getLogger('lmi.providers') def get_logger(module_name): """ diff --git a/src/software/lmi/software/yumdb/__init__.py b/src/software/lmi/software/yumdb/__init__.py index 470aaf8..d9cd3bc 100644 --- a/src/software/lmi/software/yumdb/__init__.py +++ b/src/software/lmi/software/yumdb/__init__.py @@ -43,8 +43,8 @@ import Queue as TQueue # T as threaded import threading import yum -from lmi.common import singletonmixin -from lmi.common.IndicationManager import IndicationManager +from lmi.base import singletonmixin +from lmi.providers.IndicationManager import IndicationManager from lmi.software.util import Configuration from lmi.software.util import cmpi_logging from lmi.software.util import get_signal_name diff --git a/src/software/lmi/software/yumdb/jobmanager.py b/src/software/lmi/software/yumdb/jobmanager.py index 4c9d90a..6a360ef 100644 --- a/src/software/lmi/software/yumdb/jobmanager.py +++ b/src/software/lmi/software/yumdb/jobmanager.py @@ -39,8 +39,8 @@ import threading import time import traceback -from lmi.common.IndicationManager import IndicationManager -from lmi.common.JobManager import JobManager as JM +from lmi.providers.IndicationManager import IndicationManager +from lmi.providers.JobManager import JobManager as JM from lmi.software.yumdb import errors from lmi.software.yumdb import jobs from lmi.software.util import cmpi_logging |