Add http_timeout=10 for ddb suites

When checking the shard leadership, the default 1s timeout
is not enough.

Change-Id: Ia7ea4c2c4b62cc4552d4be343df6e9b51371873c
Signed-off-by: Peter Gubka <pgubka@cisco.com>

diff --git a/csit/suites/controller/dom_data_broker/clean_leader_shutdown.robot b/csit/suites/controller/dom_data_broker/clean_leader_shutdown.robot
index 3dc228af6669c46c9aa58b1339041343b5f9b338..13c0f21d2a84b5458b9e6284683c2913a1075ee9 100644 (file)
--- a/csit/suites/controller/dom_data_broker/clean_leader_shutdown.robot
+++ b/csit/suites/controller/dom_data_broker/clean_leader_shutdown.robot
@@ -11,7 +11,8 @@ Documentation     DOMDataBroker testing: Clean Leader Shutdown
 ...               leader is shut down cleanly. This is performed by having a steady-stream
 ...               producer execute operations against the shard and then initiate leader shard
 ...               shutdown, then the producer is shut down cleanly.
-Suite Setup       SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 Suite Teardown    SSHLibrary.Close_All_Connections
 Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed

diff --git a/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot
index f19ef04ec4889246b3add222ee925b0c376e5537..c494f497c4e9552901a48ccc62272cdaf9241d8f 100644 (file)
--- a/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot
+++ b/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot
@@ -11,7 +11,8 @@ Documentation     DOMDataBroker testing: Clean Leader Shutdown
 ...               leader is shut down cleanly. This is performed by having a steady-stream
 ...               producer execute operations against the shard and then initiate leader shard
 ...               shutdown, then the producer is shut down cleanly.
-Suite Setup       BuiltIn.Run_Keywords    SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 ...               AND    DdbCommons.Create_Prefix_Based_Shard_And_Verify
 Suite Teardown    BuiltIn.Run_Keywords    DdbCommons.Remove_Prefix_Based_Shard_And_Verify
 ...               AND    SSHLibrary.Close_All_Connections

diff --git a/csit/suites/controller/dom_data_broker/client_isolation.robot b/csit/suites/controller/dom_data_broker/client_isolation.robot
index 8fdbd76bdfe689a9beb99fdffaca5452750ee079..bdfea05c0e1c0b0b6cb91ccd1b652f9e024be329 100644 (file)
--- a/csit/suites/controller/dom_data_broker/client_isolation.robot
+++ b/csit/suites/controller/dom_data_broker/client_isolation.robot
@@ -11,7 +11,8 @@ Documentation     DOMDataBroker testing: Client Isolation
 ...               cds-access-client work as expected. This is performed by having a steady
 ...               stream of transactions flowing from the frontend and isolating the node hosting
 ...               the frontend from the rest of the cluster.
-Suite Setup       SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 Suite Teardown    SSHLibrary.Close_All_Connections
 Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed

diff --git a/csit/suites/controller/dom_data_broker/client_isolation_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/client_isolation_prefbasedshard.robot
index df049ce3dad572c5f333c8c9e48b7f1bd013cee5..aecdb70d54548dd855f5cf766113b9756091f828 100644 (file)
--- a/csit/suites/controller/dom_data_broker/client_isolation_prefbasedshard.robot
+++ b/csit/suites/controller/dom_data_broker/client_isolation_prefbasedshard.robot
@@ -11,7 +11,8 @@ Documentation     DOMDataBroker testing: Client Isolation
 ...               cds-access-client work as expected. This is performed by having a steady
 ...               stream of transactions flowing from the frontend and isolating the node hosting
 ...               the frontend from the rest of the cluster.
-Suite Setup       BuiltIn.Run_Keywords    SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 ...               AND    DdbCommons.Create_Prefix_Based_Shard_And_Verify
 Suite Teardown    BuiltIn.Run_Keywords    DdbCommons.Remove_Prefix_Based_Shard_And_Verify
 ...               AND    SSHLibrary.Close_All_Connections

