X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Fsettings.py;h=aae67a4b65a92c4a30bb1c839bc21c486f6764a7;hb=HEAD;hp=b5a5e15a3a8db0153a4f6eac35c60bf2c44e7f5f;hpb=669ef8d8b4f9b9170d0710bc92ac621fe27fcb81;p=vfc%2Fnfvo%2Flcm.git

diff --git a/lcm/settings.py b/lcm/settings.py
index b5a5e15a..aae67a4b 100644
--- a/lcm/settings.py
+++ b/lcm/settings.py
@@ -16,14 +16,14 @@ import os
 import sys
 import platform
 
-import redisco
+import yaml
+
+import lcm.pub.redisco
 
 from lcm.pub.config.config import REDIS_HOST, REDIS_PORT, REDIS_PASSWD
 from lcm.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT
 from lcm.pub.config import config as pub_config
 from logging import config as log_config
-from onaplogging import monkey
-monkey.patch_all()
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -51,9 +51,10 @@ INSTALLED_APPS = [
     'rest_framework',
     'lcm.pub.database',
     'lcm.swagger',
+    # 'django_nose',
     'drf_yasg'
 ]
-
+# TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -76,16 +77,15 @@ SWAGGER_SETTINGS = {
     'DEFAULT_INFO': 'lcm.swagger.urls.swagger_info'
 }
 
-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.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'lcm.middleware.LogContextMiddleware',
 ]
 
 ROOT_URLCONF = 'lcm.urls'
@@ -122,7 +122,7 @@ DATABASES = {
 #    'NAME': 'D:/etsi-plug-test/db/nfvo',
 # }
 
-redisco.connection_setup(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWD, db=0)
+lcm.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,8 +132,8 @@ TIME_ZONE = 'UTC'
 
 STATIC_URL = '/static/'
 
-pub_config.AAI_BASE_URL = "http://%s:%s/aai/v11" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT)
-pub_config.SDC_BASE_URL = "http://%s:%s/api" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT)
+pub_config.AAI_BASE_URL = "%s/aai/v11" % pub_config.MSB_BASE_URL
+pub_config.SDC_BASE_URL = "%s/api" % pub_config.MSB_BASE_URL
 
 if platform.system() == 'Windows' or 'test' in sys.argv:
     LOGGING = {
@@ -167,9 +167,16 @@ if platform.system() == 'Windows' or 'test' in sys.argv:
     }
 else:
     LOGGING_CONFIG = None
+
+    log_path = '/var/log/onap/vfc/nslcm'
+    if not os.path.exists(log_path):
+        os.makedirs(log_path)
+
     # yaml configuration of logging
     LOGGING_FILE = os.path.join(BASE_DIR, 'lcm/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