Code Review / integration / test.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: fb32a7f)
Modify bgp cluster test to use ClusterManagement library 68/42868/4
authorLuis Gomez <ecelgp@gmail.com>
Mon, 1 Aug 2016 00:23:39 +0000 (17:23 -0700)
committerVratko Polák <vrpolak@cisco.com>
Tue, 2 Aug 2016 07:52:00 +0000 (07:52 +0000)
- Replace ClusterKeyword library KWs.

Change-Id: I719082784833df39983a6233cb6761a097721fda
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot patch | blob | history
csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot patch | blob | history
csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot patch | blob | history

diff --git a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot
index 00e97512807da6c1827068023d716f9f92ede37f..19c950be6988e6fee7c554224f1726f8a9ddfaf6 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot
+++ b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot
@@ -27,7 +27,7 @@ Resource          ${CURDIR}/../../../libraries/FailFast.robot
 Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
 Resource          ${CURDIR}/../../../libraries/PrefixCounting.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/ClusterKeywords.robot
+Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 
@@ -66,8 +66,7 @@ ${BGP_PEER_NAME}    example-bgp-peer
 
 *** Test Cases ***
 Get Default Operational Shard Leader
-    @{idx_list}=    BuiltIn.Create List    1    2    3
-    ${dos_leader}    ${dos_followers}=    ClusterKeywords.Get Cluster Shard Status    ${idx_list}    operational    default
+    ${dos_leader}    ${dos_followers}=    ClusterManagement.Get_Leader_And_Followers_For_Shard
     BuiltIn.Set Suite variable    ${dos_leader}    ${dos_leader}
     BuiltIn.Set Suite variable    ${default_oper_shard_leader_node_ip}    ${ODL_SYSTEM_${dos_leader}_IP}
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_${dos_leader}_IP}:${RESTCONFPORT}    auth=${AUTH}
@@ -200,6 +199,7 @@ Setup_Everything
     [Documentation]    Setup imported resources, SSH-login to tools system,
     ...    create HTTP session, put Python tool to tools system.
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
+    ClusterManagement.ClusterManagement_Setup
     RequestsLibrary.Create_Session    ${CONFIGURATION_1}    http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
     RequestsLibrary.Create_Session    ${CONFIGURATION_2}    http://${ODL_SYSTEM_2_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
     RequestsLibrary.Create_Session    ${CONFIGURATION_3}    http://${ODL_SYSTEM_3_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
@@ -219,16 +219,6 @@ Setup_Everything
     Builtin.Set_Suite_Variable    ${bgp_filling_timeout}    ${timeout}
     Builtin.Set_Suite_Variable    ${bgp_emptying_timeout}    ${bgp_filling_timeout*3.0/4}
     KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${KARAF_LOG_LEVEL}
-    ClusterKeywords.Create_Controller_Sessions
-    ${controller_list}=    ClusterKeywords.Get_Controller_List
-    Builtin.Set_Suite_Variable    ${controller_list}
-    BuiltIn.Log    ${controller_list}
-    ${default_shard_leader_node_ip}=    ClusterKeywords.Get_Leader_And_Verify    ${SHARD_DEFAULT_CONFIG}
-    Builtin.Set_Suite_Variable    ${default_shard_leader_node_ip}
-    BuiltIn.Log    ${default_shard_leader_node_ip}
-    ${default_shard_follower_nodes_ip}=    ClusterKeywords.Get_All_Followers    ${SHARD_DEFAULT_CONFIG}
-    Builtin.Set_Suite_Variable    ${default_shard_follower_nodes_ip}
-    BuiltIn.Log    ${default_shard_follower_nodes_ip}
 
 Teardown_Everything
     [Documentation]    Make sure Python tool was killed and tear down imported Resources.
diff --git a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot
index f3d8b6f3c0d1fcfc5922531addbe3f8ce45030c3..6417a8b09585764db97c73ae0d25546799d2bd7e 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot
@@ -27,7 +27,7 @@ Resource          ${CURDIR}/../../../libraries/FailFast.robot
 Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
 Resource          ${CURDIR}/../../../libraries/PrefixCounting.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/ClusterKeywords.robot
+Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 
@@ -66,8 +66,7 @@ ${BGP_PEER_NAME}    example-bgp-peer
 
 *** Test Cases ***
 Get Default Operational Shard Leader
-    @{idx_list}=    BuiltIn.Create List    1    2    3
-    ${dos_leader}    ${dos_followers}=    ClusterKeywords.Get Cluster Shard Status    ${idx_list}    operational    default
+    ${dos_leader}    ${dos_followers}=    ClusterManagement.Get_Leader_And_Followers_For_Shard
     BuiltIn.Set Suite variable    ${dos_leader}    ${dos_leader}
     BuiltIn.Set Suite variable    ${default_oper_shard_leader_node_ip}    ${ODL_SYSTEM_${dos_leader}_IP}
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_${dos_leader}_IP}:${RESTCONFPORT}    auth=${AUTH}
@@ -200,6 +199,7 @@ Setup_Everything
     [Documentation]    Setup imported resources, SSH-login to tools system,
     ...    create HTTP session, put Python tool to tools system.
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
+    ClusterManagement.ClusterManagement_Setup
     RequestsLibrary.Create_Session    ${CONFIGURATION_1}    http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
     RequestsLibrary.Create_Session    ${CONFIGURATION_2}    http://${ODL_SYSTEM_2_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
     RequestsLibrary.Create_Session    ${CONFIGURATION_3}    http://${ODL_SYSTEM_3_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
