X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fconfig%2Fconfig.py;h=41f0eedd164508495752e8c12d320f474d033eee;hb=dc6d989132a5db3077de6937158386aacd46400c;hp=492595df2c435d91ba802036bb115aa97dbc4789;hpb=b36aa03116722a2b5b81dfe8da8b82b580155bcd;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/pub/config/config.py b/lcm/lcm/pub/config/config.py
index 492595df..41f0eedd 100644
--- a/lcm/lcm/pub/config/config.py
+++ b/lcm/lcm/pub/config/config.py
@@ -11,21 +11,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import os
 
 # [MSB]
+MSB_SERVICE_PROTOCOL = 'http'
 MSB_SERVICE_IP = '127.0.0.1'
-MSB_SERVICE_PORT = '80'
-
-# [AAI]
-AAI_SERVICE_IP = '127.0.0.1'
-AAI_SERVICE_PORT = '8443'
-AAI_BASE_URL = "https://%s:%s/aai/v8" % (AAI_SERVICE_IP, AAI_SERVICE_PORT)
-AAI_USER = "AAI"
-AAI_PASSWORD = "AAI"
-CLOUD_OWNER = "11"
-CLOUD_REGION_ID = ""
-TENANT_ID = ""
+MSB_SERVICE_PORT = '443'
+MSB_BASE_URL = "%s://%s:%s" % (MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT)
 
 # [REDIS]
 REDIS_HOST = '127.0.0.1'
@@ -39,12 +30,28 @@ DB_NAME = "gvnfm"
 DB_USER = "gvnfm"
 DB_PASSWD = "gvnfm"
 
+# [MDC]
+SERVICE_NAME = "vnflcm"
+FORWARDED_FOR_FIELDS = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST",
+                        "HTTP_X_FORWARDED_SERVER"]
+
+# [aai config]
+AAI_BASE_URL = "http://127.0.0.1:80/aai/v13"
+AAI_USER = "AAI"
+AAI_PASSWD = "AAI"
+
 # [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": "vnflcm",
     "version": "v1",
+    "enable_ssl": enable_ssl,
     "url": "/api/vnflcm/v1",
     "protocol": "REST",
     "visualRange": "1",
@@ -54,3 +61,4 @@ REG_TO_MSB_REG_PARAM = {
         "ttl": 0
     }]
 }
+MSB_SVC_URL = "/api/microservices/v1/services/vnflcm/version/v1"