diff --git a/csit/suites/controller/dom_data_broker/ddb-sanity-module-based.robot b/csit/suites/controller/dom_data_broker/ddb-sanity-module-based.robot
index fca0943d2eb0b7f9d3a32023e0ceab39c70feffa..ab800bc0126b59fbcd5f05e2e9ab6bf656cca25e 100644 (file)
--- a/csit/suites/controller/dom_data_broker/ddb-sanity-module-based.robot
+++ b/csit/suites/controller/dom_data_broker/ddb-sanity-module-based.robot
@@ -12,7 +12,8 @@ Documentation     DOMDataBroker testing: Module based shards sanity suite
 ...               other suites.
 ...               It also verify the ability of the odl-controller-test-app to perform
 ...               several activities.
-Suite Setup       SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 Suite Teardown    SSHLibrary.Close_All_Connections
 Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed

diff --git a/csit/suites/controller/dom_data_broker/ddb-sanity-prefix-based.robot b/csit/suites/controller/dom_data_broker/ddb-sanity-prefix-based.robot
index 5472abf425f7c96250a146c8aff822aaee5ddb8a..50d910aa39188417d60c5731401e11453e0c4754 100644 (file)
--- a/csit/suites/controller/dom_data_broker/ddb-sanity-prefix-based.robot
+++ b/csit/suites/controller/dom_data_broker/ddb-sanity-prefix-based.robot
@@ -12,7 +12,8 @@ Documentation     DOMDataBroker testing: Module based shards sanity suite
 ...               other suites.
 ...               It also verify the ability of the odl-controller-test-app to perform
 ...               several activities.
-Suite Setup       BuiltIn.Run_Keywords    SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 ...               AND    DdbCommons.Create_Prefix_Based_Shard_And_Verify
 Suite Teardown    BuiltIn.Run_Keywords    DdbCommons.Remove_Prefix_Based_Shard_And_Verify
 ...               AND    SSHLibrary.Close_All_Connections

diff --git a/csit/suites/controller/dom_data_broker/explicit_leader_movement.robot b/csit/suites/controller/dom_data_broker/explicit_leader_movement.robot
index 27faa5ca0fb8223159f4ee3392db454b789d10bc..ce17df038ab5939004584dbb62096c7c2f420423 100644 (file)
--- a/csit/suites/controller/dom_data_broker/explicit_leader_movement.robot
+++ b/csit/suites/controller/dom_data_broker/explicit_leader_movement.robot
@@ -11,7 +11,8 @@ Documentation     DOMDataBroker testing: Explicit Leader Movement
 ...               leader is moved as the result of explicit application request. This is performed
 ...               by having a steady-stream producer execute operations against the shard and then
 ...               initiate shard leader shutdown, then the producer is shut down cleanly.
-Suite Setup       SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 Suite Teardown    SSHLibrary.Close_All_Connections
 Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed

diff --git a/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot
index 4cf18b47831d6522c300ed2d9fe4dbdbb14210ec..04cefb8320f3317c70a1f80f063392c0a5394e5a 100644 (file)
--- a/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot
+++ b/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot
@@ -11,7 +11,8 @@ Documentation     DOMDataBroker testing: Explicit Leader Movement
 ...               leader is moved as the result of explicit application request. This is performed
 ...               by having a steady-stream producer execute operations against the shard and then
 ...               initiate shard leader shutdown, then the producer is shut down cleanly.
-Suite Setup       BuiltIn.Run_Keywords    SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 ...               AND    DdbCommons.Create_Prefix_Based_Shard_And_Verify
 Suite Teardown    BuiltIn.Run_Keywords    DdbCommons.Remove_Prefix_Based_Shard_And_Verify
 ...               AND    SSHLibrary.Close_All_Connections

diff --git a/csit/suites/controller/dom_data_broker/leader_isolation.robot b/csit/suites/controller/dom_data_broker/leader_isolation.robot
index 272b7fa6db06cb6edd54fcfc1cfa31da3d44415b..f4b741f013dde941a6445a8704cd5383b776947f 100644 (file)
--- a/csit/suites/controller/dom_data_broker/leader_isolation.robot
+++ b/csit/suites/controller/dom_data_broker/leader_isolation.robot
@@ -9,7 +9,8 @@ Documentation     DOMDataBroker testing: Leader Isolation
 ...
 ...               The goal is to ensure the datastore succeeds in basic isolation/rejoin scenario,
 ...               simulating either a network partition, or a prolonged GC pause.
-Suite Setup       SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 Suite Teardown    SSHLibrary.Close_All_Connections
 Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed

