From 06a9262279fe25d7a59765a73a8b7b454f54bf7e Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Fri, 24 Mar 2017 19:07:23 +0100 Subject: Move all test that work up Move all test that work up so that we can commit a patch to danube branch in which the seeds can go from 0 to 3, leaving 4 and 5 out of danube. This patch is separated from the danube patch because I think it is easier to have the same list in danube and master to avoid confusion Change-Id: I99f6dad4f1878f776b02fc7eccfc51876057a0fb Signed-off-by: Manuel Buil --- sfc/lib/topology_shuffler.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sfc/lib/topology_shuffler.py b/sfc/lib/topology_shuffler.py index 9104a5f6..7e957e97 100644 --- a/sfc/lib/topology_shuffler.py +++ b/sfc/lib/topology_shuffler.py @@ -28,6 +28,13 @@ TOPOLOGIES = [ compute host. Server instance is on a different host ''' }, + { + 'id': 'CLIENT_SERVER_DIFFERENT_HOST_SPLIT_VNF', + 'description': ''' + Client and server are on different hosts. + The VNFs are split between hosts Round Robin. + ''' + }, { 'id': 'CLIENT_SERVER_SAME_HOST', 'description': ''' @@ -41,13 +48,6 @@ TOPOLOGIES = [ Server instance and vnfs are on the same compute host. Client instance is on a different host ''' - }, - { - 'id': 'CLIENT_SERVER_DIFFERENT_HOST_SPLIT_VNF', - 'description': ''' - Client and server are on different hosts. - The VNFs are split between hosts Round Robin. - ''' } ] @@ -58,6 +58,11 @@ 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'] + def get_seed(): ''' @@ -66,8 +71,8 @@ def get_seed(): NOTE: There's sure a smarter way to do this Probably with the Jenkins job id ''' - cutoff = len(TOPOLOGIES) - 1 # We only add the topologies which are working + cutoff = len(WORKING_TOPOLOGIES) - 1 seed = datetime.datetime.today().weekday() if seed > cutoff: seed = random.randrange(cutoff) -- cgit 1.2.3-korg