Cleanup in cloud script

Change-Id: I8919bbb8403d8d008a678c2310175232eae8df1d
Issue-ID: DCAEGEN2-1783
Signed-off-by: kjaniak <kornel.janiak@nokia.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/tools/performance/cloud/cloud-based-performance-test.sh b/tools/performance/cloud/cloud-based-performance-test.sh
index 7d8c1fe2..283c1301 100755
--- a/tools/performance/cloud/cloud-based-performance-test.sh
+++ b/tools/performance/cloud/cloud-based-performance-test.sh
@@ -20,6 +20,7 @@
 SCRIPT_DIRECTORY="$(pwd "$0")"
 CONTAINERS_COUNT=1
 LOAD_TEST="false"
+TEST_CONFIG_MAP=performance-test-config
 PROPERTIES_FILE=${SCRIPT_DIRECTORY}/test.properties
 PRODUCER_APPS_LABEL=hv-collector-producer
 CONSUMER_APPS_LABEL=hv-collector-kafka-consumer
@@ -41,7 +42,7 @@ function clean() {
     echo "Cleaning up environment"
 
     echo "Attempting to delete test parameters ConfigMap"
-    kubectl delete configmap performance-test-config -n ${ONAP_NAMESPACE}
+    kubectl delete configmap ${TEST_CONFIG_MAP} -n ${ONAP_NAMESPACE}
 
     echo "Attempting to delete prometheus ConfigMap"
     kubectl delete configmap -l name=${PROMETHEUS_CONF_LABEL} -n ${ONAP_NAMESPACE}
@@ -52,13 +53,13 @@ function clean() {
     echo "Attempting to delete grafana deployment and service"
     kubectl delete service,deployments -l app=${GRAFANA_APPS_LABEL} -n ${ONAP_NAMESPACE}
 
-    echo "Attempting to delete grafana ConfigMap(DASHBOARD)"
+    echo "Attempting to delete grafana ConfigMap (DASHBOARD)"
     kubectl delete configmap -l name=${GRAFANA_DASHBOARD} -n ${ONAP_NAMESPACE}
 
-    echo "Attempting to delete grafana ConfigMap(GRAFANA_DASHBOARD_PROVIDERS)"
+    echo "Attempting to delete grafana ConfigMap (GRAFANA_DASHBOARD_PROVIDERS)"
     kubectl delete configmap -l name=${GRAFANA_DASHBOARD_PROVIDERS} -n ${ONAP_NAMESPACE}
 
-    echo "Attempting to delete grafana ConfigMap(GRAFANA_DATASOURCE)"
+    echo "Attempting to delete grafana ConfigMap (GRAFANA_DATASOURCE)"
     kubectl delete configmap -l name=${GRAFANA_DATASOURCE} -n ${ONAP_NAMESPACE}
 
     echo "Attempting to delete consumer deployments"
@@ -87,8 +88,8 @@ function copy_certs_to_hvves() {
 
 function create_producers() {
     echo "Recreating test properties ConfigMap from: $PROPERTIES_FILE"
-    kubectl delete configmap performance-test-config -n ${ONAP_NAMESPACE}
-    kubectl create configmap performance-test-config --from-env-file=${PROPERTIES_FILE} -n ${ONAP_NAMESPACE}
+    kubectl delete configmap ${TEST_CONFIG_MAP} -n ${ONAP_NAMESPACE}
+    kubectl create configmap ${TEST_CONFIG_MAP} --from-env-file=${PROPERTIES_FILE} -n ${ONAP_NAMESPACE}
 
     set -e
     for i in $(seq 1 ${CONTAINERS_COUNT});
@@ -140,7 +141,7 @@ function usage() {
     echo "  setup    : set up ConfigMap and consumers"
     echo "  start    : create producers - start the performance test"
     echo "    Optional parameters:"
-    echo "      --load      : should test keep defined containers number till script interruption (false)"
+    echo "      --load            : should test keep defined containers number till script interruption (false)"
     echo "      --containers      : number of producer containers to create (1)"
     echo "      --properties-file : path to file with benchmark properties (./test.properties)"
     echo "  clean    : remove ConfigMap, HV-VES consumers and producers"
@@ -158,6 +159,7 @@ function usage() {
 
 function setup_environment() {
     echo "Setting up environment"
+
     echo "Copying certs to hv-ves pod"
     copy_certs_to_hvves
 
@@ -169,7 +171,7 @@ function setup_environment() {
     ./configure-consul.sh false
 
     echo "Creating test properties ConfigMap from: $PROPERTIES_FILE"
-    kubectl create configmap performance-test-config --from-env-file=${PROPERTIES_FILE} -n ${ONAP_NAMESPACE}
+    kubectl create configmap ${TEST_CONFIG_MAP} --from-env-file=${PROPERTIES_FILE} -n ${ONAP_NAMESPACE}
 
     echo "Creating consumer deployment"
     kubectl apply -f consumer-deployment.yaml