Update the endpoint of Portal to ONAPPORTAL

Change-Id: Iadd91e8b6f3b183add15343d506a88dc6b46ff14
Issue-ID: OOM-505
Signed-off-By: Bharath Thiruveedula<bharath_ves@hotmail.com>
(cherry picked from commit 2fa940f062455b4646e58f7d4d6d48a3af6df3a4)

diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal.properties b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal.properties
index cf99f5d..33d91cf 100644 (file)
--- a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal.properties
+++ b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal.properties
@@ -7,10 +7,10 @@ portal.api.impl.class = org.openecomp.sparky.security.portal.PortalRestAPIServic
 
 # Instance of ECOMP Portal where the app has been on-boarded
 # use insecure http for dev purposes to avoid self-signed certificate
-ecomp_rest_url = http://portalapps.onap-portal:8989/ECOMPPORTAL/auxapi
+ecomp_rest_url = http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi
 
 # Standard global logon page
-ecomp_redirect_url = http://portalapps.onap-portal:8989/ECOMPPORTAL/login.htm
+ecomp_redirect_url = http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm
 
 # Name of cookie to extract on login request
 csp_cookie_name = EPService

diff --git a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/console.conf b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/console.conf
index d5be80a..b0a7888 100755 (executable)
--- a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/console.conf
+++ b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/console.conf
@@ -121,7 +121,7 @@ onap_application_name=
 
 #-----------------------ONAP-PORTAL-Properties----------------------
 
-ONAP_REDIRECT_URL=http://portalapps.onap-portal:8989/ECOMPPORTAL/login.htm
+ONAP_REDIRECT_URL=http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm
 ONAP_REST_URL=
 ONAP_UEB_URL_LIST=
 ONAP_PORTAL_INBOX_NAME=
@@ -129,4 +129,4 @@ ONAP_UEB_APP_KEY=
 ONAP_UEB_APP_SECRET=
 ONAP_UEB_APP_MAILBOX_NAME=
 APP_DISPLAY_NAME=ONAP Policy
-ONAP_SHARED_CONTEXT_REST_URL=http://portalapps.onap-portal:8989/ECOMPPORTAL/context
+ONAP_SHARED_CONTEXT_REST_URL=http://portalapps.onap-portal:8989/ONAPPORTAL/context

diff --git a/kubernetes/config/docker/init/src/config/sdc/environments/AUTO.json b/kubernetes/config/docker/init/src/config/sdc/environments/AUTO.json
index 6258351..5d6eaef 100755 (executable)
--- a/kubernetes/config/docker/init/src/config/sdc/environments/AUTO.json
+++ b/kubernetes/config/docker/init/src/config/sdc/environments/AUTO.json
@@ -17,12 +17,12 @@
             "private": "eth0"
         },
                 "ECompP": {
-                    "ecomp_rest_url": "http://portalapps.onap-portal:8989/ECOMPPORTAL/auxapi",
+                    "ecomp_rest_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi",
             "ueb_url_list": "dmaap.onap-message-router, dmaap.onap-message-router",
             "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
             "app_key": "x9UfO7JsDn8BESVX",
             "inbox_name": "ECOMP-PORTAL-INBOX",
-            "ecomp_redirect_url": "http://portalapps.onap-portal:8989/ECOMPPORTAL/login.htm",
+            "ecomp_redirect_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm",
             "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
                         "decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
         },

diff --git a/kubernetes/config/docker/init/src/config/sdc/environments/Template.json b/kubernetes/config/docker/init/src/config/sdc/environments/Template.json
index 0bec1b7..ddddc78 100755 (executable)
--- a/kubernetes/config/docker/init/src/config/sdc/environments/Template.json
+++ b/kubernetes/config/docker/init/src/config/sdc/environments/Template.json
@@ -17,12 +17,12 @@
             "private": "eth1"
         },
                "ECompP": {
-                   "ecomp_rest_url": "http://portalapps.onap-portal:8989/ECOMPPORTAL/auxapi",
+                   "ecomp_rest_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi",
             "ueb_url_list": "dmaap.onap-message-router,dmaap.onap-message-router", 
             "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu", 
             "app_key": "x9UfO7JsDn8BESVX", 
             "inbox_name": "ECOMP-PORTAL-INBOX", 
-            "ecomp_redirect_url": "http://portalapps.onap-portal:8989/ECOMPPORTAL/login.htm", 
+            "ecomp_redirect_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm", 
             "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
                        "decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
         }, 

diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index 1c03218..5354dba 100644 (file)
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -132,4 +132,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/vid/logback.xml
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}