DCAE dashboard security fixes

Portal SDK ver 2.6.0, non-root user for docker container
Change label on Dashboard Home page, API changes, Container optimization

Change-Id: Ie2c8efd76d34fddc2b182d5ed494761522695914
Issue-ID: DCAEGEN2-1638
Issue-ID: CCSDK-1485
Issue-ID: DCAEGEN2-1921
Issue-ID: DCAEGEN2-1915
Issue-ID: DCAEGEN2-1856
Issue-ID: DCAEGEN2-1556
Issue-ID: DCAEGEN2-1592
Signed-off-by: Kotagiri, Ramprasad (rp5662) <rp5662@att.com>

3 files changed, 29 insertions, 12 deletions

diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
index 2496647..9e221cd 100644
--- a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
@@ -1,4 +1,23 @@
-# ATT dashboard.properties
+###############################################################################
+# =============LICENSE_START=========================================================
+#
+# =================================================================================
+#  Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#  
+#      http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  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.
+# ============LICENSE_END=========================================================
+#
+###############################################################################
 
 # Properties for the ONAP Controller Dashboard webapp
 
@@ -14,11 +33,12 @@ controller.env = dev
 controller.key.list = dev
 
 dev.name = Local
-dev.url = https://orcl.com/api/v3.1
-dev.inventory.url = https://inventory.com:30123/
-dev.dhandler.url = https://dplh.com:30125/
-dev.consul.url = http://consul.com:8500/
+dev.url = https://dashboard.onap.svc.cluster.local/api/v3.1
+dev.inventory.url = https://inventory.onap.svc.cluster.local:8443/
+dev.dhandler.url = https://dplh.onap.svc.cluster.local:8443/
+dev.consul.url = https://cnsl.onap.svc.cluster.local:9500/
 
 dev.username = admin
 dev.password =  admin
 dev.is_encrypted = false
+
diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template
index 4d66dba..940bcf1 100644
--- a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template
@@ -2,7 +2,7 @@
 # =============LICENSE_START=========================================================
 #
 # =================================================================================
-#  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+#  Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,11 +17,10 @@
 #  limitations under the License.
 # ============LICENSE_END=========================================================
 #
-#  ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ###############################################################################
 # OS system.properties
 
-app_display_name = ONAP Operations UI
+app_display_name = DCAE Dashboard
 
 # Postgres
 db.driver=org.postgresql.Driver
diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/ccsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
index 01ba9f7..5374b1a 100644
--- a/ccsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
@@ -2,7 +2,7 @@
 # =============LICENSE_START=========================================================
 #
 # =================================================================================
-#  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+#  Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,10 +17,7 @@
 #  limitations under the License.
 # ============LICENSE_END=========================================================
 #
-#  ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ###############################################################################
-# OS fusion.properties
-
 # login settings
 #login_method_csp            = csp
 #login_method_web_junction   = web_junction
@@ -61,3 +58,4 @@ business_direct_menu_attribute_name  = businessDirectMenuData
 
 # Role settings
 sys_admin_role_id = 1
+