diff --git a/src/service/clmcservice/aggregation/test_aggregator.py b/src/service/clmcservice/aggregation/test_aggregator.py
index ef22fb481cd03b961e979aa0230927e6b0aeeb4a..149a9d27c11a440a00376e05ae2a1001922361a0 100644
--- a/src/service/clmcservice/aggregation/test_aggregator.py
+++ b/src/service/clmcservice/aggregation/test_aggregator.py
@@ -77,24 +77,26 @@ class TestAggregation(object):
setattr(self, self.ACTUAL_RESULTS, []) # initially, there are no actual results, these are built progressively while the aggregator is running
setattr(self, self.EXPECTED_RESULTS, [
- generate_e2e_no_timestamp_row(path_id="SR1-SR3", source_sfr="SR1", target_sfr="SR3", endpoint="endpoint1", sf_instance="ms1.flame.org", delay_forward=10,
- delay_reverse=15, delay_service=10, avg_request_size=1024, avg_response_size=8, avg_bandwidth=1200),
- generate_e2e_no_timestamp_row(path_id="SR1-SR3", source_sfr="SR1", target_sfr="SR3", endpoint="endpoint1", sf_instance="ms1.flame.org", delay_forward=5,
- delay_reverse=25, delay_service=40, avg_request_size=16, avg_response_size=2048, avg_bandwidth=1200),
+ generate_e2e_no_timestamp_row(path_id="SR1-SR3", source_sfr="SR1", target_sfr="SR3", endpoint="endpoint3", sf_instance="ms1.flame.org", delay_forward=10,
+ delay_reverse=15, delay_service=10, avg_request_size=1024, avg_response_size=8, avg_bandwidth=104857600),
+ generate_e2e_no_timestamp_row(path_id="SR1-SR3", source_sfr="SR1", target_sfr="SR3", endpoint="endpoint3", sf_instance="ms1.flame.org", delay_forward=5,
+ delay_reverse=25, delay_service=40, avg_request_size=16, avg_response_size=2048, avg_bandwidth=104857600),
generate_e2e_no_timestamp_row(path_id="SR1-SR2", source_sfr="SR1", target_sfr="SR2", endpoint="endpoint2", sf_instance="ms2.flame.org", delay_forward=15,
- delay_reverse=35, delay_service=60, avg_request_size=32, avg_response_size=1024, avg_bandwidth=1200),
+ delay_reverse=35, delay_service=60, avg_request_size=32, avg_response_size=1024, avg_bandwidth=104857600),
generate_e2e_no_timestamp_row(path_id="SR4-SR5", source_sfr="SR4", target_sfr="SR5", endpoint="endpoint5", sf_instance="ms5.flame.org", delay_forward=11,
- delay_reverse=25, delay_service=50, avg_request_size=2048, avg_response_size=32, avg_bandwidth=1200),
+ delay_reverse=25, delay_service=50, avg_request_size=2048, avg_response_size=32, avg_bandwidth=104857600),
generate_e2e_no_timestamp_row(path_id="SR1-SR2", source_sfr="SR1", target_sfr="SR2", endpoint="endpoint2", sf_instance="ms2.flame.org", delay_forward=12,
- delay_reverse=5, delay_service=60, avg_request_size=32, avg_response_size=1024, avg_bandwidth=1200),
- generate_e2e_no_timestamp_row(path_id="SR1-SR3", source_sfr="SR1", target_sfr="SR3", endpoint="endpoint1", sf_instance="ms1.flame.org", delay_forward=16,
- delay_reverse=25, delay_service=40, avg_request_size=16, avg_response_size=2048, avg_bandwidth=1200),
+ delay_reverse=5, delay_service=60, avg_request_size=32, avg_response_size=1024, avg_bandwidth=104857600),
+ generate_e2e_no_timestamp_row(path_id="SR1-SR3", source_sfr="SR1", target_sfr="SR3", endpoint="endpoint3", sf_instance="ms1.flame.org", delay_forward=16,
+ delay_reverse=25, delay_service=40, avg_request_size=16, avg_response_size=2048, avg_bandwidth=104857600),
generate_e2e_no_timestamp_row(path_id="SR10-SR12", source_sfr="SR12", target_sfr="SR10", endpoint="endpoint10", sf_instance="ms4.flame.org", delay_forward=22,
- delay_reverse=3, delay_service=75, avg_request_size=1024, avg_response_size=64, avg_bandwidth=1200),
+ delay_reverse=3, delay_service=75, avg_request_size=1024, avg_response_size=64, avg_bandwidth=104857600),
generate_e2e_no_timestamp_row(path_id="SR14-SR15", source_sfr="SR14", target_sfr="SR15", endpoint="endpoint15", sf_instance="ms2.flame.org", delay_forward=24,
- delay_reverse=27, delay_service=105, avg_request_size=1024, avg_response_size=128, avg_bandwidth=1200),
+ delay_reverse=27, delay_service=105, avg_request_size=1024, avg_response_size=128, avg_bandwidth=104857600),
generate_e2e_no_timestamp_row(path_id="SR14-SR15", source_sfr="SR15", target_sfr="SR14", endpoint="endpoint14", sf_instance="ms1.flame.org", delay_forward=27,
- delay_reverse=24, delay_service=85, avg_request_size=32, avg_response_size=64, avg_bandwidth=1200),
+ delay_reverse=24, delay_service=85, avg_request_size=32, avg_response_size=64, avg_bandwidth=104857600),
+ generate_e2e_no_timestamp_row(path_id="SR8-SR18", source_sfr="SR18", target_sfr="SR8", endpoint="endpoint8", sf_instance="ms2.flame.org", delay_forward=18,
+ delay_reverse=19, delay_service=75, avg_request_size=2048, avg_response_size=16, avg_bandwidth=104857600),
]) # defines the expected rows from the aggregation
setattr(self, self.FINISHED, Event())
@@ -104,68 +106,72 @@ class TestAggregation(object):
# these tuples is generated, empty tuple means result with no points
network_items=[
(
- network_result_item("network_delays", "SR1-SR3", "SR1", "SR3", 10, 1200),
- network_result_item("network_delays", "SR1-SR3", "SR3", "SR1", 15, 1200),
- network_result_item("network_delays", "SR1-SR33", "SR1", "SR33", 15, 1200),
- network_result_item("network_delays", "SR2-SR11", "SR11", "SR2", 15, 1200)
+ network_result_item(measurement="network_delays", path="SR1-SR3", source="SR1", target="SR3", net_latency=10, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR1-SR3", source="SR3", target="SR1", net_latency=15, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR1-SR33", source="SR1", target="SR33", net_latency=15, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR2-SR11", source="SR11", target="SR2", net_latency=15, net_bandwidth=104857600),
),
(
- network_result_item("network_delays", "SR1-SR3", "SR1", "SR3", 5, 1200),
- network_result_item("network_delays", "SR1-SR3", "SR3", "SR1", 25, 1200),
- network_result_item("network_delays", "SR1-SR2", "SR1", "SR2", 15, 1200),
- network_result_item("network_delays", "SR1-SR2", "SR2", "SR1", 35, 1200)
+ network_result_item(measurement="network_delays", path="SR1-SR3", source="SR1", target="SR3", net_latency=5, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR1-SR3", source="SR3", target="SR1", net_latency=25, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR1-SR2", source="SR1", target="SR2", net_latency=15, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR1-SR2", source="SR2", target="SR1", net_latency=35, net_bandwidth=104857600),
),
(
- network_result_item("network_delays", "SR4-SR5", "SR4", "SR5", 5, 1200),
- network_result_item("network_delays", "SR4-SR5", "SR5", "SR4", 25, 1200),
+ network_result_item(measurement="network_delays", path="SR4-SR5", source="SR4", target="SR5", net_latency=5, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR4-SR5", source="SR5", target="SR4", net_latency=25, net_bandwidth=104857600),
),
(),
(
- network_result_item("network_delays", "SR4-SR5", "SR4", "SR5", 5, 1200),
- network_result_item("network_delays", "SR4-SR5", "SR5", "SR4", 25, 1200),
- network_result_item("network_delays", "SR0-SR1", "SR0", "SR1", 5, 1200),
- network_result_item("network_delays", "SR0-SR1", "SR1", "SR0", 25, 1200),
- network_result_item("network_delays", "SR10-SR12", "SR10", "SR12", 11, 1200),
- network_result_item("network_delays", "SR10-SR12", "SR12", "SR10", 22, 1200),
- network_result_item("network_delays", "SR14-SR15", "SR14", "SR15", 24, 1200),
- network_result_item("network_delays", "SR14-SR15", "SR15", "SR14", 26, 1200),
+ network_result_item(measurement="network_delays", path="SR4-SR5", source="SR4", target="SR5", net_latency=5, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR4-SR5", source="SR5", target="SR4", net_latency=25, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR0-SR1", source="SR0", target="SR1", net_latency=5, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR0-SR1", source="SR1", target="SR0", net_latency=25, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR10-SR12", source="SR10", target="SR12", net_latency=11, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR10-SR12", source="SR12", target="SR10", net_latency=22, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR14-SR15", source="SR14", target="SR15", net_latency=24, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR14-SR15", source="SR15", target="SR14", net_latency=26, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR8-SR18", source="SR18", target="SR8", net_latency=18, net_bandwidth=104857600),
),
(
- network_result_item("network_delays", "SR4-SR5", "SR4", "SR5", 11, 1200),
- network_result_item("network_delays", "SR1-SR2", "SR1", "SR2", 12, 1200),
- network_result_item("network_delays", "SR1-SR2", "SR2", "SR1", 5, 1200),
- network_result_item("network_delays", "SR1-SR3", "SR1", "SR3", 16, 1200),
- network_result_item("network_delays", "SR10-SR12", "SR10", "SR12", 3, 1200),
- network_result_item("network_delays", "SR14-SR15", "SR15", "SR14", 27, 1200),
+ network_result_item(measurement="network_delays", path="SR4-SR5", source="SR4", target="SR5", net_latency=11, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR1-SR2", source="SR1", target="SR2", net_latency=12, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR1-SR2", source="SR2", target="SR1", net_latency=5, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR1-SR3", source="SR1", target="SR3", net_latency=16, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR10-SR12", source="SR10", target="SR12", net_latency=3, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR14-SR15", source="SR15", target="SR14", net_latency=27, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR16-SR17", source="SR16", target="SR17", net_latency=27, net_bandwidth=104857600),
+ network_result_item(measurement="network_delays", path="SR8-SR18", source="SR8", target="SR18", net_latency=19, net_bandwidth=104857600),
)
],
# service items is a list of tuples, each tuple represents a result from a query; each time query() is called and a service measurement must be generated, then one of
# these tuples is generated, empty tuple means result with no points
service_items=[
(
- service_result_item("service_delays", "SR3", "endpoint1", "ms1.flame.org", 10, 1024, 8),
- service_result_item("service_delays", "SR33", "endpoint33", "ms2.flame.org", 20, 4096, 8),
- service_result_item("service_delays", "SR11", "endpoint11", "ms3.flame.org", 30, 1024, 8),
+ service_result_item(measurement="service_delays", sfr="SR3", endpoint="endpoint3", sf_instance="ms1.flame.org", response_time=10, request_size=1024, response_size=8),
+ service_result_item(measurement="service_delays", sfr="SR33", endpoint="endpoint33", sf_instance="ms2.flame.org", response_time=20, request_size=4096, response_size=8),
+ service_result_item(measurement="service_delays", sfr="SR11", endpoint="endpoint11", sf_instance="ms3.flame.org", response_time=30, request_size=1024, response_size=8),
),
(
- service_result_item("service_delays", "SR3", "endpoint1", "ms1.flame.org", 40, 16, 2048),
- service_result_item("service_delays", "SR2", "endpoint2", "ms2.flame.org", 60, 32, 1024)
+ service_result_item(measurement="service_delays", sfr="SR3", endpoint="endpoint3", sf_instance="ms1.flame.org", response_time=40, request_size=16, response_size=2048),
+ service_result_item(measurement="service_delays", sfr="SR2", endpoint="endpoint2", sf_instance="ms2.flame.org", response_time=60, request_size=32, response_size=1024),
),
(
- service_result_item("service_delays", "SR6", "endpoint6", "ms1.flame.org", 60, 1024, 8),
- service_result_item("service_delays", "SR7", "endpoint7", "ms1.flame.org", 70, 1024, 8),
+ service_result_item(measurement="service_delays", sfr="SR6", endpoint="endpoint6", sf_instance="ms1.flame.org", response_time=60, request_size=1024, response_size=8),
+ service_result_item(measurement="service_delays", sfr="SR7", endpoint="endpoint7", sf_instance="ms1.flame.org", response_time=70, request_size=1024, response_size=8),
),
(
- service_result_item("service_delays", "SR6", "endpoint6", "ms1.flame.org", 65, 2048, 16),
- service_result_item("service_delays", "SR8", "endpoint8", "ms2.flame.org", 75, 2048, 16),
- service_result_item("service_delays", "SR9", "endpoint9", "ms3.flame.org", 25, 2048, 16),
+ service_result_item(measurement="service_delays", sfr="SR6", endpoint="endpoint6", sf_instance="ms1.flame.org", response_time=65, request_size=2048, response_size=16),
+ service_result_item(measurement="service_delays", sfr="SR8", endpoint="endpoint8", sf_instance="ms2.flame.org", response_time=75, request_size=2048, response_size=16),
+ service_result_item(measurement="service_delays", sfr="SR9", endpoint="endpoint9", sf_instance="ms3.flame.org", response_time=25, request_size=2048, response_size=16),
),
(),
(
- service_result_item("service_delays", "SR5", "endpoint5", "ms5.flame.org", 50, 2048, 32),
- service_result_item("service_delays", "SR10", "endpoint10", "ms4.flame.org", 75, 1024, 64),
- service_result_item("service_delays", "SR15", "endpoint15", "ms2.flame.org", 105, 1024, 128),
- service_result_item("service_delays", "SR14", "endpoint14", "ms1.flame.org", 85, 32, 64),
+ service_result_item(measurement="service_delays", sfr="SR5", endpoint="endpoint5", sf_instance="ms5.flame.org", response_time=50, request_size=2048, response_size=32),
+ service_result_item(measurement="service_delays", sfr="SR10", endpoint="endpoint10", sf_instance="ms4.flame.org", response_time=75, request_size=1024, response_size=64),
+ service_result_item(measurement="service_delays", sfr="SR15", endpoint="endpoint15", sf_instance="ms2.flame.org", response_time=105, request_size=1024, response_size=128),
+ service_result_item(measurement="service_delays", sfr="SR14", endpoint="endpoint14", sf_instance="ms1.flame.org", response_time=85, request_size=32, response_size=64),
+ service_result_item(measurement="service_delays", sfr="SR16", endpoint="endpoint16", sf_instance="ms1.flame.org", response_time=85, request_size=32, response_size=64),
)
]
)
diff --git a/src/test/clmctest/monitoring/LineProtocolGenerator.py b/src/test/clmctest/monitoring/LineProtocolGenerator.py
index b9bf9a6249234131506e9fddca2fa77af8450ede..20b62120f9ceb9e0bfc44f318025380caebcfb68 100644
--- a/src/test/clmctest/monitoring/LineProtocolGenerator.py
+++ b/src/test/clmctest/monitoring/LineProtocolGenerator.py
@@ -29,47 +29,6 @@ import uuid
from random import randint
-def generate_e2e_delay_report(path_id, source_sfr, target_sfr, endpoint, sf_instance, delay_forward, delay_reverse, delay_service, avg_request_size, avg_response_size, avg_bandwidth, time):
- """
- Generates a combined averaged measurement about the e2e delay and its contributing parts
-
- :param path_id: The path identifier, which is a bidirectional path ID for the request and the response path
- :param source_sfr: source service router
- :param target_sfr: target service router
- :param endpoint: endpoint of the media component
- :param sf_instance: service function instance (media component)
- :param delay_forward: Path delay (Forward direction)
- :param delay_reverse: Path delay (Reverse direction)
- :param delay_service: the media service component response time
- :param avg_request_size: averaged request size
- :param avg_response_size: averaged response size
- :param avg_bandwidth: averaged bandwidth
- :param time: measurement timestamp
- :return: a list of dict-formatted reports to post on influx
- """
-
- result = [{"measurement": "e2e_delays",
- "tags": {
- "path_ID": path_id,
- "source_SFR": source_sfr,
- "target_SFR": target_sfr,
- "endpoint": endpoint,
- "sf_instance": sf_instance
- },
- "fields": {
- "delay_forward": float(delay_forward),
- "delay_reverse": float(delay_reverse),
- "delay_service": float(delay_service),
- "avg_request_size": float(avg_request_size),
- "avg_response_size": float(avg_response_size),
- "avg_bandwidth": float(avg_bandwidth)
- },
- "time": _getNSTime(time)
- }]
-
- return result
-
-
def generate_network_delay_report(path_id, source_sfr, target_sfr, latency, bandwidth, time):
"""
Generates a platform measurement about the network delay between two specific service routers.