Merge "OOM installation enable VID via HTTPS"

diff --combined kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql
index bfa3d48,0c33ca6..1dcf0d8
--- 1/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql
--- 2/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql
+++ b/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql
@@@ -1,20 -1,3 +1,20 @@@
 +/*
 +# Copyright © 2018 Amdocs, Bell Canada, AT&T
 +#
 +# 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.
 +
 +*/
 +
  USE portal;
  /*
  Any updates required by OOM to the portaldb are made here.
@@@ -32,10 -15,10 +32,10 @@@ update fn_app set app_url = 'http://{{.
  --pap => 8443:30219
  update fn_app set app_url = 'http://{{.Values.config.papHostName}}:{{.Values.config.papPort}}/onap/policy', app_rest_endpoint = 'http://pap:8443/onap/api/v2' where app_name = 'Policy';
  --vid => 8080:30200
- update fn_app set app_url = 'http://{{.Values.config.vidHostName}}:{{.Values.config.vidPort}}/vid/welcome.htm', app_rest_endpoint = 'http://vid:8080/vid/api/v2' where app_name = 'Virtual Infrastructure Deployment';
+ update fn_app set app_url = 'https://{{.Values.config.vidHostName}}:{{.Values.config.vidPort}}/vid/welcome.htm', app_rest_endpoint = 'https://vid:8443/vid/api/v2' where app_name = 'Virtual Infrastructure Deployment';
  --sparky => TODO: sparky doesn't open a node port yet
  update fn_app set app_url = 'http://{{.Values.config.aaiSparkyHostName}}:{{.Values.config.aaiSparkyPort}}/services/aai/webapp/index.html#/viewInspect', app_rest_endpoint = 'http://aai-sparky-be.{{.Release.Namespace}}:9517/api/v2' where app_name = 'A&AI UI';
  --cli => 8080:30260
  update fn_app set app_url = 'http://{{.Values.config.cliHostName}}:{{.Values.config.cliPort}}/', app_type = 1 where app_name = 'CLI';
  --msb-discovery => 10081:30281  this is clearly incorrect
 -update fn_app set app_url = 'http://{{.Values.config.msbDiscoveryHostName}}:{{.Values.config.msbDiscoveryPort}}/iui/microservices/default.html' where app_name = 'MSB';
 +update fn_app set app_url = 'http://{{.Values.config.msbDiscoveryHostName}}:{{.Values.config.msbDiscoveryPort}}/iui/microservices/default.html' where app_name = 'MSB';

diff --combined kubernetes/portal/charts/portal-mariadb/values.yaml
index f1d8936,4d0192f..9d77e53
--- 1/kubernetes/portal/charts/portal-mariadb/values.yaml
--- 2/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@@ -1,5 -1,4 +1,5 @@@
  # Copyright © 2017 Amdocs, Bell Canada
 +# Modifications Copyright © 2018 AT&T
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
@@@ -44,7 -43,7 +44,7 @@@ config
    papPort: "30219"
    # application's front end hostname.  Must be resolvable on the client side environment
    papHostName: "policy.api.simpledemo.onap.org"
-   # vid ui  assignment for port 8080
+   # vid ui  assignment for port 8443
    vidPort: "30200"
    # application's front end hostname.  Must be resolvable on the client side environment
    vidHostName: "vid.api.simpledemo.onap.org"

diff --combined kubernetes/vid/values.yaml
index 70e8170,074937d..812f74e
--- 1/kubernetes/vid/values.yaml
--- 2/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@@ -41,7 -41,7 +41,7 @@@ config
    asdcclientrestport: "8080"
    vidaaiport: "8443"
    onapport: "8989"
 -  msoport: "8080"
 +  msoport: "8443"
    vidmsopass: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz
    msodme2serverurl: http://localhost:8081
    vidcontactuslink: https://todo_contact_us_link.com
@@@ -82,7 -82,7 +82,7 @@@ service
    portName: vid
    externalPort: "00"
    nodePort: "00"
-   internalPort: 8080
+   internalPort: 8443
  
  ingress:
    enabled: false