summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2017-09-27 12:36:21 +0200
committerBrady Johnson <bjohnson@inocybe.com>2017-09-28 16:24:04 +0000
commit7d3d673882b2fcf368c17b18fa1657ce547cf53a (patch)
tree16bb0f65562dccde3303478e08178e5d0226042b
parentc98abf0deb9cb015e70601c4a06b49538467ce0d (diff)
Modify the list of working topologies
After testing, there are three topologies which work and three topologies which do not work because of bugs in OVS and ODL. We remove those two from the testing in 5.0.0 Change-Id: I576768978bfa763725027239081686c95408eef4 Signed-off-by: Manuel Buil <mbuil@suse.com>
-rw-r--r--sfc/lib/topology_shuffler.py27
1 files changed, 13 insertions, 14 deletions
diff --git a/sfc/lib/topology_shuffler.py b/sfc/lib/topology_shuffler.py
index 1a97e270..24c8f875 100644
--- a/sfc/lib/topology_shuffler.py
+++ b/sfc/lib/topology_shuffler.py
@@ -15,17 +15,17 @@ TOPOLOGIES = [
'''
},
{
- 'id': 'CLIENT_SERVER_SAME_HOST_SPLIT_VNF',
+ 'id': 'CLIENT_VNF_SAME_HOST',
'description': '''
- Client and server are on the same host.
- The VNFs are split between hosts Round Robin.
+ Client instance and vnfs are on the same
+ compute host. Server instance is on a different host
'''
},
{
- 'id': 'CLIENT_VNF_SAME_HOST',
+ 'id': 'SERVER_VNF_SAME_HOST',
'description': '''
- Client instance and vnfs are on the same
- compute host. Server instance is on a different host
+ Server instance and vnfs are on the same
+ compute host. Client instance is on a different host
'''
},
{
@@ -36,17 +36,17 @@ TOPOLOGIES = [
'''
},
{
- 'id': 'CLIENT_SERVER_SAME_HOST',
+ 'id': 'CLIENT_SERVER_SAME_HOST_SPLIT_VNF',
'description': '''
- Client instance and server instance are on the same
- compute host. All VNFs are on a different host.
+ Client and server are on the same host.
+ The VNFs are split between hosts Round Robin.
'''
},
{
- 'id': 'SERVER_VNF_SAME_HOST',
+ 'id': 'CLIENT_SERVER_SAME_HOST',
'description': '''
- Server instance and vnfs are on the same
- compute host. Client instance is on a different host
+ Client instance and server instance are on the same
+ compute host. All VNFs are on a different host.
'''
}
]
@@ -59,9 +59,8 @@ DEFAULT_TOPO = {
}
WORKING_TOPOLOGIES = ['CLIENT_SERVER_VNF_SAME_HOST',
- 'CLIENT_SERVER_SAME_HOST_SPLIT_VNF',
'CLIENT_VNF_SAME_HOST',
- 'CLIENT_SERVER_DIFFERENT_HOST_SPLIT_VNF']
+ 'SERVER_VNF_SAME_HOST']
def get_seed():