Skip to content
Snippets Groups Projects
Commit 2fc90bf4 authored by Michael Boniface's avatar Michael Boniface
Browse files

Merge branch 'integration'

parents 2581c211 e4701891
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/service/resources/GraphAPI/network_config.json
+ 72
− 30
View file @ 2fc90bf4
......@@ -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
src/service/setup.py
+ 1
− 4
View file @ 2fc90bf4
......@@ -52,8 +52,6 @@ def get_version(*relative_path):
requires = [
'ipython==6.5.0',
'jupyter_console==5.2.0',
'plaster_pastedeploy==0.6',
'pyramid==1.9.2',
'pyramid_debugtoolbar==4.5',
......@@ -63,8 +61,7 @@ requires = [
'zope.sqlalchemy==1.0',
'psycopg2==2.7.5',
'influxdb==5.2.0',
'neo4j-driver==1.6.2',
'py2neo==4.1.0',
'py2neo==4.1.3',
'pyyaml==3.13',
'tosca-parser==1.1.0',
'schema==0.6.8',
......
src/test/VERSION
+ 1
− 1
View file @ 2fc90bf4
__version__ = "1.3.0"
\ No newline at end of file
__version__ = "1.4.0"
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment