Switched to "Get|Put|Delete" from "[Get|Put|Delete]_Request"

The "Get_Request" command has a different format and the
format differs with different versions of Robot Framework.
The "Get" is deprecated but is the same across different
Robot Framework versions so to fix the problem the test was
switched to use "Get". The same is true for "Put_Request"
versus "Put" and "Delete_Request" versus "Delete".

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

diff --git a/test/csit/libraries/ConfigViaRestconf.robot b/test/csit/libraries/ConfigViaRestconf.robot
index 582f071efb6f20c385b9a88007f851165401d5d1..189d23e75b817ef06ff0f87f180084d2978dfa7c 100644 (file)
--- a/test/csit/libraries/ConfigViaRestconf.robot
+++ b/test/csit/libraries/ConfigViaRestconf.robot
@@ -81,7 +81,7 @@ Put_Xml_Config_Via_Restconf
     [Documentation]    Put XML data to given controller-config URI, check reponse text is empty and status_code is one of allowed ones.
     BuiltIn.Log    ${uri_part}
     BuiltIn.Log    ${xml_data}
-    ${response}=    RequestsLibrary.Put_Request    cvr_session    ${uri_part}    data=${xml_data}
+    ${response}=    RequestsLibrary.Put    cvr_session    ${uri_part}    data=${xml_data}
     BuiltIn.Log    ${response.text}
     BuiltIn.Log    ${response.status_code}
     BuiltIn.Should_Be_Empty    ${response.text}
@@ -91,7 +91,7 @@ Delete_Config_Via_Restconf
     [Arguments]    ${uri_part}
     [Documentation]    Delete resource at controller-config URI, check reponse text is empty and status_code is 204.
     BuiltIn.Log    ${uri_part}
-    ${response}=    RequestsLibrary.Delete_Request    cvr_session    ${uri_part}
+    ${response}=    RequestsLibrary.Delete    cvr_session    ${uri_part}
     BuiltIn.Log    ${response.text}
     BuiltIn.Should_Be_Empty    ${response.text}
     BuiltIn.Should_Contain    ${allowed_status_codes}    ${response.status_code}

diff --git a/test/csit/suites/bgpcep/bgpuser/cases.robot b/test/csit/suites/bgpcep/bgpuser/cases.robot
index ef38b66ec637920e1e6d9916f2bd48e08c4954f5..683770ab53850b32e8c90c7550566b818b8e5c2d 100644 (file)
--- a/test/csit/suites/bgpcep/bgpuser/cases.robot
+++ b/test/csit/suites/bgpcep/bgpuser/cases.robot
@@ -175,7 +175,7 @@ Compare_Topology
     [Arguments]    ${expected_normalized}    ${filename}
     [Documentation]    Get current example-ipv4-topology as json, normalize it, save to ${directory_for_actual_responses}.
     ...    Check that status code is 200, check that normalized jsons match exactly.
-    ${response}=    RequestsLibrary.Get_Request    ses    topology/example-ipv4-topology
+    ${response}=    RequestsLibrary.Get    ses    topology/example-ipv4-topology
     BuiltIn.Log    ${response.status_code}
     BuiltIn.Log    ${response.text}
     ${actual_normalized}=    Normalize_And_Save_Expected_Json    ${response.text}    ${filename}    ${directory_for_actual_responses}