X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fsettings.py;h=0974b5e12b524d3b82f74eed1833df3735c36ab6;hb=HEAD;hp=51c9a889c14ea4cc8c43f07d47fd0b35c41af9af;hpb=a32c2b20207885d895bd96204cc166fca14db97b;p=modeling%2Fetsicatalog.git

diff --git a/catalog/settings.py b/catalog/settings.py
index 51c9a88..0974b5e 100644
--- a/catalog/settings.py
+++ b/catalog/settings.py
@@ -13,17 +13,13 @@
 # limitations under the License.
 
 import os
-import sys
 import platform
+import sys
+import yaml
+from logging import config as log_config
 
-import catalog.pub.redisco
-
-from catalog.pub.config.config import REDIS_HOST, REDIS_PORT, REDIS_PASSWD
-from catalog.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT
 from catalog.pub.config import config as pub_config
-from logging import config as log_config
-from onaplogging import monkey
-monkey.patch_all()
+from catalog.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -53,8 +49,9 @@ INSTALLED_APPS = [
     'catalog.samples',
     'catalog.swagger',
     'drf_yasg',
+    # 'django_nose'
 ]
-
+# TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 # drf-yasg
 SWAGGER_SETTINGS = {
     'LOGIN_URL': '/admin/login',
@@ -78,16 +75,14 @@ TEMPLATES = [
     },
 ]
 
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'catalog.middleware.LogContextMiddleware',
 ]
 
 ROOT_URLCONF = 'catalog.urls'
@@ -116,7 +111,13 @@ DATABASES = {
     },
 }
 
-catalog.pub.redisco.connection_setup(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWD, db=0)
+# DATABASES = {}
+# DATABASES['default'] = {
+#     'ENGINE': 'django.db.backends.sqlite3',
+#     'NAME': ':memory:',
+# }
+
+# catalog.pub.redisco.connection_setup(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWD, db=0)
 # CACHE_BACKEND = 'redis_cache.cache://%s@%s:%s' % (REDIS_PASSWD, REDIS_HOST, REDIS_PORT)
 
 TIME_ZONE = 'UTC'
@@ -132,7 +133,6 @@ STATICFILES_DIRS = [
 
 pub_config.CATALOG_ROOT_PATH = os.path.join(STATICFILES_DIRS[0], "catalog")
 pub_config.CATALOG_URL_PATH = "static/catalog"
-pub_config.SDC_BASE_URL = "http://%s:%s/api" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT)
 
 if platform.system() == 'Windows' or 'test' in sys.argv:
     LOGGING = {
@@ -154,11 +154,16 @@ if platform.system() == 'Windows' or 'test' in sys.argv:
                 'maxBytes': 1024 * 1024 * 50,
                 'backupCount': 5,
             },
+            'console': {
+                'level': 'DEBUG',
+                'class': 'logging.StreamHandler',
+                'formatter': 'standard'
+            },
         },
 
         'loggers': {
             'catalog': {
-                'handlers': ['catalog_handler'],
+                'handlers': ['catalog_handler', 'console'],
                 'level': 'DEBUG',
                 'propagate': False
             },
@@ -171,9 +176,15 @@ if platform.system() == 'Windows' or 'test' in sys.argv:
     }
 else:
     LOGGING_CONFIG = None
+    log_path = '/var/log/onap/modeling/etsicatalog'
+    if not os.path.exists(log_path):
+        os.makedirs(log_path)
+
     # yaml configuration of logging
     LOGGING_FILE = os.path.join(BASE_DIR, 'catalog/log.yml')
-    log_config.yamlConfig(filepath=LOGGING_FILE, watchDog=True)
+    with open(file=LOGGING_FILE, mode='r', encoding="utf-8")as file:
+        logging_yaml = yaml.load(stream=file, Loader=yaml.FullLoader)
+    log_config.dictConfig(config=logging_yaml)
 
 if 'test' in sys.argv:
     pub_config.REG_TO_MSB_WHEN_START = False
@@ -190,8 +201,3 @@ if 'test' in sys.argv:
         TEST_OUTPUT_VERBOSE = True
         TEST_OUTPUT_DESCRIPTIONS = True
         TEST_OUTPUT_DIR = 'test-reports'
-
-    import mock
-    from catalog.pub.utils import idutil
-    idutil.get_auto_id = mock.Mock()
-    idutil.get_auto_id.return_value = 1