diff --git a/csit/suites/controller/dom_data_broker/leader_isolation_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/leader_isolation_prefbasedshard.robot
index eee0934031320a5e9f4a5dd482809412367d6a39..d479a8be387c996de4952696f8faa11bfb4350ef 100644 (file)
--- a/csit/suites/controller/dom_data_broker/leader_isolation_prefbasedshard.robot
+++ b/csit/suites/controller/dom_data_broker/leader_isolation_prefbasedshard.robot
@@ -9,7 +9,8 @@ Documentation     DOMDataBroker testing: Leader Isolation
 ...
 ...               The goal is to ensure the datastore succeeds in basic isolation/rejoin scenario,
 ...               simulating either a network partition, or a prolonged GC pause.
-Suite Setup       BuiltIn.Run_Keywords    SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 ...               AND    DdbCommons.Create_Prefix_Based_Shard_And_Verify
 Suite Teardown    BuiltIn.Run_Keywords    DdbCommons.Remove_Prefix_Based_Shard_And_Verify
 ...               AND    SSHLibrary.Close_All_Connections

diff --git a/csit/suites/controller/dom_data_broker/remote_listener.robot b/csit/suites/controller/dom_data_broker/remote_listener.robot
index 716056fb95604bb4fd4f987bc1220436c343f5e9..976192842c25713f31f40e4514a66871b5caf82e 100644 (file)
--- a/csit/suites/controller/dom_data_broker/remote_listener.robot
+++ b/csit/suites/controller/dom_data_broker/remote_listener.robot
@@ -10,7 +10,8 @@ Documentation     DOMDataBroker testing: Remote Listener
 ...               The goal is to ensure listeners do no observe disruption when the leader moves.
 ...               This is performed by having a steady stream of transactions being observed by
 ...               the listeners and having the leader move.
-Suite Setup       SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 Suite Teardown    SSHLibrary.Close_All_Connections
 Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed

diff --git a/csit/suites/controller/dom_data_broker/remote_listener_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/remote_listener_prefbasedshard.robot
index fa5ff7b5e11efaf53b5e24de018053b49f885fa4..a365b2fe1f446e7e4ce5ce63b708a9448f1ea2db 100644 (file)
--- a/csit/suites/controller/dom_data_broker/remote_listener_prefbasedshard.robot
+++ b/csit/suites/controller/dom_data_broker/remote_listener_prefbasedshard.robot
@@ -10,7 +10,8 @@ Documentation     DOMDataBroker testing: Remote Listener
 ...               The goal is to ensure listeners do no observe disruption when the leader moves.
 ...               This is performed by having a steady stream of transactions being observed by
 ...               the listeners and having the leader move.
-Suite Setup       BuiltIn.Run_Keywords    SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 ...               AND    DdbCommons.Create_Prefix_Based_Shard_And_Verify
 Suite Teardown    BuiltIn.Run_Keywords    DdbCommons.Remove_Prefix_Based_Shard_And_Verify
 ...               AND    SSHLibrary.Close_All_Connections

diff --git a/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot b/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
index 2caf4a17f4357c9f0e2bf1edc3b0386d844b9c1c..0df01076e6f54187be456c121db43bf29a26f8c0 100644 (file)
--- a/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
+++ b/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
@@ -9,7 +9,8 @@ Documentation     Unset tell-based protocol usage
 ...
 ...               Suite stops all odl nodes, outcomment usage of tell-based protocol in
 ...               config file (means make it false by default) and starts all nodes again.
-Suite Setup       SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 Suite Teardown    SSHLibrary.Close_All_Connections
 Library           SSHLibrary
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot

diff --git a/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot b/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot
index 3d40e18e061436383fb23b4e3a36b476891f1869..862d2844eabc66f02752a6ea7c32f02ed76b0286 100644 (file)
--- a/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot
+++ b/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot
@@ -9,7 +9,8 @@ Documentation     Set tell-based protocol usage
 ...
 ...               Suite stops all odl nodes, un-comment usage of tell-based protocol in
 ...               config file (means make it true) and starts all nodes again.
-Suite Setup       SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Suite Setup       BuiltIn.Run_Keywords    ClusterManagement.ClusterManagement_Setup    http_timeout=10
+...               AND    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 Suite Teardown    SSHLibrary.Close_All_Connections
 Library           SSHLibrary
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot