diff options
| -rw-r--r-- | .helmignore | 7 | ||||
| -rwxr-xr-x | demo-k8s.sh | 127 | ||||
| -rwxr-xr-x | ete-k8s.sh | 23 | ||||
| -rw-r--r-- | templates/robot-deployment.yaml | 20 |
4 files changed, 157 insertions, 20 deletions
diff --git a/.helmignore b/.helmignore new file mode 100644 index 0000000..586046a --- /dev/null +++ b/.helmignore @@ -0,0 +1,7 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. + +# k8s scripts +ete-k8s.sh +demo-k8s.sh diff --git a/demo-k8s.sh b/demo-k8s.sh new file mode 100755 index 0000000..a870972 --- /dev/null +++ b/demo-k8s.sh @@ -0,0 +1,127 @@ +#!/bin/bash + +# +# Execute tags built to support the hands on demo, +# +function usage +{ + echo "Usage: demo.sh <command> [<parameters>]" + echo " " + echo " demo.sh init" + echo " - Execute both init_customer + distribute" + echo " " + echo " demo.sh init_customer" + echo " - Create demo customer (Demonstration) and services, etc." + echo " " + echo " demo.sh distribute [<prefix>]" + echo " - Distribute demo models (demoVFW and demoVLB)" + echo " " + echo " demo.sh preload <vnf_name> <module_name>" + echo " - Preload data for VNF for the <module_name>" + echo " " + echo " demo.sh appc <module_name>" + echo " - provide APPC with vFW module mount point for closed loop" + echo " " + echo " demo.sh init_robot" + echo " - Initialize robot after all ONAP VMs have started" + echo " " + echo " demo.sh instantiateVFW" + echo " - Instantiate vFW module for the a demo customer (DemoCust<uuid>)" + echo " " + echo " demo.sh deleteVNF <module_name from instantiateVFW>" + echo " - Delete the module created by instantiateVFW" +} + +# Set the defaults +if [ $# -eq 0 ];then + usage + exit +fi +## +## if more than 1 tag is supplied, the must be provided with -i or -e +## +while [ $# -gt 0 ] +do + key="$1" + + case $key in + init_robot) + TAG="UpdateWebPage" + read -s -p "WEB Site Password for user 'test': " WEB_PASSWORD + if [ "$WEB_PASSWORD" = "" ]; then + echo "" + echo "WEB Password is required for user 'test'" + exit + fi + VARIABLES="$VARIABLES -v WEB_PASSWORD:$WEB_PASSWORD" + shift + ;; + init) + TAG="InitDemo" + shift + ;; + init_customer) + TAG="InitCustomer" + shift + ;; + distribute) + TAG="InitDistribution" + shift + if [ $# -eq 1 ];then + VARIABLES="$VARIABLES -v DEMO_PREFIX:$1" + fi + shift + ;; + preload) + TAG="PreloadDemo" + shift + if [ $# -ne 2 ];then + echo "Usage: demo.sh preload <vnf_name> <module_name>" + exit + fi + VARIABLES="$VARIABLES -v VNF_NAME:$1" + shift + VARIABLES="$VARIABLES -v MODULE_NAME:$1" + shift + ;; + appc) + TAG="APPCMountPointDemo" + shift + if [ $# -ne 1 ];then + echo "Usage: demo.sh appc <module_name>" + exit + fi + VARIABLES="$VARIABLES -v MODULE_NAME:$1" + shift + ;; + instantiateVFW) + TAG="instantiateVFW" + VARIABLES="$VARIABLES -v GLOBAL_BUILD_NUMBER:$$" + shift + ;; + deleteVNF) + TAG="deleteVNF" + shift + if [ $# -ne 1 ];then + echo "Usage: demo.sh deleteVNF <module_name from instantiateVFW>" + exit + fi + VARFILE=$1.py + if [ -e /opt/eteshare/${VARFILE} ]; then + VARIABLES="$VARIABLES -V /share/${VARFILE}" + else + echo "Cache file ${VARFILE} is not found" + exit + fi + shift + ;; + *) + usage + exit + esac +done + +ETEHOME=/var/opt/OpenECOMP_ETE +VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py" +POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot) +kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d ${ETEHOME}/html/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out diff --git a/ete-k8s.sh b/ete-k8s.sh new file mode 100755 index 0000000..26eedc9 --- /dev/null +++ b/ete-k8s.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# +# Run the testsuite for the passed tag. Valid tags are ete, health, closedloop, instantiate +# Please clean up logs when you are done... +# Note: Do not run multiple concurrent ete.sh as the --display is not parameterized and tests will collide +# +if [ "$1" == "" ];then + echo "Usage: ete.sh [ health | ete | closedloop | instantiate | distribute ]" + exit +fi + +export TAGS="-i $1" +export ETEHOME=/var/opt/OpenECOMP_ETE +export OUTPUT_FOLDER=ETE_$$ + +VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py" +VARIABLES="-v GLOBAL_BUILD_NUMBER:$$" + +#docker exec openecompete_container ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88 + +POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot) +kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d ${ETEHOME}/html/logs/ete/${OUTPUT_FOLDER} ${TAGS} --display 88 diff --git a/templates/robot-deployment.yaml b/templates/robot-deployment.yaml index 561d795..5130955 100644 --- a/templates/robot-deployment.yaml +++ b/templates/robot-deployment.yaml @@ -32,14 +32,6 @@ spec: mountPath: /var/opt/OpenECOMP_ETE/robot/resources/sdngc_interface.robot - name: lighttpd-authorization mountPath: /etc/lighttpd/authorization - - name: robot-assets-asdc-base-clearwater-env - mountPath: /var/opt/OpenECOMP_ETE/robot/assets/asdc/base_clearwater/base_clearwater.env - - name: robot-assets-asdc-base-vfw-env - mountPath: /var/opt/OpenECOMP_ETE/robot/assets/asdc/base_vfw/base_vfw.env - - name: robot-assets-asdc-base-vlb-env - mountPath: /var/opt/OpenECOMP_ETE/robot/assets/asdc/base_vlb/base_vlb.env - - name: robot-assets-asdc-base-vlb-dns-env - mountPath: /var/opt/OpenECOMP_ETE/robot/assets/asdc/base_vlb/dnsscaling.env ports: - containerPort: 88 readinessProbe: @@ -66,18 +58,6 @@ spec: - name: lighttpd-authorization hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/authorization - - name: robot-assets-asdc-base-clearwater-env - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/assets/asdc/base_clearwater/base_clearwater.env - - name: robot-assets-asdc-base-vfw-env - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/assets/asdc/base_vfw/base_vfw.env - - name: robot-assets-asdc-base-vlb-env - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/assets/asdc/base_vlb/base_vlb.env - - name: robot-assets-asdc-base-vlb-dns-env - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/assets/asdc/base_vlb/dnsscaling.env imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }}
\ No newline at end of file |