From cc44bd24981d33e8684ddf3a1592fbc2a0247cd4 Mon Sep 17 00:00:00 2001 From: Simon Crowle <sgc@it-innovation.soton.ac.uk> Date: Tue, 5 Jun 2018 08:44:00 +0000 Subject: [PATCH] Revert "Creates 2x NGINX and MINIO services" This reverts commit 59d45a57fa4108016868c8d3606810f38c67fdec --- src/test/clmctest/rspec.json | 121 ++++++++++++++++++++++------------- 1 file changed, 77 insertions(+), 44 deletions(-) diff --git a/src/test/clmctest/rspec.json b/src/test/clmctest/rspec.json index ce6ad86..97d18cd 100644 --- a/src/test/clmctest/rspec.json +++ b/src/test/clmctest/rspec.json @@ -12,67 +12,100 @@ ] }, { - "name": "nginx_ep1", + "name": "apache", + "ip_address": "172.40.231.150", + "location": "DC1", + "sfc_id": "MS_Template_1", + "sfc_id_instance": "MS_I1", + "sf_id": "apache", + "sf_id_instance": "adaptive_streaming_I1", + "ipendpoint_id": "adaptive_streaming_I1_apache1", + "sr_id": "service_router", + "influxdb_url": "http://172.40.231.51:8086", + "database_name": "CLMCMetrics" +}, +{ + "name": "nginx", "ip_address": "172.40.231.151", "location": "DC1", - "sfc_id": "MS_Demo", - "sfc_id_instance": "MS_Demo1", + "sfc_id": "MS_Template_1", + "sfc_id_instance": "MS_I1", "sf_id": "nginx", - "sf_id_instance": "nginx__sf1", - "ipendpoint_id": "nginx_ep1", - "sr_id": "SR2", + "sf_id_instance": "adaptive_streaming_nginx_I1", + "ipendpoint_id": "adaptive_streaming_nginx_I1_apache1", + "sr_id": "service_router", "influxdb_url": "http://172.40.231.51:8086", - "database_name": "CLMCMetrics", - "forward_ports": [ - { "guest": 80, "host": 9180 } - ] + "database_name": "CLMCMetrics" }, { - "name": "nginx_ep2", + "name": "mongo", + "service_name": "mongo", "ip_address": "172.40.231.152", "location": "DC1", - "sfc_id": "MS_Demo", - "sfc_id_instance": "MS_Demo1", - "sf_id": "nginx", - "sf_id_instance": "nginx__sf1", - "ipendpoint_id": "nginx_ep2", - "sr_id": "SR3", + "sfc_id": "MS_Template_1", + "sfc_id_instance": "MS_I1", + "sf_id": "mongo", + "sf_id_instance": "metadata_database_I1", + "ipendpoint_id": "metadata_database_I1_apache1", + "sr_id": "service_router", "influxdb_url": "http://172.40.231.51:8086", - "database_name": "CLMCMetrics", - "forward_ports": [ - { "guest": 80, "host": 9181 } - ] + "database_name": "CLMCMetrics" }, { - "name": "minio_ep1", - "ip_address": "172.40.231.153", + "name": "host", + "service_name": "host", + "ip_address": "172.40.231.154", "location": "DC1", - "sfc_id": "MS_Demo", - "sfc_id_instance": "MS_Demo1", - "sf_id": "minio", - "sf_id_instance": "minio_sf1", - "ipendpoint_id": "minio_ep1", - "sr_id": "SR4", + "sfc_id": "MS_Template_1", + "sfc_id_instance": "MS_I1", + "sf_id": "host", + "sf_id_instance": "adaptive_streaming_I1", + "ipendpoint_id": "adaptive_streaming_I1_apache1", + "sr_id": "service_router", "influxdb_url": "http://172.40.231.51:8086", - "database_name": "CLMCMetrics", - "forward_ports": [ - { "guest": 9000, "host": 9182 } - ] + "database_name": "CLMCMetrics" }, { - "name": "minio_ep2", - "ip_address": "172.40.231.154", + "name": "minio", + "ip_address": "172.40.231.155", "location": "DC1", - "sfc_id": "MS_Demo", - "sfc_id_instance": "MS_Demo1", + "sfc_id": "MS_Template_1", + "sfc_id_instance": "MS_I1", "sf_id": "minio", - "sf_id_instance": "minio_sf1", - "ipendpoint_id": "minio_ep2", - "sr_id": "SR5", + "sf_id_instance": "adaptive_streaming_I1", + "ipendpoint_id": "adaptive_streaming_I1_minio", + "sr_id": "service_router", "influxdb_url": "http://172.40.231.51:8086", - "database_name": "CLMCMetrics", - "forward_ports": [ - { "guest": 9000, "host": 9183 } - ] + "database_name": "CLMCMetrics" +}, +{ + "name": "ipendpoint1", + "ip_address": "172.40.231.170", + "location": "nova", + "sfc_id": "media_service_A", + "sfc_id_instance": "StackID", + "sf_id": "ipendpoint", + "sf_id_instance": "ms-A.ict-flame.eu", + "ipendpoint_id": "endpoint1.ms-A.ict-flame.eu", + "sr_id": "service_router", + "influxdb_url": "http://172.40.231.51:8086", + "database_name": "CLMCMetrics" +}, +{ + "name": "ipendpoint2", + "ip_address": "172.40.231.171", + "location": "nova", + "sfc_id": "media_service_A", + "sfc_id_instance": "StackID", + "sf_id": "ipendpoint", + "sf_id_instance": "ms-A.ict-flame.eu", + "ipendpoint_id": "endpoint2.ms-A.ict-flame.eu", + "sr_id": "service_router", + "influxdb_url": "http://172.40.231.51:8086", + "database_name": "CLMCMetrics" +}, +{ + "name": "test-runner", + "ip_address": "172.40.231.200" } ] \ No newline at end of file -- GitLab