6 files changed, 14 insertions, 43 deletions
diff --git a/moonv4/moon_db/moon_db/api/keystone.py b/moonv4/moon_db/moon_db/api/keystone.py
index b5d7e3a6..b570918c 100644
--- a/moonv4/moon_db/moon_db/api/keystone.py
+++ b/moonv4/moon_db/moon_db/api/keystone.py
@@ -8,13 +8,11 @@ import requests
 import json
 from uuid import uuid4
 from oslo_log import log as logging
-from oslo_config import cfg
-from moon_utilities import exceptions
+from moon_utilities import exceptions, configuration
 from moon_db.api.managers import Managers
 from moon_utilities.security_functions import filter_input, login, logout
 
-LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
+LOG = logging.getLogger("moon.db.api.keystone")
 
 
 class KeystoneManager(Managers):
@@ -22,11 +20,13 @@ class KeystoneManager(Managers):
     def __init__(self, connector=None):
         self.driver = connector.driver
         Managers.KeystoneManager = self
-        self.__url = CONF.keystone.url
-        self.__user = CONF.keystone.user
-        self.__password = CONF.keystone.password
-        self.__domain = CONF.keystone.domain
-        self.__project = CONF.keystone.project
+        conf = configuration.get_configuration("openstack/keystone")['openstack/keystone']
+
+        self.__url = conf['url']
+        self.__user = conf['user']
+        self.__password = conf['password']
+        self.__domain = conf['domain']
+        self.__project = conf['project']
         try:
             os.environ.pop("http_proxy")
             os.environ.pop("https_proxy")
diff --git a/moonv4/moon_db/moon_db/api/managers.py b/moonv4/moon_db/moon_db/api/managers.py
index 48ac9ce1..602e0f11 100644
--- a/moonv4/moon_db/moon_db/api/managers.py
+++ b/moonv4/moon_db/moon_db/api/managers.py
@@ -4,7 +4,7 @@
 # or at 'http://www.apache.org/licenses/LICENSE-2.0'.
 
 from oslo_log import log as logging
-LOG = logging.getLogger(__name__)
+LOG = logging.getLogger("moon.db.api.managers")
 
 
 class Managers(object):
diff --git a/moonv4/moon_db/moon_db/api/model.py b/moonv4/moon_db/moon_db/api/model.py
index 22a5a834..f648295e 100644
--- a/moonv4/moon_db/moon_db/api/model.py
+++ b/moonv4/moon_db/moon_db/api/model.py
@@ -3,23 +3,14 @@
 # license which can be found in the file 'LICENSE' in this package distribution
 # or at 'http://www.apache.org/licenses/LICENSE-2.0'.
 
-import os
-import re
-import types
-import json
-import copy
 from uuid import uuid4
-from oslo_config import cfg
 from oslo_log import log as logging
-import requests
 from moon_utilities import exceptions
 from moon_utilities.security_functions import filter_input, enforce
-# from moon_db.api import algorithms
 from moon_db.api.managers import Managers
 
 
-LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
+LOG = logging.getLogger("moon.db.api.model")
 
 
 class ModelManager(Managers):
diff --git a/moonv4/moon_db/moon_db/api/pdp.py b/moonv4/moon_db/moon_db/api/pdp.py
index f84c7a85..05eb163f 100644
--- a/moonv4/moon_db/moon_db/api/pdp.py
+++ b/moonv4/moon_db/moon_db/api/pdp.py
@@ -3,23 +3,13 @@
 # license which can be found in the file 'LICENSE' in this package distribution
 # or at 'http://www.apache.org/licenses/LICENSE-2.0'.
 
-import os
-import re
-import types
-import json
-import copy
 from uuid import uuid4
-from oslo_config import cfg
 from oslo_log import log as logging
-import requests
-from moon_utilities import exceptions
 from moon_utilities.security_functions import filter_input, enforce
-# from moon_db.api import algorithms
 from moon_db.api.managers import Managers
 
 
-LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
+LOG = logging.getLogger("moon.db.api.pdp")
 
 
 class PDPManager(Managers):
diff --git a/moonv4/moon_db/moon_db/api/policy.py b/moonv4/moon_db/moon_db/api/policy.py
index 0beaf78f..e0413bdc 100644
--- a/moonv4/moon_db/moon_db/api/policy.py
+++ b/moonv4/moon_db/moon_db/api/policy.py
@@ -3,23 +3,13 @@
 # license which can be found in the file 'LICENSE' in this package distribution
 # or at 'http://www.apache.org/licenses/LICENSE-2.0'.
 
-import os
-import re
-import types
-import json
-import copy
 from uuid import uuid4
-from oslo_config import cfg
 from oslo_log import log as logging
-import requests
-from moon_utilities import exceptions
 from moon_utilities.security_functions import filter_input, enforce
-# from moon_db.api import algorithms
 from moon_db.api.managers import Managers
 
 
-LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
+LOG = logging.getLogger("moon.db.api.policy")
 
 
 class PolicyManager(Managers):
diff --git a/moonv4/moon_db/moon_db/api/tenants.py b/moonv4/moon_db/moon_db/api/tenants.py
index dd7c4ec5..527e6712 100644
--- a/moonv4/moon_db/moon_db/api/tenants.py
+++ b/moonv4/moon_db/moon_db/api/tenants.py
@@ -9,7 +9,7 @@ from moon_db.api.managers import Managers
 from moon_utilities.security_functions import filter_input, enforce
 from oslo_log import log as logging
 
-LOG = logging.getLogger(__name__)
+LOG = logging.getLogger("moon.db.api.tenants")
 
 
 class TenantManager(Managers):