1. Remove the mandatory dependency on MSB

[modeling/etsicatalog.git] / catalog / settings.py

diff --git a/catalog/settings.py b/catalog/settings.py
index 0068dac..81127b8 100644 (file)
--- a/catalog/settings.py
+++ b/catalog/settings.py
@@ -13,16 +13,14 @@
 # limitations under the License.
 
 import os
-import sys
 import platform
+import sys
+from logging import config as log_config
 
-# import catalog.pub.redisco
+from onaplogging import monkey
 
-# 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
+from catalog.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT
 
 monkey.patch_all()
 
@@ -80,13 +78,12 @@ 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',
@@ -140,7 +137,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 = "https://%s:%s/api" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT)
 
 if platform.system() == 'Windows' or 'test' in sys.argv:
     LOGGING = {