@@ -219,16 +219,6 @@ Setup_Everything
     Builtin.Set_Suite_Variable    ${bgp_filling_timeout}    ${timeout}
     Builtin.Set_Suite_Variable    ${bgp_emptying_timeout}    ${bgp_filling_timeout*3.0/4}
     KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${KARAF_LOG_LEVEL}
-    ClusterKeywords.Create_Controller_Sessions
-    ${controller_list}=    ClusterKeywords.Get_Controller_List
-    Builtin.Set_Suite_Variable    ${controller_list}
-    BuiltIn.Log    ${controller_list}
-    ${default_shard_leader_node_ip}=    ClusterKeywords.Get_Leader_And_Verify    ${SHARD_DEFAULT_CONFIG}
-    Builtin.Set_Suite_Variable    ${default_shard_leader_node_ip}
-    BuiltIn.Log    ${default_shard_leader_node_ip}
-    ${default_shard_follower_nodes_ip}=    ClusterKeywords.Get_All_Followers    ${SHARD_DEFAULT_CONFIG}
-    Builtin.Set_Suite_Variable    ${default_shard_follower_nodes_ip}
-    BuiltIn.Log    ${default_shard_follower_nodes_ip}
 
 Teardown_Everything
     [Documentation]    Make sure Python tool was killed and tear down imported Resources.
diff --git a/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot b/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot
index b61d8347e1444e0e966769959a188f0ac3bc9ee8..a1f1bbc4bc0bb1f1ce08600a87f25d895913d5dc 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot
@@ -27,7 +27,7 @@ Resource          ${CURDIR}/../../../libraries/FailFast.robot
 Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
 Resource          ${CURDIR}/../../../libraries/PrefixCounting.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/ClusterKeywords.robot
+Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 
@@ -66,8 +66,7 @@ ${BGP_PEER_NAME}    example-bgp-peer
 
 *** Test Cases ***
 Get Default Operational Shard Leader
-    @{idx_list}=    BuiltIn.Create List    1    2    3
-    ${dos_leader}    ${dos_followers}=    ClusterKeywords.Get Cluster Shard Status    ${idx_list}    operational    default
+    ${dos_leader}    ${dos_followers}=    ClusterManagement.Get_Leader_And_Followers_For_Shard
     BuiltIn.Set Suite variable    ${dos_leader}    ${dos_leader}
     BuiltIn.Set Suite variable    ${default_oper_shard_leader_node_ip}    ${ODL_SYSTEM_${dos_leader}_IP}
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_${dos_leader}_IP}:${RESTCONFPORT}    auth=${AUTH}
@@ -200,6 +199,7 @@ Setup_Everything
     [Documentation]    Setup imported resources, SSH-login to tools system,
     ...    create HTTP session, put Python tool to tools system.
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
+    ClusterManagement.ClusterManagement_Setup
     RequestsLibrary.Create_Session    ${CONFIGURATION_1}    http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
     RequestsLibrary.Create_Session    ${CONFIGURATION_2}    http://${ODL_SYSTEM_2_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
     RequestsLibrary.Create_Session    ${CONFIGURATION_3}    http://${ODL_SYSTEM_3_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
@@ -219,16 +219,6 @@ Setup_Everything
     Builtin.Set_Suite_Variable    ${bgp_filling_timeout}    ${timeout}
     Builtin.Set_Suite_Variable    ${bgp_emptying_timeout}    ${bgp_filling_timeout*3.0/4}
     KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${KARAF_LOG_LEVEL}
-    ClusterKeywords.Create_Controller_Sessions
-    ${controller_list}=    ClusterKeywords.Get_Controller_List
-    Builtin.Set_Suite_Variable    ${controller_list}
-    BuiltIn.Log    ${controller_list}
-    ${default_shard_leader_node_ip}=    ClusterKeywords.Get_Leader_And_Verify    ${SHARD_DEFAULT_CONFIG}
-    Builtin.Set_Suite_Variable    ${default_shard_leader_node_ip}
-    BuiltIn.Log    ${default_shard_leader_node_ip}
-    ${default_shard_follower_nodes_ip}=    ClusterKeywords.Get_All_Followers    ${SHARD_DEFAULT_CONFIG}
-    Builtin.Set_Suite_Variable    ${default_shard_follower_nodes_ip}
-    BuiltIn.Log    ${default_shard_follower_nodes_ip}
 
 Teardown_Everything
     [Documentation]    Make sure Python tool was killed and tear down imported Resources.
Integration test