X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fsettings.py;h=0068dac44ce93e9514e32f4eb567c1daaec01517;hb=0eaa773364c415f946860fef6f69f1fcda414178;hp=40c756584250f58bd207dffa87f6676e9c174305;hpb=f96008008bcbefd4142611c9ecca45899c5bb7d6;p=modeling%2Fetsicatalog.git

diff --git a/catalog/settings.py b/catalog/settings.py
index 40c7565..0068dac 100644
--- a/catalog/settings.py
+++ b/catalog/settings.py
@@ -16,9 +16,9 @@ import os
 import sys
 import platform
 
-import catalog.pub.redisco
+# import catalog.pub.redisco
 
-from catalog.pub.config.config import REDIS_HOST, REDIS_PORT, REDIS_PASSWD
+# 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
@@ -124,7 +124,7 @@ DATABASES = {
 #     'NAME': ':memory:',
 # }
 
-catalog.pub.redisco.connection_setup(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWD, db=0)
+# 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'
@@ -140,7 +140,7 @@ 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)
+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 = {
@@ -203,9 +203,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