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 <jluhrsen@gmail.com>

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 553d2ec3e6113be1cfe99f20e4c7bdf641925ee0..693a660ae76075e2e29497586af3a563380a2b2f 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
@@ -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 18c39aa935fd16c779917fff09f5c730e81b297e..277cb1b58c729412e5ff8d5399b41328c4a4f92b 100644 (file)
--- 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 838f8602e1650c743576070bba812b7d041027fb..fe9e750fc1e10ec453b83709c026d7b8c4872550 100644 (file)
--- 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 9e22326d94368fc196abed084f483e9dfb7deb11..e828e90f5c46e530f989f051291865f3761f6ca2 100644 (file)
--- 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 f3911f8e681f99ca18a2d21a50ba4666ed7011fe..4474a81fcf3413cbc7353031ab83b4ec7e502826 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
@@ -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 75fc8c978abeeaafc4f5ac5000a6e43130dc9cbd..8ad2c0454e9f690e1cf43ad3fab6f8b15b933eab 100644 (file)
--- 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 5e3b2b00b12b32fd8b79a89073c32cc3e65231a5..050f73d16fc257041bea3af65a052155b76cd43a 100644 (file)
--- 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 831fdcf20ea2e70fe2f1d7c57d78f9d0e8c0bf38..5099623fa2840e85d4e6fc939b29ef9dd3c0ddf4 100644 (file)
--- 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 756cffb0f950c635df1d16ddade95472a060162a..afd48e7d5d8e39e05696d1c6c3c690c2e0eadbfa 100644 (file)
--- 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}