Migrate a few Get Request invocations

We have warnings about needing to migrate, this patch addresses three of
such sources.

Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Change-Id: I0fbc37c62fd9a9900c6eb329cdfedce8755a4476

diff --git a/csit/libraries/BGPSpeaker.robot b/csit/libraries/BGPSpeaker.robot
index d8e284d56a77e535eebef21f11bf05cb47cfb517..f1a1d62a63c3c6bb8e9903130fc62e5e4d870dd4 100644 (file)
--- a/csit/libraries/BGPSpeaker.robot
+++ b/csit/libraries/BGPSpeaker.robot
@@ -65,8 +65,7 @@ Verify_BGP_Speaker_Connection
     ${exp_status_code}=    BuiltIn.Set_Variable_If    ${connected}    ${200}    ${404}
     ${url}=    BuiltIn.Set_Variable
     ...    ${REST_API}/bgp-rib:bgp-rib/rib=example-bgp-rib/peer=bgp:%2F%2F${ip}?content=nonconfig
-    ${response}=    RequestsLibrary.Get_Request    ${session}    ${url}
-    BuiltIn.Should_Be_Equal_As_Numbers    ${exp_status_code}    ${response.status_code}
+    ${response}=    RequestsLibrary.GET On Session    ${session}    ${url}    expected_status=${exp_status_code}
     RETURN    ${response.content}
 
 Start_BGP_Manager

diff --git a/csit/libraries/ChangeCounter.robot b/csit/libraries/ChangeCounter.robot
index 60f6ba38fb9fdcecfccfdf420e457cb7969fd313..5d082b17aaf34e6cc8ad7ee8d0b2e8df12d83459 100644 (file)
--- a/csit/libraries/ChangeCounter.robot
+++ b/csit/libraries/ChangeCounter.robot
@@ -34,11 +34,7 @@ CC_Setup
 Get_Change_Count
     [Documentation]    GET data change request, assert status 200, return the value.
     [Arguments]    ${session}=operational
-    ${response} =    RequestsLibrary.Get_Request    ${session}    ${CC_DATA_CHANGE_COUNTER_URL}
-    BuiltIn.Should_Be_Equal
-    ...    ${response.status_code}
-    ...    ${200}
-    ...    Got status: ${response.status_code} and message: ${response.text}
+    ${response} =    RequestsLibrary.GET On Session    ${session}    ${CC_DATA_CHANGE_COUNTER_URL}    expected_status=200
     # CompareStream.Set_Variable_If_At_Least_Else cannot be used direcly, because ${response.text}["data-change-counter"]["count"] would be
     # evaluated before the stream comparison and it causes failures
     BuiltIn.Log    ${response.text}

diff --git a/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot b/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot
index fdecc8dfb0dad1958fa0fb3a0d36180d6e0e801e..a856f23d9877f248dbf13bd819eae3c619184e1f 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot
+++ b/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot
@@ -137,9 +137,8 @@ Verify_Bgp_Peer_Connection
     # TODO:    This keyword is not specific to prefix counting. Find a better place for it.
     ${peer_check_url} =    BuiltIn.Set_Variable    ${REST_API}/bgp-rib:bgp-rib/rib=example-bgp-rib/peer=bgp:%2F%2F
     ${exp_status_code} =    BuiltIn.Set_Variable_If    ${connected}    ${200}    ${404}
-    ${rsp} =    RequestsLibrary.Get Request    ${session}    ${peer_check_url}${peer_ip}?content=nonconfig
+    ${rsp} =    RequestsLibrary.GET On Session    ${session}    ${peer_check_url}${peer_ip}?content=nonconfig    expected_status=${exp_status_code}
     BuiltIn.Log    ${rsp.content}
-    BuiltIn.Should_Be_Equal_As_Numbers    ${exp_status_code}    ${rsp.status_code}
 
 Set_Shard_Leaders_Location_And_Verify
     [Documentation]    Move default/topology config/operational shard location to local or remote node as requested