upgrade code to add HTTP/HTTPS protocol registration switch to MSB

[modeling/etsicatalog.git] / catalog / pub / config / config.py

diff --git a/catalog/pub/config/config.py b/catalog/pub/config/config.py
index 99932d7..c1d4695 100644 (file)
--- a/catalog/pub/config/config.py
+++ b/catalog/pub/config/config.py
@@ -32,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",
@@ -47,6 +53,7 @@ REG_TO_MSB_REG_PARAM = [{
 }, {
     "serviceName": "nsd",
     "version": "v1",
+    "enable_ssl": enable_ssl,
     "url": "/api/nsd/v1",
     "protocol": "REST",
     "visualRange": "1",
@@ -58,6 +65,7 @@ REG_TO_MSB_REG_PARAM = [{
 }, {
     "serviceName": "vnfpkgm",
     "version": "v1",
+    "enable_ssl": enable_ssl,
     "url": "/api/vnfpkgm/v1",
     "protocol": "REST",
     "visualRange": "1",
@@ -69,6 +77,7 @@ REG_TO_MSB_REG_PARAM = [{
 }, {
     "serviceName": "parser",
     "version": "v1",
+    "enable_ssl": enable_ssl,
     "url": "/api/parser/v1",
     "protocol": "REST",
     "visualRange": "1",
@@ -88,13 +97,13 @@ CATALOG_ROOT_PATH = None
 CATALOG_URL_PATH = None
 
 # [sdc config]
-SDC_BASE_URL = "https://msb-iag/api"
+SDC_BASE_URL = MSB_BASE_URL + "/api"
 SDC_USER = "modeling"
 SDC_PASSWD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
 
 # [dmaap config]
-DMAAP_MR_IP = '127.0.0.1'
-DMAAP_MR_PORT = '3904'
+DMAAP_MR_IP = MSB_SERVICE_IP
+DMAAP_MR_PORT = '30226'
 CONSUMER_GROUP = "consumerGroup"
 CONSUMER_ID = "consumerId"
 POLLING_INTERVAL = 15