From ae11159e47d24c3c02e1dc70a305c8b7bea0475d Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Wed, 4 Apr 2018 14:54:49 +0100
Subject: [PATCH] updated monitoring test to be consistent with naming on
platform
---
clmctest/monitoring/rspec.yml | 16 ++++++++--------
clmctest/monitoring/test_simresults.py | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/clmctest/monitoring/rspec.yml b/clmctest/monitoring/rspec.yml
index 03bb6d7..5183064 100644
--- a/clmctest/monitoring/rspec.yml
+++ b/clmctest/monitoring/rspec.yml
@@ -21,11 +21,11 @@ hosts:
host: 8081
ip_address: "203.0.113.140"
location: "DC1"
- sfc_id: "MS_Template_1"
+ sfc_id: "media_service_A"
sfc_id_instance: "MS_I1"
- sf_id: "adaptive_streaming"
- sf_id_instance: "adaptive_streaming_I1"
- ipendpoint_id: "adaptive_streaming_I1_apache1"
+ sf_id: "test-sf-clmc-agent-build"
+ sf_id_instance: "ms-A.ict-flame.eu"
+ ipendpoint_id: "endpoint1.ms-A.ict-flame.eu"
influxdb_url: "http://203.0.113.100:8086"
database_name: "CLMCMetrics"
- name: ipendpoint2
@@ -38,11 +38,11 @@ hosts:
host: 8082
ip_address: "203.0.113.141"
location: "DC2"
- sfc_id: "MS_Template_1"
+ sfc_id: "media_service_A"
sfc_id_instance: "MS_I1"
- sf_id: "adaptive_streaming"
- sf_id_instance: "adaptive_streaming_I1"
- ipendpoint_id: "adaptive_streaming_I1_apache2"
+ sf_id: "test-sf-clmc-agent-build"
+ sf_id_instance: "ms-A.ict-flame.eu"
+ ipendpoint_id: "endpoint2.ms-A.ict-flame.eu"
influxdb_url: "http://203.0.113.100:8086"
database_name: "CLMCMetrics"
- name: test-runner
diff --git a/clmctest/monitoring/test_simresults.py b/clmctest/monitoring/test_simresults.py
index 8953a58..8cac2b8 100644
--- a/clmctest/monitoring/test_simresults.py
+++ b/clmctest/monitoring/test_simresults.py
@@ -27,9 +27,9 @@ class TestSimulation(object):
('SELECT count(*) FROM "CLMCMetrics"."autogen"."vm_res_alloc"',
{"time": "1970-01-01T00:00:00Z", "count_cpu": 12, "count_memory": 12, "count_storage": 12}),
- ('SELECT count(*) FROM "CLMCMetrics"."autogen"."mpegdash_service_config" WHERE ipendpoint=\'adaptive_streaming_I1_apache1\'',
+ ('SELECT count(*) FROM "CLMCMetrics"."autogen"."mpegdash_service_config" WHERE ipendpoint=\'endpoint1.ms-A.ict-flame.eu\'',
{"time" : "1970-01-01T00:00:00Z", "count_avg_running" : 3604, "count_avg_starting" : 3604, "count_avg_stopped" : 3604, "count_avg_stopping" : 3604, "count_running" : 3604, "count_starting" : 3604, "count_stopped" : 3604, "count_stopping" : 3604}),
- ('SELECT count(*) FROM "CLMCMetrics"."autogen"."mpegdash_service_config" WHERE ipendpoint=\'adaptive_streaming_I1_apache2\'',
+ ('SELECT count(*) FROM "CLMCMetrics"."autogen"."mpegdash_service_config" WHERE ipendpoint=\'endpoint2.ms-A.ict-flame.eu\'',
{"time" : "1970-01-01T00:00:00Z", "count_avg_running" : 3604, "count_avg_starting" : 3604, "count_avg_stopped" : 3604, "count_avg_stopping" : 3604, "count_running" : 3604, "count_starting" : 3604, "count_stopped" : 3604, "count_stopping" : 3604}),
])
def test_simulation( self, run_simulator, influx_db, query, expected_result ):
--
GitLab