From bebbaa331eaa932e6e4086c98377cfae44d704a7 Mon Sep 17 00:00:00 2001
From: Nikolay Stanchev <ns17@it-innovation.soton.ac.uk>
Date: Thu, 13 Dec 2018 11:18:35 +0000
Subject: [PATCH] Fixes a bug in the graph network measurements generator
script and adjusts the static network config
---
.../generate_network_measurements.py | 4 +-
.../resources/GraphAPI/network_config.json | 102 ++++++++++++------
2 files changed, 74 insertions(+), 32 deletions(-)
diff --git a/src/service/clmcservice/generate_network_measurements.py b/src/service/clmcservice/generate_network_measurements.py
index 5d1a162..11424de 100644
--- a/src/service/clmcservice/generate_network_measurements.py
+++ b/src/service/clmcservice/generate_network_measurements.py
@@ -53,9 +53,9 @@ def report_network_measurements(influx_host, db_name, json_data, neo4j_host, neo
to_node = Node("ComputeNode", name=to_node_name)
graph.create(to_node)
- # query = 'SELECT mean(*) FROM "CLMCMetrics"."autogen"."ping" WHERE host=\'{0}\' and url=\'{1}\' and time>={2} and time<{3}'.format(from_node['name'], to_node['name'], from_timestamp, to_timestamp)
+ # query = 'SELECT mean(*) FROM "{0}"."autogen"."ping" WHERE host=\'{1}\' and url=\'{2}\' and time>={3} and time<{4}'.format(db_name, from_node['name'], to_node['name'], from_timestamp, to_timestamp)
# In future when latencies are reported continuously, we should put timestamp filtering in the query for network links
- query = 'SELECT mean(*) FROM "CLMCMetrics"."autogen"."ping" WHERE host=\'{0}\' and url=\'{1}\''.format(from_node['name'], to_node['name'])
+ query = 'SELECT mean(*) FROM "{0}"."autogen"."ping" WHERE host=\'{1}\' and url=\'{2}\''.format(db_name, from_node['name'], to_node['name'])
print("Executing query: {0}".format(query))
result = db_client.query(query) # execute the query
diff --git a/src/service/resources/GraphAPI/network_config.json b/src/service/resources/GraphAPI/network_config.json
index c8ca7cb..4af2f1b 100644
--- a/src/service/resources/GraphAPI/network_config.json
+++ b/src/service/resources/GraphAPI/network_config.json
@@ -2,46 +2,88 @@
"bandwidth": 104857600,
"links": [
{
- "source": "DC1",
- "target": "DC2",
- "min_response_time": 10,
- "max_response_time": 20,
- "avg_response_time": 15
+ "source": "20-sr1-cluster1-cluster",
+ "target": "22-sr1-cluster1-cluster",
+ "min_response_time": 3.427,
+ "avg_response_time": 3.737,
+ "max_response_time": 4.281
},
{
- "source": "DC2",
- "target": "DC1",
- "min_response_time": 16,
- "max_response_time": 28,
- "avg_response_time": 22
+ "source": "20-sr1-cluster1-cluster",
+ "target": "23-sr1-cluster1-cluster",
+ "min_response_time": 4.302,
+ "avg_response_time": 4.692,
+ "max_response_time": 5.463
},
{
- "source": "DC1",
- "target": "DC3",
- "min_response_time": 17,
- "max_response_time": 19,
- "avg_response_time": 18
+ "source": "20-sr1-cluster1-cluster",
+ "target": "24-sr1-cluster1-cluster",
+ "min_response_time": 3.597,
+ "avg_response_time": 3.974,
+ "max_response_time": 4.432
},
{
- "source": "DC3",
- "target": "DC1",
- "min_response_time": 15,
- "max_response_time": 25,
- "avg_response_time": 20
+ "source": "22-sr1-cluster1-cluster",
+ "target": "20-sr1-cluster1-cluster",
+ "min_response_time": 3.338,
+ "avg_response_time": 4.115,
+ "max_response_time": 4.735
+ },
+ {
+ "source": "22-sr1-cluster1-cluster",
+ "target": "23-sr1-cluster1-cluster",
+ "min_response_time": 3.780,
+ "avg_response_time": 4.658,
+ "max_response_time": 10.347
+ },
+ {
+ "source": "22-sr1-cluster1-cluster",
+ "target": "24-sr1-cluster1-cluster",
+ "min_response_time": 3.436,
+ "avg_response_time": 5.253,
+ "max_response_time": 13.881
+ },
+ {
+ "source": "23-sr1-cluster1-cluster",
+ "target": "20-sr1-cluster1-cluster",
+ "min_response_time": 3.311,
+ "avg_response_time": 3.379,
+ "max_response_time": 4.031
+ },
+ {
+ "source": "23-sr1-cluster1-cluster",
+ "target": "22-sr1-cluster1-cluster",
+ "min_response_time": 3.230,
+ "avg_response_time": 5.950,
+ "max_response_time": 15.286
+ },
+ {
+ "source": "23-sr1-cluster1-cluster",
+ "target": "24-sr1-cluster1-cluster",
+ "min_response_time": 3.117,
+ "avg_response_time": 4.934,
+ "max_response_time": 12.666
+ },
+ {
+ "source": "24-sr1-cluster1-cluster",
+ "target": "20-sr1-cluster1-cluster",
+ "min_response_time": 3.494,
+ "avg_response_time": 4.326,
+ "max_response_time": 4.916
},
{
- "source": "DC2",
- "target": "DC3",
- "min_response_time": 11,
- "max_response_time": 29,
- "avg_response_time": 20
+ "source": "24-sr1-cluster1-cluster",
+ "target": "22-sr1-cluster1-cluster",
+ "min_response_time": 3.273,
+ "avg_response_time": 5.052,
+ "max_response_time": 11.490
},
{
- "source": "DC3",
- "target": "DC2",
- "min_response_time": 12,
- "max_response_time": 40,
- "avg_response_time": 26
+ "source": "24-sr1-cluster1-cluster",
+ "target": "23-sr1-cluster1-cluster",
+ "min_response_time": 2.807,
+ "avg_response_time": 4.652,
+ "max_response_time": 12.504
}
]
}
\ No newline at end of file
--
GitLab