From 20578fec9156624e4a205f358b83fd9b8451111b Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Sat, 13 Jan 2018 00:13:33 +0000
Subject: [PATCH] removed global tags
---
src/mediaServiceSim/LineProtocolGenerator.py | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/mediaServiceSim/LineProtocolGenerator.py b/src/mediaServiceSim/LineProtocolGenerator.py
index 1f55222..f57689a 100644
--- a/src/mediaServiceSim/LineProtocolGenerator.py
+++ b/src/mediaServiceSim/LineProtocolGenerator.py
@@ -42,14 +42,9 @@ def generate_vm_config(state, cpu, mem, storage, time):
# Reports cpu usage, scaling on requests
-def generate_cpu_report(loc, sfc, sfc_i, sf_package, sf_i, cpu_useage, cpu_usage_system, time):
+def generate_cpu_report(cpu_useage, cpu_usage_system, time):
result = 'vm_host_cpu_usage'
# Tag
- result += ',location='+quote_wrap(loc)
- result += ',sfc='+quote_wrap(sfc)
- result += ',sfc_i='+quote_wrap(sfc_i)
- result += ',sf_package='+quote_wrap(sf_package)
- result += ',sf_i='+quote_wrap(sf_i)
result += ' '
# field
result += 'cpu_usage='+str(cpu_useage)
@@ -64,11 +59,11 @@ def generate_cpu_report(loc, sfc, sfc_i, sf_package, sf_i, cpu_useage, cpu_usage
# Reports response times, scaling on number of requests
def generate_mpegdash_report(resource, requests, avg_response_time, peak_response_time, time):
# Measurement
- result = 'mpegdash_service '
+ result = 'mpegdash_service'
# Tags
- # None
+ result += ',cont_nav=\"' + str(resource) + "\" "
# Fields
- result += 'cont_nav=\"' + str(resource) + "\","
+
# result += 'cont_rep=' + str(quality) + ','
result += 'requests=' + str(requests) + ','
result += 'avg_response_time=' + str(avg_response_time) + ','
--
GitLab