Remove leader moving ask-based protocol suites

This is a continuation of I47dd074fd50b3965a34c4568b1dbcc9baa292725.

The suites pass sometimes, but they might fail with AskTimeoutException,
which is a known limitation of ask-based protocol.

Also reordered BGP cluster suites,
putting tell-based protocol first to simplify karaf.log reading.

Change-Id: I428460fe8851168276de918b6b25d6224d0abf0c
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/csit/testplans/bgpcep-bgpclustering.txt b/csit/testplans/bgpcep-bgpclustering.txt
index d598d7ad0462b61b8221432c3665fae605191e6a..450c7123351a6278b13bcc6a5bf2531482c722c3 100644 (file)
--- a/csit/testplans/bgpcep-bgpclustering.txt
+++ b/csit/testplans/bgpcep-bgpclustering.txt
@@ -5,14 +5,15 @@
 # and is available at http://www.eclipse.org/legal/epl-v10.html
 
 # Place the suites in run order:
+integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot
 integration/test/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_shards_local.robot
-integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
+integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot
 integration/test/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_shards_remote.robot
 integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
-integration/test/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot
-integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot
 integration/test/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_shards_local.robot
-integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot
+integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
 integration/test/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes_shards_remote.robot
+integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
+integration/test/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot
 integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot
 integration/test/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_1Mroutes.robot

diff --git a/csit/testplans/controller-clustering.txt b/csit/testplans/controller-clustering.txt
index d99ac951d4b9680b0940f95d9c5d15bff44d5175..fe4811f7b607d7f062c681399383697f3c3faa5c 100644 (file)
--- a/csit/testplans/controller-clustering.txt
+++ b/csit/testplans/controller-clustering.txt
@@ -1,9 +1,4 @@
 # Place the suites in run order:
-integration/test/csit/suites/controller/dom_data_broker/clean_leader_shutdown.robot
-integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
-integration/test/csit/suites/controller/dom_data_broker/explicit_leader_movement.robot
-integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
-integration/test/csit/suites/controller/dom_data_broker/remote_listener.robot
 integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
 integration/test/csit/suites/controller/dom_rpc_broker/rpc_provider_precedence.robot
 integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot