X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpub%2Fconfig%2Fconfig.py;h=c1d469597a240e09839b789436c2cb258b092ab9;hb=25a5b7ae680a120672faae4c2a1381b9e89f2a14;hp=3f6592a250baa4dd678db5b51d0108ed8073c21c;hpb=1e1ba6cb568bbf426175ee8d5fa25c07d87678f1;p=modeling%2Fetsicatalog.git

diff --git a/catalog/pub/config/config.py b/catalog/pub/config/config.py
index 3f6592a..c1d4695 100644
--- a/catalog/pub/config/config.py
+++ b/catalog/pub/config/config.py
@@ -13,13 +13,10 @@
 # limitations under the License.
 
 # [MSB]
+MSB_SERVICE_PROTOCOL = 'http'
 MSB_SERVICE_IP = '127.0.0.1'
 MSB_SERVICE_PORT = '80'
-
-# [REDIS]
-REDIS_HOST = '127.0.0.1'
-REDIS_PORT = '6379'
-REDIS_PASSWD = ''
+MSB_BASE_URL = "%s://%s:%s" % (MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT)
 
 # [mysql]
 DB_IP = "127.0.0.1"
@@ -35,10 +32,16 @@ FORWARDED_FOR_FIELDS = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST",
 
 # [register]
 REG_TO_MSB_WHEN_START = True
+SSL_ENABLED = "true"
 REG_TO_MSB_REG_URL = "/api/microservices/v1/services"
+if SSL_ENABLED == "true":
+    enable_ssl = "true"
+else:
+    enable_ssl = "false"
 REG_TO_MSB_REG_PARAM = [{
     "serviceName": "catalog",
     "version": "v1",
+    "enable_ssl": enable_ssl,
     "url": "/api/catalog/v1",
     "protocol": "REST",
     "visualRange": "1",
@@ -50,6 +53,7 @@ REG_TO_MSB_REG_PARAM = [{
 }, {
     "serviceName": "nsd",
     "version": "v1",
+    "enable_ssl": enable_ssl,
     "url": "/api/nsd/v1",
     "protocol": "REST",
     "visualRange": "1",
@@ -61,6 +65,7 @@ REG_TO_MSB_REG_PARAM = [{
 }, {
     "serviceName": "vnfpkgm",
     "version": "v1",
+    "enable_ssl": enable_ssl,
     "url": "/api/vnfpkgm/v1",
     "protocol": "REST",
     "visualRange": "1",
@@ -72,6 +77,7 @@ REG_TO_MSB_REG_PARAM = [{
 }, {
     "serviceName": "parser",
     "version": "v1",
+    "enable_ssl": enable_ssl,
     "url": "/api/parser/v1",
     "protocol": "REST",
     "visualRange": "1",
@@ -91,8 +97,15 @@ CATALOG_ROOT_PATH = None
 CATALOG_URL_PATH = None
 
 # [sdc config]
-SDC_BASE_URL = "http://msb-iag/api"
-SDC_USER = "aai"
+SDC_BASE_URL = MSB_BASE_URL + "/api"
+SDC_USER = "modeling"
 SDC_PASSWD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
 
+# [dmaap config]
+DMAAP_MR_IP = MSB_SERVICE_IP
+DMAAP_MR_PORT = '30226'
+CONSUMER_GROUP = "consumerGroup"
+CONSUMER_ID = "consumerId"
+POLLING_INTERVAL = 15
+
 VNFD_SCHEMA_VERSION_DEFAULT = "base"