From 8fa5576d999af0f3ae3d72bf1d5889c5383d29d2 Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Thu, 30 Jan 2020 18:09:59 -0800 Subject: [PATCH] Add back [Template] override for rest of files This should clean up what's left after: https://git.opendaylight.org/gerrit/c/integration/test/+/87307 Change-Id: I28da3bc07ff1acdb92482a37fed7e3d544119d64 Signed-off-by: Jamo Luhrsen --- .../dom_data_broker/clean_leader_shutdown_prefbasedshard.robot | 1 + csit/suites/controller/dom_data_broker/client_isolation.robot | 3 +++ .../dom_data_broker/client_isolation_prefbasedshard.robot | 3 +++ .../controller/dom_data_broker/explicit_leader_movement.robot | 2 ++ .../explicit_leader_movement_prefbasedshard.robot | 2 ++ csit/suites/controller/dom_data_broker/leader_isolation.robot | 1 + .../suites/controller/dom_data_broker/listener_stability.robot | 2 ++ .../dom_data_broker/listener_stability_prefbasedshard.robot | 2 ++ csit/suites/vpnservice/030__configure_2_switches.robot | 1 + 9 files changed, 17 insertions(+) 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 553d2ec3e6..693a660ae7 100644 --- a/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot +++ b/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot @@ -31,6 +31,7 @@ Local_Leader_Shutdown Restart [Documentation] Restart odl. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ [Teardown] SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed diff --git a/csit/suites/controller/dom_data_broker/client_isolation.robot b/csit/suites/controller/dom_data_broker/client_isolation.robot index 18c39aa935..277cb1b58c 100644 --- a/csit/suites/controller/dom_data_broker/client_isolation.robot +++ b/csit/suites/controller/dom_data_broker/client_isolation.robot @@ -28,6 +28,7 @@ Producer_On_Shard_Leader_Node_ChainedTx Restart1 [Documentation] Restart odl + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ Producer_On_Shard_Leader_Node_SimpleTx @@ -36,6 +37,7 @@ Producer_On_Shard_Leader_Node_SimpleTx Restart2 [Documentation] Restart odl + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ Producer_On_Shard_Non_Leader_Node_ChainedTx @@ -44,6 +46,7 @@ Producer_On_Shard_Non_Leader_Node_ChainedTx Restart3 [Documentation] Restart odl + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ Producer_On_Shard_Non_Leader_Node_SimpleTx 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 838f8602e1..fe9e750fc1 100644 --- a/csit/suites/controller/dom_data_broker/client_isolation_prefbasedshard.robot +++ b/csit/suites/controller/dom_data_broker/client_isolation_prefbasedshard.robot @@ -31,6 +31,7 @@ Producer_On_Shard_Leader_Node_Isolated_Transactions Restart1 [Documentation] Restart odl. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ [Teardown] SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed @@ -41,6 +42,7 @@ Producer_On_Shard_Leader_Node_Nonisolated_Transactions Restart2 [Documentation] Restart odl. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ [Teardown] SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed @@ -51,6 +53,7 @@ Producer_On_Shard_Non_Leader_Node_Isolated_Transactions Restart3 [Documentation] Restart odl [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ [Teardown] SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed 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 9e22326d94..e828e90f5c 100644 --- a/csit/suites/controller/dom_data_broker/explicit_leader_movement.robot +++ b/csit/suites/controller/dom_data_broker/explicit_leader_movement.robot @@ -28,6 +28,7 @@ Local_To_Remote_Movement Restart1 [Documentation] Restart odl + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ Remote_To_Remote_Movement @@ -36,6 +37,7 @@ Remote_To_Remote_Movement Restart2 [Documentation] Restart odl + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ Remote_To_Local_Movement 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 f3911f8e68..4474a81fcf 100644 --- a/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot +++ b/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot @@ -31,6 +31,7 @@ Local_To_Remote_Movement Restart1 [Documentation] Restart odl. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ [Teardown] SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed @@ -41,6 +42,7 @@ Remote_To_Remote_Movement Restart2 [Documentation] Restart odl. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ [Teardown] SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed diff --git a/csit/suites/controller/dom_data_broker/leader_isolation.robot b/csit/suites/controller/dom_data_broker/leader_isolation.robot index 75fc8c978a..8ad2c0454e 100644 --- a/csit/suites/controller/dom_data_broker/leader_isolation.robot +++ b/csit/suites/controller/dom_data_broker/leader_isolation.robot @@ -27,6 +27,7 @@ Healing_Within_Request_Timeout Restart [Documentation] Restart odl + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ Healing_After_Request_Timeout diff --git a/csit/suites/controller/dom_data_broker/listener_stability.robot b/csit/suites/controller/dom_data_broker/listener_stability.robot index 5e3b2b00b1..050f73d16f 100644 --- a/csit/suites/controller/dom_data_broker/listener_stability.robot +++ b/csit/suites/controller/dom_data_broker/listener_stability.robot @@ -27,6 +27,7 @@ Move_Leader_From_Listener_Local_To_Remote Restart_1 [Documentation] Restart odl. + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ Move_Leader_From_Listener_Remote_To_Other_Remote @@ -35,6 +36,7 @@ Move_Leader_From_Listener_Remote_To_Other_Remote Restart_2 [Documentation] Restart odl. + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ Move_Leader_From_Listener_Remote_To_Local diff --git a/csit/suites/controller/dom_data_broker/listener_stability_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/listener_stability_prefbasedshard.robot index 831fdcf20e..5099623fa2 100644 --- a/csit/suites/controller/dom_data_broker/listener_stability_prefbasedshard.robot +++ b/csit/suites/controller/dom_data_broker/listener_stability_prefbasedshard.robot @@ -30,6 +30,7 @@ Move_Leader_From_Listener_Local_To_Remote Restart_1 [Documentation] Restart odl. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ [Teardown] SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed @@ -40,6 +41,7 @@ Move_Leader_From_Listener_Remote_To_Other_Remote Restart_2 [Documentation] Restart odl. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing + [Template] ${EMPTY} DdbCommons.Restart_Test_Templ [Teardown] SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed diff --git a/csit/suites/vpnservice/030__configure_2_switches.robot b/csit/suites/vpnservice/030__configure_2_switches.robot index 756cffb0f9..afd48e7d5d 100644 --- a/csit/suites/vpnservice/030__configure_2_switches.robot +++ b/csit/suites/vpnservice/030__configure_2_switches.robot @@ -140,6 +140,7 @@ Verify FIB entries after delete Verify flows after delete [Documentation] Verify if the flows are deleted from the switch [Tags] verify in switch + [Template] ${EMPTY} Wait Until Keyword Succeeds 12s 2s Ensure Flows Are Removed ${mininet1_conn_id_1} Wait Until Keyword Succeeds 12s 2s Ensure Flows Are Removed ${mininet2_conn_id_1} -- 2.36.6