From 580b42f0a62a88824dccfab5528e6a010526f0fc Mon Sep 17 00:00:00 2001
From: Rowan Powell <rp17@it-innovation.soton.ac.uk>
Date: Wed, 10 Jan 2018 16:42:26 +0000
Subject: [PATCH] Added port and service function configuration to simulated
measurements
---
src/mediaServiceSim/LineProtocolGenerator.py | 8 ++++----
.../LineProtocolGenerator.cpython-36.pyc | Bin 3260 -> 3277 bytes
src/mediaServiceSim/serviceSim.py | 7 +++++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/mediaServiceSim/LineProtocolGenerator.py b/src/mediaServiceSim/LineProtocolGenerator.py
index 1d95e44..e458608 100644
--- a/src/mediaServiceSim/LineProtocolGenerator.py
+++ b/src/mediaServiceSim/LineProtocolGenerator.py
@@ -116,8 +116,8 @@ def _configure_port(port_id, state, rate, time):
result = 'net_port_config '
# Fields
result += 'port_id=' + quote_wrap('enps' + port_id)
- result += 'port_state=' + quote_wrap(state)
- result += 'tx_constraint=' + quote_wrap(rate)
+ result += ',port_state=' + quote_wrap(state)
+ result += ',tx_constraint=' + quote_wrap(rate)
result += ' '
# Time
@@ -130,10 +130,10 @@ def _configure_service_function(state, max_connected_clients):
# measurement
result = 'mpegdash_service_config'
# tags
- result += ',running='+quote_wrap(state)
+ result += ',service_state='+quote_wrap(state)
result += ' '
# fields
- result += 'max_connected_clients='+max_connected_clients
+ result += 'max_connected_clients='+str(max_connected_clients)
return result
diff --git a/src/mediaServiceSim/__pycache__/LineProtocolGenerator.cpython-36.pyc b/src/mediaServiceSim/__pycache__/LineProtocolGenerator.cpython-36.pyc
index 300897333a0708de99926299a5af7d4d76fab0dc..baf0ef5ade2ecfd3654ef586e653dcf0cbff2f5d 100644
GIT binary patch
delta 95
zcmdlZc~+9sn3tE!)F~`#{zlGsoB}*L1^GoK@x>*HC8@Sm{5q3ax#lt&OkT{T%v!=&
w!`M9eIF|-LzfN&#QCVhkDn#AnA6)VrOhpO|3=BoAlcl(m83i`iaoaHh0DMLq6aWAK
delta 104
zcmX>rxkr-In3tF9xk*^mq>Y^KIQh5>@{3C1i%SwqQf;gFCbM(RWz?CxluMbhX7X7s
z4Q)=HqSCy)%)E5lA{GV)hAOe##ESUj{Jgx><dW2s_~e|-)Vz{nTTR9yg~{67$&5Uk
I`?>8H0r>qPIsgCw
diff --git a/src/mediaServiceSim/serviceSim.py b/src/mediaServiceSim/serviceSim.py
index 38de6d1..52dd6fe 100644
--- a/src/mediaServiceSim/serviceSim.py
+++ b/src/mediaServiceSim/serviceSim.py
@@ -267,9 +267,12 @@ class DemoServer(object):
print("Configuring")
self.configure_VM('starting')
self.configure_VM('running')
- time.sleep(1)
+ time.sleep(0.1)
self.configure_server(server_id, server_location)
- #self.generate_clients()
+ self._sendInfluxData(lp._configure_port('01', 'running', '1GB/s', self.currentTime))
+ self._sendInfluxData(lp._configure_service_function('starting', 100))
+ time.sleep(0.1)
+ self._sendInfluxData(lp._configure_service_function('running', 100))
def _cpuUsage(self, clientCount):
cpuUsage = randint(0, 10)
--
GitLab