Merge "Fix vfc-lcm vserver report bug."

[vfc/nfvo/lcm.git] / lcm / settings.py

diff --git a/lcm/settings.py b/lcm/settings.py
index f3d9303..9a095b3 100644 (file)
--- a/lcm/settings.py
+++ b/lcm/settings.py
@@ -19,6 +19,7 @@ import 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
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -44,7 +45,8 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'rest_framework',
     'lcm.pub.database',
-    'lcm.samples'
+    'lcm.samples',
+    'lcm.swagger'
 ]
 
 MIDDLEWARE_CLASSES = [
@@ -70,7 +72,7 @@ REST_FRAMEWORK = {
     'DEFAULT_PARSER_CLASSES': (
         'rest_framework.parsers.JSONParser',
         'rest_framework.parsers.MultiPartParser',
-        # 'rest_framework.parsers.FormParser',
+        'rest_framework.parsers.FormParser',
         # 'rest_framework.parsers.FileUploadParser',
     )
 }
@@ -100,6 +102,9 @@ STATICFILES_DIRS = [
     os.path.join(BASE_DIR, "static")
 ]
 
+config.CATALOG_ROOT_PATH = os.path.join(STATICFILES_DIRS[0], "catalog")
+config.CATALOG_URL_PATH = "static/catalog"
+
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': True,
@@ -131,8 +136,8 @@ LOGGING = {
 }
 
 if 'test' in sys.argv:
-    from lcm.pub.config import config
     config.REG_TO_MSB_WHEN_START = False
+    config.DEPLOY_WORKFLOW_WHEN_START = False
     DATABASES = {}
     DATABASES['default'] = {
         'ENGINE': 'django.db.backends.sqlite3',