From ff669cdf918bff7245c42382ae81e5131dfd97f2 Mon Sep 17 00:00:00 2001 From: Nikolay Stanchev <ns17@it-innovation.soton.ac.uk> Date: Fri, 15 Feb 2019 15:50:31 +0000 Subject: [PATCH] Update pipeline to iterate through a list of UEs and endpoints --- scripts/test/pipeline.sh | 42 +++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/scripts/test/pipeline.sh b/scripts/test/pipeline.sh index 7a62522..6baff44 100644 --- a/scripts/test/pipeline.sh +++ b/scripts/test/pipeline.sh @@ -3,15 +3,15 @@ sfc="fms-sfc" sfci="fms-sfc-1" service_function="fms-storage" -endpoint="fms-storage-endpoint" measurement="tomcat_connector" response_time_field="(max(processing_time) - min(processing_time)) / ((count(processing_time) - 1)*1000)" request_size_field="(max(bytes_received) - min(bytes_received)) / (count(bytes_received) - 1)" response_size_field="(max(bytes_sent) - min(bytes_sent)) / (count(bytes_sent) - 1)" -ue="ue22" rtt_measurement="graph_measurement" query_period=30 +ues=("ue20" "ue22" "ue23" "ue24") +endpoints=("fms-storage-endpoint" "fms-storage-second-endpoint") while true do @@ -39,28 +39,34 @@ do echo "Received request uuid ${graph_uuid}" echo "Timestamp to use for measurement ${timestamp}" - echo "Querying for round-trip time..." - response=$(curl -s -X GET "http://172.40.231.51/clmc-service/graph/temporal/${graph_uuid}/round-trip-time?startpoint=${ue}&endpoint=${endpoint}") + for endpoint in ${endpoints[@]}; do + for ue in ${ues[@]}; do - global_tags=$(echo ${response} | jq -r '.global_tags | to_entries | map("\(.key)=\(.value|tostring)") | join(",")') - echo "Global tags: ${global_tags}" + echo "Querying for round-trip time..." + response=$(curl -s -X GET "http://172.40.231.51/clmc-service/graph/temporal/${graph_uuid}/round-trip-time?startpoint=${ue}&endpoint=${endpoint}") - local_tags=$(echo ${response} | jq -r '.local_tags | to_entries | map("\(.key)=\(.value|tostring)") | join (",")') - echo "Local tags: ${local_tags}" + global_tags=$(echo ${response} | jq -r '.global_tags | to_entries | map("\(.key)=\(.value|tostring)") | join(",")') + echo "Global tags: ${global_tags}" - rtt=$(echo ${response} | jq -r '.round_trip_time') - echo "Round-trip-time: ${rtt}" + local_tags=$(echo ${response} | jq -r '.local_tags | to_entries | map("\(.key)=\(.value|tostring)") | join (",")') + echo "Local tags: ${local_tags}" - service_delay=$(echo ${response} | jq -r '.response_time') - echo "Service delay: ${service_delay}" + rtt=$(echo ${response} | jq -r '.round_trip_time') + echo "Round-trip-time: ${rtt}" - network_delay=$(echo ${response} | jq -r '.total_forward_latency') - echo "Network latency ${network_delay}" + service_delay=$(echo ${response} | jq -r '.response_time') + echo "Service delay: ${service_delay}" - 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://172.40.231.51/influxdb/write?db=${sfc}" --data-binary "${measurement_line}") - echo "InfluxDB response: ${response}" + network_delay=$(echo ${response} | jq -r '.total_forward_latency') + echo "Network latency ${network_delay}" + + 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://172.40.231.51/influxdb/write?db=${sfc}" --data-binary "${measurement_line}") + echo "InfluxDB response: ${response}" + + done + done echo "Deleting temporal graph..." response=$(curl -s -X DELETE "http://172.40.231.51/clmc-service/graph/temporal/${graph_uuid}") -- GitLab