From 9e484669d45e687dde4d422971e47ac5f19069ae Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Wed, 27 Sep 2017 12:36:21 +0200 Subject: 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 --- sfc/lib/topology_shuffler.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'sfc') 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(): -- cgit 1.2.3-korg