Change template properties for AAI

Change-Id: I5412a152e6df701d94c8dffbc2a22d70e282008c
Issue-ID: VID-343
Signed-off-by: biniek <lukasz.biniek@nokia.com>

diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index 8cd2bc7..33c3ac1 100755 (executable)
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -25,8 +25,7 @@ ENV LOG4J_LOGLEVEL INFO
 ENV LOG4J_APPENDER rollingfile\r
 ENV LOG4J_LOGS_DIRECTORY ${ROOT_DIR}/logs\r
 \r
-ENV VID_AAI_HOST aai.api.simpledemo.onap.org\r
-ENV VID_AAI_PORT 8443\r
+ENV VID_AAI_URL https://aai.api.simpledemo.onap.org:8443\r
 ENV VID_APP_DISPLAY_NAME VID\r
 ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.onap.org:8080/onapportal/context\r
 ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra\r

diff --git a/deliveries/src/main/scripts/localize_system.sh b/deliveries/src/main/scripts/localize_system.sh
index 0947d49..a7e6cd3 100755 (executable)
--- a/deliveries/src/main/scripts/localize_system.sh
+++ b/deliveries/src/main/scripts/localize_system.sh
@@ -13,8 +13,7 @@ sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \
        -e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \
        -e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \
        -e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \
-       -e 's/${VID_AAI_HOST}/'${VID_AAI_HOST}'/g' \
-       -e 's/${VID_AAI_PORT}/'${VID_AAI_PORT}'/g' \
+       -e 's ${VID_AAI_URL} '${VID_AAI_URL}' g' \
        -e 's/${AAI_USE_CLIENT_CERT}/'${AAI_USE_CLIENT_CERT}'/g' \
        -e 's/${AAI_VID_UID}/'${AAI_VID_UID}'/g' \
        -e 's/${AAI_VID_PASSWD_X}/'${AAI_VID_PASSWD_X}'/g' \

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
index 06a2e6b..149ad99 100755 (executable)
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
@@ -64,10 +64,10 @@ element_map_file_path = /tmp
 element_map_icon_path = app/vid/icons/\r
 \r
 #aai related properties\r
-aai.server.url.base=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/\r
-aai.server.url=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/v13/\r
-aai.oldserver.url.base=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/servers/\r
-aai.oldserver.url=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/servers/v3/\r
+aai.server.url.base=${VID_AAI_URL}/aai/\r
+aai.server.url=${VID_AAI_URL}/aai/v13/\r
+aai.oldserver.url.base=${VID_AAI_URL}/aai/servers/\r
+aai.oldserver.url=${VID_AAI_URL}/aai/servers/v3/\r
 aai.truststore.filename=${AAI_TRUSTSTORE_FILENAME}\r
 aai.truststore.passwd.x=${AAI_TRUSTSTORE_PASSWD_X}\r
 aai.keystore.filename=${AAI_KEYSTORE_FILENAME}\r