Merge remote-tracking branch 'origin' into clmcservice

clmctest/monitoring/E2ETestAggregatorThread.py → src/test/clmctest/monitoring/E2ETestAggregatorThread.py

@@ -30,7 +30,7 @@ from clmcservice.aggregator import Aggregator
 class TestAggregator(Thread):
 
     REPORT_PERIOD = 5  # currently, report period is 5s, that is every 5 seconds the mean delay values for the last 5 seconds are aggregated
-    DATABASE = 'E2EMetrics'  # default database the aggregator uses
+    DATABASE = 'CLMCMetrics'  # default database the aggregator uses
     DATABASE_URL = 'http://203.0.113.100:8086'  # default database URL the aggregator uses
 
     def __init__(self, database=DATABASE, database_url=DATABASE_URL, report_period=REPORT_PERIOD):

clmctest/monitoring/test_e2eresults.py → src/test/clmctest/monitoring/test_e2eresults.py

@@ -62,15 +62,15 @@ class TestE2ESimulation(object):
         e2e_aggregator.stop()
 
     @pytest.mark.parametrize("query, expected_result", [
-        ('SELECT count(*) FROM "E2EMetrics"."autogen"."network_delays"',
+        ('SELECT count(*) FROM "CLMCMetrics"."autogen"."network_delays"',
          {"time": "1970-01-01T00:00:00Z", "count_latency": 120, "count_bandwidth": 120}),
-        ('SELECT count(*) FROM "E2EMetrics"."autogen"."service_delays"',
+        ('SELECT count(*) FROM "CLMCMetrics"."autogen"."service_delays"',
          {"time": "1970-01-01T00:00:00Z", "count_response_time": 24, "count_request_size": 24, "count_response_size": 24}),
-        ('SELECT count(*) FROM "E2EMetrics"."autogen"."e2e_delays"',
+        ('SELECT count(*) FROM "CLMCMetrics"."autogen"."e2e_delays"',
          {"time": "1970-01-01T00:00:00Z", "count_delay_forward": 38, "count_delay_reverse": 38, "count_delay_service": 38,
           "count_avg_request_size": 38, "count_avg_response_size": 38, "count_avg_bandwidth": 38}),
 
-        ('SELECT mean(*) FROM "E2EMetrics"."autogen"."e2e_delays"',
+        ('SELECT mean(*) FROM "CLMCMetrics"."autogen"."e2e_delays"',
          {"time": "1970-01-01T00:00:00Z", "mean_delay_forward": 8.010964912280702, "mean_delay_reverse": 12.881578947368423, "mean_delay_service": 23.42105263157895,
           'mean_avg_request_size': 10485760, 'mean_avg_response_size': 1024, 'mean_avg_bandwidth': 104857600}),
         ])