add missing information to see VID in Portal

add missign information into properties files, localization scirtp and Dockerfile  to solve the problem of accessing VID portal form ONAP Portal

Issue: PORTAL-34 PORTAL-38
Change-Id: Ief9c0fcb57aa0d455d943806acb04de698342b8e
Signed-off-by: Krzysztof Kwiecien <krzysztof.kwiecien1@orange.com>

4 files changed, 11 insertions, 2 deletions

diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index 72d37c32..43e472da 100755
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -1,7 +1,10 @@
 FROM tomcat:8.0-jre8

-

+# add vim and uncomment alias to speedup troubleshooting purpose

 RUN apt-get update && apt-get install -y \

-	openjdk-8-jdk

+	openjdk-8-jdk vim

+

+RUN sed -i 's/# alias/alias/g' /root/.bashrc

+

 

 ENV ROOT_DIR /opt/app/vid

 

diff --git a/deliveries/src/main/scripts/localize_portal.sh b/deliveries/src/main/scripts/localize_portal.sh
index 7d630c56..f29d485e 100755
--- a/deliveries/src/main/scripts/localize_portal.sh
+++ b/deliveries/src/main/scripts/localize_portal.sh
@@ -10,6 +10,7 @@ sed -e 's ${VID_WJ_LOGOUT_URL} '${VID_WJ_LOGOUT_URL}' g' \
 	-e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \
 	-e 's ${VID_UEB_URL_LIST} '${VID_UEB_URL_LIST}' g' \
 	-e 's ${VID_ECOMP_PORTAL_INBOX_NAME} '${VID_ECOMP_PORTAL_INBOX_NAME}' g' \
+	-e 's ${VID_DECRYPTION_KEY} '${VID_DECRYPTION_KEY}' g' \
 	-e 's ${VID_UEB_APP_KEY} '${VID_UEB_APP_KEY}' g' \
 	-e 's ${VID_UEB_APP_SECRET} '${VID_UEB_APP_SECRET}' g' \
 	-e 's ${VID_UEB_APP_MAILBOX_NAME} '${VID_UEB_APP_MAILBOX_NAME}' g' \
diff --git a/epsdk-app-onap/src/main/resources/portal_template.properties b/epsdk-app-onap/src/main/resources/portal_template.properties
index 6ef41556..ed694014 100755
--- a/epsdk-app-onap/src/main/resources/portal_template.properties
+++ b/epsdk-app-onap/src/main/resources/portal_template.properties
@@ -4,6 +4,7 @@ portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl
 portal.api.prefix = /api

 max.idle.time = 5

 user.attribute.name = user_attribute

+decryption_key = ${VID_DECRYPTION_KEY}

 

 # Log On for single sign on

 ecomp_redirect_url	= ${VID_ECOMP_REDIRECT_URL}

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
index 97267f60..74417aad 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
@@ -1,6 +1,10 @@
 # login settings

 login_method_backdoor       = backdoor

+login_method_web_junction       = login_method_web_junction

+login_method_csp       = login_method_csp

 login_method_attribute_name = login_method

+authentication_mechanism = BOTH

+role_function_list = role_funcion_list

 

 #login message

 login.error.hrid.empty = Login failed, please contact system administrator.