Merge "Add ingress controler support to ROBOT"
diff --git a/demo-k8s.sh b/demo-k8s.sh
index eca3232..c29ff41 100755
--- a/demo-k8s.sh
+++ b/demo-k8s.sh
@@ -112,6 +112,10 @@
TAG="InitDemo"
shift
;;
+ distribute_vcpe)
+ TAG="distributeVCPE"
+ shift
+ ;;
init_customer)
TAG="InitCustomer"
shift
diff --git a/resources/config/eteshare/config/robot_properties.py b/resources/config/eteshare/config/robot_properties.py
index ef51f72..af98847 100644
--- a/resources/config/eteshare/config/robot_properties.py
+++ b/resources/config/eteshare/config/robot_properties.py
@@ -164,7 +164,7 @@
GLOBAL_DCAE_HVVES_SERVER_PORT = "6061"
# data router info - everything is from the private oam network (also called onap private network)
GLOBAL_DMAAP_DR_PROV_SERVER_PROTOCOL = "http"
-GLOBAL_DMAAP_DR_PROV_SERVER_PORT = "8080"
+GLOBAL_DMAAP_DR_PROV_SERVER_PORT = "80"
GLOBAL_DMAAP_DR_NODE_SERVER_PROTOCOL = "http"
GLOBAL_DMAAP_DR_NODE_SERVER_PORT = "8080"
# dmaap message router info
@@ -200,15 +200,23 @@
GLOBAL_POMBA_CONTEXTAGGREGATOR_PORT = "9529"
# microservice bus info - everything is from the private oam network (also called onap private network)
-GLOBAL_MSB_SERVER_PROTOCOL = "http"
-GLOBAL_MSB_SERVER_PORT = "80"
+GLOBAL_MSB_SERVER_PROTOCOL = "https"
+GLOBAL_MSB_SERVER_PORT = "443"
# message router info - everything is from the private oam network (also called onap private network)
GLOBAL_MR_SERVER_PROTOCOL = "http"
GLOBAL_MR_SERVER_PORT = "3904"
# bus controller info
+GLOBAL_BC_SERVER_PROTOCOL = "https"
GLOBAL_BC_HTTPS_SERVER_PORT = "8443"
GLOBAL_BC_USERNAME = '{{ .Values.bcUsername }}'
GLOBAL_BC_PASSWORD = '{{ .Values.bcPassword }}'
+# dcae inventory and deployment handler info
+GLOBAL_INVENTORY_SERVER_NAME = 'inventory.{{include "common.namespace" .}}'
+GLOBAL_INVENTORY_SERVER_PROTOCOL = "https"
+GLOBAL_INVENTORY_SERVER_PORT = "8080"
+GLOBAL_DEPLOYMENT_HANDLER_SERVER_NAME = 'deployment-handler.{{include "common.namespace" .}}'
+GLOBAL_DEPLOYMENT_HANDLER_SERVER_PROTOCOL = "https"
+GLOBAL_DEPLOYMENT_HANDLER_SERVER_PORT = "8443"
# SO containers - everything is from the private oam network (also called onap private network)
GLOBAL_SO_APIHAND_SERVER_PORT = "8080"
GLOBAL_SO_SDCHAND_SERVER_PORT = "8085"
@@ -232,8 +240,8 @@
GLOBAL_SO_REQDB_ENDPOINT = 'http://' + GLOBAL_INJECTED_SO_REQDB_IP_ADDR + ':' + GLOBAL_SO_REQDB_SERVER_PORT
GLOBAL_SO_SDNC_ENDPOINT = 'http://' + GLOBAL_INJECTED_SO_SDNC_IP_ADDR + ':' + GLOBAL_SO_SDNC_SERVER_PORT
GLOBAL_SO_VFC_ENDPOINT = 'http://' + GLOBAL_INJECTED_SO_VFC_IP_ADDR + ':' + GLOBAL_SO_VFC_SERVER_PORT
-#GLOBAL_SO_VNFM_ENDPOINT = 'https://' + GLOBAL_INJECTED_SO_VNFM_IP_ADDR + ':' + GLOBAL_SO_VNFM_SERVER_PORT
-GLOBAL_SO_VNFM_ENDPOINT = 'http://' + GLOBAL_INJECTED_SO_VNFM_IP_ADDR + ':' + GLOBAL_SO_VNFM_SERVER_PORT
+GLOBAL_SO_VNFM_ENDPOINT = 'https://' + GLOBAL_INJECTED_SO_VNFM_IP_ADDR + ':' + GLOBAL_SO_VNFM_SERVER_PORT
+#GLOBAL_SO_VNFM_ENDPOINT = 'http://' + GLOBAL_INJECTED_SO_VNFM_IP_ADDR + ':' + GLOBAL_SO_VNFM_SERVER_PORT
# music info - everything is from the private oam network (also called onap private network)
GLOBAL_MUSIC_SERVER_PROTOCOL = "http"
GLOBAL_MUSIC_SERVER_PORT = "8080"
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index 7b0c140..e582119 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -30,6 +30,18 @@
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
+ hostAliases:
+ - ip: {{ .Values.kubernetesExternalIp }}
+ hostnames:
+ - "portal.api.simpledemo.onap.org"
+ - "vid.api.simpledemo.onap.org"
+ - "sdc.api.fe.simpledemo.onap.org"
+ - "portal-sdk.simpledemo.onap.org"
+ - "policy.api.simpledemo.onap.org"
+ - "aai.api.sparky.simpledemo.onap.org"
+ - "aai.ui.simpledemo.onap.org"
+ - "cli.api.simpledemo.onap.org"
+ - "so-monitoring"
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
diff --git a/templates/pv.yaml b/templates/pv.yaml
index 184728f..63829cb 100644
--- a/templates/pv.yaml
+++ b/templates/pv.yaml
@@ -15,6 +15,7 @@
*/}}
{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
+{{- if eq "True" (include "common.needPV" .) -}}
kind: PersistentVolume
apiVersion: v1
metadata:
@@ -31,7 +32,9 @@
storage: {{ .Values.persistence.size}}
accessModes:
- {{ .Values.persistence.accessMode }}
+ storageClassName: "{{ include "common.fullname" . }}-data"
persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
hostPath:
path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }}
{{- end -}}
+{{- end -}}
diff --git a/templates/pvc.yaml b/templates/pvc.yaml
index e27c331..e21babb 100644
--- a/templates/pvc.yaml
+++ b/templates/pvc.yaml
@@ -30,19 +30,10 @@
{{ toYaml .Values.persistence.annotations | indent 4 }}
{{- end }}
spec:
- selector:
- matchLabels:
- name: {{ include "common.fullname" . }}
accessModes:
- {{ .Values.persistence.accessMode }}
+ storageClassName: {{ include "common.storageClass" . }}
resources:
requests:
storage: {{ .Values.persistence.size }}
-{{- if .Values.persistence.storageClass }}
-{{- if (eq "-" .Values.persistence.storageClass) }}
- storageClassName: ""
-{{- else }}
- storageClassName: "{{ .Values.persistence.storageClass }}"
-{{- end }}
-{{- end }}
{{- end -}}
diff --git a/values.yaml b/values.yaml
index 2712144..c6ba420 100644
--- a/values.yaml
+++ b/values.yaml
@@ -124,6 +124,9 @@
vnfPrivateKey: "onap_dev.yaml"
# Override with DCAE VES Collector external IP
dcaeCollectorIp: "FILL_IN_WITH_DCAE_VES_COLLECTOR_IP"
+# kubernetes external IP for Portal GUI tests
+kubernetesExternalIp: "10.0.0.14"
+
# Credentials for ONAP Component
# AAF
@@ -136,8 +139,8 @@
appcUsername: "appc@appc.onap.org"
appcPassword: "demo123456!"
# DCAE
-dcaeUsername: "console"
-dcaePassword: "ZjJkYjllMjljMTI2M2Iz"
+dcaeUsername: "dcae@dcae.onap.org"
+dcaePassword: "demo123456!"
# DROOLS
droolsUsername: "demo@people.osaaf.org"
droolsPassword: "demo123456!"