Changed bandwidth to 10Gb/s and fixed inconsistencies between metrics when calculating RTT

src/service/clmcservice/graphapi/conftest.py

@@ -28,37 +28,37 @@ from py2neo import Graph
 from clmcservice.graphapi.utilities import build_network_graph
 
 
-# static network configuration data used for testing cases
+# static network configuration data used for testing cases, latencies reported in milliseconds
 links = [
     {
         "src-switch": "dpid1",
         "dst-switch": "dpid2",
-        "latency": 7.5
+        "latency": 7.5 * 1000
     },
     {
         "src-switch": "dpid1",
         "dst-switch": "dpid3",
-        "latency": 9
+        "latency": 9 * 1000
     },
     {
         "src-switch": "dpid1",
         "dst-switch": "dpid5",
-        "latency": 15
+        "latency": 15 * 1000
     },
     {
         "src-switch": "dpid2",
         "dst-switch": "dpid4",
-        "latency": 10
+        "latency": 10 * 1000
     },
     {
         "src-switch": "dpid3",
         "dst-switch": "dpid4",
-        "latency": 12.5
+        "latency": 12.5 * 1000
     },
     {
         "src-switch": "dpid5",
         "dst-switch": "dpid6",
-        "latency": 4.5
+        "latency": 4.5 * 1000
     }
 ]
 

src/service/clmcservice/graphapi/utilities.py

@@ -314,7 +314,7 @@ def build_network_graph(graph, switches, links, clusters):
         destination = switches[destination]
 
         # retrieve the latency for this link
-        latency = link["latency"]
+        latency = link["latency"] / 1000  # convert to seconds
 
         # create or retrieve the from node
         from_node, created = find_or_create_node(graph, "Switch", return_created=True, name=source)

src/service/development.ini

@@ -16,7 +16,8 @@ exclog.ignore =
 
 
 network_configuration_path = /opt/clmc/src/service/resources/GraphAPI/network_clusters.json
-network_bandwidth = 104857600
+# 10000 Mb/s = 10 Gb/s
+network_bandwidth = 10000
 
 # PostgreSQL connection url
 sqlalchemy.url = postgresql://clmc:clmc_service@localhost:5432/whoamidb

src/service/production.ini

@@ -16,7 +16,8 @@ exclog.ignore =
 
 
 network_configuration_path = /opt/clmc/src/service/resources/GraphAPI/network_clusters.json
-network_bandwidth = 104857600
+# 10000 Mb/s = 10 Gb/s
+network_bandwidth = 10000
 
 # PostgreSQL connection url
 sqlalchemy.url = postgresql://clmc:clmc_service@localhost:5432/whoamidb