diff options
Diffstat (limited to 'kubernetes')
15 files changed, 198 insertions, 572 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml index e40a03068c..2718e1882f 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml @@ -24,7 +24,7 @@ external_tls_port: {{ .Values.config.address.dashboard.portSecure }} database_cluster_name: {{ .Values.postgres.service.name2 }}.{{ include "common.namespace" . }} database_cluster_fqdn: {{ .Values.postgres.service.name2 }}.{{ include "common.namespace" . }}.{{ .Values.postgres.suffix }} database_name: "dashboard_pg" -cloudify_ip: {{ .Values.config.address.cm }} +cloudify_ip: {{ .Values.config.address.cm.host }} cloudify_user: "admin" cloudify_password: "admin" consul_url: {{ .Values.config.address.consul_ui }} diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml index 0463655c79..be5a769a37 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml @@ -61,6 +61,19 @@ spec: fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
+ - name: init-tls
+ env:
+ - name: POD_IP
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: status.podIP
+ image: {{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ resources: {}
+ volumeMounts:
+ - mountPath: /opt/tls/shared
+ name: tls-info
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
@@ -75,14 +88,21 @@ spec: - mountPath: /etc/localtime
name: localtime
readOnly: true
+ - mountPath: /certs
+ name: tls-info
+ readOnly: true
env:
- name: CMADDR
- value: {{ .Values.config.address.cm }}
+ value: {{ .Values.config.address.cm.host }}
- name: CMPASS
valueFrom:
secretKeyRef:
name: {{ include "common.name" . }}-cmpass
key: password
+ - name: CMPROTO
+ value: {{ .Values.config.address.cm.proto }}
+ - name: CMPORT
+ value: !!string {{ .Values.config.address.cm.port }}
- name: CONSUL
value: {{ .Values.config.address.consul.host }}:{{ .Values.config.address.consul.port }}
- name: DCAE_NAMESPACE
@@ -99,5 +119,7 @@ spec: - name: localtime
hostPath:
path: /etc/localtime
+ - name: tls-info
+ emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml index aec082fe15..882cf371e7 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml @@ -38,7 +38,10 @@ config: host: consul-server port: 8500 consul_ui: consul-server-ui - cm: dcae-cloudify-manager + cm: + host: dcae-cloudify-manager + port: 443 + proto: https dashboard: port: 30418 portSecure: 30419 @@ -90,7 +93,7 @@ postgres: # application image repository: nexus3.onap.org:10001 -image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.18 +image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.6.0-STAGING-latest default_k8s_location: central # DCAE component images to be deployed via Cloudify Manager diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml index d6c58cd75f..b3e90a2efb 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml @@ -34,6 +34,12 @@ spec: app: {{ include "common.name" . }} release: {{ .Release.Name }} spec: + # host alias allows local 'cfy' command to use https and match + # the host name in the certificate + hostAliases: + - ip: "127.0.0.1" + hostnames: + - "dcae-cloudify-manager" initContainers: - name: {{ include "common.name" . }}-multisite-init image: {{ include "common.repository" . }}/{{ .Values.multisiteInitImage }} @@ -44,10 +50,26 @@ spec: - --configmap - {{ .Values.multisiteConfigMapName }} restartPolicy: Never + - name: init-tls + env: + - name: POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP + image: {{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + resources: {} + volumeMounts: + - mountPath: /opt/tls/shared + name: tls-info containers: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + env: + - name: REQUESTS_CA_BUNDLE + value: "/opt/onap/certs/cacert.pem" resources: {{ include "common.resources" . | indent 12 }} ports: @@ -86,6 +108,8 @@ spec: readOnly: true - mountPath: /cfy-persist name: cm-persistent + - mountPath: /opt/onap/certs + name: tls-info securityContext: privileged: True volumes: @@ -107,5 +131,7 @@ spec: - name: cm-persistent persistentVolumeClaim: claimName: {{ include "common.fullname" . }}-data + - emptyDir: {} + name: tls-info imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml index 41f0750c78..b015143a1a 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml @@ -44,7 +44,7 @@ config: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/org.onap.dcaegen2.deployments.cm-container:1.6.2 +image: onap/org.onap.dcaegen2.deployments.cm-container:2.0.0-STAGING-latest pullPolicy: Always # name of shared ConfigMap with kubeconfig for multiple clusters @@ -69,8 +69,8 @@ readiness: service: type: ClusterIP name: dcae-cloudify-manager - externalPort: 80 - internalPort: 80 + externalPort: 443 + internalPort: 443 # Resource Limit flavor -By Default using small flavor: small diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml index a968204575..19fe038d44 100644 --- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml +++ b/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml @@ -50,36 +50,60 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace + {{- if .Values.service.secure.enabled }} + - name: init-tls + env: + - name: POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP + image: {{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + resources: {} + volumeMounts: + - mountPath: /opt/tls/shared + name: tls-info + {{ end }} containers: + {{- if .Values.service.secure.enabled }} - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} resources: {{ include "common.resources" . | indent 12 }} ports: - - containerPort: {{ .Values.service.internalPort }} + - containerPort: {{ .Values.service.secure.internalPort }} # disable liveness probe when breakpoints set in debugger # so K8s doesn't restart unresponsive container {{- if eq .Values.liveness.enabled true }} livenessProbe: tcpSocket: - port: {{ .Values.service.internalPort }} + port: {{ .Values.service.secure.internalPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} {{ end -}} readinessProbe: httpGet: + scheme: "HTTPS" path: {{ .Values.readiness.path }} - port: {{ .Values.service.internalPort }} + port: {{ .Values.service.secure.internalPort }} initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} volumeMounts: - name: {{ include "common.fullname" . }}-logs mountPath: /opt/logs + - name: tls-info + mountPath: /opt/tls env: - name: CONSUL_HOST value: consul.{{ include "common.namespace" . }} - + - name: USE_HTTPS + value: "1" + - name: HTTPS_CERT_PATH + value: "/opt/tls/cert.pem" + - name: HTTPS_KEY_PATH + value: "/opt/tls/key.pem" - name: {{ include "common.name" . }}-filebeat-onap image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} @@ -91,13 +115,67 @@ spec: mountPath: /usr/share/filebeat/data - name: {{ include "common.fullname" . }}-logs mountPath: /var/log/onap + {{ end }} + {{- if .Values.service.insecure.enabled }} + - name: {{ include "common.name" . }}-insecure + image: "{{ include "common.repository" . }}/{{ .Values.image }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + resources: +{{ include "common.resources" . | indent 12 }} + ports: + - containerPort: {{ .Values.service.insecure.internalPort }} + # disable liveness probe when breakpoints set in debugger + # so K8s doesn't restart unresponsive container + {{- if eq .Values.liveness.enabled true }} + livenessProbe: + tcpSocket: + port: {{ .Values.service.insecure.internalPort }} + initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.liveness.periodSeconds }} + {{ end -}} + readinessProbe: + httpGet: + scheme: "HTTP" + path: {{ .Values.readiness.path }} + port: {{ .Values.service.insecure.internalPort }} + initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.readiness.periodSeconds }} + volumeMounts: + - name: {{ include "common.fullname" . }}-logs-insecure + mountPath: /opt/logs + env: + - name: CONSUL_HOST + value: consul.{{ include "common.namespace" . }} + - name: {{ include "common.name" . }}-filebeat-onap-insecure + image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + volumeMounts: + - name: {{ include "common.fullname" . }}-filebeat-conf + mountPath: /usr/share/filebeat/filebeat.yml + subPath: filebeat.yml + - name: {{ include "common.fullname" . }}-data-filebeat-insecure + mountPath: /usr/share/filebeat/data + - name: {{ include "common.fullname" . }}-logs-insecure + mountPath: /var/log/onap + {{ end }} volumes: - name: {{ include "common.fullname" . }}-filebeat-conf configMap: name: {{ .Release.Name }}-cbs-filebeat-configmap + {{- if .Values.service.secure.enabled }} - name: {{ include "common.fullname" . }}-data-filebeat emptyDir: {} - name: {{ include "common.fullname" . }}-logs emptyDir: {} + - name: tls-info + emptyDir: {} + {{ end }} + {{- if .Values.service.insecure.enabled }} + - name: {{ include "common.fullname" . }}-data-filebeat-insecure + emptyDir: {} + - name: {{ include "common.fullname" . }}-logs-insecure + emptyDir: {} + {{ end }} + imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/service.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/service.yaml index 794b896eef..8176e77c1e 100644 --- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/service.yaml +++ b/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/service.yaml @@ -28,16 +28,29 @@ metadata: spec: type: {{ .Values.service.type }} ports: - {{if eq .Values.service.type "NodePort" -}} - - port: {{ .Values.service.externalPort }} - nodePort: {{ .Values.global.nodePortPrefixExt| default .Values.nodePortPrefixExt }}{{ .Values.service.nodePort }} - name: {{ .Values.service.name }} + {{ if eq .Values.service.type "NodePort" -}} + {{ if .Values.service.insecure.enabled -}} + - port: {{ .Values.service.insecure.externalPort }} + nodePort: {{ .Values.global.nodePortPrefixExt| default .Values.nodePortPrefixExt }}{{ .Values.service.insecure.nodePort }} + name: {{ .Values.service.name }}-insecure + {{- end }} + {{ if .Values.service.secure.enabled -}} + - port: {{ .Values.service.secure.externalPort }} + nodePort: {{ .Values.global.nodePortPrefixExt| default .Values.nodePortPrefixExt }}{{ .Values.service.secure.nodePort }} + name: {{ .Values.service.name }}-secure + {{- end }} {{- else -}} - - port: {{ .Values.service.externalPort }} - targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} - {{- end}} + {{ if .Values.service.insecure.enabled -}} + - port: {{ .Values.service.insecure.externalPort }} + targetPort: {{ .Values.service.insecure.internalPort }} + name: {{ .Values.service.name }}-insecure + {{- end }} + {{ if .Values.service.secure.enabled -}} + - port: {{ .Values.service.secure.externalPort }} + targetPort: {{ .Values.service.secure.internalPort }} + name: {{ .Values.service.name }}-secure + {{- end }} + {{- end }} selector: app: {{ include "common.name" . }} release: {{ .Release.Name }} - diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml index 4605e88c09..9adbffda20 100644 --- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml @@ -25,6 +25,8 @@ global: readinessImage: readiness-check:2.0.0 loggingRepository: docker.elastic.co loggingImage: beats/filebeat:5.5.0 + tlsRepository: nexus3.onap.org:10001 + tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:1.0.3 repositoryCred: user: docker password: docker @@ -43,7 +45,7 @@ config: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/org.onap.dcaegen2.platform.configbinding.app-app:2.3.0 +image: onap/org.onap.dcaegen2.platform.configbinding:2.5.1-STAGING-latest pullPolicy: Always # probe configuration parameters @@ -63,9 +65,18 @@ readiness: service: type: NodePort name: config-binding-service - externalPort: 10000 - internalPort: 10000 - nodePort: 15 + # TLS service + secure: + enabled: true + externalPort: 10443 + internalPort: 10443 + nodePort: 14 + # Non-TLS service + insecure: + enabled: true + externalPort: 10000 + internalPort: 10000 + nodePort: 15 # Resource Limit flavor -By Default using small flavor: small diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/resources/config/config.json b/kubernetes/dcaegen2/charts/dcae-deployment-handler/resources/config/config.json index 600f07c457..3b20fc4e98 100644 --- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/resources/config/config.json +++ b/kubernetes/dcaegen2/charts/dcae-deployment-handler/resources/config/config.json @@ -1,6 +1,6 @@ { "cloudify": { - "protocol": "http" + "protocol": "https" }, "inventory": { "protocol": "http" diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/deployment.yaml index 3e4e53b679..a67197849f 100644 --- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/deployment.yaml +++ b/kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/deployment.yaml @@ -72,7 +72,7 @@ spec: imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} args: - --service - - "cloudify_manager|dcae-cloudify-manager.{{ include "common.namespace" . }}|80" + - "cloudify_manager|dcae-cloudify-manager.{{ include "common.namespace" . }}|443" - --service - "inventory|inventory.{{ include "common.namespace" . }}|8080" - --key @@ -119,6 +119,8 @@ spec: value: admin - name: CONFIG_BINDING_SERVICE value: config-binding-service + - name: NODE_EXTRA_CA_CERTS + value: /opt/app/dh/etc/cert/cacert.pem - name: POD_IP valueFrom: fieldRef: diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/values.yaml b/kubernetes/dcaegen2/charts/dcae-deployment-handler/values.yaml index 0eddf7c1a0..30893b6d7c 100644 --- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-deployment-handler/values.yaml @@ -46,7 +46,7 @@ config: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/org.onap.dcaegen2.platform.deployment-handler:4.0.1 +image: onap/org.onap.dcaegen2.platform.deployment-handler:4.2.0 pullPolicy: Always # probe configuration parameters diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/values.yaml b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/values.yaml index dd985163c1..6e03f52713 100644 --- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/values.yaml @@ -40,7 +40,7 @@ config: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/org.onap.dcaegen2.platform.servicechange-handler:1.1.5 +image: onap/org.onap.dcaegen2.platform.servicechange-handler:1.2.0 pullPolicy: Always diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py deleted file mode 100644 index d58e1389cd..0000000000 --- a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py +++ /dev/null @@ -1,542 +0,0 @@ -# Copyright (c) 2018 Amdocs, Bell Canada -# -# 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. - -import json -import os.path -from itertools import chain -from collections import defaultdict - - -GLOBAL_PRELOAD_PARAMETERS = { - # heat template parameter values common to all heat template continaing these parameters - "defaults" : { - 'key_name' : 'vfw_key${uuid}', - "pub_key" : "{{ .Values.vnfPubKey }}", - "repo_url_blob" : "https://nexus.onap.org/content/repositories/raw", - "repo_url_artifacts" : "{{ .Values.demoArtifactsRepoUrl }}", - "demo_artifacts_version" : "${GLOBAL_INJECTED_ARTIFACTS_VERSION}", - "onap_private_net_id" : "${GLOBAL_INJECTED_NETWORK}", - "onap_private_subnet_id" : "{{ .Values.openStackPrivateSubnetId }}", - "onap_private_net_cidr" : "{{ .Values.openStackPrivateNetCidr }}", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - "dcae_collector_ip" : "{{ .Values.dcaeCollectorIp }}", - "dcae_collector_port" : "30235", - "public_net_id" : "${GLOBAL_INJECTED_PUBLIC_NET_ID}", - "cloud_env" : "${GLOBAL_INJECTED_CLOUD_ENV}", - "install_script_version" : "${GLOBAL_INJECTED_SCRIPT_VERSION}", - }, - # ## - # heat template parameter values for heat template instances created during Vnf-Orchestration test cases - # ## - "Vnf-Orchestration" : { - "vfw_preload.template": { - "unprotected_private_net_id" : "vofwl01_unprotected${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_id" : "vofwl01_protected${hostid}", - "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_int_unprotected_private_ip_0" : "192.168.10.100", - "vfw_int_protected_private_ip_0" : "192.168.20.100", - "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.1", - "vfw_int_protected_private_floating_ip" : "192.168.10.200", - "vpg_int_unprotected_private_ip_0" : "192.168.10.200", - "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.2", - "vsn_int_protected_private_ip_0" : "192.168.20.250", - "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.3", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vfw_name_0':'vofwl01fwl${hostid}', - 'vpg_name_0':'vofwl01pgn${hostid}', - "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - 'vsn_name_0':'vofwl01snk${hostid}' - }, - "vfwsnk_preload.template": { - "int_unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}", - "int_unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "int_protected_private_net_id" : "vofwlsnk_protected${hostid}", - "int_protected_private_subnet_id" : "vofwlsnk_protected_sub${hostid}", - "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_int_unprotected_private_ip_0" : "192.168.10.100", - # this should be the same value as vpg_private_ip_0 - "vfw_int_protected_private_floating_ip" : "192.168.10.200", - "vfw_int_protected_private_ip_0" : "192.168.20.100", - "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.101", - "vsn_int_protected_private_ip_0" : "192.168.20.250", - "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.102", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vfw_name_0':'vofwl01fwl${hostid}', - 'vsn_name_0':'vofwl01snk${hostid}', - "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - }, - "vpkg_preload.template": { - # vFWSNK_ prepended to vpkg since the default behoir for vFWSNK tempalte is to concatenate vnf_name and network_name - "unprotected_private_net_id" : "vFWSNK_vofwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "vFWSNK_vofwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_private_ip_0" : "192.168.10.100", - "vpg_unprotected_private_ip_0" : "192.168.10.200", - "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103", - "vsn_private_ip_0" : "192.168.20.250", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vpg_name_0':'vofwl01pgn${hostid}', - "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - }, - # vFWDT preload data - "vfwdt_vpkg_preload.template": { - "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_private_ip_0" : "192.168.10.100", - "vpg_private_ip_0" : "192.168.10.200", - "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103", - "vsn_private_ip_0" : "192.168.20.250", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vpg_name_0':'vofwl01pgn${hostid}', - "vfw_name_0": "vofwl01vfw${hostid}", - "vsn_name_0": "vofwl01snk${hostid}", - "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "protected_private_net_id" : "vofwlsnk01_protected${hostid}", - "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}", - "ext_private_net_id": "onap_oam_ext", - "ext_private_subnet_id": "onap_oam_ext_sub", - "ext_private_net_cidr": "10.100.0.0/16", - "vfw_private_ip_1": "192.168.20.100", - "vfw_private_ip_2": "10.0.110.1", - "vfw_private_ip_3": "10.100.100.1", - "vsn_private_ip_1": "10.0.110.3", - "vsn_private_ip_0": "192.168.20.250", - "vsn_private_ip_2": "10.100.100.3", - }, - "vfwdt_vfwsnk0_preload.template": { - "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_private_ip_0" : "192.168.10.100", - "vpg_private_ip_0" : "192.168.10.200", - "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103", - "vsn_private_ip_0" : "192.168.20.250", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vpg_name_0':'vofwl01pgn${hostid}', - "vsn_name_0": "vofwl01snk${hostid}", - "vfw_name_0": "vofwl01vfw${hostid}", - "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "protected_private_net_id" : "vofwlsnk01_protected${hostid}", - "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}", - "ext_private_net_id": "onap_oam_ext", - "ext_private_subnet_id": "onap_oam_ext_sub", - "ext_private_net_cidr": "10.100.0.0/16", - "vfw_private_ip_1": "192.168.20.100", - "vfw_private_ip_2": "10.0.110.1", - "vfw_private_ip_3": "10.100.100.1", - "vsn_private_ip_1": "10.0.110.3", - "vsn_private_ip_0": "192.168.20.250", - "vpg_private_ip_2": "10.100.100.2", - "vsn_private_ip_1": "10.0.110.3", - "vsn_private_ip_0": "192.168.20.250", - "vsn_private_ip_2": "10.100.100.3" - }, - "vfwdt_vfwsnk1_preload.template": { - "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_private_ip_0" : "192.168.10.110", - "vpg_private_ip_0" : "192.168.10.200", - "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103", - "vsn_private_ip_0" : "192.168.20.250", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vpg_name_0':'vofwl01pgn${hostid}', - "vsn_name_0": "vofwl01snk${hostid}", - "vfw_name_0": "vofwl01vfw${hostid}", - "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "protected_private_net_id" : "vofwlsnk01_protected${hostid}", - "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}", - "ext_private_net_id": "onap_oam_ext", - "ext_private_subnet_id": "onap_oam_ext_sub", - "ext_private_net_cidr": "10.100.0.0/16", - "vfw_private_ip_1": "192.168.20.110", - "vfw_private_ip_2": "10.0.110.4", - "vfw_private_ip_3": "10.100.100.4", - "vpg_private_ip_0": "192.168.10.200", - "vpg_private_ip_1": "10.0.110.2", - "vpg_private_ip_2": "10.100.100.2", - "vsn_private_ip_0": "192.168.20.240", - "vsn_private_ip_1": "10.0.110.5", - "vsn_private_ip_2": "10.100.100.5" - }, - "vlb_preload.template" : { - "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", - "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", - "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", - "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - 'vlb_name_0':'vovlblb${hostid}', - 'vdns_name_0':'vovlbdns${hostid}', - "vpg_name_0" : "vovlbpgn${hostid}", - "vlb_private_net_id" : "volb01_private${hostid}", - "vlb_private_net_cidr" : "192.168.30.0/24", - "pktgen_private_net_id" : "volb01_pktgen${hostid}", - "pktgen_private_net_cidr" : "192.168.9.0/24", - "vlb_int_private_ip_0" : "192.168.30.100", - "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.4", - "vlb_int_pktgen_private_ip_0" : "192.168.9.111", - "vdns_int_private_ip_0" : "192.168.30.110", - "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.5", - "vpg_int_pktgen_private_ip_0" : "192.168.9.110", - "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.7", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - "pg_int" : "192.168.9.109", - "vip" : "192.168.9.112", - "gre_ipaddr" : "192.168.30.112", - "vnf_id" : "vLoadBalancer_${hostid}", - "vf_module_id" : "vLoadBalancer" - - }, - "dnsscaling_preload.template" : { - "int_private_net_id" : "vLBMS_volb01_private${hostid}", - "int_private_subnet_id" : "vLBMS_volb01_private${hostid}_subnet", - "vlb_int_private_ip_0" : "192.168.30.100", - "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.4", - "vlb_int_pktgen_private_ip_0" : "192.168.9.111", - "vdns_int_private_ip_0" : "192.168.30.222", - "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.6", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vdns_name_0':'vovlbscaling${hostid}', - "vlb_private_net_cidr" : "192.168.30.0/24" - }, - "vims_preload.template" : { - "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "sprout_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "homer_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "homestead_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "ralf_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "ellis_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "dns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "bono_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "sprout_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "homer_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "homestead_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "ralf_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "ellis_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "dns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "repo_url" : "http://repo.cw-ngv.com/stable", - "zone" : "me.cw-ngv.com", - "dn_range_start" : "2425550000", - "dn_range_length" : "10000", - "dnssec_key" : "9FPdYTWhk5+LbhrqtTPQKw==" - - }, - "vvg_preload.template" : { - } - }, -# heat template parameter values for heat template instances created during Closed-Loop test cases - "Closed-Loop" : { - "vfw_preload.template": { - "unprotected_private_net_id" : "clfwl01_unprotected${hostid}", - "unprotected_private_net_cidr" : "192.168.110.0/24", - "protected_private_net_id" : "clfwl01_protected${hostid}", - "protected_private_net_cidr" : "192.168.120.0/24", - "vfw_int_unprotected_private_ip_0" : "192.168.110.100", - "vfw_int_protected_private_ip_0" : "192.168.120.100", - "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.11", - "vfw_int_protected_private_floating_ip" : "192.168.110.200", - "vpg_int_unprotected_private_ip_0" : "192.168.110.200", - "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12", - "vsn_int_protected_private_ip_0" : "192.168.120.250", - "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.13", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vfw_name_0':'clfwl01fwl${hostid}', - 'vpg_name_0':'clfwl01pgn${hostid}', - "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - 'vsn_name_0':'clfwl01snk${hostid}' - }, - "vfwsnk_preload.template": { - "int_unprotected_private_net_id" : "clfwlsnk_unprotected${hostid}", - "int_unprotected_private_subnet_id" : "clfwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "int_protected_private_net_id" : "clfwlsnk_protected${hostid}", - "int_protected_private_subnet_id" : "clfwlsnk_protected_sub${hostid}", - "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_int_unprotected_private_ip_0" : "192.168.10.100", - # this should be the same value as vpg_private_ip_0 - "vfw_int_protected_private_floating_ip" : "192.168.10.200", - "vfw_int_protected_private_ip_0" : "192.168.20.100", - "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.111", - "vsn_int_protected_private_ip_0" : "192.168.20.250", - "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.112", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vfw_name_0':'clfwl01fwl${hostid}', - 'vsn_name_0':'clfwl01snk${hostid}', - "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - }, - "vpkg_preload.template": { - "unprotected_private_net_id" : "vFWSNK_clfwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "vFWSNK_clfwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_private_ip_0" : "192.168.10.100", - "vpg_unprotected_private_ip_0" : "192.168.10.200", - "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.113", - "vsn_private_ip_0" : "192.168.20.250", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vpg_name_0':'clfwl01pgn${hostid}', - "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - }, - # vLBMS - "vlb_preload.template" : { - "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", - "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", - "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", - "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - 'vlb_name_0':'clvlblb${hostid}', - 'vdns_name_0':'clvlbdns${hostid}', - "vpg_name_0" : "clvlbpgn${hostid}", - "vlb_private_net_id" : "cllb01_private${hostid}", - "vlb_private_net_cidr" : "192.168.30.0/24", - "pktgen_private_net_id" : "cllb01_pktgen${hostid}", - "pktgen_private_net_cidr" : "192.168.9.0/24", - "vlb_int_private_ip_0" : "192.168.30.100", - "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.14", - "vlb_int_pktgen_private_ip_0" : "192.168.9.111", - "vdns_int_private_ip_0" : "192.168.30.110", - "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.15", - "vpg_int_pktgen_private_ip_0" : "192.168.9.110", - "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.17", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - "pg_int" : "192.168.9.109", - "vip" : "192.168.9.112", - "gre_ipaddr" : "192.168.30.112", - "vnf_id" : "vLoadBalancer_${hostid}", - "vf_module_id" : "vLoadBalancer" - }, - "dnsscaling_preload.template" : { - "int_private_net_id" : "vLBMS_cllb01_private${hostid}", - "int_private_subnet_id" : "vLBMS_cllb01_private${hostid}_subnet", - "vlb_int_private_ip_0" : "192.168.30.100", - "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.14", - "vlb_int_pktgen_private_ip_0" : "192.168.9.111", - "vdns_int_private_ip_0" : "192.168.30.222", - "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.16", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vdns_name_0':'clvlbscaling${hostid}', - "vlb_private_net_cidr" : "192.168.10.0/24" - }, - "vims_preload.template" : { - "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "sprout_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "homer_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "homestead_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "ralf_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "ellis_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "dns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "bono_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "sprout_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "homer_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "homestead_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "ralf_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "ellis_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "dns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "repo_url" : "http://repo.cw-ngv.com/stable", - "zone" : "me.cw-ngv.com", - "dn_range_start" : "2425550000", - "dn_range_length" : "10000", - "dnssec_key" : "9FPdYTWhk5+LbhrqtTPQKw==" - }, - "vvg_preload.template" : { - } - }, - # heat template parameter values for heat template instances created for hands on demo test case - "Demo" : { - "vfw_preload.template": { - "unprotected_private_net_id" : "demofwl_unprotected", - "unprotected_private_net_cidr" : "192.168.110.0/24", - "protected_private_net_id" : "demofwl_protected", - "protected_private_net_cidr" : "192.168.120.0/24", - "vfw_int_unprotected_private_ip_0" : "192.168.110.100", - "vfw_int_protected_private_ip_0" : "192.168.120.100", - "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.11", - "vpg_int_unprotected_private_ip_0" : "192.168.110.200", - "vfw_int_protected_private_floating_ip" : "192.168.110.200", - "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12", - "vsn_int_protected_private_ip_0" : "192.168.120.250", - "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.13", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vfw_name_0':'demofwl01fwl', - 'vpg_name_0':'demofwl01pgn', - "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - 'vsn_name_0':'demofwl01snk' - }, - "vfwsnk_preload.template": { - "int_unprotected_private_net_id" : "demofwlsnk_unprotected${hostid}", - "int_unprotected_private_subnet_id" : "demofwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "int_protected_private_net_id" : "demofwlsnk_protected${hostid}", - "int_protected_private_subnet_id" : "vofwlsnk_protected_sub${hostid}", - "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_int_unprotected_private_ip_0" : "192.168.10.100", - # this should be the same value as vpg_private_ip_0 - "vfw_int_protected_private_floating_ip" : "192.168.10.200", - "vfw_int_protected_private_ip_0" : "192.168.20.100", - "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.121", - "vsn_int_protected_private_ip_0" : "192.168.20.250", - "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.122", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vfw_name_0':'${generic_vnf_name}', - 'vsn_name_0':'demofwl01snk${hostid}', - "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - }, - "vpkg_preload.template": { - "unprotected_private_net_id" : "vFWSNK_demofwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "vFWSNK_demofwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_private_ip_0" : "192.168.10.100", - "vpg_unprotected_private_ip_0" : "192.168.10.200", - "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.123", - "vsn_private_ip_0" : "192.168.20.250", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vpg_name_0':'demofwl01pgn${hostid}', - "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}" - }, - # vLBMS - "vlb_preload.template" : { - "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", - "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", - "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", - "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - 'vlb_name_0':'demovlblb${hostid}', - 'vdns_name_0':'demovlbdns${hostid}', - "vpg_name_0" : "clvlbpgn${hostid}", - "vlb_private_net_id" : "demolb_private${hostid}", - "vlb_private_net_cidr" : "192.168.30.0/24", - "pktgen_private_net_id" : "demolb_pktgen${hostid}", - "pktgen_private_net_cidr" : "192.168.9.0/24", - "vlb_int_private_ip_0" : "192.168.30.100", - "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.24", - "vlb_int_pktgen_private_ip_0" : "192.168.9.111", - "vdns_int_private_ip_0" : "192.168.30.110", - "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.25", - "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.27", - "vpg_int_pktgen_private_ip_0" : "192.168.9.110", - "pg_int" : "192.168.9.109", - "vip" : "192.168.9.112", - "gre_ipaddr" : "192.168.30.112", - "vnf_id" : "vLoadBalancer_${hostid}", - "vf_module_id" : "vLoadBalancer", - "sec_group" : "{{ .Values.openStackSecurityGroup }}" - }, - "dnsscaling_preload.template" : { - "int_private_net_id" : "vLBMS_demolb_private${hostid}", - "int_private_subnet_id" : "vLBMS_demolb_private${hostid}_subnet", - "vlb_int_private_ip_0" : "192.168.30.100", - "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.24", - "vlb_int_pktgen_private_ip_0" : "192.168.9.111", - "vdns_int_private_ip_0" : "192.168.30.222", - "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.26", - "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'vdns_name_0':'demovlbscaling${hostid}', - "vlb_private_net_cidr" : "192.168.30.0/24" - }, - "vims_preload.template" : { - "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "sprout_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "homer_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "homestead_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "ralf_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "ellis_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "dns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "bono_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "sprout_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "homer_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "homestead_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "ralf_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "ellis_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "dns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "repo_url" : "http://repo.cw-ngv.com/stable", - "zone" : "me.cw-ngv.com", - "dn_range_start" : "2425550000", - "dn_range_length" : "10000", - "dnssec_key" : "9FPdYTWhk5+LbhrqtTPQKw==" - }, - "vvg_preload.template" : { - } - } -} - - -# Create dictionaries for new MAPPING data to join to original MAPPING data -GLOBAL_PRELOAD_PARAMETERS2 = {} - - -folder=os.path.join('/var/opt/ONAP/demo/preload_data') -subfolders = [d for d in os.listdir(folder) if os.path.isdir(os.path.join(folder, d))] - -for service in subfolders: - filepath=os.path.join('/var/opt/ONAP/demo/preload_data', service, 'preload_data.json') - with open(filepath, 'r') as f: - preload_data = json.load(f) - GLOBAL_PRELOAD_PARAMETERS2['Demo']=preload_data - - -# Merge dictionaries -# preload_data.json is for Demo key in GLOBAL_PRELOAD_PARAMETERS - - -GLOBAL_PRELOAD_PARAMETERS3 = {'Demo':{}} - -for k, v in chain(GLOBAL_PRELOAD_PARAMETERS['Demo'].items(), GLOBAL_PRELOAD_PARAMETERS2['Demo'].items()): - GLOBAL_PRELOAD_PARAMETERS3['Demo'][k] = v -# print(k, v) - -GLOBAL_PRELOAD_PARAMETERS = dict(GLOBAL_PRELOAD_PARAMETERS.items() + GLOBAL_PRELOAD_PARAMETERS3.items()) - -#print GLOBAL_PRELOAD_PARAMETERS - diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py index 69190638a7..b66aaf43ff 100644 --- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py @@ -184,5 +184,6 @@ GLOBAL_PROXY_WARNING_TITLE="" GLOBAL_PROXY_WARNING_CONTINUE_XPATH="" # dns info GLOBAL_DNS_TRAFFIC_DURATION = "600" -# location where heat templates are loaded from +# location where heat templates and data are loaded from GLOBAL_HEAT_TEMPLATES_FOLDER = "/var/opt/ONAP/demo/heat" +GLOBAL_PRELOAD_DATA_FOLDER = "/var/opt/ONAP/demo/preload-data" diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py index 9cc30319c7..64e5273f5c 100644 --- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py @@ -20,9 +20,11 @@ GLOBAL_INJECTED_AAI2_IP_ADDR = 'N/A' GLOBAL_INJECTED_APPC_IP_ADDR = 'appc.{{include "common.namespace" .}}' GLOBAL_INJECTED_APPC_CDT_IP_ADDR = 'appc-cdt.{{include "common.namespace" .}}' GLOBAL_INJECTED_ARTIFACTS_VERSION = '{{.Values.demoArtifactsVersion}}' +GLOBAL_INJECTED_ARTIFACTS_REPO_URL = "{{ .Values.demoArtifactsRepoUrl }}" GLOBAL_INJECTED_CLAMP_IP_ADDR = 'clamp.{{include "common.namespace" .}}' GLOBAL_INJECTED_CLI_IP_ADDR = 'cli.{{include "common.namespace" .}}' GLOBAL_INJECTED_CLOUD_ENV = 'openstack' +GLOBAL_INJECTED_DCAE_COLLECTOR_IP = "{{ .Values.dcaeCollectorIp }}" GLOBAL_INJECTED_DCAE_IP_ADDR = 'dcae-healthcheck.{{include "common.namespace" .}}' GLOBAL_INJECTED_DCAE_VES_HOST = 'dcae-ves-collector.{{include "common.namespace" .}}' GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR = 'dmaap-dr-prov.{{include "common.namespace" .}}' @@ -76,6 +78,9 @@ GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE = '{{ .Values.openStackPro GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE = '{{ .Values.openStackDomainIdRegionThree }}' GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX = '{{ .Values.openStackOamNetworkCidrPrefix }}' GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK = 'public' +GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP = '{{ .Values.openStackSecurityGroup }}' +GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID = "{{ .Values.openStackPrivateSubnetId }}" +GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR = "{{ .Values.openStackPrivateNetCidr }}" GLOBAL_INJECTED_POLICY_IP_ADDR = 'pdp.{{include "common.namespace" .}}' GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = 'drools.{{include "common.namespace" .}}' GLOBAL_INJECTED_PORTAL_IP_ADDR = 'portal-app.{{include "common.namespace" .}}' @@ -85,6 +90,7 @@ GLOBAL_INJECTED_POLICY_DISTRIBUTION_IP_ADDR = 'policy-distribution.{{include "co GLOBAL_INJECTED_POLICY_PDPX_IP_ADDR = 'policy-xacml-pdp.{{include "common.namespace" .}}' GLOBAL_INJECTED_POLICY_APEX_PDP_IP_ADDR = 'policy-apex-pdp.{{include "common.namespace" .}}' GLOBAL_INJECTED_PUBLIC_NET_ID = '{{ .Values.openStackPublicNetId }}' +GLOBAL_INJECTED_PUBLIC_KEY = "{{ .Values.vnfPubKey }}" GLOBAL_INJECTED_REGION = '{{ .Values.openStackRegion }}' GLOBAL_INJECTED_SCRIPT_VERSION = '{{ .Values.scriptVersion }}' GLOBAL_INJECTED_SDC_BE_IP_ADDR = 'sdc-be.{{include "common.namespace" .}}' @@ -117,9 +123,11 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_APPC_IP_ADDR" : 'appc.{{include "common.namespace" .}}', "GLOBAL_INJECTED_APPC_CDT_IP_ADDR" : 'appc-cdt.{{include "common.namespace" .}}', "GLOBAL_INJECTED_ARTIFACTS_VERSION" : '{{.Values.demoArtifactsVersion}}', + "GLOBAL_INJECTED_ARTIFACTS_REPO_URL" : "{{ .Values.demoArtifactsRepoUrl }}", "GLOBAL_INJECTED_CLAMP_IP_ADDR" : 'clamp.{{include "common.namespace" .}}', "GLOBAL_INJECTED_CLI_IP_ADDR" : 'cli.{{include "common.namespace" .}}', "GLOBAL_INJECTED_CLOUD_ENV" : 'openstack', + "GLOBAL_INJECTED_DCAE_COLLECTOR_IP" : "{{ .Values.dcaeCollectorIp }}", "GLOBAL_INJECTED_DCAE_IP_ADDR" : 'dcae-healthcheck.{{include "common.namespace" .}}', "GLOBAL_INJECTED_DCAE_VES_HOST" : 'dcae-ves-collector.{{include "common.namespace" .}}', "GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR" : 'dmaap-dr-prov.{{include "common.namespace" .}}', @@ -169,6 +177,9 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE" : '{{ .Values.openStackDomainIdRegionThree }}', "GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX" : '{{ .Values.openStackOamNetworkCidrPrefix }}', "GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK" : 'public', + "GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP": '{{ .Values.openStackSecurityGroup }}', + "GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID" : "{{ .Values.openStackPrivateSubnetId }}", + "GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR" : "{{ .Values.openStackPrivateNetCidr }}", "GLOBAL_INJECTED_POLICY_IP_ADDR" : 'pdp.{{include "common.namespace" .}}', "GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR" : 'drools.{{include "common.namespace" .}}', "GLOBAL_INJECTED_POLICY_API_IP_ADDR" : 'policy-api.{{include "common.namespace" .}}', @@ -178,6 +189,7 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_POLICY_APEX_PDP_IP_ADDR" : 'policy-apex-pdp.{{include "common.namespace" .}}', "GLOBAL_INJECTED_PORTAL_IP_ADDR" : 'portal-app.{{include "common.namespace" .}}', "GLOBAL_INJECTED_PUBLIC_NET_ID" : '{{ .Values.openStackPublicNetId }}', + "GLOBAL_INJECTED_PUBLIC_KEY" : "{{ .Values.vnfPubKey }}", "GLOBAL_INJECTED_REGION" : '{{ .Values.openStackRegion }}', "GLOBAL_INJECTED_SDC_BE_IP_ADDR" : 'sdc-be.{{include "common.namespace" .}}', "GLOBAL_INJECTED_SDC_BE_ONBOARD_IP_ADDR" : 'sdc-onboarding-be.{{include "common.namespace" .}}', @@ -203,4 +215,4 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_VM_FLAVOR" : '{{ .Values.openStackFlavourMedium }}', "GLOBAL_INJECTED_VNFSDK_IP_ADDR" : 'refrepo.{{include "common.namespace" .}}' -} +}
\ No newline at end of file |