Add convenience keywords to ClusterManagement

The convenience keywords allow starting or stopping a cluster
node using just one line. A few test suites were updated to
utilize the new keywords.

Change-Id: Id6b457e1f649ff979e868d723d5527f3e425a073
Signed-off-by: Jozef Behran <jbehran@cisco.com>

diff --git a/csit/libraries/ClusterManagement.robot b/csit/libraries/ClusterManagement.robot
index f2759e1f29e14b054a48f759e6b89641c823c269..16713a3b3ef9f09ded73aef9b6e3ca9af070e74b 100644 (file)
--- a/csit/libraries/ClusterManagement.robot
+++ b/csit/libraries/ClusterManagement.robot
@@ -10,8 +10,7 @@ Documentation     Resource housing Keywords common to several suites for cluster
 ...
 ...               This resource holds private state (in suite variables),
 ...               which is generated once at Setup.
-...               The state includes list with indexes (numbers enumerating cluster members),
-...               IP addresses and Http (RequestsLibrary) sessions.
+...               The state includes IP addresses and Http (RequestsLibrary) sessions.
 ...               Most functionality deals with stopping/starting controllers
 ...               and finding leaders/followers for a Shard.
 ...
@@ -63,6 +62,18 @@ Kill_Members_From_List_Or_All
     : FOR    ${index}    IN    @{index_list}
     \    Verify_Karaf_Is_Not_Running_On_Member    member_index=${index}
 
+ClusterManagement__Build_List
+    [Arguments]    ${member}
+    ${member_int}=    BuiltIn.Convert_To_Integer    ${member}
+    ${index_list}=    BuiltIn.Create_List    ${member_int}
+    [Return]    ${index_list}
+
+Kill_Single_Member
+    [Arguments]    ${member}    ${confirm}=True
+    [Documentation]    Convenience keyword that kills the specified member of the cluster.
+    ${index_list}=    ClusterManagement__Build_List    ${member}
+    Kill_Members_From_List_Or_All    ${index_list}    ${confirm}
+
 Clean_Journals_And_Snapshots_On_List_Or_All
     [Arguments]    ${member_index_list}=${EMPTY}
     [Documentation]    Delete journal and snapshots directories on every node listed (or all).
@@ -81,6 +92,12 @@ Start_Members_From_List_Or_All
     BuiltIn.Wait_Until_Keyword_Succeeds    ${timeout}    1s    Check_Cluster_Is_In_Sync    member_index_list=${member_index_list}
     # TODO: Do we also want to check Shard Leaders here?
 
+Start_Single_Member
+    [Arguments]    ${member}    ${wait_for_sync}=True    ${timeout}=300s
+    [Documentation]    Convenience keyword that starts the specified member of the cluster.
+    ${index_list}=    ClusterManagement__Build_List    ${member}
+    Start_Members_From_List_Or_All    ${index_list}    ${wait_for_sync}    ${timeout}
+
 Verify_Leader_Exists_For_Each_Shard
     [Arguments]    ${shard_name_list}    ${shard_type}=operational    ${member_index_list}=${EMPTY}    ${verify_restconf}=True
     [Documentation]    For each shard name, call Get_Leader_And_Followers_For_Shard.

diff --git a/csit/suites/controller/Clustering_Datastore/buycar_failover.robot b/csit/suites/controller/Clustering_Datastore/buycar_failover.robot
index 421ba304ef170c8c3788e8162ce5283f812017d4..2a4838b76fc793e50b39e6427add34d9fcc4ec32 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/buycar_failover.robot
+++ b/csit/suites/controller/Clustering_Datastore/buycar_failover.robot
@@ -52,9 +52,8 @@ Buy_Cars_After_0_Reboots_And_Verify
 Reboot_1
     [Documentation]    Previous car-people Leader is rebooted (without persistence cleanup).
     ${index_to_reboot} =    Collections.Remove_From_List    ${list_to_reboot}    0
-    ${index_list} =    BuiltIn.Create_List    ${index_to_reboot}
-    ClusterManagement.Kill_Members_From_List_Or_All    member_index_list=${index_list}    confirm=True
-    ClusterManagement.Start_Members_From_List_Or_All    member_index_list=${index_list}    wait_for_sync=True    timeout=${MEMBER_START_TIMEOUT}
+    ClusterManagement.Kill_Single_Member    ${index_to_reboot}    confirm=True
+    ClusterManagement.Start_Single_Member    ${index_to_reboot}    wait_for_sync=True    timeout=${MEMBER_START_TIMEOUT}
     BuiltIn.Wait_Until_Keyword_Succeeds    30s    2s    ClusterManagement.Verify_Leader_Exists_For_Each_Shard    shard_name_list=${SHARD_NAME_LIST}    shard_type=config
 
 Buy_Cars_After_1_Reboots_And_Verify
