aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Wielebski <piotr.wielebski@nokia.com>2019-10-21 08:29:23 +0000
committerGerrit Code Review <gerrit@onap.org>2019-10-21 08:29:23 +0000
commitb79b2bdafb3a841d079f710fcf87fa97b5ce4a7a (patch)
tree7cc20dea04e6e80cb78072bd715dbfde0d731879
parent8594e0a6bf25e4c4b94d91f5d4dda2f35ed5158f (diff)
parent23ab98744ac4c3348515a429c990fe275178625f (diff)
Merge "Add setting up consul configuration to cloud performance test shell scripts"
-rwxr-xr-xtools/performance/cloud/cloud-based-performance-test.sh6
-rwxr-xr-xtools/performance/cloud/configure-consul.sh61
2 files changed, 67 insertions, 0 deletions
diff --git a/tools/performance/cloud/cloud-based-performance-test.sh b/tools/performance/cloud/cloud-based-performance-test.sh
index f4445844..b9267a97 100755
--- a/tools/performance/cloud/cloud-based-performance-test.sh
+++ b/tools/performance/cloud/cloud-based-performance-test.sh
@@ -68,6 +68,9 @@ function clean() {
echo "Attempting to delete client certs secret"
kubectl delete secret cert -n ${ONAP_NAMESPACE}
+ echo "Attempting to turn off SSL"
+ ./configure-consul.sh true
+
echo "Environment clean up finished!"
}
@@ -132,6 +135,9 @@ function setup_environment() {
kubectl create secret generic cert --from-file=./client.p12 --from-file=./client.pass -n ${ONAP_NAMESPACE}
cd ${SCRIPT_DIRECTORY}
+ echo "Turning on SSL"
+ ./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}
diff --git a/tools/performance/cloud/configure-consul.sh b/tools/performance/cloud/configure-consul.sh
new file mode 100755
index 00000000..3ab298e8
--- /dev/null
+++ b/tools/performance/cloud/configure-consul.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+# ============LICENSE_START=======================================================
+# dcaegen2-collectors-veshv
+# ================================================================================
+# Copyright (C) 2019 NOKIA
+# ================================================================================
+# 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=========================================================
+
+SSL=$1
+if [ "$SSL" != "true" ] && [ "$SSL" != "false" ] ; then
+ SSL=true
+fi
+IP=$(kubectl config view -o jsonpath='{.clusters[].cluster.server}')
+HTTPS="https://"
+IP=${IP[@]//${HTTPS}}
+IP=${IP[@]//:*}
+
+STATUS=$(curl -s --header "Content-Type: application/json" \
+ --request PUT \
+ --data '{"security.sslDisable": '${SSL}',
+"logLevel": "INFO",
+"server.listenPort": 6061,
+"server.idleTimeoutSec": 300,
+"cbs.requestIntervalSec": 5,
+"streams_publishes": {
+ "perf3gpp": {
+ "type": "kafka",
+ "aaf_credentials": {
+ "username": "admin",
+ "password": "admin_secret"
+ },
+ "kafka_info": {
+ "bootstrap_servers": "message-router-kafka:9092",
+ "topic_name": "HV_VES_PERF3GPP"
+ }
+ }
+ },
+"security.keys.trustStoreFile": "/etc/ves-hv/ssl/trust.p12",
+"security.keys.keyStoreFile": "/etc/ves-hv/ssl/server.p12",
+"security.keys.trustStorePasswordFile":"/etc/ves-hv/ssl/trust.pass",
+"security.keys.keyStorePasswordFile": "/etc/ves-hv/ssl/server.pass"}' \
+${IP}:30270/v1/kv/dcae-hv-ves-collector?dc=dc1&token=)
+
+if [ "$STATUS" = "true" ] ; then
+ if [ "$SSL" = "true" ] ; then
+ echo "SSL turned off"
+ else
+ echo "SSL turned on"
+ fi
+fi \ No newline at end of file