From c1523f6678e09130a3c4268b8b7bcd6365448c88 Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Mon, 12 Sep 2016 16:04:46 -0700 Subject: [PATCH] OpenFlow cluster test rework Make all test suites branch and swith agnostic. Change to use right entity-owner names. Rework the Entity-Owner suite. Change-Id: I694ad4adfe3a4afe8c84a886a6c9925008c59b56 Signed-off-by: Luis Gomez --- csit/libraries/ClusterOpenFlow.robot | 9 ++ .../010__Cluster_HA_Owner_Failover.robot | 96 +++++++++---------- ...ta_Recovery_Leader_Follower_Failover.robot | 16 ++-- .../010_Switch_Disconnect.robot | 67 ++++--------- .../020_Cluster_Node_Failure.robot | 80 ++++++---------- .../030_Cluster_Sync_Problems.robot | 92 +++++++----------- ...nflowplugin-clustering-helium-redesign.txt | 12 +-- ...flowplugin-clustering-lithium-redesign.txt | 12 +-- csit/testplans/openflowplugin-clustering.txt | 12 +-- 9 files changed, 161 insertions(+), 235 deletions(-) rename csit/suites/openflowplugin/{EntityOwhership => EntityOwnership}/010_Switch_Disconnect.robot (61%) rename csit/suites/openflowplugin/{EntityOwhership => EntityOwnership}/020_Cluster_Node_Failure.robot (61%) rename csit/suites/openflowplugin/{EntityOwhership => EntityOwnership}/030_Cluster_Sync_Problems.robot (62%) diff --git a/csit/libraries/ClusterOpenFlow.robot b/csit/libraries/ClusterOpenFlow.robot index 23228ba976..90088debfd 100644 --- a/csit/libraries/ClusterOpenFlow.robot +++ b/csit/libraries/ClusterOpenFlow.robot @@ -76,6 +76,15 @@ Add Sample Flow And Verify ClusterManagement.Put_As_Json_And_Check_Member_List_Or_All ${config_table_0}/flow/1 ${body} ${controller_index} ${controller_index_list} Wait Until Keyword Succeeds 15s 1s ClusterManagement.Check_Item_Occurrence_Member_List_Or_All uri=${operational_table_0} dictionary=${dictionary} member_index_list=${controller_index_list} +Verify Sample Flow + [Arguments] ${controller_index_list}=${EMPTY} + [Documentation] Verify sample flow gets applied in all instances in ${controller_index_list}. + # There are slight differences on the way He and Li plugin display table information. He plugin has an additional Hashmap field + # replicating some of the matches in the flows section. Same comment applies for further keywords. + Run Keyword If '${ODL_OF_PLUGIN}' == 'helium' Set Test Variable &{dictionary} 10.0.1.0/24=2 "output-node-connector":"1"=1 + Run Keyword If '${ODL_OF_PLUGIN}' == 'lithium' Set Test Variable &{dictionary} 10.0.1.0/24=1 "output-node-connector":"1"=1 + Wait Until Keyword Succeeds 15s 1s ClusterManagement.Check_Item_Occurrence_Member_List_Or_All uri=${operational_table_0} dictionary=${dictionary} member_index_list=${controller_index_list} + Modify Sample Flow And Verify [Arguments] ${controller_index} ${controller_index_list}=${EMPTY} [Documentation] Modify sample flow in ${controller_index} and verify it gets applied in all instances in ${controller_index_list}. diff --git a/csit/suites/openflowplugin/Clustering/010__Cluster_HA_Owner_Failover.robot b/csit/suites/openflowplugin/Clustering/010__Cluster_HA_Owner_Failover.robot index 0ab20eeeab..85d3c6ed0c 100644 --- a/csit/suites/openflowplugin/Clustering/010__Cluster_HA_Owner_Failover.robot +++ b/csit/suites/openflowplugin/Clustering/010__Cluster_HA_Owner_Failover.robot @@ -19,20 +19,18 @@ Start Mininet Multiple Connections BuiltIn.Set Suite Variable ${mininet_conn_id} BuiltIn.Wait Until Keyword Succeeds 10s 1s OVSDB.Check OVS OpenFlow Connections ${TOOLS_SYSTEM_IP} 9 -Check Entity Owner Status And Find Owner and Candidate Before Fail - [Documentation] Check Entity Owner Status and identify owner and candidate for first switch s1. - ${original_owner} ${original_candidate_list} ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:1 1 - ${original_candidate}= Collections.Get From List ${original_candidate_list} 0 +Check Entity Owner Status And Find Owner and Successor Before Fail + [Documentation] Check Entity Owner Status and identify owner and successor for first switch s1. + ${original_owner} ${original_successor_list} ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:1 1 + ${original_successor}= Collections.Get From List ${original_successor_list} 0 BuiltIn.Set Suite Variable ${original_owner} - BuiltIn.Set Suite Variable ${original_candidate_list} - BuiltIn.Set Suite Variable ${original_candidate} + BuiltIn.Set Suite Variable ${original_successor_list} + BuiltIn.Set Suite Variable ${original_successor} -Reconnect Extra Switches To Candidates And Check OVS Connections - [Documentation] Connect switches s2 and s3 to candidate instances. - ${candidate_list} = BuiltIn.Run_Keyword_If '${ODL_STREAM}' != 'beryllium' and '${ODL_OF_PLUGIN}' == 'lithium' Create List @{ClusterManagement__member_index_list} - ... ELSE Create List ${original_candidate} +Reconnect Extra Switches To Successors And Check OVS Connections + [Documentation] Connect switches s2 and s3 to successor instances. ${controller_opt} = BuiltIn.Set Variable - : FOR ${index} IN @{original_candidate_list} + : FOR ${index} IN @{original_successor_list} \ ${controller_opt} = BuiltIn.Catenate ${controller_opt} ${SPACE}tcp:${ODL_SYSTEM_${index}_IP}:${ODL_OF_PORT} \ Log ${controller_opt} OVSDB.Set Controller In OVS Bridge ${TOOLS_SYSTEM_IP} s2 ${controller_opt} @@ -55,17 +53,17 @@ Delete Configuration In Owner and Verify Before Fail [Documentation] Delete Flow in Owner and verify it gets applied from all instances. ClusterOpenFlow.Delete Sample Flow and Verify ${original_owner} -Add Configuration In Candidate and Verify Before Fail - [Documentation] Add Flow in Candidate and verify it gets applied from all instances. - ClusterOpenFlow.Add Sample Flow and Verify ${original_candidate} +Add Configuration In Successor and Verify Before Fail + [Documentation] Add Flow in Successor and verify it gets applied from all instances. + ClusterOpenFlow.Add Sample Flow and Verify ${original_successor} -Modify Configuration In Candidate and Verify Before Fail - [Documentation] Modify Flow in candidate and verify it gets applied from all instances. - ClusterOpenFlow.Modify Sample Flow and Verify ${original_candidate} +Modify Configuration In Successor and Verify Before Fail + [Documentation] Modify Flow in successor and verify it gets applied from all instances. + ClusterOpenFlow.Modify Sample Flow and Verify ${original_successor} -Delete Configuration In Candidate and Verify Before Fail - [Documentation] Delete Flow in Candidate and verify it gets removed from all instances. - ClusterOpenFlow.Delete Sample Flow and Verify ${original_candidate} +Delete Configuration In Successor and Verify Before Fail + [Documentation] Delete Flow in Successor and verify it gets removed from all instances. + ClusterOpenFlow.Delete Sample Flow and Verify ${original_successor} Send RPC Add to Owner and Verify Before Fail [Documentation] Add Flow in Owner and verify it gets applied from all instances. @@ -75,13 +73,13 @@ Send RPC Delete to Owner and Verify Before Fail [Documentation] Delete Flow in Owner and verify it gets removed from all instances. ClusterOpenFlow.Send RPC Delete Sample Flow and Verify ${original_owner} -Send RPC Add to Candidate and Verify Before Fail - [Documentation] Add Flow in Candidate and verify it gets applied from all instances. - ClusterOpenFlow.Send RPC Add Sample Flow and Verify ${original_candidate} +Send RPC Add to Successor and Verify Before Fail + [Documentation] Add Flow in Successor and verify it gets applied from all instances. + ClusterOpenFlow.Send RPC Add Sample Flow and Verify ${original_successor} -Send RPC Delete to Candidate and Verify Before Fail - [Documentation] Delete Flow in Candidate and verify it gets removed from all instances. - ClusterOpenFlow.Send RPC Delete Sample Flow and Verify ${original_candidate} +Send RPC Delete to Successor and Verify Before Fail + [Documentation] Delete Flow in Successor and verify it gets removed from all instances. + ClusterOpenFlow.Send RPC Delete Sample Flow and Verify ${original_successor} Modify Network And Verify Before Fail [Documentation] Take a link down and verify port status in all instances. @@ -94,18 +92,18 @@ Restore Network And Verify Before Fail Kill Owner Instance [Documentation] Kill Owner Instance and verify it is dead ClusterManagement.Kill Single Member ${original_owner} - BuiltIn.Set Suite Variable ${new_cluster_list} ${original_candidate_list} + BuiltIn.Set Suite Variable ${new_cluster_list} ${original_successor_list} Check Shards Status After Fail [Documentation] Create original cluster list and check Status for all shards in OpenFlow application. ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event ${new_cluster_list} -Check Entity Owner Status And Find Owner and Candidate After Fail - [Documentation] Check Entity Owner Status and identify owner and candidate. - ${new_owner} ${new_candidate_list} ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:1 ${original_candidate} ${new_cluster_list} - ${new_candidate}= Collections.Get From List ${new_candidate_list} 0 +Check Entity Owner Status And Find Owner and Successor After Fail + [Documentation] Check Entity Owner Status and identify owner and successor. + ${new_owner} ${new_successor_list} ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:1 ${original_successor} ${new_cluster_list} + ${new_successor}= Collections.Get From List ${new_successor_list} 0 BuiltIn.Set Suite Variable ${new_owner} - BuiltIn.Set Suite Variable ${new_candidate} + BuiltIn.Set Suite Variable ${new_successor} Check Network Operational Information After Fail [Documentation] Check devices in operational inventory and topology in all cluster instances. @@ -123,17 +121,17 @@ Delete Configuration In Owner and Verify After Fail [Documentation] Delete Flow in Owner and verify it gets applied from all instances. ClusterOpenFlow.Delete Sample Flow and Verify ${new_owner} ${new_cluster_list} -Add Configuration In Candidate and Verify After Fail - [Documentation] Add Flow in Candidate and verify it gets applied from all instances. - ClusterOpenFlow.Add Sample Flow and Verify ${new_candidate} ${new_cluster_list} +Add Configuration In Successor and Verify After Fail + [Documentation] Add Flow in Successor and verify it gets applied from all instances. + ClusterOpenFlow.Add Sample Flow and Verify ${new_successor} ${new_cluster_list} -Modify Configuration In Candidate and Verify After Fail - [Documentation] Modify Flow in Candidate and verify it gets applied from all instances. - ClusterOpenFlow.Modify Sample Flow and Verify ${new_candidate} ${new_cluster_list} +Modify Configuration In Successor and Verify After Fail + [Documentation] Modify Flow in Successor and verify it gets applied from all instances. + ClusterOpenFlow.Modify Sample Flow and Verify ${new_successor} ${new_cluster_list} -Delete Configuration In Candidate and Verify After Fail - [Documentation] Delete Flow in Candidate and verify it gets applied from all instances. - ClusterOpenFlow.Delete Sample Flow and Verify ${new_candidate} ${new_cluster_list} +Delete Configuration In Successor and Verify After Fail + [Documentation] Delete Flow in Successor and verify it gets applied from all instances. + ClusterOpenFlow.Delete Sample Flow and Verify ${new_successor} ${new_cluster_list} Send RPC Add to Owner and Verify After Fail [Documentation] Add Flow in Owner and verify it gets applied from all instances. @@ -143,13 +141,13 @@ Send RPC Delete to Owner and Verify After Fail [Documentation] Delete Flow in Owner and verify it gets removed from all instances. ClusterOpenFlow.Send RPC Delete Sample Flow and Verify ${new_owner} ${new_cluster_list} -Send RPC Add to Candidate and Verify After Fail - [Documentation] Add Flow in Candidate and verify it gets applied from all instances. - ClusterOpenFlow.Send RPC Add Sample Flow and Verify ${new_candidate} ${new_cluster_list} +Send RPC Add to Successor and Verify After Fail + [Documentation] Add Flow in Successor and verify it gets applied from all instances. + ClusterOpenFlow.Send RPC Add Sample Flow and Verify ${new_successor} ${new_cluster_list} -Send RPC Delete to Candidate and Verify After Fail - [Documentation] Delete Flow in Candidate and verify it gets removed from all instances. - ClusterOpenFlow.Send RPC Delete Sample Flow and Verify ${new_candidate} ${new_cluster_list} +Send RPC Delete to Successor and Verify After Fail + [Documentation] Delete Flow in Successor and verify it gets removed from all instances. + ClusterOpenFlow.Send RPC Delete Sample Flow and Verify ${new_successor} ${new_cluster_list} Modify Network and Verify After Fail [Documentation] Take a link down and verify port status in all instances. @@ -168,8 +166,8 @@ Check Shards Status After Recover ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event Check Entity Owner Status After Recover - [Documentation] Check Entity Owner Status and identify owner and candidate. - ${new_owner} ${new_candidates_list} ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:1 1 + [Documentation] Check Entity Owner Status and identify owner and successor. + ${new_owner} ${new_successors_list} ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:1 1 BuiltIn.Set Suite Variable ${new_owner} Check Network Operational Information After Recover diff --git a/csit/suites/openflowplugin/Clustering/030__Cluster_HA_Data_Recovery_Leader_Follower_Failover.robot b/csit/suites/openflowplugin/Clustering/030__Cluster_HA_Data_Recovery_Leader_Follower_Failover.robot index 8584a95749..8994632df8 100644 --- a/csit/suites/openflowplugin/Clustering/030__Cluster_HA_Data_Recovery_Leader_Follower_Failover.robot +++ b/csit/suites/openflowplugin/Clustering/030__Cluster_HA_Data_Recovery_Leader_Follower_Failover.robot @@ -9,16 +9,12 @@ Resource ../../../libraries/CompareStream.robot Resource ../../../libraries/MininetKeywords.robot Variables ../../../variables/Variables.py -*** Variables *** -${switch_count_per_node} 1 -${operation_timeout} 15s - *** Test Cases *** Check Shards Status Before Leader Restart - [Documentation] Check Status for all shards in OpenFlow application. + [Documentation] Check Status for all shards in OpenFlow application and set default flows variable. + ... Note that Boron and beyond use latest OVS 2.5 which means controller has to push table miss flow, + ... therefore Boron+ has 1 flow/switch more than Beryllium. ClusterOpenFlow.Check OpenFlow Shards Status - ${flow_count_per_switch}= CompareStream.Set_Variable_If_At_Least_Boron 2 1 - Set Suite Variable ${flow_count_per_switch} Get inventory Leader Before Leader Restart [Documentation] Find leader in the inventory config shard @@ -65,7 +61,7 @@ Start Mininet Connect To Old Leader Verify Flows In Switch After Leader Restart [Documentation] Verify flows are installed in switch after leader restart. - MininetKeywords.Verify Aggregate Flow From Mininet Session ${mininet_conn_id} ${switch_count_per_node} ${flow_count_per_switch} ${operation_timeout} + ClusterOpenFlow.Verify Sample Flow Stop Mininet Connected To Old Leader and Exit [Documentation] Stop mininet and exit connection. @@ -93,7 +89,7 @@ Start Mininet Connect To Leader Verify Flows In Switch After Follower Restart [Documentation] Verify flows are installed in switch after follower restart. - MininetKeywords.Verify Aggregate Flow From Mininet Session ${mininet_conn_id} ${switch_count_per_node} ${flow_count_per_switch} ${operation_timeout} + ClusterOpenFlow.Verify Sample Flow Stop Mininet Connected To Leader and Exit [Documentation] Stop mininet Connected To Other Follower and exit connection. @@ -121,7 +117,7 @@ Start Mininet Connect To Follower Node2 After Cluster Restart Verify Flows In Switch After Cluster Restart [Documentation] Verify flows are installed in switch after cluster restart. - MininetKeywords.Verify Aggregate Flow From Mininet Session ${mininet_conn_id} ${switch_count_per_node} ${flow_count_per_switch} ${operation_timeout} + ClusterOpenFlow.Verify Sample Flow Delete Flows In Follower Node1 and Verify After Leader Restart [Documentation] Delete Flow in Follower Node1. diff --git a/csit/suites/openflowplugin/EntityOwhership/010_Switch_Disconnect.robot b/csit/suites/openflowplugin/EntityOwnership/010_Switch_Disconnect.robot similarity index 61% rename from csit/suites/openflowplugin/EntityOwhership/010_Switch_Disconnect.robot rename to csit/suites/openflowplugin/EntityOwnership/010_Switch_Disconnect.robot index c1cda09997..303d1280b4 100644 --- a/csit/suites/openflowplugin/EntityOwhership/010_Switch_Disconnect.robot +++ b/csit/suites/openflowplugin/EntityOwnership/010_Switch_Disconnect.robot @@ -9,6 +9,7 @@ Library XML Resource ${CURDIR}/../../../libraries/Utils.robot Resource ${CURDIR}/../../../libraries/OvsManager.robot Resource ${CURDIR}/../../../libraries/ClusterManagement.robot +Resource ${CURDIR}/../../../libraries/ClusterOpenFlow.robot Library Collections *** Variables *** @@ -72,33 +73,27 @@ Check All Switches Connected To All Cluster Nodes Reconnecting Switch Scenario [Arguments] ${switch_name} - [Documentation] Disconnect and connect master and follower and check switch data to be consistent + [Documentation] Disconnect and connect master and slave and check switch data to be consistent ${idx}= BuiltIn.Evaluate str("${switch_name}"[1:]) BuiltIn.Set Test Variable ${idx} Disconnect Switchs Old Master ${switch_name} Reconnect Switchs Old Master ${switch_name} - Disconnect Switchs Follower ${switch_name} - Reconnect Switchs Follower ${switch_name} + Disconnect Switchs Slave ${switch_name} + Reconnect Switchs Slave ${switch_name} [Teardown] Run Keyword If "${disc_cntl}"!="${Empty}" OvsManager.Reconnect Switch To Controller And Verify Connected ${switch_name} ${disc_cntl} Disconnect Switchs Old Master [Arguments] ${switch_name} BuiltIn.Set Test Variable ${disc_cntl} ${Empty} - Check Count Integrity ${switch_name} expected_controllers=3 - ${old_owner} ${old_followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} + ${old_owner} ${old_successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} ${old_master}= BuiltIn.Set Variable ${ODL_SYSTEM_${old_owner}_IP} OvsManager.Disconnect Switch From Controller And Verify Disconnected ${switch_name} ${old_master} BuiltIn.Set Test Variable ${disc_cntl} ${old_master} ${new_master}= BuiltIn.Wait Until Keyword Succeeds 5x 3s Verify New Master Controller Node ${switch_name} ${old_master} - ${owner} ${followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - Collections.List Should Contain Value ${old_followers} ${owner} - BuiltIn.Run Keyword If '${ODL_STREAM}' != 'beryllium' and '${ODL_OF_PLUGIN}' == 'lithium' BuiltIn.Wait Until Keyword Succeeds 5x 3s Check Count Integrity ${switch_name} - ... expected_controllers=3 - ... ELSE BuiltIn.Wait Until Keyword Succeeds 5x 3s Check Count Integrity ${switch_name} - ... expected_controllers=2 + ${owner} ${successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} ${old_successors} BuiltIn.Should Be Equal As Strings ${new_master} ${ODL_SYSTEM_${owner}_IP} BuiltIn.Set Test Variable ${old_owner} - BuiltIn.Set Test Variable ${old_followers} + BuiltIn.Set Test Variable ${old_successors} BuiltIn.Set Test Variable ${old_master} BuiltIn.Set Test Variable ${owner} BuiltIn.Set Test Variable ${new_master} @@ -107,61 +102,39 @@ Reconnect Switchs Old Master [Arguments] ${switch_name} OvsManager.Reconnect Switch To Controller And Verify Connected ${switch_name} ${old_master} BuiltIn.Set Test Variable ${disc_cntl} ${Empty} - BuiltIn.Wait Until Keyword Succeeds 5x 3s Verify Follower Added ${switch_name} ${old_owner} - ${new_owner} ${new_followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - Check Count Integrity ${switch_name} expected_controllers=3 + ${new_owner} ${new_successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} BuiltIn.Should Be Equal ${owner} ${new_owner} - Collections.List Should Contain Value ${new_followers} ${old_owner} -Disconnect Switchs Follower +Disconnect Switchs Slave [Arguments] ${switch_name} - ${old_owner} ${old_followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - ${old_follower}= Collections.Get From List ${old_followers} 0 - ${old_slave}= BuiltIn.Set Variable ${ODL_SYSTEM_${old_follower}_IP} + ${old_owner} ${old_successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} + ${old_successor}= Collections.Get From List ${old_successors} 0 + ${old_slave}= BuiltIn.Set Variable ${ODL_SYSTEM_${old_successor}_IP} OvsManager.Disconnect Switch From Controller And Verify Disconnected ${switch_name} ${old_slave} BuiltIn.Set Test Variable ${disc_cntl} ${old_slave} - BuiltIn.Run Keyword If '${ODL_STREAM}' != 'beryllium' and '${ODL_OF_PLUGIN}' == 'lithium' Check Count Integrity ${switch_name} expected_controllers=3 - ... ELSE Check Count Integrity ${switch_name} expected_controllers=2 - ${owner} ${followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} + ${tmp_candidates}= BuiltIn.Create List @{ClusterManagement__member_index_list} + Collections.Remove Values From List ${tmp_candidates} ${old_successor} + ${owner} ${successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} ${tmp_candidates} BuiltIn.Should Be Equal ${owner} ${old_owner} - BuiltIn.Run Keyword If '${ODL_STREAM}' != 'beryllium' and '${ODL_OF_PLUGIN}' == 'lithium' Collections.Lists Should Be Equal ${followers} ${old_followers} - ... ELSE Collections.List Should Not Contain Value ${followers} ${old_follower} BuiltIn.Should Be Equal As Strings ${new_master} ${ODL_SYSTEM_${owner}_IP} BuiltIn.Set Test Variable ${old_owner} - BuiltIn.Set Test Variable ${old_followers} - BuiltIn.Set Test Variable ${old_follower} + BuiltIn.Set Test Variable ${old_successors} + BuiltIn.Set Test Variable ${old_successor} BuiltIn.Set Test Variable ${old_slave} BuiltIn.Set Test Variable ${owner} -Reconnect Switchs Follower +Reconnect Switchs Slave [Arguments] ${switch_name} OvsManager.Reconnect Switch To Controller And Verify Connected ${switch_name} ${old_slave} BuiltIn.Set Test Variable ${disc_cntl} ${Empty} - BuiltIn.Wait Until Keyword Succeeds 5x 3s Check Count Integrity ${switch_name} expected_controllers=3 - ${new_owner} ${new_followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} + ${new_owner} ${new_successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} BuiltIn.Should Be Equal ${old_owner} ${new_owner} - Collections.List Should Contain Value ${new_followers} ${old_follower} - -Check Count Integrity - [Arguments] ${switch_name} ${expected_controllers}=3 - [Documentation] Every switch must have only one master and rest must be followers and together must be of expected nodes count - ${idx}= BuiltIn.Evaluate "${switch_name}"[1:] - ${owner} ${candidates}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - ${count}= BuiltIn.Get Length ${candidates} - BuiltIn.Should Be Equal As Numbers ${expected_controllers} ${count} Verify New Master Controller Node [Arguments] ${switch_name} ${old_master} [Documentation] Checks if given node is different from actual master ${idx}= BuiltIn.Evaluate "${switch_name}"[1:] - ${owner} ${followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} + ${owner} ${successors}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} ${new_master} BuiltIn.Set Variable ${ODL_SYSTEM_${owner}_IP} BuiltIn.Should Not Be Equal ${old_master} ${new_master} Return From Keyword ${new_master} - -Verify Follower Added - [Arguments] ${switch_name} ${expected_node} - [Documentation] Checks if given node is in the list of active followers - ${idx}= BuiltIn.Evaluate "${switch_name}"[1:] - ${owner} ${followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - Collections.List Should Contain Value ${followers} ${expected_node} diff --git a/csit/suites/openflowplugin/EntityOwhership/020_Cluster_Node_Failure.robot b/csit/suites/openflowplugin/EntityOwnership/020_Cluster_Node_Failure.robot similarity index 61% rename from csit/suites/openflowplugin/EntityOwhership/020_Cluster_Node_Failure.robot rename to csit/suites/openflowplugin/EntityOwnership/020_Cluster_Node_Failure.robot index 7d4762a035..c9dbc4fd68 100644 --- a/csit/suites/openflowplugin/EntityOwhership/020_Cluster_Node_Failure.robot +++ b/csit/suites/openflowplugin/EntityOwnership/020_Cluster_Node_Failure.robot @@ -9,7 +9,7 @@ Library XML Resource ${CURDIR}/../../../libraries/Utils.robot Resource ${CURDIR}/../../../libraries/OvsManager.robot Resource ${CURDIR}/../../../libraries/ClusterManagement.robot -Resource ${CURDIR}/../../../libraries/CompareStream.robot +Resource ${CURDIR}/../../../libraries/ClusterOpenFlow.robot Library Collections *** Variables *** @@ -73,36 +73,31 @@ Check All Switches Connected To All Cluster Nodes Restarting Karaf Scenario [Arguments] ${switch_name} - [Documentation] Disconnect and connect master and follower and check switch data to be consistent + [Documentation] Disconnect and connect owner and successor and check switch data to be consistent ${idx}= BuiltIn.Evaluate str("${switch_name}"[1:]) BuiltIn.Set Test Variable ${idx} Kill Switchs Old Owner ${switch_name} Restart Switchs Old Owner ${switch_name} - Kill Switchs Candidate ${switch_name} - Restart Switchs Candidate ${switch_name} + Kill Switchs Successor ${switch_name} + Restart Switchs Successor ${switch_name} [Teardown] Run Keyword If "${stopped_karaf}"!="${Empty}" Start Controller Node And Verify ${stopped_karaf} Kill Switchs Old Owner [Arguments] ${switch_name} BuiltIn.Set Test Variable ${stopped_karaf} ${Empty} - Check Count Integrity ${switch_name} expected_controllers=3 - ${old_owner} ${old_followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} + ${old_owner} ${old_successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} ${old_master}= BuiltIn.Set Variable ${ODL_SYSTEM_${old_owner}_IP} - ${tmp_followers}= BuiltIn.Create List @{old_followers} - Collections.Remove Values From List ${tmp_followers} ${old_owner} - ${tmp_follower}= Collections.Get From List ${tmp_followers} 0 - BuiltIn.Set Suite Variable ${active_member} ${tmp_follower} + ${active_member}= Collections.Get From List ${old_successors} 0 + BuiltIn.Set Suite Variable ${active_member} Stop Controller Node And Verify ${old_owner} BuiltIn.Set Test Variable ${stopped_karaf} ${old_owner} + ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event ${old_successors} ${new_master}= BuiltIn.Wait Until Keyword Succeeds 5x 3s Verify New Master Controller Node ${switch_name} ${old_master} - ${owner} ${followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - Collections.List Should Contain Value ${old_followers} ${owner} - ${expected_controllers}= CompareStream.Set_Variable_If_At_Least_Boron 3 2 - BuiltIn.Wait Until Keyword Succeeds 5x 3s Check Count Integrity ${switch_name} expected_controllers=${expected_controllers} + ${owner} ${successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} ${old_successors} BuiltIn.Should Be Equal As Strings ${new_master} ${ODL_SYSTEM_${owner}_IP} BuiltIn.Set Suite Variable ${active_member} ${owner} BuiltIn.Set Test Variable ${old_owner} - BuiltIn.Set Test Variable ${old_followers} + BuiltIn.Set Test Variable ${old_successors} BuiltIn.Set Test Variable ${old_master} BuiltIn.Set Test Variable ${owner} BuiltIn.Set Test Variable ${new_master} @@ -111,63 +106,46 @@ Restart Switchs Old Owner [Arguments] ${switch_name} Start Controller Node And Verify ${old_owner} BuiltIn.Set Test Variable ${stopped_karaf} ${Empty} - BuiltIn.Wait Until Keyword Succeeds 5x 3s Verify Follower Added ${switch_name} ${old_owner} - ${new_owner} ${new_followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - BuiltIn.Wait Until Keyword Succeeds 5x 3s Check Count Integrity ${switch_name} expected_controllers=3 + ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event + ${new_owner} ${new_successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} BuiltIn.Should Be Equal ${owner} ${new_owner} - Collections.List Should Contain Value ${new_followers} ${old_owner} -Kill Switchs Candidate +Kill Switchs Successor [Arguments] ${switch_name} - ${old_owner} ${old_followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - ${old_follower}= Collections.Get From List ${old_followers} 0 - ${old_slave}= BuiltIn.Set Variable ${ODL_SYSTEM_${old_follower}_IP} - Stop Controller Node And Verify ${old_follower} - BuiltIn.Set Test Variable ${stopped_karaf} ${old_follower} - ${expected_controllers}= CompareStream.Set_Variable_If_At_Least_Boron 3 2 - BuiltIn.Wait Until Keyword Succeeds 5x 3s Check Count Integrity ${switch_name} expected_controllers=${expected_controllers} - ${owner} ${followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} + ${old_owner} ${old_successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} + ${old_successor}= Collections.Get From List ${old_successors} 0 + ${old_slave}= BuiltIn.Set Variable ${ODL_SYSTEM_${old_successor}_IP} + Stop Controller Node And Verify ${old_successor} + BuiltIn.Set Test Variable ${stopped_karaf} ${old_successor} + ${tmp_candidates}= BuiltIn.Create List @{ClusterManagement__member_index_list} + Collections.Remove Values From List ${tmp_candidates} ${old_successor} + ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event ${tmp_candidates} + ${owner} ${successor}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} ${tmp_candidates} BuiltIn.Should Be Equal ${owner} ${old_owner} BuiltIn.Should Be Equal As Strings ${new_master} ${ODL_SYSTEM_${owner}_IP} BuiltIn.Set Test Variable ${old_owner} - BuiltIn.Set Test Variable ${old_followers} - BuiltIn.Set Test Variable ${old_follower} + BuiltIn.Set Test Variable ${old_successors} + BuiltIn.Set Test Variable ${old_successor} BuiltIn.Set Test Variable ${old_slave} BuiltIn.Set Test Variable ${owner} -Restart Switchs Candidate +Restart Switchs Successor [Arguments] ${switch_name} - Start Controller Node And Verify ${old_follower} + Start Controller Node And Verify ${old_successor} BuiltIn.Set Test Variable ${stopped_karaf} ${Empty} - BuiltIn.Wait Until Keyword Succeeds 5x 3s Check Count Integrity ${switch_name} expected_controllers=3 - ${new_owner} ${new_followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} + ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event + ${new_owner} ${new_successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} BuiltIn.Should Be Equal ${old_owner} ${new_owner} - Collections.List Should Contain Value ${new_followers} ${old_follower} - -Check Count Integrity - [Arguments] ${switch_name} ${expected_controllers}=3 - [Documentation] Every switch must have only one master and rest must be followers and together must be of expected nodes count - ${idx}= BuiltIn.Evaluate "${switch_name}"[1:] - ${owner} ${candidates}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - ${count}= BuiltIn.Get Length ${candidates} - BuiltIn.Should Be Equal As Numbers ${expected_controllers} ${count} Verify New Master Controller Node [Arguments] ${switch_name} ${old_master} [Documentation] Checks if given node is different from actual master ${idx}= BuiltIn.Evaluate "${switch_name}"[1:] - ${owner} ${followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} + ${owner} ${successors}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} ${new_master} BuiltIn.Set Variable ${ODL_SYSTEM_${owner}_IP} BuiltIn.Should Not Be Equal ${old_master} ${new_master} Return From Keyword ${new_master} -Verify Follower Added - [Arguments] ${switch_name} ${expected_node} - [Documentation] Checks if given node is in the list of active followers - ${idx}= BuiltIn.Evaluate "${switch_name}"[1:] - ${owner} ${followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - Collections.List Should Contain Value ${followers} ${expected_node} - Stop Controller Node And Verify [Arguments] ${node} [Documentation] Stops the given node diff --git a/csit/suites/openflowplugin/EntityOwhership/030_Cluster_Sync_Problems.robot b/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot similarity index 62% rename from csit/suites/openflowplugin/EntityOwhership/030_Cluster_Sync_Problems.robot rename to csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot index fec88bb5ab..9b7c3d9500 100644 --- a/csit/suites/openflowplugin/EntityOwhership/030_Cluster_Sync_Problems.robot +++ b/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot @@ -10,7 +10,6 @@ Resource ${CURDIR}/../../../libraries/Utils.robot Resource ${CURDIR}/../../../libraries/OvsManager.robot Resource ${CURDIR}/../../../libraries/ClusterManagement.robot Resource ${CURDIR}/../../../libraries/ClusterOpenFlow.robot -Resource ${CURDIR}/../../../libraries/CompareStream.robot Library Collections *** Variables *** @@ -47,18 +46,18 @@ Switches To Be Connected To All Nodes Isolating Owner Of Switch s1 s1 - [Teardown] Report_Failure_Due_To_Bug 6540 + [Teardown] Report_Failure_Due_To_Bug 6177 Switches Still Be Connected To All Nodes [Template] NONE BuiltIn.Wait Until Keyword Succeeds 15x 1s Check All Switches Connected To All Cluster Nodes - [Teardown] Report_Failure_Due_To_Bug 6540 + [Teardown] Report_Failure_Due_To_Bug 6177 Stop Mininet And Verify No Owners [Template] NONE Utils.Stop Suite BuiltIn.Wait Until Keyword Succeeds 15x 1s Check No Owners In Controller - [Teardown] Report_Failure_Due_To_Bug 6540 + [Teardown] Report_Failure_Due_To_Bug 6177 *** Keywords *** Start Suite @@ -86,37 +85,31 @@ Check All Switches Connected To All Cluster Nodes Isolating Node Scenario [Arguments] ${switch_name} - [Documentation] Disconnect and connect master and follower and check switch data to be consistent + [Documentation] Disconnect and connect owner and successor and check switch data to be consistent ${idx}= BuiltIn.Evaluate str("${switch_name}"[1:]) BuiltIn.Set Test Variable ${idx} Isolate Switchs Old Owner ${switch_name} Rejoin Switchs Old Owner ${switch_name} - Isolate Switchs Candidate ${switch_name} - Rejoin Switchs Candidate ${switch_name} + Isolate Switchs Successor ${switch_name} + Rejoin Switchs Successor ${switch_name} [Teardown] Run Keyword If "${isol_node}"!="${Empty}" Rejoin Controller To The Cluster ${isol_node} Isolate Switchs Old Owner [Arguments] ${switch_name} BuiltIn.Set Test Variable ${isol_node} ${Empty} - Check Count Integrity ${switch_name} expected_controllers=3 - ${old_owner} ${old_followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} + ${old_owner} ${old_successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} ${old_master}= BuiltIn.Set Variable ${ODL_SYSTEM_${old_owner}_IP} - ${tmp_followers}= BuiltIn.Create List @{old_followers} - Collections.Remove Values From List ${tmp_followers} ${old_owner} - ${tmp_follower}= Collections.Get From List ${tmp_followers} 0 - BuiltIn.Set Suite Variable ${active_member} ${tmp_follower} + ${active_member}= Collections.Get From List ${old_successors} 0 + BuiltIn.Set Suite Variable ${active_member} Isolate Controller From The Cluster ${old_owner} - ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event ${tmp_followers} BuiltIn.Set Test Variable ${isol_node} ${old_owner} + ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event ${old_successors} ${new_master}= BuiltIn.Wait Until Keyword Succeeds 10x 3s Verify New Master Controller Node ${switch_name} ${old_master} - ${owner} ${followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - Collections.List Should Contain Value ${old_followers} ${owner} - ${expected_controllers}= CompareStream.Set_Variable_If_At_Least_Boron 3 2 - BuiltIn.Wait Until Keyword Succeeds 10x 3s Check Count Integrity ${switch_name} expected_controllers=${expected_controllers} + ${owner} ${successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} ${old_successors} BuiltIn.Should Be Equal As Strings ${new_master} ${ODL_SYSTEM_${owner}_IP} BuiltIn.Set Suite Variable ${active_member} ${owner} BuiltIn.Set Test Variable ${old_owner} - BuiltIn.Set Test Variable ${old_followers} + BuiltIn.Set Test Variable ${old_successors} BuiltIn.Set Test Variable ${old_master} BuiltIn.Set Test Variable ${owner} BuiltIn.Set Test Variable ${new_master} @@ -124,45 +117,39 @@ Isolate Switchs Old Owner Rejoin Switchs Old Owner [Arguments] ${switch_name} Rejoin Controller To The Cluster ${old_owner} - ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event BuiltIn.Set Test Variable ${isol_node} ${Empty} - BuiltIn.Wait Until Keyword Succeeds 20x 3s Verify Follower Added ${switch_name} ${old_owner} - ${new_owner} ${new_followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - BuiltIn.Wait Until Keyword Succeeds 10x 3s Check Count Integrity ${switch_name} expected_controllers=3 + ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event + ${new_owner} ${new_successors}= BuiltIn.Wait Until Keyword Succeeds 6x 10s ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} + ... ${active_member} BuiltIn.Should Be Equal ${owner} ${new_owner} - Collections.List Should Contain Value ${new_followers} ${old_owner} -Isolate Switchs Candidate +Isolate Switchs Successor [Arguments] ${switch_name} - ${old_owner} ${old_followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - ${old_follower}= Collections.Get From List ${old_followers} 0 - ${old_slave}= BuiltIn.Set Variable ${ODL_SYSTEM_${old_follower}_IP} - ${tmp_members}= BuiltIn.Create List @{ClusterManagement__member_index_list} - Collections.Remove Values From List ${tmp_members} ${old_follower} - Isolate Controller From The Cluster ${old_follower} - ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event ${tmp_members} + ${old_owner} ${old_successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} + ${old_successor}= Collections.Get From List ${old_successors} 0 + ${old_slave}= BuiltIn.Set Variable ${ODL_SYSTEM_${old_successor}_IP} + Isolate Controller From The Cluster ${old_successor} BuiltIn.Set Test Variable ${isol_cntl} ${old_slave} - ${expected_controllers}= CompareStream.Set_Variable_If_At_Least_Boron 3 2 - BuiltIn.Wait Until Keyword Succeeds 10x 3s Check Count Integrity ${switch_name} expected_controllers=${expected_controllers} - ${owner} ${followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} + ${tmp_candidates}= BuiltIn.Create List @{ClusterManagement__member_index_list} + Collections.Remove Values From List ${tmp_candidates} ${old_successor} + ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event ${tmp_candidates} + ${owner} ${successors}= ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} ${active_member} ${tmp_candidates} BuiltIn.Should Be Equal ${owner} ${old_owner} BuiltIn.Should Be Equal As Strings ${new_master} ${ODL_SYSTEM_${owner}_IP} BuiltIn.Set Test Variable ${old_owner} - BuiltIn.Set Test Variable ${old_followers} - BuiltIn.Set Test Variable ${old_follower} + BuiltIn.Set Test Variable ${old_successors} + BuiltIn.Set Test Variable ${old_successor} BuiltIn.Set Test Variable ${old_slave} BuiltIn.Set Test Variable ${owner} -Rejoin Switchs Candidate +Rejoin Switchs Successor [Arguments] ${switch_name} - Rejoin Controller To The Cluster ${old_follower} - ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event - BuiltIn.Wait Until Keyword Succeeds 20x 3s Verify Follower Added ${switch_name} ${old_follower} + Rejoin Controller To The Cluster ${old_successor} BuiltIn.Set Test Variable ${isol_node} ${Empty} - BuiltIn.Wait Until Keyword Succeeds 10x 3s Check Count Integrity ${switch_name} expected_controllers=3 - ${new_owner} ${new_followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} + ClusterOpenFlow.Check OpenFlow Shards Status After Cluster Event + ${new_owner} ${new_successors}= BuiltIn.Wait Until Keyword Succeeds 6x 10s ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device openflow:${idx} + ... ${active_member} BuiltIn.Should Be Equal ${old_owner} ${new_owner} - Collections.List Should Contain Value ${new_followers} ${old_follower} Rejoin Controller To The Cluster [Arguments] ${isolated_node} @@ -174,14 +161,6 @@ Isolate Controller From The Cluster ClusterManagement.Isolate Member From List Or All ${isolated_node} [Teardown] SSHLibrary.Switch Connection ${mininet_conn_id} -Check Count Integrity - [Arguments] ${switch_name} ${expected_controllers}=3 - [Documentation] Every switch must have only one master and rest must be followers and together must be of expected nodes count - ${idx}= BuiltIn.Evaluate "${switch_name}"[1:] - ${owner} ${candidates}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - ${count}= BuiltIn.Get Length ${candidates} - BuiltIn.Should Be Equal As Numbers ${expected_controllers} ${count} - Check No Owners In Controller [Documentation] Check there is no owners in controllers ${session} = Resolve_Http_Session_For_Member member_index=${active_member} @@ -192,14 +171,7 @@ Verify New Master Controller Node [Arguments] ${switch_name} ${old_master} [Documentation] Checks if given node is different from actual master ${idx}= BuiltIn.Evaluate "${switch_name}"[1:] - ${owner} ${followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} + ${owner} ${successors}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} ${new_master} BuiltIn.Set Variable ${ODL_SYSTEM_${owner}_IP} BuiltIn.Should Not Be Equal ${old_master} ${new_master} Return From Keyword ${new_master} - -Verify Follower Added - [Arguments] ${switch_name} ${expected_node} - [Documentation] Checks if given node is in the list of active followers - ${idx}= BuiltIn.Evaluate "${switch_name}"[1:] - ${owner} ${followers}= ClusterManagement.Get Owner And Candidates For Device openflow:${idx} openflow ${active_member} - Collections.List Should Contain Value ${followers} ${expected_node} diff --git a/csit/testplans/openflowplugin-clustering-helium-redesign.txt b/csit/testplans/openflowplugin-clustering-helium-redesign.txt index e5461f60ba..7acdb5944d 100644 --- a/csit/testplans/openflowplugin-clustering-helium-redesign.txt +++ b/csit/testplans/openflowplugin-clustering-helium-redesign.txt @@ -5,9 +5,9 @@ integration/test/csit/suites/openflowplugin/Clustering/020__Cluster_HA_Leader_Fo integration/test/csit/suites/openflowplugin/Clustering/020__Cluster_HA_Leader_Follower_Failover.robot integration/test/csit/suites/openflowplugin/Clustering/030__Cluster_HA_Data_Recovery_Leader_Follower_Failover.robot integration/test/csit/suites/openflowplugin/Clustering/030__Cluster_HA_Data_Recovery_Leader_Follower_Failover.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/010_Switch_Disconnect.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/010_Switch_Disconnect.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/020_Cluster_Node_Failure.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/020_Cluster_Node_Failure.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/030_Cluster_Sync_Problems.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/030_Cluster_Sync_Problems.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/010_Switch_Disconnect.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/010_Switch_Disconnect.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/020_Cluster_Node_Failure.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/020_Cluster_Node_Failure.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot diff --git a/csit/testplans/openflowplugin-clustering-lithium-redesign.txt b/csit/testplans/openflowplugin-clustering-lithium-redesign.txt index e5461f60ba..7acdb5944d 100644 --- a/csit/testplans/openflowplugin-clustering-lithium-redesign.txt +++ b/csit/testplans/openflowplugin-clustering-lithium-redesign.txt @@ -5,9 +5,9 @@ integration/test/csit/suites/openflowplugin/Clustering/020__Cluster_HA_Leader_Fo integration/test/csit/suites/openflowplugin/Clustering/020__Cluster_HA_Leader_Follower_Failover.robot integration/test/csit/suites/openflowplugin/Clustering/030__Cluster_HA_Data_Recovery_Leader_Follower_Failover.robot integration/test/csit/suites/openflowplugin/Clustering/030__Cluster_HA_Data_Recovery_Leader_Follower_Failover.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/010_Switch_Disconnect.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/010_Switch_Disconnect.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/020_Cluster_Node_Failure.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/020_Cluster_Node_Failure.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/030_Cluster_Sync_Problems.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/030_Cluster_Sync_Problems.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/010_Switch_Disconnect.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/010_Switch_Disconnect.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/020_Cluster_Node_Failure.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/020_Cluster_Node_Failure.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot diff --git a/csit/testplans/openflowplugin-clustering.txt b/csit/testplans/openflowplugin-clustering.txt index 49aaa1bb92..f4f00488ff 100644 --- a/csit/testplans/openflowplugin-clustering.txt +++ b/csit/testplans/openflowplugin-clustering.txt @@ -5,10 +5,10 @@ integration/test/csit/suites/openflowplugin/Clustering/020__Cluster_HA_Leader_Fo integration/test/csit/suites/openflowplugin/Clustering/020__Cluster_HA_Leader_Follower_Failover.robot integration/test/csit/suites/openflowplugin/Clustering/030__Cluster_HA_Data_Recovery_Leader_Follower_Failover.robot integration/test/csit/suites/openflowplugin/Clustering/030__Cluster_HA_Data_Recovery_Leader_Follower_Failover.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/010_Switch_Disconnect.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/010_Switch_Disconnect.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/020_Cluster_Node_Failure.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/020_Cluster_Node_Failure.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/030_Cluster_Sync_Problems.robot -integration/test/csit/suites/openflowplugin/EntityOwhership/030_Cluster_Sync_Problems.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/010_Switch_Disconnect.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/010_Switch_Disconnect.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/020_Cluster_Node_Failure.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/020_Cluster_Node_Failure.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot +integration/test/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot -- 2.36.6