diff --git a/src/mediaServiceSim/LineProtocolGenerator.py b/src/mediaServiceSim/LineProtocolGenerator.py index 1d95e4495add5e3745ab87d64bc58aa2721d3d1f..e4586083b39cf7a3ee262b4c3fb26aed066cc139 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 Binary files a/src/mediaServiceSim/__pycache__/LineProtocolGenerator.cpython-36.pyc and b/src/mediaServiceSim/__pycache__/LineProtocolGenerator.cpython-36.pyc differ diff --git a/src/mediaServiceSim/serviceSim.py b/src/mediaServiceSim/serviceSim.py index 38de6d1ce7187c6d7c4d8da1c7232da30ac11658..52dd6fe2e72d58b0bb951992b352aa542e92fd6e 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)