@@ -68,9 +67,8 @@ Buy_Cars_After_1_Reboots_And_Verify
 Reboot_2
     [Documentation]    Previous car-people Leader is rebooted (without persistence cleanup).
     ${index_to_reboot} =    Collections.Remove_From_List    ${list_to_reboot}    0
-    ${index_list} =    BuiltIn.Create_List    ${index_to_reboot}
-    ClusterManagement.Kill_Members_From_List_Or_All    member_index_list=${index_list}    confirm=True
-    ClusterManagement.Start_Members_From_List_Or_All    member_index_list=${index_list}    wait_for_sync=True    timeout=${MEMBER_START_TIMEOUT}
+    ClusterManagement.Kill_Single_Member    ${index_to_reboot}    confirm=True
+    ClusterManagement.Start_Single_Member    ${index_to_reboot}    wait_for_sync=True    timeout=${MEMBER_START_TIMEOUT}
     BuiltIn.Wait_Until_Keyword_Succeeds    30s    2s    ClusterManagement.Verify_Leader_Exists_For_Each_Shard    shard_name_list=${SHARD_NAME_LIST}    shard_type=config
 
 Buy_Cars_After_2_Reboots_And_Verify
@@ -84,9 +82,8 @@ Buy_Cars_After_2_Reboots_And_Verify
 Reboot_3
     [Documentation]    Previous car-people Leader is rebooted (without persistence cleanup).
     ${index_to_reboot} =    Collections.Remove_From_List    ${list_to_reboot}    0
-    ${index_list} =    BuiltIn.Create_List    ${index_to_reboot}
-    ClusterManagement.Kill_Members_From_List_Or_All    member_index_list=${index_list}    confirm=True
-    ClusterManagement.Start_Members_From_List_Or_All    member_index_list=${index_list}    wait_for_sync=True    timeout=${MEMBER_START_TIMEOUT}
+    ClusterManagement.Kill_Single_Member    ${index_to_reboot}    confirm=True
+    ClusterManagement.Start_Single_Member    ${index_to_reboot}    wait_for_sync=True    timeout=${MEMBER_START_TIMEOUT}
     BuiltIn.Wait_Until_Keyword_Succeeds    30s    2s    ClusterManagement.Verify_Leader_Exists_For_Each_Shard    shard_name_list=${SHARD_NAME_LIST}    shard_type=config
 
 Buy_Cars_After_3_Reboots_And_Verify

diff --git a/csit/suites/controller/Clustering_Datastore/car_failover_crud.robot b/csit/suites/controller/Clustering_Datastore/car_failover_crud.robot
index e33a57e296c66698cfa6e532972c9e0265d8ff87..ca27dbb8af8eb2dcff9836d94667a7ed99cd1b3c 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/car_failover_crud.robot
+++ b/csit/suites/controller/Clustering_Datastore/car_failover_crud.robot
@@ -40,8 +40,7 @@ Add_Original_Cars_On_Old_Leader
 
 Kill_Original_Car_Leader
     [Documentation]    Kill the car Leader to cause a new leader to get elected.
-    ${kill_list} =    BuiltIn.Create_List    ${car_leader_index}
-    ClusterManagement.Kill_Members_From_List_Or_All    member_index_list=${kill_list}    confirm=True
+    ClusterManagement.Kill_Single_Member    ${car_leader_index}    confirm=True
 
 Wait_For_New_Leader
     [Documentation]    Wait until new car Leader is elected.
@@ -92,8 +91,7 @@ See_Follower_Cars_On_New_Followers
 
 Start_Old_Car_Leader
     [Documentation]    Start the killed member without deleting the persisted data.
-    ${revive_list} =    BuiltIn.Create_List    ${car_leader_index}
-    ClusterManagement.Start_Members_From_List_Or_All    member_index_list=${revive_list}    wait_for_sync=True    timeout=${MEMBER_START_TIMEOUT}
+    ClusterManagement.Start_Single_Member    ${car_leader_index}    wait_for_sync=True    timeout=${MEMBER_START_TIMEOUT}
     BuiltIn.Wait_Until_Keyword_Succeeds    30s    2s    ClusterManagement.Verify_Leader_Exists_For_Each_Shard    shard_name_list=${SHARD_NAME_LIST}    shard_type=config
 
 See_Folower_Cars_On_Old_Leader