From: fujinhua <fu.jinhua@zte.com.cn>
Date: Sat, 12 Aug 2017 03:38:16 +0000 (+0800)
Subject: Add catalog logic to interactive with sdc
X-Git-Tag: v1.0.0~199
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=be03e0dddc975f9072c9e3c852a60541293b7a61;p=vfc%2Fnfvo%2Flcm.git

Add catalog logic to interactive with sdc

Change-Id: I2ab709322b2a8588aa7b982b7a273579455bca1f
Issue-Id: VFC-93
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
---

diff --git a/lcm/pub/config/config.py b/lcm/pub/config/config.py
index 462d1ba0..1a3c013f 100644
--- a/lcm/pub/config/config.py
+++ b/lcm/pub/config/config.py
@@ -51,3 +51,8 @@ REG_TO_MSB_REG_PARAM = {
 
 # delete image from vim option when delete csar
 IGNORE_DEL_IMG_WEHN_DEL_CSAR = True
+
+# catalog path(values is defined in settings.py)
+CATALOG_ROOT_PATH = None
+CATALOG_URL_PATH = None
+
diff --git a/lcm/settings.py b/lcm/settings.py
index f3d93039..f338ac29 100644
--- 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__)))
@@ -100,6 +101,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,7 +135,6 @@ LOGGING = {
 }
 
 if 'test' in sys.argv:
-    from lcm.pub.config import config
     config.REG_TO_MSB_WHEN_START = False
     DATABASES = {}
     DATABASES['default'] = {