+++ /dev/null
-#!/bin/bash
-# ============LICENSE_START==========================================
-# ===================================================================
-# Copyright (c) 2017 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.
-#============LICENSE_END============================================
-
-helm delete $2 --purge
-
-
+++ /dev/null
-#!/bin/bash
-# ============LICENSE_START==========================================
-# ===================================================================
-# Copyright (c) 2017 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.
-#============LICENSE_END============================================
-
-printf "%s" "$*"
-printf `pwd`
-printf "%s" "---------------"
-
-helm install local/$2 --name $2 --namespace $1
\ No newline at end of file
+++ /dev/null
-#!/bin/bash
-# ============LICENSE_START==========================================
-# ===================================================================
-# Copyright (c) 2017 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.
-#============LICENSE_END============================================
-
-kubectl delete secret $1-docker-registry-key
-kubectl delete clusterrolebinding $1-admin-binding
-kubectl delete namespace $1
-
-
-
+++ /dev/null
-#!/bin/bash
-# ============LICENSE_START==========================================
-# ===================================================================
-# Copyright (c) 2017 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.
-#============LICENSE_END============================================
-
-printf "%s" "$*"
-printf `pwd`
-printf "%s" "---------------"
-
-kubectl create namespace $1
-kubectl create clusterrolebinding $1-admin-binding --clusterrole=cluster-admin --serviceaccount=$1:default
-kubectl --namespace $1 create secret docker-registry $1-docker-registry-key --docker-server=nexus3.onap.org:10001 --docker-username=docker --docker-password=docker --docker-email=@
\ No newline at end of file
+++ /dev/null
-# ============LICENSE_START==========================================
-# ===================================================================
-# Copyright (c) 2017 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.
-#============LICENSE_END============================================
-
-tosca_definitions_version: cloudify_dsl_1_3
-
-imports:
- - http://www.getcloudify.org/spec/cloudify/3.4.2/types.yaml
- - http://www.getcloudify.org/spec/fabric-plugin/1.5/plugin.yaml
-
-inputs:
- # For agent, toggle to true.
- install_method:
- default: none # For fabric use false.
- ip:
- user:
- default: centos
- namespace:
- default: onap
-
-node_types:
- cloudify.nodes.Helm:
- derived_from: cloudify.nodes.SoftwareComponent
- properties:
- cwd:
- default: /home/centos/oom/kubernetes
- args:
- default:
- - onap
- - mso
- interfaces:
- cloudify.interfaces.lifecycle:
- # This is for fabric: # Run Anywhere.
- start:
- implementation: fabric.fabric_plugin.tasks.run_script
- inputs:
- script_path:
- default: helminstall.sh # Relative to the blueprint file.
- process:
- default: &process_vars
- cwd: { get_property: [ SELF, cwd ] }
- args: { get_property: [ SELF, args ] }
- fabric_env:
- default: &fabric_env
- user: { get_property: [ k8s_master, agent_config, user ] }
- host_string: { get_property: [ k8s_master, ip ] }
- key: { get_property: [ k8s_master, agent_config, key ] }
- stop:
- implementation: fabric.fabric_plugin.tasks.run_script
- inputs:
- script_path:
- default: helmdelete.sh
- process:
- default: *process_vars
- fabric_env:
- default: *fabric_env
-
-node_templates:
-
- k8s_master:
- type: cloudify.nodes.Compute
- properties:
- ip: { get_input: ip }
- agent_config:
- install_method: { get_input: install_method } # False for Fabric.
- key: { get_secret: agent_key_private }
- user: { get_input: user }
-
- k8s_env:
- type: cloudify.nodes.SoftwareComponent
- properties:
- interfaces:
- cloudify.interfaces.lifecycle:
- start:
- implementation: fabric.fabric_plugin.tasks.run_script
- inputs:
- script_path: k8s_setup_env.sh
- process:
- args: [{ get_input: namespace }]
- fabric_env:
- host_string: { get_input: ip }
- user: { get_input: user }
- key: { get_secret: agent_key_private }
- stop:
- implementation: fabric.fabric_plugin.tasks.run_script
- inputs:
- script_path: k8s_delete_env.sh
- process:
- args: [{ get_input: namespace }]
- fabric_env:
- host_string: { get_input: ip }
- user: { get_input: user }
- key: { get_secret: agent_key_private }
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_master
-
- consul:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - consul
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- msb:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - msb
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- so:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - so
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- appc:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - appc
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- dmaap:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - dmaap
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- oof:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - oof
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- sdnc:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - sdnc
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- vid:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - vid
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- robot:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - robot
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- policy:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - policy
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- portal:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - portal
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- aai:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - aai
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- sdc:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - sdc
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- log:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - log
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- cli:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - cli
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- multicloud:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - multicloud
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- clamp:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - clamp
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- vnfsdk:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - vnfsdk
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- uui:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - uui
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- aaf:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - aaf
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- vfc:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - vfc
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- dcaegen2:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - dcaegen2
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- esr:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - esr
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- sniro-emulator:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - sniro-emulator
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
-
- nbi:
- type: cloudify.nodes.Helm
- properties:
- args:
- - { get_input: namespace }
- - nbi
- relationships:
- - type: cloudify.relationships.connected_to
- target: k8s_env
\ No newline at end of file
--- /dev/null
+# ============LICENSE_START==========================================
+# ===================================================================
+# Copyright (c) 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.
+# 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============================================
+tosca_definitions_version: cloudify_dsl_1_3
+
+imports:
+ - http://www.getcloudify.org/spec/cloudify/4.3.1/types.yaml
+ - plugin:helm?version=3.0.0
+
+inputs:
+ tiller-server-ip:
+ description: the IP address of Kubernetes master
+ tiller-server-port:
+ description: the nodeport of tiller server
+ namespace:
+ default: onap
+ chart-repo-url:
+ default: https://nexus.onap.org/content/sites/oom-helm-staging
+ chart-version :
+ default: 2.0.0
+ stable-repo-url:
+ description: URL for stable repository
+ type: string
+ default: 'https://kubernetes-charts.storage.googleapis.com'
+
+
+
+node_templates:
+
+ onap_env:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: onap
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ config: '{ "aaf": {"enabled": false}, "aai": {"enabled": false}, "appc": {"enabled": false}, "clamp": {"enabled": false}, "cli": {"enabled": false}, "consul": {"enabled": false}, "dcaegen2": {"enabled": false}, "dmaap": {"enabled": false}, "esr": {"enabled": false}, "log": {"enabled": false}, "sniro-emulator": {"enabled": false}, "msb": {"enabled": false}, "multicloud": {"enabled": false}, "nbi": {"enabled": false}, "oof": {"enabled": false}, "policy": {"enabled": false}, "pomba": {"enabled": false}, "portal": {"enabled": false}, "robot": {"enabled": false}, "sdc": {"enabled": false}, "sdnc": {"enabled": false}, "so": {"enabled": false}, "uui": {"enabled": false}, "vfc": {"enabled": false}, "vid": {"enabled": false}, "vnfsdk": {"enabled": false} }'
+
+ aaf:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: aaf
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ aai:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: aai
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ appc:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: appc
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ clamp:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: clamp
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ cli:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: cli
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ consul:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: consul
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ contrib:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: contrib
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ dcaegen2:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: dcaegen2
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+
+ dmaap:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: dmaap
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ esr:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: esr
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ log:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: log
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ sniro-emulator:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: sniro-emulator
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ oof:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: oof
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ msb:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: msb
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ multicloud:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: multicloud
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ nbi:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: nbi
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ policy:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: policy
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ pomba:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: pomba
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ portal:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: portal
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ robot:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: robot
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ sdc:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: sdc
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ sdnc:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: sdnc
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ so:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: so
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ uui:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: uui
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ vfc:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: vfc
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ vid:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: vid
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
+
+ vnfsdk:
+ type: onap.nodes.component
+ properties:
+ tiller-server-ip: { get_input: tiller-server-ip }
+ tiller-server-port: { get_input: tiller-server-port }
+ component-name: vnfsdk
+ chart-repo-url: { get_input: chart-repo-url }
+ chart-version: { get_input: chart-version }
+ namespace: { get_input: namespace }
+ stable-repo-url: { get_input: stable-repo-url}
+ relationships:
+ - type: cloudify.relationships.connected_to
+ target: onap_env
\ No newline at end of file
http://www.springframework.org/schema/util/spring-util.xsd
">
- <!-- Event publisher to pass to the Champ library for logging raw graph
- events (Kafka implementation). -->
- <bean id="champEventPublisher" class="org.onap.aai.event.client.KafkaEventPublisher" >
- <constructor-arg name="hosts" value="message-router-kafka.{{.Release.Namespace}}:9092" />
- <constructor-arg name="topic" value="champRawEvents" />
+ <bean id="champEventPublisher" class="org.onap.aai.event.client.DMaaPEventPublisher" >
+ <constructor-arg name="host" value="message-router.{{.Release.Namespace}}:{{.Values.event.port.dmaap}}" />
+ <constructor-arg name="topic" value="{{.Values.event.publisher.topic}}" />
+ <constructor-arg name="username" value="" />
+ <constructor-arg name="password" value="" />
+ <constructor-arg name="maxBatchSize" value="100" />
+ <constructor-arg name="maxAgeMs" value="250" />
+ <constructor-arg name="delayBetweenBatchesMs" value="50" />
+ <constructor-arg name="transportType" value="HTTPAUTH" />
+ <constructor-arg name="protocol" value="{{.Values.event.protocol}}" />
+ <constructor-arg name="contentType" value="application/json" />
</bean>
<!-- Graph Implementation Configuration-->
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
- initContainers:
- - command:
- - /root/ready.py
- args:
- - --container-name
- - aai-resources
- - --container-name
- - message-router-kafka
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.namespace
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
- mountPath: /opt/app/champ-service/bundleconfig/etc/logback.xml
name: {{ include "common.fullname" . }}-logback-config
subPath: logback.xml
- - mountPath: /logs
+ - mountPath: /var/log/onap
name: {{ include "common.fullname" . }}-logs
resources:
{{ toYaml .Values.resources | indent 12 }}
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
+ # side car containers
+ - name: filebeat-onap
+ image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ volumeMounts:
+ - mountPath: /usr/share/filebeat/filebeat.yml
+ subPath: filebeat.yml
+ name: filebeat-conf
+ - mountPath: /var/log/onap
+ name: {{ include "common.fullname" . }}-logs
+ - mountPath: /usr/share/filebeat/data
+ name: aai-filebeat
+
volumes:
- name: localtime
hostPath:
items:
- key: logback.xml
path: logback.xml
+ - name: filebeat-conf
+ configMap:
+ name: aai-filebeat
+ - name: aai-filebeat
+ emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
enabled: false
resources: {}
+
+# XML beans configuration
+event:
+ port:
+ dmaap: 3905
+ protocol: https
+ publisher:
+ topic: champRawEvents
<property name="searchEndpointDocuments" value = "documents" />
<property name="searchEntitySearchIndex" value="entity-search-index" />
<property name="searchTopographySearchIndex" value="topography-search-index" />
- <property name="searchEntityAutoSuggestIndex" value="entity-autosuggest-index" />
- <property name="searchAggregationVnfIndex" value="aggregate-vnf-index" />
+ <property name="searchEntityAutoSuggestIndex" value="entityautosuggestindex" />
+ <property name="searchAggregationVnfIndex" value="aggregate_generic-vnf_index" />
<property name="searchCertName" value="client-cert-onap.p12" />
<property name="searchKeystorePwd" value="OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10" />
<property name="searchKeystore" value="tomcat_keystore" />
</bean>
+
+ <bean id="consumerBeanEntityEvent" class="org.onap.aai.event.client.DMaaPEventConsumer " >
+ <constructor-arg name="host" value="message-router.{{.Release.Namespace}}:3904" />
+ <constructor-arg name="topic" value="AAI-EVENT" />
+ <constructor-arg name="username" value="" />
+ <constructor-arg name="password" value="" />
+ <constructor-arg name="consumerGroup" value="datarouter" />
+ <constructor-arg name="consumerId" value="datarouter" />
+ <constructor-arg name="timeoutMs" value="1000" />
+ <constructor-arg name="messageLimit" value="100" />
+ <constructor-arg name="transportType" value="HTTPAUTH" />
+ </bean>
<bean id="entityEventPolicy" class="org.onap.aai.datarouter.policy.EntityEventPolicy" init-method="startup" >
<constructor-arg ref="eepConfig"/>
<route xmlns="http://camel.apache.org/schema/spring" trace="true">\r
- <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&groupName=datarouter&groupId=datarouter&url=http://message-router.{{.Release.Namespace}}:3904"/>\r
+ <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&consumer=#consumerBeanEntityEvent" />\r
<to uri="bean:entityEventPolicy?method=process"/>\r
-</route>\r
+</route>
\ No newline at end of file
# JMS bind address host port
jms.bind.address=tcp://localhost:61649
-dmaap.ribbon.listOfServers=message-router.{{.Release.Namespace}}:3904
+dmaap.ribbon.listOfServers=message-router.{{.Release.Namespace}}:3905
# Schema related attributes for the oxm and edges
# Any additional schema related attributes should start with prefix schema
ml.babel.GENERATE_ARTIFACTS_URL=/services/babel-service/v1/app/generateArtifacts
ml.babel.KEYSTORE_FILE=babel-client-cert.p12
ml.babel.KEYSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+ml.babel.TRUSTSTORE_FILE=tomcat_keystore
+ml.babel.TRUSTSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
# JMS bind address host port
jms.bind.address=tcp://localhost:61647
-dmaap.ribbon.listOfServers=message-router.{{.Release.Namespace}}:3904
+dmaap.ribbon.listOfServers=message-router.{{.Release.Namespace}}:3905
# Schema related attributes for the oxm and edges
# Any additional schema related attributes should start with prefix schema
<constructor-arg name="timeoutMs" value="1000" />
<constructor-arg name="messageLimit" value="100" />
<constructor-arg name="transportType" value="HTTPAUTH" />
+ <constructor-arg name="protocol" value="{{.Values.event.protocol}}" />
+ <constructor-arg name="filter"><null /></constructor-arg>
</bean>
<bean id="eventPublisher" class="org.onap.aai.event.client.DMaaPEventPublisher" >
<constructor-arg name="maxAgeMs" value="250" />
<constructor-arg name="delayBetweenBatchesMs" value="50" />
<constructor-arg name="transportType" value="HTTPAUTH" />
+ <constructor-arg name="protocol" value="{{.Values.event.protocol}}" />
+ <constructor-arg name="contentType" value="application/json" />
</bean>
<bean id="spikeService" class="org.onap.aai.spike.service.SpikeService" init-method="startup">
# XML bean configuration
event:
port:
- dmaap: 3904
+ dmaap: 3905
+ protocol: https
consumer:
topic: champRawEvents
publisher:
# JMS bind address host port
jms.bind.address=tcp://localhost:61647
-dmaap.ribbon.listOfServers=message-router.{{ include "common.namespace" . }}:3904
+dmaap.ribbon.listOfServers=message-router.{{ include "common.namespace" . }}:3905
# Schema related attributes for the oxm and edges
# Any additional schema related attributes should start with prefix schema
appc.demo.threads.poolsize.min=1
appc.demo.threads.poolsize.max=2
appc.demo.provider.user=admin
-appc.demo.provider.pass=admin
+appc.demo.provider.pass={{.Values.config.odlPassword}}
appc.demo.provider.url=http://localhost:8181/restconf/operations/appc-provider
-appc.provider.vfodl.url=http://admin:admin@{{.Values.service.name}}:{{.Values.service.externalPort}}/restconf/config/network-topology:network-topology/topology/topology-netconf/node/NODE_NAME/yang-ext:mount/sample-plugin:sample-plugin/pg-streams/
+appc.provider.vfodl.url=http://admin:{{.Values.config.odlPassword}}@{{.Values.service.name}}:{{.Values.service.externalPort}}/restconf/config/network-topology:network-topology/topology/topology-netconf/node/NODE_NAME/yang-ext:mount/sample-plugin:sample-plugin/pg-streams/
# The properties right below are needed to properly call the Master DG to serve demo purposes
appc.service.logic.module.name=APPC
appc.LCM.topic.write=APPC-LCM-WRITE
appc.LCM.client.name=APPC-EVENT-LISTENER-TEST
appc.LCM.provider.user=admin
-appc.LCM.provider.pass=admin
+appc.LCM.provider.pass={{.Values.config.odlPassword}}
appc.LCM.provider.url=http://localhost:8181/restconf/operations/appc-provider-lcm
appc.LCM.scopeOverlap.endpoint=http://localhost:8181/restconf/operations/interfaces-service:execute-service
poolMembers=message-router.{{.Release.Namespace}}:3904
event.pool.members=message-router.{{.Release.Namespace}}:3904
restconf.user=admin
-restconf.pass=admin
+restconf.pass={{.Values.config.odlPassword}}
# properties found in appc-rest-adapter-bundle, appc-chef-adapter-bundle, appc-iaas-adapter-bundle)
appc.OAM.topic.write=testOAM
appc.OAM.client.name=testOAM
appc.OAM.provider.user=admin
-appc.OAM.provider.pass=admin
+appc.OAM.provider.pass={{.Values.config.odlPassword}}
dmaapTopic: SUCCESS
logstashServiceName: log-ls
logstashPort: 5044
+ odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
openStackType: OpenStackProvider
openStackName: OpenStack
openStackKeyStoneUrl: http://localhost:8181/apidoc/explorer/index.html
# limitations under the License.
global: # global defaults
- nodePortPrefix: 302
+ nodePortPrefixExt: 304
persistence: {}
config:
initialDelaySeconds: 10
periodSeconds: 10
-resources: {}
\ No newline at end of file
+resources: {}
ports:
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
- nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+ nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.nodePort }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
# Declare variables to be passed into your templates.
global: # global defaults
- nodePortPrefix: 302
+ nodePortPrefixExt: 304
persistence: {}
pullPolicy: Always
name: netbox-nginx
portName: netbox-nginx
internalPort: 8080
- nodePort: 69
+ nodePort: 20
-resources: {}
\ No newline at end of file
+resources: {}
# Declare variables to be passed into your templates.
global: # global defaults
- nodePortPrefix: 302
+ nodePortPrefixExt: 304
persistence: {}
# application image
# Global configuration defaults.
#################################################################
global:
- nodePortPrefix: 302
+ nodePortPrefixExt: 304
commonConfigPrefix: netbox
readinessRepository: oomk8s
readinessImage: readiness-check:2.0.0
metadata:
name: {{ include "common.fullname" . }}-esr-filebeat
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
---
metadata:
name: {{ include "common.fullname" . }}-esr-esrserver-log
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/log/esrserver/logback.xml").AsConfig . | indent 2 }}
-
--- /dev/null
+#!/bin/bash
+
+usage() {
+cat << EOF
+Install (or upgrade) an umbrella Helm Chart, and its subcharts, as separate Helm Releases
+
+The umbrella Helm Chart is broken apart into a parent release and subchart releases.
+Subcharts the are disabled (<chart>.enabled=false) will not be installed or upgraded.
+All releases are grouped and deployed within the same namespace.
+
+
+The deploy arguments must be a release and chart. The chart
+argument can be either: a chart reference('stable/onap'), a path to a chart directory,
+a packaged chart, or a fully qualified URL. For chart references, the latest
+version will be specified unless the '--version' flag is set.
+
+To override values in a chart, use either the '--values' flag and pass in a file
+or use the '--set' flag and pass configuration from the command line, to force string
+values, use '--set-string'.
+
+You can specify the '--values'/'-f' flag multiple times. The priority will be given to the
+last (right-most) file specified. For example, if both myvalues.yaml and override.yaml
+contained a key called 'Test', the value set in override.yaml would take precedence:
+
+ $ helm deploy demo ./onap --namespace onap -f openstack.yaml -f overrides.yaml
+
+You can specify the '--set' flag multiple times. The priority will be given to the
+last (right-most) set specified. For example, if both 'bar' and 'newbar' values are
+set for a key called 'foo', the 'newbar' value would take precedence:
+
+ $ helm deploy demo local/onap --namespace onap -f overrides.yaml --set log.enabled=false --set vid.enabled=false
+
+Usage:
+ helm deploy [RELEASE] [CHART] [flags]
+
+Flags:
+ --namespace string namespace to install the release into. Defaults to the current kube config namespace.
+ --set stringArray set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)
+ --set-string stringArray set STRING values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)
+ -f, --values valueFiles specify values in a YAML file or a URL(can specify multiple) (default [])
+EOF
+}
+
+parse_yaml() {
+ local prefix=$2
+ local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034')
+ sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \
+ -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p" $1 |
+ awk -F$fs '{
+ indent = length($1)/2;
+ vname[indent] = $2;
+ for (i in vname) {if (i > indent) {delete vname[i]}}
+ if (length($3) > 0) {
+ vn=""; for (i=0; i<indent; i++) {vn=(vn)(vname[i])("_")}
+ printf("%s%s%s=\"%s\"\n", "'$prefix'",vn, $2, $3);
+ }
+ }'
+}
+
+generate_overrides() {
+ SUBCHART_NAMES=($(cat $COMPUTED_OVERRIDES | grep -v '^\s\s'))
+
+ for index in "${!SUBCHART_NAMES[@]}"; do
+ START=${SUBCHART_NAMES[index]}
+ END=${SUBCHART_NAMES[index+1]}
+ if [[ $START == "global:" ]]; then
+ echo "global:" > $GLOBAL_OVERRIDES
+ cat $COMPUTED_OVERRIDES | sed '/common:/,/consul:/d' \
+ | sed -n '/'"$START"'/,/'log:'/p' | sed '1d;$d' >> $GLOBAL_OVERRIDES
+ else
+ SUBCHART_DIR="$CACHE_SUBCHART_DIR/$(cut -d':' -f1 <<<"$START")"
+ if [[ -d "$SUBCHART_DIR" ]]; then
+ cat $COMPUTED_OVERRIDES | sed -n '/'"$START"'/,/'"$END"'/p' \
+ | sed '1d;$d' | cut -c3- > $SUBCHART_DIR/subchart-overrides.yaml
+ fi
+ fi
+ done
+}
+
+deploy() {
+ RELEASE=$1
+ CHART_URL=$2
+ FLAGS=${@:3}
+ CHART_REPO="$(cut -d'/' -f1 <<<"$CHART_URL")"
+ CHART_NAME="$(cut -d'/' -f2 <<<"$CHART_URL")"
+ CACHE_DIR=~/.helm/plugins/deploy/cache
+ CHART_DIR=$CACHE_DIR/$CHART_NAME
+ CACHE_SUBCHART_DIR=$CHART_DIR-subcharts
+ # should pass all flags instead
+ NAMESPACE="$(echo $FLAGS | sed -n 's/.*\(namespace\).\s*/\1/p' | cut -c10-)"
+
+ # clear previously cached charts
+ rm -rf $CACHE_DIR
+
+ # fetch umbrella chart (parent chart containing subcharts)
+ if [[ -d "$CHART_URL" ]]; then
+ mkdir -p $CHART_DIR
+ cp -R $CHART_URL/* $CHART_DIR/
+
+ cd $CHART_DIR/charts/
+ for subchart in * ; do
+ tar xzf ${subchart}
+ done
+ rm -rf *.tgz
+ else
+ helm fetch $CHART_URL --untar --untardir $CACHE_DIR
+ fi
+
+ # move out subcharts to process separately
+ mkdir -p $CACHE_SUBCHART_DIR
+ mv $CHART_DIR/charts/* $CACHE_SUBCHART_DIR/
+ # temp hack - parent chart needs common subchart
+ mv $CACHE_SUBCHART_DIR/common $CHART_DIR/charts/
+
+ # disable dependencies
+ rm $CHART_DIR/requirements.lock
+ mv $CHART_DIR/requirements.yaml $CHART_DIR/requirements.deploy
+
+ # compute overrides for parent and all subcharts
+ COMPUTED_OVERRIDES=$CACHE_DIR/$CHART_NAME/computed-overrides.yaml
+ helm upgrade -i $RELEASE $CHART_DIR $FLAGS --dry-run --debug \
+ | sed -n '/COMPUTED VALUES:/,/HOOKS:/p' | sed '1d;$d' > $COMPUTED_OVERRIDES
+
+ # extract global overrides to apply to parent and all subcharts
+ GLOBAL_OVERRIDES=$CHART_DIR/global-overrides.yaml
+ generate_overrides $COMPUTED_OVERRIDES $GLOBAL_OVERRIDES
+
+ # upgrade/install parent chart first
+ helm upgrade -i $RELEASE $CHART_DIR --namespace $NAMESPACE -f $COMPUTED_OVERRIDES
+
+ # parse computed overrides - will use to determine if a subchart is "enabled"
+ eval $(parse_yaml $COMPUTED_OVERRIDES "computed_")
+
+ # upgrade/install each "enabled" subchart
+ cd $CACHE_SUBCHART_DIR
+ for subchart in * ; do
+ VAR="computed_${subchart}_enabled"
+ COMMAND="$"$VAR
+ eval "SUBCHART_ENABLED=$COMMAND"
+ if [[ $SUBCHART_ENABLED == "true" ]]; then
+ SUBCHART_OVERRIDES=$CACHE_SUBCHART_DIR/$subchart/subchart-overrides.yaml
+ helm upgrade -i "${RELEASE}-${subchart}" $CACHE_SUBCHART_DIR/$subchart \
+ --namespace $NAMESPACE -f $GLOBAL_OVERRIDES -f $SUBCHART_OVERRIDES
+ fi
+ done
+}
+
+if [[ $# < 2 ]]; then
+ usage
+ exit 0
+fi
+
+case "${1:-"help"}" in
+ "help")
+ usage
+ ;;
+ "--help")
+ usage
+ ;;
+ "-h")
+ usage
+ ;;
+ *)
+ deploy $1 $2 ${@:3}
+ ;;
+esac
+
+exit 0
\ No newline at end of file
--- /dev/null
+name: "deploy"
+version: "1.0.0"
+usage: "install (upgrade if release exists) parent chart and subcharts as separate
+but related releases"
+description: "install (upgrade if release exists) parent charty and all subcharts as separate
+but related releases"
+command: "$HELM_PLUGIN_DIR/deploy.sh"
\ No newline at end of file
--- /dev/null
+name: "undeploy"
+version: "1.0.0"
+usage: "delete parent chart and subcharts that were deployed as separate
+releases"
+description: "delete parent chart and subcharts that were deployed as separate
+releases"
+command: "$HELM_PLUGIN_DIR/undeploy.sh"
\ No newline at end of file
--- /dev/null
+#!/bin/bash
+
+usage() {
+cat << EOF
+Delete an umbrella Helm Chart, and its subcharts, that was previously deployed using 'Helm deploy'.
+
+Example of deleting all Releases that have the prefix 'demo'.
+ $ helm undeploy demo
+
+ $ helm undeploy demo --purge
+
+Usage:
+ helm undeploy [RELEASE] [flags]
+
+Flags:
+ --purge remove the releases from the store and make its name free for later use
+EOF
+}
+
+undeploy() {
+ RELEASE=$1
+ FLAGS=$2
+
+ array=($(helm ls -q | grep $RELEASE))
+ n=${#array[*]}
+ for (( i = n-1; i >= 0; i-- ))
+ do
+ helm del "${array[i]}" $FLAGS
+ done
+}
+
+if [[ $# < 1 ]]; then
+ echo "Error: command 'undeploy' requires a release name"
+ exit 0
+fi
+
+case "${1:-"help"}" in
+ "help")
+ usage
+ ;;
+ "--help")
+ usage
+ ;;
+ "-h")
+ usage
+ ;;
+ *)
+ undeploy $1 ${@:2}
+ ;;
+esac
+
+exit 0
\ No newline at end of file
metadata:
name: {{ include "common.fullname" . }}-log-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}
metadata:
name: {{ include "common.fullname" . }}-log-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}
metadata:
name: {{ include "common.fullname" . }}-log-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}
metadata:
name: multicloud-filebeat-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
---
metadata:
name: {{ include "common.fullname" . }}-log-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/log/framework/*").AsConfig . | indent 2 }}
---
metadata:
name: {{ include "common.fullname" . }}-provider-plugin-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/provider-plugin.json").AsConfig . | indent 2 }}
echo "Create MicroServicevCPE Policy"
curl -k -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
- "configBody": "{ \"service\": \"tca_policy\", \"location\": \"SampleServiceLocation\", \"uuid\": \"test\", \"policyName\": \"MicroServicevCPE\", \"description\": \"MicroService vCPE Policy\", \"configName\": \"SampleConfigName\", \"templateVersion\": \"OpenSource.version.1\", \"version\": \"1.1.0\", \"priority\": \"1\", \"policyScope\": \"resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\", \"riskType\": \"SampleRiskType\", \"riskLevel\": \"1\", \"guard\": \"False\", \"content\": { \"tca_policy\": { \"domain\": \"measurementsForVfScaling\", \"metricsPerEventName\": [{ \"eventName\": \"Measurement_vGMUX\", \"controlLoopSchemaType\": \"VNF\", \"policyScope\": \"DCAE\", \"policyName\": \"DCAE.Config_tca-hi-lo\", \"policyVersion\": \"v0.0.1\", \"thresholds\": [{ \"closedLoopControlName\": \"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\", \"version\": \"1.0.2\", \"fieldPath\": \"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\", \"thresholdValue\": 0, \"direction\": \"EQUAL\", \"severity\": \"MAJOR\", \"closedLoopEventStatus\": \"ABATED\" }, { \"closedLoopControlName\": \"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\", \"version\": \"1.0.2\", \"fieldPath\": \"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\", \"thresholdValue\": 0, \"direction\": \"GREATER\", \"severity\": \"CRITICAL\", \"closedLoopEventStatus\": \"ONSET\" }] }] } } }",
+ "configBody": "{ \"service\": \"tca_policy\", \"location\": \"SampleServiceLocation\", \"uuid\": \"test\", \"policyName\": \"MicroServicevCPE\", \"description\": \"MicroService vCPE Policy\", \"configName\": \"SampleConfigName\", \"templateVersion\": \"OpenSource.version.1\", \"version\": \"1.1.0\", \"priority\": \"1\", \"policyScope\": \"resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\", \"riskType\": \"SampleRiskType\", \"riskLevel\": \"1\", \"guard\": \"False\", \"content\": { \"tca_policy\": { \"domain\": \"measurementsForVfScaling\", \"metricsPerEventName\": [{ \"eventName\": \"Measurement_vGMUX\", \"controlLoopSchemaType\": \"VNF\", \"policyScope\": \"DCAE\", \"policyName\": \"DCAE.Config_tca-hi-lo\", \"policyVersion\": \"v0.0.1\", \"thresholds\": [{ \"closedLoopControlName\": \"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\", \"version\": \"1.0.2\", \"fieldPath\": \"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\", \"thresholdValue\": 0, \"direction\": \"EQUAL\", \"severity\": \"MAJOR\", \"closedLoopEventStatus\": \"ABATED\" }, { \"closedLoopControlName\": \"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\", \"version\": \"1.0.2\", \"fieldPath\": \"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\", \"thresholdValue\": 0, \"direction\": \"GREATER\", \"severity\": \"CRITICAL\", \"closedLoopEventStatus\": \"ONSET\" }] }] } } }",
"policyConfigType": "MicroService",
"policyName": "com.MicroServicevCPE",
"onapName": "DCAE"
}' 'https://{{.Values.global.pdp.nameOverride}}:{{.Values.config.pdpPort}}/pdp/api/createPolicy'
+#########################################Create SDNC Naming Policies##########################################
+
+echo "Create SDNC Naming Policies"
+
+sleep 2
+
+echo "Create SDNC vFW Naming Policy"
+curl -k -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+ "configBody": "{\"service\":\"SDNC-GenerateName\",\"version\":\"CSIT\",\"content\":{\"policy-instance-name\":\"ONAP_VFW_NAMING_TIMESTAMP\",\"naming-models\":[{\"naming-properties\":[{\"property-name\":\"AIC_CLOUD_REGION\"},{\"property-name\":\"nfRole\"},{\"property-name\":\"TIMESTAMP\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"VNF\",\"nfRole\":\"vFW\",\"naming-recipe\":\"AIC_CLOUD_REGION|DELIMITER|nfRole|DELIMITER|TIMESTAMP\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-name\":\"SEQUENCE\",\"increment-sequence\":{\"max\":\"zzz\",\"scope\":\"ENTIRETY\",\"start-value\":\"001\",\"length\":\"3\",\"increment\":\"1\",\"sequence-type\":\"alpha-numeric\"}},{\"property-name\":\"NFC_NAMING_CODE\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"VNFC\",\"nfRole\":\"vFW\",\"naming-recipe\":\"VNF_NAME|DELIMITER|NFC_NAMING_CODE|DELIMITER|SEQUENCE\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"},{\"property-name\":\"VF_MODULE_LABEL\"},{\"property-name\":\"VF_MODULE_TYPE\"},{\"property-name\":\"SEQUENCE\",\"increment-sequence\":{\"max\":\"zzz\",\"scope\":\"PRECEEDING\",\"start-value\":\"01\",\"length\":\"3\",\"increment\":\"1\",\"sequence-type\":\"alpha-numeric\"}}],\"naming-type\":\"VF-MODULE\",\"nfRole\":\"vFW\",\"naming-recipe\":\"VNF_NAME|DELIMITER|VF_MODULE_LABEL|DELIMITER|VF_MODULE_TYPE|DELIMITER|SEQUENCE\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"}],\"naming-type\":\"KEY\",\"nfRole\":\"vFW\",\"naming-recipe\":\"VNF_NAME\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"protected\",\"property-name\":\"CONSTANT\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"protected_private_net_id\",\"nfRole\":\"vFW\",\"naming-recipe\":\"VNF_NAME|DELIMITER|CONSTANT\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"unprotected\",\"property-name\":\"CONSTANT\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"unprotected_private_net_id\",\"nfRole\":\"vFW\",\"naming-recipe\":\"VNF_NAME|DELIMITER|CONSTANT\"}]}}",
+ "policyName": "SDNC_Policy.ONAP_VFW_NAMING_TIMESTAMP",
+ "policyConfigType": "MicroService",
+ "onapName": "SDNC",
+ "riskLevel": "4",
+ "riskType": "test",
+ "guard": "false",
+ "priority": "4",
+ "description": "ONAP_VFW_NAMING_TIMESTAMP"
+}' 'https://{{.Values.global.pdp.nameOverride}}:{{.Values.config.pdpPort}}/pdp/api/createPolicy'
+
+sleep 2
+
+echo "Create SDNC vPG Naming Policy"
+curl -k -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+ "configBody": "{\"service\":\"SDNC-GenerateName\",\"version\":\"CSIT\",\"content\":{\"policy-instance-name\":\"ONAP_VPG_NAMING_TIMESTAMP\",\"naming-models\":[{\"naming-properties\":[{\"property-name\":\"AIC_CLOUD_REGION\"},{\"property-name\":\"nfRole\"},{\"property-name\":\"TIMESTAMP\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"VNF\",\"nfRole\":\"vPG\",\"naming-recipe\":\"AIC_CLOUD_REGION|DELIMITER|nfRole|DELIMITER|TIMESTAMP\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-name\":\"SEQUENCE\",\"increment-sequence\":{\"max\":\"zzz\",\"scope\":\"ENTIRETY\",\"start-value\":\"001\",\"length\":\"3\",\"increment\":\"1\",\"sequence-type\":\"alpha-numeric\"}},{\"property-name\":\"NFC_NAMING_CODE\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"VNFC\",\"nfRole\":\"vPG\",\"naming-recipe\":\"VNF_NAME|DELIMITER|NFC_NAMING_CODE|DELIMITER|SEQUENCE\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"},{\"property-name\":\"VF_MODULE_LABEL\"},{\"property-name\":\"VF_MODULE_TYPE\"},{\"property-name\":\"SEQUENCE\",\"increment-sequence\":{\"max\":\"zzz\",\"scope\":\"PRECEEDING\",\"start-value\":\"01\",\"length\":\"3\",\"increment\":\"1\",\"sequence-type\":\"alpha-numeric\"}}],\"naming-type\":\"VF-MODULE\",\"nfRole\":\"vPG\",\"naming-recipe\":\"VNF_NAME|DELIMITER|VF_MODULE_LABEL|DELIMITER|VF_MODULE_TYPE|DELIMITER|SEQUENCE\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"}],\"naming-type\":\"KEY\",\"nfRole\":\"vPG\",\"naming-recipe\":\"VNF_NAME\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"protected\",\"property-name\":\"CONSTANT\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"protected_private_net_id\",\"nfRole\":\"vPG\",\"naming-recipe\":\"VNF_NAME|DELIMITER|CONSTANT\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"unprotected\",\"property-name\":\"CONSTANT\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"unprotected_private_net_id\",\"nfRole\":\"vPG\",\"naming-recipe\":\"VNF_NAME|DELIMITER|CONSTANT\"}]}}",
+ "policyName": "SDNC_Policy.ONAP_VPG_NAMING_TIMESTAMP",
+ "policyConfigType": "MicroService",
+ "onapName": "SDNC",
+ "riskLevel": "4",
+ "riskType": "test",
+ "guard": "false",
+ "priority": "4",
+ "description": "ONAP_VPG_NAMING_TIMESTAMP"
+}' 'https://{{.Values.global.pdp.nameOverride}}:{{.Values.config.pdpPort}}/pdp/api/createPolicy'
#########################################Creating Decision Guard policy#########################################
"policyName": "com.MicroServicevCPE",
"policyType": "MicroService"
}' 'https://{{.Values.global.pdp.nameOverride}}:{{.Values.config.pdpPort}}/pdp/api/pushPolicy'
+
+#########################################Pushing SDNC Naming Policies##########################################
+echo "Pushing SDNC Naming Policies"
+
+sleep 2
+
+echo "pushPolicy : PUT : SDNC_Policy.ONAP_VFW_NAMING_TIMESTAMP"
+curl -k -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+ "pdpGroup": "default",
+ "policyName": "SDNC_Policy.ONAP_VFW_NAMING_TIMESTAMP",
+ "policyType": "MicroService"
+}' 'https://{{.Values.global.pdp.nameOverride}}:{{.Values.config.pdpPort}}/pdp/api/pushPolicy'
+
+sleep 10
+
+echo "pushPolicy : PUT : SDNC_Policy.ONAP_VPG_NAMING_TIMESTAMP"
+curl -k -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+ "pdpGroup": "default",
+ "policyName": "SDNC_Policy.ONAP_VPG_NAMING_TIMESTAMP",
+ "policyType": "MicroService"
+}' 'https://{{.Values.global.pdp.nameOverride}}:{{.Values.config.pdpPort}}/pdp/api/pushPolicy'
"index-pattern": {
"title": "service-validations*",
"timeFieldName": "validationTimestamp",
- "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"modelInvariantId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"modelName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"modelVersionId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"result\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"serviceInstanceId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"validationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"validationTimestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"violations.category\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.errorMessage\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.modelName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.severity\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.validationRule\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*]-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*]-type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].invariant-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].nf-naming-code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].uuid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].vf-module-list.invariant-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].vf-module-list.max-instances\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].vf-module-list.min-instances\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].vf-module-list.uuid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].vnfc-list.name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].vnfc-list.nfc-naming-code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf[*]-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf[*]-type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-service-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].invariant-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].uuid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vf-module-list.invariant-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vf-module-list.max-instances\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vf-module-list.min-instances\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vf-module-list.uuid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vnfc-list.invariant-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vnfc-list.name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vnfc-list.nfc-naming-code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vnfc-list.uuid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdnc-vf-list[*]-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdnc-vf-list[*]-type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdnc-vf[*]-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdnc-vf[*]-type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationTimestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"violations.violationType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false}]"
+ "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"modelInvariantId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"modelName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"modelVersionId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"result\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"serviceInstanceId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"validationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"validationTimestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"violations.category\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.errorMessage\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.modelName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.severity\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.validationRule\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*]-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*]-type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].invariant-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].nf-naming-code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].uuid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].vf-module-list.invariant-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].vf-module-list.max-instances\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].vf-module-list.min-instances\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].vf-module-list.uuid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].vnfc-list.name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf-list[*].vnfc-list.nfc-naming-code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf[*]-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-aai-vf[*]-type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-service-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].invariant-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].uuid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vf-module-list.invariant-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vf-module-list.max-instances\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vf-module-list.min-instances\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vf-module-list.uuid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vnfc-list.invariant-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vnfc-list.name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vnfc-list.nfc-naming-code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdc-vf-list[*].vnfc-list.uuid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdnc-vf-list[*]-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdnc-vf-list[*]-type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdnc-vf[*]-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationDetails.context-list-sdnc-vf[*]-type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"violations.violationTimestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"violations.violationType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"client\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"requestId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false}]"
}
}
}{
}
}
}
-}
\ No newline at end of file
+}
"type": "text"
}
}
+ },
+ "client": {
+ "type": "text"
+ },
+ "requestId": {
+ "type": "text"
}
}
}
}
}
-}
\ No newline at end of file
+}
--- /dev/null
+/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * 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=====================================================
+ */
+
+entity {
+ name 'POA-EVENT'
+ indexing {
+ indices 'default-rules'
+ }
+ validation {
+
+ // NDCB-AAI comparison: Context level
+ useRule {
+ name 'NDCB-AAI-attribute-comparison'
+ attributes 'context-list.ndcb', 'context-list.aai'
+ }
+
+ // NDCB-AAI comparison: Service entity
+ useRule {
+ name 'NDCB-AAI-attribute-comparison'
+ attributes 'context-list.ndcb.service', 'context-list.aai.service'
+ }
+
+ // NDCB-AAI comparison: VF list
+ useRule {
+ name 'NDCB-AAI-attribute-comparison'
+ attributes 'context-list.ndcb.vfList[*]', 'context-list.aai.vfList[*]'
+ }
+
+ // NDCB-AAI comparison: VF-Module list
+ useRule {
+ name 'NDCB-AAI-attribute-comparison'
+ attributes 'context-list.ndcb.vfList[*].vfModuleList[*]', 'context-list.aai.vfList[*].vfModuleList[*]'
+ }
+
+ // NDCB-AAI comparison: VNFC list
+ useRule {
+ name 'NDCB-AAI-attribute-comparison'
+ attributes 'context-list.ndcb.vfList[*].vnfcList[*]', 'context-list.aai.vfList[*].vnfcList[*]'
+ }
+
+ // NDCB-AAI comparison: VM list
+ useRule {
+ name 'NDCB-AAI-attribute-comparison'
+ attributes 'context-list.ndcb.vfList[*].vfModuleList[*].vmList[*]', 'context-list.aai.vfList[*].vfModuleList[*].vmList[*]'
+ }
+
+ // NDCB-AAI comparison: Network list
+ useRule {
+ name 'NDCB-AAI-attribute-comparison'
+ attributes 'context-list.ndcb.vfList[*].vfModuleList[*].networkList[*]', 'context-list.aai.vfList[*].vfModuleList[*].networkList[*]'
+ }
+
+ // SDC-AAI VNFC type
+ useRule {
+ name 'SDC-AAI-vnfc-type'
+ attributes 'context-list.sdc.vfList[*].vnfcList[*]', 'context-list.aai.vfList[*].vnfcList[*]'
+ }
+
+ // SDC-AAI VNFC node count
+ useRule {
+ name 'SDC-AAI-vnfc-node-count'
+ attributes 'context-list.sdc.vfList[*].vnfcList[*]', 'context-list.aai.vfList[*].vnfcList[*]'
+ }
+
+ // SDC-AAI VF-Module instance
+ useRule {
+ name 'SDC-AAI-vf-module-instance-check'
+ attributes 'context-list.ndcb.vfList[*].vfModuleList[*]', 'context-list.aai.vfList[*].vfModuleList[*]'
+ }
+ }
+}
+
+rule {
+ name 'SDC-AAI-vnfc-type'
+ category 'INVALID_VALUE'
+ description 'Validate that each VNFC instance in AAI conforms to a VNFC type defined in SDC model'
+ errorText 'AAI VNFC instance includes non-specified type in design SDC model'
+ severity 'ERROR'
+ attributes 'sdcList', 'aaiList'
+ validate '''
+ def getVnfcTypes = { parsedData ->
+ parsedData.collect{ it.findResult{ k, v -> if(k.equals("type")) {return "$v"}}}
+ }
+
+ def slurper = new groovy.json.JsonSlurper()
+ def sdcTypes = getVnfcTypes(slurper.parseText(sdcList.toString()))
+ def aaiTypes = getVnfcTypes(slurper.parseText(aaiList.toString()))
+
+ // each type in AAI must exist in SDC
+ return aaiTypes.containsAll(sdcTypes)
+ '''
+}
+
+rule {
+ name 'SDC-AAI-vnfc-node-count'
+ category 'INVALID_VALUE'
+ description 'Validate that for each VNFC node defined in SDC model, there is at least one VNFC instance in AAI'
+ errorText 'Design has specified types but not all of them exist in AAI'
+ severity 'WARNING'
+ attributes 'sdcList', 'aaiList'
+ validate '''
+ def getVnfcNodes = { parsedData ->
+ parsedData.collect { new Tuple2(
+ it.findResult{ k, v -> if(k.equals("name")) {return "$v"}},
+ it.findResult{ k, v -> if(k.equals("type")) {return "$v"}})
+ }
+ }
+
+ def slurper = new groovy.json.JsonSlurper()
+ def sdcNodes = getVnfcNodes(slurper.parseText(sdcList.toString()))
+ def aaiNodes = getVnfcNodes(slurper.parseText(aaiList.toString()))
+
+ // each node in AAI must exist in SDC
+ return aaiNodes.containsAll(sdcNodes)
+ '''
+}
+
+rule {
+ name 'SDC-AAI-vf-module-instance-check'
+ category 'INVALID_VALUE'
+ description 'Validate that each VF module instance in AAI conforms to a VF module defined in SDC service model'
+ errorText 'One or more AAI VF module instance(s) not defined in SDC model'
+ severity 'CRITICAL'
+ attributes 'sdcList', 'aaiList'
+ validate '''
+ def getVfModules = { parsedData ->
+ parsedData.collect{ it.findResult{ k, v -> if(k.equals("name")) {return "$v"}}}
+ }
+
+ def slurper = new groovy.json.JsonSlurper()
+ def sdcVfModules = getVfModules(slurper.parseText(sdcList.toString()))
+ def aaiVfModules = getVfModules(slurper.parseText(aaiList.toString()))
+
+ // all VF modules in AAI must exist in SDC
+ return aaiVfModules.containsAll(sdcVfModules)
+ '''
+}
+
+rule {
+ name 'NDCB-AAI-attribute-comparison'
+ category 'INVALID_VALUE'
+ description 'Verify that every attribute in Network-Discovery is the same as in AAI'
+ errorText 'Some attributes in Network-Discovery are not equal to attributes in AAI'
+ severity 'ERROR'
+ attributes 'ndcbItems', 'aaiItems'
+ validate '''
+ Closure<java.util.Map> getAttributes = { parsedData ->
+ java.util.Map attributeMap = new java.util.HashMap()
+
+ def isAttributeDataQualityOk = { attribute ->
+ attribute.findResult{ k, v -> if(k.equals("dataQuality") ) {return v.get("status")}}.equals("ok")
+ }
+
+ def addToMap = { attrKey, attrValue ->
+ java.util.Set values = attributeMap.get("$attrKey")
+ if(values == null) {
+ values = new java.util.HashSet()
+ attributeMap.put("$attrKey", values)
+ }
+ values.add("$attrValue")
+ }
+
+ def addAttributeToMap = { attribute ->
+ if(isAttributeDataQualityOk(attribute)) {
+ String key, value
+ attribute.each { k, v ->
+ if(k.equals("name")) {key = "$v"}
+ if(k.equals("value")) {value = "$v"}
+ }
+ addToMap("$key", "$value")
+ }
+ }
+
+ def processKeyValue = { key, value ->
+ if(value instanceof java.util.ArrayList) {
+ if(key.equals("attributeList")) {
+ value.each {
+ addAttributeToMap(it)
+ }
+ }
+ } else if(!(value instanceof groovy.json.internal.LazyMap)) {
+ // only add key-value attributes, skip the rest
+ addToMap("$key", "$value")
+ }
+ }
+
+ if(parsedData instanceof java.util.ArrayList) {
+ parsedData.each {
+ it.each { key, value -> processKeyValue(key, value) }
+ }
+ } else {
+ parsedData.each { key, value -> processKeyValue(key, value) }
+ }
+ return attributeMap
+ }
+
+ def slurper = new groovy.json.JsonSlurper()
+ java.util.Map ndcb = getAttributes(slurper.parseText(ndcbItems.toString()))
+ java.util.Map aai = getAttributes(slurper.parseText(aaiItems.toString()))
+
+ ndcb.each{ ndcbKey, ndcbValueList ->
+ def aaiValueList = aai.get("$ndcbKey")
+ aaiValueList.each{ aaiValue ->
+ if(!ndcbValueList.any{ it == "$aaiValue" }) {
+ return false
+ }
+ }
+ }
+ return true
+ '''
+}
\ No newline at end of file
namespace: {{ include "common.namespace" . }}
data:
{{ tpl (.Files.Glob "resources/appconfig/topics/*.properties").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-rules
+ namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/bundleconfig/etc/rules/poa-event/*.groovy").AsConfig . | indent 2 }}
name: config-auth
- mountPath: {{ .Values.config.configTopicsDir }}/
name: config-topics
+ - mountPath: {{ .Values.config.rulesDir }}/
+ name: rules
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- if .Values.nodeSelector }}
path: topic-poa-audit-result.properties
- key: topic-poa-rule-validation.properties
path: topic-poa-rule-validation.properties
+ - name: rules
+ configMap:
+ name: {{ include "common.fullname" . }}-rules
+ defaultMode: 0644
+ items:
+ - key: default-rules.groovy
+ path: default-rules.groovy
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
configDir: /opt/app/validation-service/appconfig
configAuthDir: /opt/app/validation-service/appconfig/auth
configTopicsDir: /opt/app/validation-service/appconfig/topics
+ rulesDir: /opt/app/validation-service/bundleconfig/etc/rules/poa-event
maxHeap: 1024
# username: myusername
# password: mypassword
GLOBAL_SMS_SERVER_NAME = "aaf-sms.{{include "common.namespace" .}}"
GLOBAL_SMS_SERVER_PORT = "10443"
# vid info - everything is from the private oam network (also called onap private network)
-GLOBAL_VID_SERVER_PROTOCOL = "http"
-GLOBAL_VID_SERVER_PORT = "8080"
+GLOBAL_VID_SERVER_PROTOCOL = "https"
+GLOBAL_VID_SERVER_PORT = "8443"
GLOBAL_VID_USERNAME = "demo"
GLOBAL_VID_PASSWORD = "Kp8bJ4SXszM0WX"
GLOBAL_VID_HEALTH_USERNAME = "Default"
metadata:
name: {{ include "common.fullname" . }}
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
metadata:
name: {{ include "common.fullname" . }}
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
metadata:
name: {{ include "common.fullname" . }}
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
metadata:
name: {{ include "common.fullname" . }}
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
metadata:
name: {{ include "common.fullname" . }}-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
---
metadata:
name: {{ include "common.fullname" . }}-scripts
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/bin/*").AsConfig . | indent 2 }}
metadata:
name: {{ include "common.fullname" . }}-filebeat-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/log/filebeat/log4j/*").AsConfig . | indent 2 }}
---
metadata:
name: {{ include "common.fullname" . }}-log-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}
---
metadata:
name: {{ include "common.fullname" . }}-bin
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/bin/*").AsConfig . | indent 2 }}
---
metadata:
name: {{ include "common.fullname" . }}-properties
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/conf/*").AsConfig . | indent 2 }}
---
metadata:
name: {{ include "common.fullname" . }}-env
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Get "resources/env.yaml") . | indent 2 }}
auth: 2630606608347B7124C244AB0FE34F6F
dme2:
timeout: '30000'
- endpoint: https://aai.api.simpledemo.onap.org:8443
+ endpoint: https://aai.{{ include "common.namespace" . }}:8443
camunda:
bpm:
admin-user:
adapters:
requestDb:
auth: Basic YnBlbDptc28tZGItMTUwNyE=
- endpoint: https://c1.vm1.mso.simpledemo.onap.org:8081
+ endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
completemsoprocess:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8081/CompleteMsoProcess
+ endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/CompleteMsoProcess
db:
auth: 26AFB797A6A57960D5D718491925C50F77CDC22AC394B3DBA09950D8FD1C0764
password: wLg4sjrAFUS8rfVfdvTXeQ==
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/services/RequestsDbAdapter
+ endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/services/RequestsDbAdapter
spring:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083
+ endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
network:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/NetworkAdapter
+ endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/NetworkAdapter
rest:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/networks
+ endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/v1/networks
openecomp:
db:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/services/RequestsDbAdapter
+ endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/services/RequestsDbAdapter
po:
auth: 757A94191D685FD2092AC1490730A4FC
password: 3141634BF7E070AA289CF2892C986C0B
sdnc:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/SDNCAdapter
+ endpoint: http://mso-sdnc-adapter.{{ include "common.namespace" . }}:8086/adapters/SDNCAdapter
rest:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/rest/v1/sdnc
+ endpoint: http://mso-sdnc-adapter.{{ include "common.namespace" . }}:8086/adapters/rest/v1/sdnc
timeout: PT60S
tenant:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/TenantAdapter
+ endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/TenantAdapter
vnf:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/VnfAdapter
+ endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAdapter
rest:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/vnfs/v1/vnfs
+ endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/vnfs/v1/vnfs
volume-groups:
rest:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/volume-groups
+ endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}g:8087/services/rest/v1/volume-groups
vnf-async:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/VnfAdapterAsync
+ endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAsyncAdapter
bpmn:
process:
historyTimeToLive: '30'
callbackRetryAttempts: '5'
catalog:
db:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082/ecomp/mso/catalog
+ endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8083/ecomp/mso/catalog
spring:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
+ endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8083
db:
auth: Basic YnBlbDptc28tZGItMTUwNyE=
default:
timeout: PT60S
request:
db:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/
+ endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/
rollback: 'true'
sdnc:
password: 3141634BF7E070AA289CF2892C986C0B
site-name: CamundaEngine
sniro:
auth: test:testpwd
- callback: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/rest/SDNCNotify
+ callback: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/adapters/rest/SDNCNotify
endpoint: http://replaceme:28090/optimizationInstance/V1/create
timeout: PT30M
workflow:
aai:
namespace: http://org.onap.aai.inventory/
message:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage
+ endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage
notification:
name: GenericNotificationServiceATT
sdncadapter:
- callback: http://c1.vm1.mso.simpledemo.onap.org:8086/mso/SDNCAdapterCallbackService
+ callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/SDNCAdapterCallbackService
vnfadapter:
create:
- callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
+ callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/VNFAdaptercallback
delete:
- callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
+ callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/VNFAdaptercallback
query:
- callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
+ callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/VNFAdaptercallback
rollback:
- callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
+ callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/VNFAdaptercallback
global:
dmaap:
username: testuser
auth: Basic dGVzdHBkcDphbHBoYTEyMw==
client:
auth: Basic bTAzNzQzOnBvbGljeVIwY2sk
- endpoint: https://localhost:8081/pdp/api/
+ endpoint: http://pdp.{{ include "common.namespace" . }}:8081/pdp/api/
environment: TEST
sdnc:
auth: Basic YWRtaW46YWRtaW4=
- host: https://localhost:8443
+ host: https://sdc-be.{{ include "common.namespace" . }}:8443
path: /restconf/operations/GENERIC-RESOURCE-API
appc:
client:
key: VIlbtVl6YLhNUrtU
secret: 64AG2hF4pYeG2pq7CT6XwUOT
service: ueb
- poolMembers: ueb1.simpledemo.onap.org:3904,ueb2.simpledemo.onap.org:3904
+ poolMembers: message-router.{{ include "common.namespace" . }}:3904,message-router.{{ include "common.namespace" . }}:3904
server:
port: 8081
tomcat:
max-threads: 50
spring:
- datasource:
- driver-class-name: org.mariadb.jdbc.Driver
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
security:
usercredentials:
-
-
username: mso_admin
password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
- role: ACTUATOR
\ No newline at end of file
+ role: ACTUATOR
+
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
maxUnavailable: 1
maxSurge: 1
# Resource Limit flavor -By Default using small
-flavor: small
+flavor: large
# Segregation for Different environment (Small and Large)
resources:
small:
catalog:
db:
spring:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
+ endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
auth: Basic YnBlbDpwYXNzd29yZDEk
spring:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driver-class-name: org.mariadb.jdbc.Driver
- initialize: false
- initialization-mode: never
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
- jpa:
- generate-ddl: false
- show-sql: false
- hibernate:
- ddl-auto: validate
- naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
- enable-lazy-load-no-trans: true
- database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
security:
usercredentials:
-
#Actuator
management:
context-path: /manage
-flyway:
- base-on-migrate: true
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- user: ${DB_USERNAME}
- password: ${DB_PASSWORD}
\ No newline at end of file
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
server:
port: 8087
spring:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driver-class-name: org.mariadb.jdbc.Driver
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
security:
usercredentials:
-
catalog:
db:
spring:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
+ endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
auth: Basic YnBlbDptc28tZGItMTUwNyE=
site-name: localDevEnv
region_id: "DFW"
clli: "DFW"
aic_version: "2.5"
- identity_service_id: "RAX_KEYSTONE"
\ No newline at end of file
+ identity_service_id: "RAX_KEYSTONE"
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
adapters:
requestDb:
auth: Basic YnBlbDptc28tZGItMTUwNyE=
- endpoint: https://c1.vm1.mso.simpledemo.onap.org:8081
+ endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
spring:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driver-class-name: org.mariadb.jdbc.Driver
- initialize: false
- initialization-mode: never
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
- jpa:
- generate-ddl: false
- show-sql: false
- hibernate:
- ddl-auto: validate
- naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
- enable-lazy-load-no-trans: true
- database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
security:
usercredentials:
-
#Actuator
management:
context-path: /manage
-flyway:
- base-on-migrate: true
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
\ No newline at end of file
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
server:
port: 8085
spring:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driver-class-name: org.mariadb.jdbc.Driver
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
security:
usercredentials:
-
username: mso_admin
password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
role: ACTUATOR
-request:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driver-class-name: org.mariadb.jdbc.Driver
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
mso:
msoKey: 07a7159d3bf51a0e53be7a8f89699be7
logPath: ./logs/sdc
catalog:
db:
spring:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
+ endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
auth: Basic YnBlbDpwYXNzd29yZDEk
site-name: onapheat
aai:
- endpoint: https://aai.api.simpledemo.onap.org:8443
+ endpoint: https://aai.{{ include "common.namespace" . }}:8443
asdc-connections:
asdc-controller1:
user: mso
consumerGroup: sdc-OpenSource-Env1
consumerId: sdc-COpenSource-Env11
environmentName: AUTO
- asdcAddress: c2.vm1.sdc.simpledemo.onap.org:8443
+ asdcAddress: sdc-be.{{ include "common.namespace" . }}:8443
password: 613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247
pollingInterval: 60
pollingTimeout: 60
keyStorePath:
watchDogTimeout: 60
isFitlerInEmptyResources: true
- messageBusAddress: vm1.mr.simpledemo.onap.org,vm1.mr.simpledemo.onap.org
+ messageBusAddress: message-router.{{ include "common.namespace" . }},message-router.{{ include "common.namespace" . }}
asdc:
config:
key: 566B754875657232314F5548556D3665
count: 3,
componentNames: SO,AAI,SDNC
scheduling:
- enabled: false
\ No newline at end of file
+ enabled: false
+ adapters:
+ requestDb:
+ auth: Basic YnBlbDptc28tZGItMTUwNyE=
+ endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
catalog:
db:
spring:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
+ endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
auth: Basic cGFzc3dvcmQxJA==
site-name: onapheat
delete: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
rollback: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
bpelauth: cGFzc3dvcmQxJA==
- bpelurl: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/SDNCAdapterCallbackService
+ bpelurl: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/SDNCAdapterCallbackService
generic-resource:
network-topology-operation:
activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
mobility:
'':
query: GET|60000|sdncurl5|
- myurl: http://c1.vm1.mso.simpledemo.onap.org:8081/adapters/rest/SDNCNotify
+ myurl: http://so-sdnc-adapter{{ include "common.namespace" . }}:8086/adapters/rest/SDNCNotify
rest:
- bpelurl: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage
+ bpelurl: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage
sdncauth: 406B2AE613211B6FB52466DE6E1769AC
sdncconnecttime: 5000
- sdncurl10: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/GENERIC-RESOURCE-API:'
- sdncurl11: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/VNFTOPOLOGYAIC-API:'
- sdncurl12: http://c1.vm1.sdnc.simpledemo.onap.org:8282/
- sdncurl5: http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/config
- sdncurl6: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/VNF-API:'
- sdncurl8: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/NBNC-API:'
- sdncurl9: http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/NORTHBOUND-API:service-topology-operation
+ sdncurl10: http://sdnc.{{ include "common.namespace" . }}:8282/restconf/operations/GENERIC-RESOURCE-API:'
+ sdncurl11: http://sdnc.{{ include "common.namespace" . }}:8282/restconf/operations/VNFTOPOLOGYAIC-API:'
+ sdncurl12: http://sdnc.{{ include "common.namespace" . }}:8282/
+ sdncurl5: http://sdnc.{{ include "common.namespace" . }}:8282/restconf/config
+ sdncurl6: http://sdnc.{{ include "common.namespace" . }}:8282/restconf/operations/VNF-API:'
+ sdncurl8: http://sdnc.{{ include "common.namespace" . }}:8282/restconf/operations/NBNC-API:'
+ sdncurl9: http://sdnc.{{ include "common.namespace" . }}:8282/restconf/operations/NORTHBOUND-API:service-topology-operation
service:
infra:
service-topology-infra-activate-operation: POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-
username: mso_admin
password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
- role: ACTUATOR
\ No newline at end of file
+ role: ACTUATOR
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
# limitations under the License.
logging:
path: logs
-spring:
- datasource:
- driver-class-name: org.mariadb.jdbc.Driver
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
server:
port: 8084
tomcat:
adapters:
requestDb:
auth: Basic YnBlbDptc28tZGItMTUwNyE=
- endpoint: https://c1.vm1.mso.simpledemo.onap.org:8081
+ endpoint: https://so-request-db-adapter.{{ include "common.namespace" . }}:8083
#Actuator
management:
security:
enabled: false
basic:
- enabled: false
\ No newline at end of file
+ enabled: false
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
msoKey: "07a7159d3bf51a0e53be7a8f89699be7"
logPath: logs
site-name: onapheat
- adapters:
- requestDb:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083
- auth: YnBlbDptc28tZGItMTUwNyE=
catalog:
db:
spring:
- endpoint: "http://c1.vm1.mso.simpledemo.onap.org:8082"
+ endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
auth: Basic cGFzc3dvcmQxJA==
- config:
- path: /src/main/resources/
+ adapters:
+ requestDb:
+ auth: YnBlbDptc28tZGItMTUwNyE=
+ endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
+ config:
+ path: /src/main/resources/
infra:
default:
alacarte:
apih:
homing:
sdna:
- url: http://c1.vm1.mso.simpledemo.onap.org:8086/
+ url: http://so-sdnc-adapter.{{ include "common.namespace" . }}:8086/
password: 4112B789E942B161228F7D5AFC654C0F
- bpelURL: http://c1.vm1.mso.simpledemo.onap.org:8082/
+ bpelURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8082/
bpelAuth: 786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1
- camundaURL: http://c1.vm1.mso.simpledemo.onap.org:8082/
+ camundaURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8082/
camundaAuth: 5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1
async:
core-pool-size: 50
activate:
instanceid: test
userid: cs0008
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:28090
+ endpoint: http://sdc-be.{{ include "common.namespace" . }}:8443
tenant:
isolation:
retry:
count: 3
aai:
- endpoint: https://aai.api.simpledemo.onap.org:8443
+ endpoint: https://aai.{{ include "common.namespace" . }}:8443
auth: 2630606608347B7124C244AB0FE34F6F
so:
operational-environment:
dmaap:
username: testuser
password: VjR5NDcxSzA=
- host: http://c1.vm1.mso.simpledemo.onap.org:28090
+ host: http://dmaap-bc.{{ include "common.namespace" . }}:8080
publisher:
topic: com.att.ecomp.mso.operationalEnvironmentEvent
spring:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driver-class-name: org.mariadb.jdbc.Driver
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
- jpa:
- show-sql: true
- hibernate:
- dialect: org.hibernate.dialect.MySQL5Dialect
- ddl-auto: validate
- naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
- enable-lazy-load-no-trans: true
jersey:
type: filter
security:
username: mso_admin
password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
role: ACTUATOR
-request:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driver-class-name: org.mariadb.jdbc.Driver
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
\ No newline at end of file
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
cpu: 1000m
memory: 2Gi
livenessProbe:
- path: /manage/health
- scheme: HTTPS
+ path: /manage/health
+ scheme: HTTP
initialDelaySeconds: 600
periodSeconds: 60
timeoutSeconds: 10
# limitations under the License.
apiVersion: v1
-description: Chart for MariaDB Galera cluster
-name: mariadb-galera
-version: 2.0.0
+description: ONAP VID MariaDB Galera cluster
+name: vid_mariadb_galera
+version: 3.0.0
keywords:
- mariadb
- mysql
memory: 4Gi
# Name for mariadb-galera cluster - should be unique accross all projects or other clusters
-nameOverride: vid-galera
+nameOverride: vid-mariadb-galera
# DNS name for mariadb-galera cluster - should be unique accross all projects other clusters
#dnsnameOverride: mariadb-galera
-# Copyright © 2018 Amdocs, Bell Canada
+#!/bin/sh
+# 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.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-dbcmd-configmap
- namespace: {{ include "common.namespace" . }}
-data:
- db_cmd.sh : |-
- #!/bin/sh
- #mysql -uroot -p${MYSQL_ROOT_PASSWORD} -h${MYSQL_HOST} -P3306 < /db-config/vid-pre-init.sql
- mysql -uvidadmin -p${MYSQL_PASSWORD} -h${MYSQL_HOST} -P3306 < /db-config/vid-pre-init.sql
-
+echo "Going to run mysql -u${MYSQL_USER} -p${MYSQL_PASSWORD} -h${MYSQL_HOST} -P${MYSQL_PORT} ..."
+mysql -u${MYSQL_USER} -p${MYSQL_PASSWORD} -h${MYSQL_HOST} -P${MYSQL_PORT} < /db-config/vid-pre-init.sql
+if [ $? -ne 0 ];then
+ echo "ERROR: Failed to run ${cmd} vid-pre-init.sql"
+ exit 1
+else
+ echo "INFO: Database initialized successfully"
+fi
--- /dev/null
+/*
+# 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.
+# 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.
+*/
+
+CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`schema_info` (
+`SCHEMA_ID` VARCHAR(25) NOT NULL,
+`SCHEMA_DESC` VARCHAR(75) NOT NULL,
+`DATASOURCE_TYPE` VARCHAR(100) NULL DEFAULT NULL,
+`CONNECTION_URL` VARCHAR(200) NOT NULL,
+`USER_NAME` VARCHAR(45) NOT NULL,
+`PASSWORD` VARCHAR(45) NULL DEFAULT NULL,
+`DRIVER_CLASS` VARCHAR(100) NOT NULL,
+`MIN_POOL_SIZE` INT(11) NOT NULL,
+`MAX_POOL_SIZE` INT(11) NOT NULL,
+`IDLE_CONNECTION_TEST_PERIOD` INT(11) NOT NULL)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8;
\ No newline at end of file
+++ /dev/null
-# Copyright © 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.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-check-job-completion
- namespace: {{ include "common.namespace" . }}
-data:
- vid_check_job_completion.py: |
- #!/usr/bin/python
- from __future__ import print_function
- import time, argparse, logging, sys, os
- import kubernetes.client
- from kubernetes import client, config
- from pprint import pprint
-
- #extract env variables.
- namespace = os.environ['NAMESPACE']
- cert = os.environ['CERT']
- host = os.environ['KUBERNETES_SERVICE_HOST']
- token_path = os.environ['TOKEN']
-
- with open(token_path, 'r') as token_file:
- token = token_file.read().replace('\n', '')
-
- client.configuration.api_key['authorization'] = token
- client.configuration.api_key_prefix['authorization'] = 'Bearer'
- client.configuration.host = "https://" + str(host)
- client.configuration.ssl_ca_cert = cert
-
- api_instance = client.BatchV1Api()
-
- #setup logging
- log = logging.getLogger(__name__)
- handler = logging.StreamHandler(sys.stdout)
- handler.setFormatter(logging.Formatter('%(asctime)s - %(levelname)s - %(message)s'))
- handler.setLevel(logging.INFO)
- log.addHandler(handler)
- log.setLevel(logging.INFO)
-
-
- def is_ready(job_name):
- log.info( "[INFO] Checking if " + job_name + " is completed")
- pretty = True
- job_status = False
-
- try:
- api_response = api_instance.read_namespaced_job_status(job_name, namespace, pretty=pretty)
- except Exception as e:
- print("Exception when calling BatchV1Api->read_namespaced_job_status: %s\n" % e)
-
- pprint(api_response)
- if api_response.status.succeeded == 1:
- job_status_type = api_response.status.conditions[0].type
- if job_status_type == "Complete":
- job_status = True
-
- print("[DBG] jobStatus: " + unicode(job_status))
- return job_status
-
-
- def main(args):
- for job_name in args:
- timeout = time.time() + 60 * 10
- while True:
- ready = is_ready(job_name)
- if ready is True :
- break
- elif time.time() > timeout:
- log.warning( "timed out waiting for '" + job_name + "' to be ready")
- exit(1)
- else:
- time.sleep(5)
-
-
- if __name__ == "__main__":
- parser = argparse.ArgumentParser(description='Process some names.')
- parser.add_argument('--job-name', action='append', required=True, help='A container name')
- args = parser.parse_args()
- arg_dict = vars(args)
-
- for arg in arg_dict.itervalues():
- main(arg)
-
-
+++ /dev/null
-# Copyright © 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.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-cluster-ready-configmap
- namespace: {{ include "common.namespace" . }}
-data:
- vid_ready.py : |-
- #!/usr/bin/python
- from kubernetes import client, config
- import time, argparse, logging, sys, os
-
- #extract env variables.
- namespace = os.environ['NAMESPACE']
- cert = os.environ['CERT']
- host = os.environ['KUBERNETES_SERVICE_HOST']
- token_path = os.environ['TOKEN']
-
- with open(token_path, 'r') as token_file:
- token = token_file.read().replace('\n', '')
-
- client.configuration.host = "https://" + host
- client.configuration.ssl_ca_cert = cert
- client.configuration.api_key['authorization'] = token
- client.configuration.api_key_prefix['authorization'] = 'Bearer'
-
- #setup logging
- log = logging.getLogger(__name__)
- handler = logging.StreamHandler(sys.stdout)
- handler.setFormatter(logging.Formatter('%(asctime)s - %(levelname)s - %(message)s'))
- handler.setLevel(logging.INFO)
- log.addHandler(handler)
- log.setLevel(logging.INFO)
-
-
- def is_ready(container_name):
- log.info( "Checking if " + container_name + " is ready")
- # config.load_kube_config() # for local testing
- # namespace='onap-sdc' # for local testing
- v1 = client.CoreV1Api()
-
- ready = False
-
- try:
- response = v1.list_namespaced_pod(namespace=namespace, watch=False)
-
- for i in response.items:
- #log.info(i.metadata.name)
- for s in i.status.container_statuses:
- #log.info(s.name)
- if i.metadata.name == container_name:
- ready = s.ready
- if not ready:
- log.info( container_name + " is not ready.")
- else:
- log.info( container_name + " is ready!")
- else:
- continue
- return ready
- except Exception as e:
- log.error("Exception when calling list_namespaced_pod: %s\n" % e)
-
-
- def main(args):
- # args are a list of container names
- for container_name in args:
- # 5 min, TODO: make configurable
- timeout = time.time() + 60 * 10
- while True:
- ready = is_ready(container_name)
- if ready is True:
- break
- elif time.time() > timeout:
- log.warning( "timed out waiting for '" + container_name + "' to be ready")
- exit(1)
- else:
- time.sleep(5)
-
-
- if __name__ == "__main__":
- parser = argparse.ArgumentParser(description='Process some names.')
- parser.add_argument('--container-name', action='append', required=True, help='A container name')
- args = parser.parse_args()
- arg_dict = vars(args)
-
- for arg in arg_dict.itervalues():
- main(arg)
-
-
-
namespace: {{ include "common.namespace" . }}
data:
{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
\ No newline at end of file
release: {{ .Release.Name }}
spec:
initContainers:
-#dd775k: This container checks if the job that wait for all db instances to be up and initializes the db had finished.
-# - command:
-# - /bin/sh
-# args:
-# - "-c"
-# - "sleep 1000000000m"
- command:
- - python
+ - /root/job_complete.py
args:
- - /tmp/vid-check-job-completion/vid_check_job_completion.py
- --job-name
- vid-config-galera
env:
image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
- volumeMounts:
- - mountPath: /tmp/vid-check-job-completion
- name: vid-check-job-completion
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- lifecycle:
- postStart:
- exec:
- command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/usr/local/tomcat/webapps/vid/WEB-INF/classes/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
ports:
- containerPort: {{ .Values.service.internalPort }}
# disable liveness probe when breakpoints set in debugger
- name: vid-logback
configMap:
name: {{ include "common.fullname" . }}-log-configmap
- - name: vid-check-job-completion
- configMap:
- name: {{ include "common.fullname" . }}-check-job-completion
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
-
+++ /dev/null
-# Copyright © 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.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-galera-sql-configmap
- namespace: "{{ include "common.namespace" . }}"
-data:
- vid-pre-init.sql: |-
- CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`schema_info` (
- `SCHEMA_ID` VARCHAR(25) NOT NULL,
- `SCHEMA_DESC` VARCHAR(75) NOT NULL,
- `DATASOURCE_TYPE` VARCHAR(100) NULL DEFAULT NULL,
- `CONNECTION_URL` VARCHAR(200) NOT NULL,
- `USER_NAME` VARCHAR(45) NOT NULL,
- `PASSWORD` VARCHAR(45) NULL DEFAULT NULL,
- `DRIVER_CLASS` VARCHAR(100) NOT NULL,
- `MIN_POOL_SIZE` INT(11) NOT NULL,
- `MAX_POOL_SIZE` INT(11) NOT NULL,
- `IDLE_CONNECTION_TEST_PERIOD` INT(11) NOT NULL)
- ENGINE = InnoDB
- DEFAULT CHARACTER SET = utf8;
-
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
name: {{ .Values.service.portName }}
+ - port: {{ .Values.service.internalPort2 }}
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
+ name: {{ .Values.service.portName2 }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
name: {{ .Values.service.portName }}
+ - port: {{ .Values.service.externalPort2 }}
+ targetPort: {{ .Values.service.internalPort2 }}
+ name: {{ .Values.service.portName2 }}
{{- end}}
selector:
app: {{ include "common.name" . }}
name: vid-galera-init
spec:
initContainers:
-#dd775k: This container checks that all galera instances are up before initializing it.
+#This container checks that all galera instances are up before initializing it.
- name: vid-init-galera-readiness
image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-# - /bin/sh
-# args:
-# - "-c"
-# - "sleep 1000000000m"
command:
- - python
- args:
- - /root/vid_ready.py
+ - /root/ready.py
+{{- $fullname := include "common.fullname" . -}}
+{{- range $i,$t := until (int .Values.vid_mariadb_galera.replicaCount)}}
- --container-name
- - {{ include "common.fullname" . }}-mariadb-galera-0
+ - {{ $fullname }}-mariadb-galera-{{$i}}
+{{- end }}
env:
- name: NAMESPACE
- value: {{ include "common.namespace" . }}
- volumeMounts:
- - name: init-config
- mountPath: /root/
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
containers:
- name: vid-config-galeradb
image: {{ .Values.mariadb_image }}
imagePullPolicy: "{{ .Values.pullPolicy }}"
volumeMounts:
- - name: vid-db-config
- mountPath: /db-config
- - name: dbcmd-config
- mountPath: /dbcmd-config
+ - mountPath: /dbcmd-config/db_cmd.sh
+ name: {{ include "common.fullname" . }}-config
+ subPath: db_cmd.sh
+ - mountPath: /db-config/vid-pre-init.sql
+ name: {{ include "common.fullname" . }}-config
+ subPath: vid-pre-init.sql
command:
- /bin/sh
args:
env:
- name: MYSQL_PASSWORD
value: "{{ .Values.config.vidmysqlpassword }}"
-# valueFrom:
-# secretKeyRef:
-# name: {{ template "common.fullname" . }}
-# key: vid-password
- name: MYSQL_HOST
value: "{{ .Values.config.vidmysqlhost }}"
+ - name: MYSQL_USER
+ value: "{{ .Values.config.vidmysqluser }}"
+ - name: MYSQL_PORT
+ value: "{{ .Values.config.vidmysqlport }}"
+ restartPolicy: Never
volumes:
- - name: vid-db-config
- configMap:
- name: {{ include "common.fullname" . }}-galera-sql-configmap
- - name: dbcmd-config
+ - name: {{ include "common.fullname" . }}-config
configMap:
- name: {{ include "common.fullname" . }}-dbcmd-configmap
- - name: init-config
- configMap:
- name: {{ include "common.fullname" . }}-cluster-ready-configmap
- restartPolicy: Never
-
+ name: {{ include "common.fullname" . }}
+ items:
+ - key: db_cmd.sh
+ path: db_cmd.sh
+ - key: vid-pre-init.sql
+ path: vid-pre-init.sql
# Declare variables to be passed into your templates.
global:
nodePortPrefix: 302
- repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
readinessRepository: oomk8s
- readinessImage: readiness-check:1.0.0
+ readinessImage: readiness-check:2.0.1
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
# application image
repository: nexus3.onap.org:10001
-image: onap/vid:2.0.0
+image: onap/vid:3.0.0
pullPolicy: Always
# mariadb image for initializing
logstashPort: 5044
# subchart configuration
-mariadb-galera:
- nameOverride: vid-mariadb-galera
+vid_mariadb_galera:
+# nameOverride: vid-mariadb-galera
+ replicaCount: 1
# default number of instances
replicaCount: 1
type: NodePort
name: vid
portName: vid
- externalPort: "00"
- nodePort: "00"
+ externalPort: 8443
internalPort: 8443
+ nodePort: "00"
+ portName2: vid-http
+ externalPort2: 8080
+ internalPort2: 8080
+ nodePort2: "38"
ingress:
enabled: false
Code Review / oom.git / commitdiff