X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fsettings.py;fp=genericparser%2Fsettings.py;h=51c9a889c14ea4cc8c43f07d47fd0b35c41af9af;hb=a32c2b20207885d895bd96204cc166fca14db97b;hp=6044c134e2ed53127032f620070a206d068415c5;hpb=431a5a35a8e0a26d21c663167303696db8a7a2a6;p=modeling%2Fetsicatalog.git

diff --git a/genericparser/settings.py b/catalog/settings.py
similarity index 81%
rename from genericparser/settings.py
rename to catalog/settings.py
index 6044c13..51c9a88 100644
--- a/genericparser/settings.py
+++ b/catalog/settings.py
@@ -16,14 +16,13 @@ import os
 import sys
 import platform
 
-import genericparser.pub.redisco
+import catalog.pub.redisco
 
-from genericparser.pub.config.config import REDIS_HOST, REDIS_PORT, REDIS_PASSWD
-from genericparser.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT
-from genericparser.pub.config import config as pub_config
+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()
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -50,9 +49,9 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'rest_framework',
-    'genericparser.pub.database',
-    'genericparser.samples',
-    'genericparser.swagger',
+    'catalog.pub.database',
+    'catalog.samples',
+    'catalog.swagger',
     'drf_yasg',
 ]
 
@@ -60,7 +59,7 @@ INSTALLED_APPS = [
 SWAGGER_SETTINGS = {
     'LOGIN_URL': '/admin/login',
     'LOGOUT_URL': '/admin/logout',
-    'DEFAULT_INFO': 'genericparser.swagger.urls.swagger_info'
+    'DEFAULT_INFO': 'catalog.swagger.urls.swagger_info'
 }
 
 TEMPLATES = [
@@ -88,12 +87,12 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'genericparser.middleware.LogContextMiddleware',
+    'catalog.middleware.LogContextMiddleware',
 ]
 
-ROOT_URLCONF = 'genericparser.urls'
+ROOT_URLCONF = 'catalog.urls'
 
-WSGI_APPLICATION = 'genericparser.wsgi.application'
+WSGI_APPLICATION = 'catalog.wsgi.application'
 
 REST_FRAMEWORK = {
     'DEFAULT_RENDERER_CLASSES': (
@@ -117,7 +116,7 @@ DATABASES = {
     },
 }
 
-genericparser.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'
@@ -130,9 +129,9 @@ STATIC_URL = '/static/'
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, "static")
 ]
-# change
-pub_config.GENERICPARSER_ROOT_PATH = os.path.join(STATICFILES_DIRS[0], "genericparser")
-pub_config.GENERICPARSER_URL_PATH = "static/genericparser"
+
+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:
@@ -146,12 +145,11 @@ if platform.system() == 'Windows' or 'test' in sys.argv:
         },
         'filters': {
         },
-        # change
         'handlers': {
-            'genericparser_handler': {
+            'catalog_handler': {
                 'level': 'DEBUG',
                 'class': 'logging.handlers.RotatingFileHandler',
-                'filename': os.path.join(BASE_DIR, 'logs/runtime_genericparser.log'),
+                'filename': os.path.join(BASE_DIR, 'logs/runtime_catalog.log'),
                 'formatter': 'standard',
                 'maxBytes': 1024 * 1024 * 50,
                 'backupCount': 5,
@@ -159,14 +157,13 @@ if platform.system() == 'Windows' or 'test' in sys.argv:
         },
 
         'loggers': {
-            # change
-            'genericparser': {
-                'handlers': ['genericparser_handler'],
+            'catalog': {
+                'handlers': ['catalog_handler'],
                 'level': 'DEBUG',
                 'propagate': False
             },
             'tosca': {
-                'handlers': ['genericparser_handler'],
+                'handlers': ['catalog_handler'],
                 'level': 'DEBUG',
                 'propagate': False
             },
@@ -175,7 +172,7 @@ if platform.system() == 'Windows' or 'test' in sys.argv:
 else:
     LOGGING_CONFIG = None
     # yaml configuration of logging
-    LOGGING_FILE = os.path.join(BASE_DIR, 'genericparser/log.yml')
+    LOGGING_FILE = os.path.join(BASE_DIR, 'catalog/log.yml')
     log_config.yamlConfig(filepath=LOGGING_FILE, watchDog=True)
 
 if 'test' in sys.argv:
@@ -195,7 +192,6 @@ if 'test' in sys.argv:
         TEST_OUTPUT_DIR = 'test-reports'
 
     import mock
-    from genericparser.pub.utils import idutil
-
+    from catalog.pub.utils import idutil
     idutil.get_auto_id = mock.Mock()
     idutil.get_auto_id.return_value = 1