From: Tony Hansen <tony@att.com>
Date: Sun, 13 Oct 2019 00:41:28 +0000 (+0000)
Subject: Merge "Fix of configmap issue"
X-Git-Tag: 1.3.1~22
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c09091a3586793b74351e908ab344af6aa2fd916;p=dcaegen2%2Fcollectors%2Fhv-ves.git

Merge "Fix of configmap issue"
---

c09091a3586793b74351e908ab344af6aa2fd916
diff --cc tools/performance/cloud/cloud-based-performance-test.sh
index 31299cc0,12daeb47..78ab7717
--- a/tools/performance/cloud/cloud-based-performance-test.sh
+++ b/tools/performance/cloud/cloud-based-performance-test.sh
@@@ -72,18 -66,11 +71,22 @@@ function clean() 
      echo "Environment clean up finished!"
  }
  
 +function copy_certs_to_hvves() {
 +	 cd ../../ssl
 +	 echo "Creating cert directory: ${HVVES_CERT_PATH}"
 +	 kubectl exec ${HVVES_POD_NAME} mkdir ${HVVES_CERT_PATH} -n ${ONAP_NAMESPACE}
 +	 for file in {trust.p12,trust.pass,server.p12,server.pass}
 +	 do
 +       echo "Copying file: ${file}"
 +       kubectl cp ${file} ${ONAP_NAMESPACE}/${HVVES_POD_NAME}:${HVVES_CERT_PATH}
 +   done
 +}
 +
  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}
+ 
      set -e
      for i in $(seq 1 ${CONTAINERS_COUNT});
      do
@@@ -124,15 -103,8 +127,15 @@@ function usage() 
  
  function setup_environment() {
      echo "Setting up environment"
 +    echo "Copying certs to hv-ves pod"
 +    copy_certs_to_hvves
 +
 +    echo "Creating secrets with clients cert"
 +    kubectl create secret generic cert --from-file=./client.p12 --from-file=./client.pass -n ${ONAP_NAMESPACE}
 +    cd ${SCRIPT_DIRECTORY}
 +
      echo "Creating test properties ConfigMap from: $PROPERTIES_FILE"
-     kubectl create configmap ${CONFIG_MAP_NAME} --from-env-file=${PROPERTIES_FILE} -n ${ONAP_NAMESPACE}
+     kubectl create configmap performance-test-config --from-env-file=${PROPERTIES_FILE} -n ${ONAP_NAMESPACE}
  
      echo "Creating consumer deployment"
      kubectl apply -f consumer-deployment.yaml