From a67fb730bd84c06376ce157ada873b4fcb18cccf Mon Sep 17 00:00:00 2001
From: Nikolay Stanchev <ns17@it-innovation.soton.ac.uk>
Date: Tue, 19 Feb 2019 14:33:27 +0000
Subject: [PATCH] Slight update to pipeline script
---
scripts/test/pipeline.sh | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/scripts/test/pipeline.sh b/scripts/test/pipeline.sh
index dd559ac..11f7fb1 100644
--- a/scripts/test/pipeline.sh
+++ b/scripts/test/pipeline.sh
@@ -40,8 +40,8 @@ do
'{from: $from, to: $to, service_function_chain: $sfc, service_function_chain_instance: $sfci, service_functions: {($sf): {measurement_name: $measurement, response_time_field: $response_time, request_size_field: $request_size, response_size_field: $response_size}}}' )
echo "Sending build request to CLMC"
response=$(curl -s -X POST -d "${JSON_STRING}" http://${CLMC_IP}/clmc-service/graph/temporal)
- timestamp=$(echo ${response} | jq -r '.graph.time_range.to')
- graph_uuid=$(echo ${response} | jq -r '.graph.uuid')
+ fields=$(echo ${response} | jq -r '. | "\(.graph.time_range.to) \(.graph.uuid)"')
+ read timestamp graph_uuid <<< ${fields}
echo "Received request uuid ${graph_uuid}"
echo "Timestamp to use for measurement ${timestamp}"
@@ -57,18 +57,12 @@ do
local_tags=$(echo ${response} | jq -r '.local_tags | to_entries | map("\(.key)=\(.value|tostring)") | join (",")')
echo "Local tags: ${local_tags}"
- rtt=$(echo ${response} | jq -r '.round_trip_time')
- echo "Round-trip-time: ${rtt}"
-
- service_delay=$(echo ${response} | jq -r '.response_time')
- echo "Service delay: ${service_delay}"
-
- network_delay=$(echo ${response} | jq -r '.total_forward_latency')
- echo "Network latency ${network_delay}"
+ fields=$(echo ${response} | jq -r '. | "\(.round_trip_time) \(.response_time) \(.total_forward_latency)"')
+ read rtt service_delay network_delay <<< ${fields}
measurement_line="${rtt_measurement},${global_tags},${local_tags} round_trip_time=${rtt},service_delay=${service_delay},network_delay=${network_delay} ${timestamp}"
echo "Measurement line: ${measurement_line}"
- response=$(curl -si -XPOST "http://${CLMC_IP}/influxdb/write?db=${sfc}" --data-binary "${measurement_line}")
+ response=$(curl -si -X POST "http://${CLMC_IP}/influxdb/write?db=${sfc}" --data-binary "${measurement_line}")
echo "InfluxDB response: ${response}"
done
--
GitLab