Delete data folder

Delete data along with journal and snapshots folder.
This is needed for ODL upgrade CSIT

Change-Id: I893accaecf6931701b9b27c321a99c47e62798a6
Signed-Off-By: Janki Chhatbar <jchhatba@redhat.com>

diff --git a/csit/libraries/ClusterManagement.robot b/csit/libraries/ClusterManagement.robot
index 0278e204919ca7810d0ff3a27867438f778df562..0d8a67bf35c126d2b0075169c7cbd4a81933796f 100644 (file)
--- a/csit/libraries/ClusterManagement.robot
+++ b/csit/libraries/ClusterManagement.robot
@@ -464,13 +464,13 @@ Freeze_Or_Unfreeze_Members_From_List_Or_All
     ${freeze_index_list} =    List_Indices_Or_All    given_list=${member_index_list}
     Run_Bash_Command_On_List_Or_All    command=${command}    member_index_list=${member_index_list}
 
-Clean_Journals_And_Snapshots_On_List_Or_All
+Clean_Journals_Data_And_Snapshots_On_List_Or_All
     [Arguments]    ${member_index_list}=${EMPTY}    ${karaf_home}=${KARAF_HOME}
     [Documentation]    Delete journal and snapshots directories on every node listed (or all).
     ...    BEWARE: If only a subset of members is cleaned, this causes RetiredGenerationException in Carbon after the affected node re-start.
     ...    See https://bugs.opendaylight.org/show_bug.cgi?id=8138
     ${index_list} =    List_Indices_Or_All    given_list=${member_index_list}
-    ${command} =    Set Variable    rm -rf "${karaf_home}/journal" "${karaf_home}/snapshots"
+    ${command} =    Set Variable    rm -rf "${karaf_home}/journal" "${karaf_home}/snapshots" "${karaf_home}/data"
     : FOR    ${index}    IN    @{index_list}    # usually: 1, 2, 3.
     \    Run_Bash_Command_On_Member    command=${command}    member_index=${index}
 

diff --git a/csit/suites/controller/akka_upgrade/1node.robot b/csit/suites/controller/akka_upgrade/1node.robot
index 7822722759d35dce0144bad8cc5f617874042920..2a3e56d5b3b0915056d5ae0feb4d28d41c3a85d3 100644 (file)
--- a/csit/suites/controller/akka_upgrade/1node.robot
+++ b/csit/suites/controller/akka_upgrade/1node.robot
@@ -77,7 +77,7 @@ Kill_Original_Odl
     ClusterManagement.Kill_Members_From_List_Or_All
     # This is deliberately analoguous to killing the whole cluster.
     # (As opposed to killing just one member, but for 1 node it is the same.)
-    ClusterManagement.Clean_Journals_And_Snapshots_On_List_Or_All
+    ClusterManagement.Clean_Journals_Data_And_Snapshots_On_List_Or_All
 
 Install_Older_Odl
     [Documentation]    Download .zip of older ODL, unpack, delete .zip, copy featuresBoot line.