Get rid of deprecation warnings

First patch to replace deprecated RequestsLibrary keywords
{Get,Put,Post,Put,Delete}_Request with {Get,Put,Post,Delete}_On_Session.

Signed-off-by: gvrangan <gvrangan@gmail.com>
Change-Id: I2402538bb11be2f93f4157bdbd0ec8280a7eba7e

diff --git a/csit/libraries/NetconfCallHome.robot b/csit/libraries/NetconfCallHome.robot
index af86f10ec5a268603854757ca4b3c51b1808651e..415f7cdae5ec96f5954b7e9171bc4661fc96105c 100644 (file)
--- a/csit/libraries/NetconfCallHome.robot
+++ b/csit/libraries/NetconfCallHome.robot
@@ -239,8 +239,8 @@ Test Teardown
     ...    return_stderr=True
     ...    return_rc=True
     SSHLibrary.Execute_Command    rm -rf ./configuration-files
-    ${resp}    RequestsLibrary.Delete_Request    session    ${whitelist}
-    ${resp}    RequestsLibrary.Delete_Request    session    ${netconf_keystore_data_url}
+    ${resp}    RequestsLibrary.Delete_On_Session    session    ${whitelist}
+    ${resp}    RequestsLibrary.Delete_On_Session    session    ${netconf_keystore_data_url}
 
 Suite Setup
     [Documentation]    Get the suite ready for callhome test cases.

diff --git a/csit/libraries/TemplatedRequests.robot b/csit/libraries/TemplatedRequests.robot
index 67cb62ae3a8541c73b7ab8aa0117480129b013a6..30b743a65c89e1ae548788ca62cb226a78cfda8f 100644 (file)
--- a/csit/libraries/TemplatedRequests.robot
+++ b/csit/libraries/TemplatedRequests.robot
@@ -507,9 +507,9 @@ Delete_From_Uri
     [Arguments]    ${uri}    ${session}=default    ${additional_allowed_status_codes}=${NO_STATUS_CODES}    ${http_timeout}=${EMPTY}
     BuiltIn.Log    ${uri}
     IF    """${http_timeout}""" == """${EMPTY}"""
-        ${response} =    RequestsLibrary.Delete_Request    alias=${session}    uri=${uri}
+        ${response} =    RequestsLibrary.Delete_On_Session    ${session}    ${uri}
     ELSE
-        ${response} =    RequestsLibrary.Delete_Request    alias=${session}    uri=${uri}    timeout=${http_timeout}
+        ${response} =    RequestsLibrary.Delete_On_Session    ${session}    ${uri}    timeout=${http_timeout}
     END
     Check_Status_Code    ${response}    additional_allowed_status_codes=${additional_allowed_status_codes}
     RETURN    ${response.text}
@@ -664,11 +664,11 @@ Get_From_Uri
     BuiltIn.Log    ${uri}
     BuiltIn.Log    ${accept}
     IF    """${http_timeout}""" == """${EMPTY}"""
-        ${response} =    RequestsLibrary.Get_Request    alias=${session}    uri=${uri}    headers=${accept}
+        ${response} =    RequestsLibrary.Get_On_Session    ${session}    ${uri}    headers=${accept}
     ELSE
-        ${response} =    RequestsLibrary.Get_Request
-        ...    alias=${session}
-        ...    uri=${uri}
+        ${response} =    RequestsLibrary.Get_On_Session
+        ...    ${session}
+        ...    ${uri}
         ...    headers=${accept}
         ...    timeout=${http_timeout}
     END
@@ -692,15 +692,15 @@ Put_To_Uri
     BuiltIn.Log    ${accept}
     ${headers} =    Join_Two_Headers    first=${content_type}    second=${accept}
     IF    """${http_timeout}""" == """${EMPTY}"""
-        ${response} =    RequestsLibrary.Put_Request
-        ...    alias=${session}
-        ...    uri=${uri}
+        ${response} =    RequestsLibrary.Put_On_Session
+        ...    ${session}
+        ...    ${uri}
         ...    data=${data}
         ...    headers=${headers}
     ELSE
-        ${response} =    RequestsLibrary.Put_Request
-        ...    alias=${session}
-        ...    uri=${uri}
+        ${response} =    RequestsLibrary.Put_On_Session
+        ...    ${session}
+        ...    ${uri}
         ...    data=${data}
         ...    headers=${headers}
         ...    timeout=${http_timeout}
@@ -722,15 +722,15 @@ Post_To_Uri
     BuiltIn.Log    ${accept}
     ${headers} =    Join_Two_Headers    first=${content_type}    second=${accept}
     IF    """${http_timeout}""" == """${EMPTY}"""
-        ${response} =    RequestsLibrary.Post_Request
-        ...    alias=${session}
-        ...    uri=${uri}
+        ${response} =    RequestsLibrary.Post_On_Session
+        ...    ${session}
+        ...    ${uri}
         ...    data=${data}
         ...    headers=${headers}
     ELSE
-        ${response} =    RequestsLibrary.Post_Request
-        ...    alias=${session}
-        ...    uri=${uri}
+        ${response} =    RequestsLibrary.Post_On_Session
+        ...    ${session}
+        ...    ${uri}
         ...    data=${data}
         ...    headers=${headers}
         ...    timeout=${http_timeout}

diff --git a/csit/libraries/Utils.robot b/csit/libraries/Utils.robot
index f9b8139bde85aefb7bce7ff77a3df274c22289b7..914fc47ef79144b543ef803dc7fed891e5b417ce 100644 (file)
--- a/csit/libraries/Utils.robot
+++ b/csit/libraries/Utils.robot
@@ -94,7 +94,7 @@ Check Nodes Stats
     [Documentation]    A GET on the /node/${node} API is made and specific flow stat
     ...    strings are checked for existence.
     [Arguments]    ${node}    ${session}=session
-    ${resp}=    RequestsLibrary.Get Request
+    ${resp}=    RequestsLibrary.Get On Session
     ...    ${session}
     ...    ${RFC8040_NODES_API}/node=${node}?${RFC8040_OPERATIONAL_CONTENT}
     Should Be Equal As Strings    ${resp.status_code}    200
@@ -105,7 +105,7 @@ Check For Specific Number Of Elements At URI
     [Documentation]    A GET is made to the specified ${URI} and the specific count of a
     ...    given element is done (as supplied by ${element} and ${expected_count})
     [Arguments]    ${uri}    ${element}    ${expected_count}    ${session}=session
-    ${resp}=    RequestsLibrary.Get Request    ${session}    ${uri}
+    ${resp}=    RequestsLibrary.Get On Session    ${session}    ${uri}
     Log    ${resp.text}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain X Times    ${resp.text}    ${element}    ${expected_count}
@@ -124,7 +124,7 @@ Check For Elements At URI
     [Documentation]    A GET is made at the supplied ${URI} and every item in the list of
     ...    ${elements} is verified to exist in the response
     [Arguments]    ${uri}    ${elements}    ${session}=session    ${pretty_print_json}=False
-    ${resp}=    RequestsLibrary.Get Request    ${session}    ${uri}
+    ${resp}=    RequestsLibrary.Get On Session    ${session}    ${uri}
     IF    "${pretty_print_json}" == "True"
         Log Content    ${resp.text}
     ELSE
@@ -141,7 +141,7 @@ Check For Elements Not At URI
     ...    return of 404 is treated as empty list. From Neon onwards, an empty list is always
     ...    returned as null, giving 404 on rest call.
     [Arguments]    ${uri}    ${elements}    ${session}=session    ${pretty_print_json}=False    ${check_for_null}=False
-    ${resp}=    RequestsLibrary.Get Request    ${session}    ${uri}
+    ${resp}=    RequestsLibrary.Get On Session    ${session}    ${uri}
     IF    "${pretty_print_json}" == "True"
         Log Content    ${resp.text}
     ELSE
@@ -364,26 +364,26 @@ Concatenate the String
 Post Elements To URI
     [Documentation]    Perform a POST rest operation, using the URL and data provided
     [Arguments]    ${rest_uri}    ${data}    ${headers}=${headers}    ${session}=session
-    ${resp}=    RequestsLibrary.Post Request    ${session}    ${rest_uri}    data=${data}    headers=${headers}
+    ${resp}=    RequestsLibrary.Post On Session    ${session}    ${rest_uri}    data=${data}    headers=${headers}
     Log    ${resp.text}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
 
 Remove All Elements At URI
     [Arguments]    ${uri}    ${session}=session
-    ${resp}=    RequestsLibrary.Delete Request    ${session}    ${uri}
+    ${resp}=    RequestsLibrary.Delete On Session    ${session}    ${uri}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
 
 Remove All Elements At URI And Verify
     [Arguments]    ${uri}    ${session}=session
-    ${resp}=    RequestsLibrary.Delete Request    ${session}    ${uri}
+    ${resp}=    RequestsLibrary.Delete On Session    ${session}    ${uri}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
-    ${resp}=    RequestsLibrary.Get Request    ${session}    ${uri}
+    ${resp}=    RequestsLibrary.Get On Session    ${session}    ${uri}
     Should Contain    ${DELETED_STATUS_CODES}    ${resp.status_code}
 
 Remove All Elements If Exist
     [Documentation]    Delete all elements from an URI if the configuration was not empty
     [Arguments]    ${uri}    ${session}=session
-    ${resp}=    RequestsLibrary.Get Request    ${session}    ${uri}
+    ${resp}=    RequestsLibrary.Get On Session    ${session}    ${uri}
     IF    '${resp.status_code}'!='404' and '${resp.status_code}'!='409'
         Remove All Elements At URI    ${uri}    ${session}
     END
@@ -392,7 +392,7 @@ Add Elements To URI From File
     [Documentation]    Put data from a file to a URI
     [Arguments]    ${dest_uri}    ${data_file}    ${headers}=${headers}    ${session}=session
     ${body}=    OperatingSystem.Get File    ${data_file}
-    ${resp}=    RequestsLibrary.Put Request    ${session}    ${dest_uri}    data=${body}    headers=${headers}
+    ${resp}=    RequestsLibrary.Put On Session    ${session}    ${dest_uri}    data=${body}    headers=${headers}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
 
 Add Elements To URI From File And Verify
@@ -404,9 +404,9 @@ Add Elements To URI From File And Verify
 Add Elements To URI And Verify
     [Documentation]    Put data to a URI and verify the HTTP response
     [Arguments]    ${dest_uri}    ${data}    ${headers}=${headers}    ${session}=session
-    ${resp}=    RequestsLibrary.Put Request    ${session}    ${dest_uri}    ${data}    headers=${headers}
+    ${resp}=    RequestsLibrary.Put On Session    ${session}    ${dest_uri}    ${data}    headers=${headers}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
-    ${resp}=    RequestsLibrary.Get Request    ${session}    ${dest_uri}
+    ${resp}=    RequestsLibrary.Get On Session    ${session}    ${dest_uri}
     Should Not Contain    ${DELETED_STATUS_CODES}    ${resp.status_code}
 
 Add Elements To URI From File And Check Validation Error
@@ -414,7 +414,7 @@ Add Elements To URI From File And Check Validation Error
     [Arguments]    ${dest_uri}    ${data_file}    ${headers}=${headers}    ${session}=session
     BuiltIn.Comment    TODO: Does this have any benefits, considering TemplatedRequests can also do this in one line?
     ${body}=    OperatingSystem.Get File    ${data_file}
-    ${resp}=    RequestsLibrary.Put Request    ${session}    ${dest_uri}    data=${body}    headers=${headers}
+    ${resp}=    RequestsLibrary.Put On Session    ${session}    ${dest_uri}    data=${body}    headers=${headers}
     Should Contain    ${DATA_VALIDATION_ERROR}    ${resp.status_code}
 
 Add Elements To URI From File And Check Server Error
@@ -423,13 +423,13 @@ Add Elements To URI From File And Check Server Error
     [Arguments]    ${dest_uri}    ${data_file}    ${headers}=${headers}    ${session}=session
     BuiltIn.Comment    TODO: Does this have any benefits, considering TemplatedRequests can also do this in one line?
     ${body}=    OperatingSystem.Get File    ${data_file}
-    ${resp}=    RequestsLibrary.Put Request    ${session}    ${dest_uri}    data=${body}    headers=${headers}
+    ${resp}=    RequestsLibrary.Put On Session    ${session}    ${dest_uri}    data=${body}    headers=${headers}
     Should Contain    ${INTERNAL_SERVER_ERROR}    ${resp.status_code}
 
 Post Elements To URI From File
     [Arguments]    ${dest_uri}    ${data_file}    ${headers}=${headers}    ${session}=session
     ${body}=    OperatingSystem.Get File    ${data_file}
-    ${resp}=    RequestsLibrary.Post Request    ${session}    ${dest_uri}    data=${body}    headers=${headers}
+    ${resp}=    RequestsLibrary.Post On Session    ${session}    ${dest_uri}    data=${body}    headers=${headers}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
 
 Run Process With Logging And Status Check
@@ -442,31 +442,31 @@ Run Process With Logging And Status Check
     RETURN    ${result}
 
 Get Data From URI
-    [Documentation]    Issue a GET request and return the data obtained or on error log the error and fail.
-    ...    Issues a GET request for ${uri} in ${session} using headers from
+    [Documentation]    Issue a Get On Session and return the data obtained or on error log the error and fail.
+    ...    Issues a Get On Session for ${uri} in ${session} using headers from
     ...    ${headers}. If the request returns a HTTP error, fails. Otherwise
     ...    returns the data obtained by the request.
     [Arguments]    ${session}    ${uri}    ${headers}=${NONE}
-    ${resp}=    RequestsLibrary.Get Request    ${session}    ${uri}    ${headers}
+    ${resp}=    RequestsLibrary.Get On Session    ${session}    ${uri}    ${headers}
     IF    ${resp.status_code} == 200    RETURN    ${resp.text}
     Builtin.Log    ${resp.text}
     Builtin.Fail    The request failed with code ${resp.status_code}
 
 Get URI And Verify
-    [Documentation]    Issue a GET request and verify a successfull HTTP return.
-    ...    Issues a GET request for ${uri} in ${session} using headers from ${headers}.
+    [Documentation]    Issue a Get On Session and verify a successfull HTTP return.
+    ...    Issues a Get On Session for ${uri} in ${session} using headers from ${headers}.
     [Arguments]    ${uri}    ${session}=session    ${headers}=${NONE}
-    ${resp}=    RequestsLibrary.Get Request    ${session}    ${uri}    ${headers}
+    ${resp}=    RequestsLibrary.Get On Session    ${session}    ${uri}    ${headers}
     Builtin.Log    ${resp.status_code}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
 
 No Content From URI
-    [Documentation]    Issue a GET request and return on error 404 (No content) or will fail and log the content.
-    ...    Issues a GET request for ${uri} in ${session} using headers from
+    [Documentation]    Issue a Get On Session and return on error 404 (No content) or will fail and log the content.
+    ...    Issues a Get On Session for ${uri} in ${session} using headers from
     ...    ${headers}. If the request returns a HTTP error, fails. Otherwise
     ...    returns the data obtained by the request.
     [Arguments]    ${session}    ${uri}    ${headers}=${NONE}
-    ${resp}=    RequestsLibrary.Get Request    ${session}    ${uri}    ${headers}
+    ${resp}=    RequestsLibrary.Get On Session    ${session}    ${uri}    ${headers}     expected_status=409
     IF    ${resp.status_code} == 404 or ${resp.status_code} == 409    RETURN
     Builtin.Log    ${resp.text}
     Builtin.Fail    The request failed with code ${resp.status_code}
@@ -494,7 +494,7 @@ Check Item Occurrence
 Post Log Check
     [Documentation]    Post body to ${uri}, log response content, and check status
     [Arguments]    ${uri}    ${body}    ${session}=session    ${status_codes}=200
-    ${resp}=    RequestsLibrary.Post Request    ${session}    ${uri}    ${body}
+    ${resp}=    RequestsLibrary.Post On Session    ${session}    ${uri}    ${body}
     Log    ${resp.text}
     TemplatedRequests.Check Status Code    ${resp}    ${status_codes}
     RETURN    ${resp}
@@ -658,7 +658,7 @@ Check Diagstatus
     ...    By default, this keyword will pass if the status code returned is 200, and fail otherwise.
     [Arguments]    ${ip_address}=${ODL_SYSTEM_IP}    ${check_status}=True    ${expected_status}=${200}
     RequestsLibrary.Create Session    diagstatus_session    http://${ip_address}:${RESTCONFPORT}
-    ${resp}=    RequestsLibrary.Get Request    diagstatus_session    /diagstatus
+    ${resp}=    RequestsLibrary.Get On Session    diagstatus_session    /diagstatus
     IF    "${check_status}" == "True"
         BuiltIn.Should Be Equal As Strings    ${resp.status_code}    ${expected_status}
     END

diff --git a/csit/suites/netconf/KeyAuth/keyauth.robot b/csit/suites/netconf/KeyAuth/keyauth.robot
index e24c8bca1260d3513c3e75b19568cc90cd4e8c99..c9644ef046c161334c4637536e658a062eb48daa 100644 (file)
--- a/csit/suites/netconf/KeyAuth/keyauth.robot
+++ b/csit/suites/netconf/KeyAuth/keyauth.robot
@@ -108,7 +108,7 @@ Restart Controller
 
 Get Controller Modules
     [Documentation]    Get the restconf modules, check 200 status and ietf-restconf presence
-    ${resp}=    RequestsLibrary.Get_Request    default    ${MODULES_API}
+    ${resp}=    RequestsLibrary.Get_On_Session    default    ${MODULES_API}
     BuiltIn.Log    ${resp.content}
     BuiltIn.Should_Be_Equal    ${resp.status_code}    ${200}
     BuiltIn.Should_Contain    ${resp.content}    ietf-restconf

diff --git a/csit/suites/netconf/notifications/notifications_basic.robot b/csit/suites/netconf/notifications/notifications_basic.robot
index ed9c289209dda00995211b0736597b8ae7ef04e0..e4a51514b257ce261adebef5a993e72f335015c8 100644 (file)
--- a/csit/suites/netconf/notifications/notifications_basic.robot
+++ b/csit/suites/netconf/notifications/notifications_basic.robot
@@ -68,7 +68,7 @@ Create_DCN_Stream
     Comment    Create DCN subscription
     ${body} =    OperatingSystem.Get_File    ${TEMPLATE_FOLDER}/${RESTCONF_SUBSCRIBE_DATA}
     ${uri} =    Restconf.Generate URI    sal-remote:create-data-change-event-subscription    rpc
-    ${resp} =    RequestsLibrary.Post_Request
+    ${resp} =    RequestsLibrary.Post_On_Session
     ...    restconf
     ...    ${uri}
     ...    headers=${SEND_ACCEPT_XML_HEADERS}
@@ -80,7 +80,7 @@ Subscribe_To_DCN_Stream
     [Documentation]    Subscribe to DCN streams.
     [Tags]    critical
     ${uri} =    Set Variable If    "${USE_RFC8040}" == "False"    ${DRAFT_DCN_STREAM_URI}    ${RFC8040_DCN_STREAM_URI}
-    ${resp} =    RequestsLibrary.Get_Request    restconf    ${uri}    headers=${SEND_ACCEPT_XML_HEADERS}
+    ${resp} =    RequestsLibrary.Get_On_Session    restconf    ${uri}    headers=${SEND_ACCEPT_XML_HEADERS}
     Log_Response    ${resp}
     BuiltIn.Should_Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     ${location} =    XML.Get_Element_Text    ${resp.content}
@@ -96,7 +96,7 @@ List_DCN_Streams
     ...    "${USE_RFC8040}" == "False"
     ...    ${DRAFT_STREAMS_URI}
     ...    ${RFC8040_STREAMS_URI}
-    ${resp} =    RequestsLibrary.Get_Request    restconf    ${uri}    headers=${SEND_ACCEPT_XML_HEADERS}
+    ${resp} =    RequestsLibrary.Get_On_Session    restconf    ${uri}    headers=${SEND_ACCEPT_XML_HEADERS}
     Log_Response    ${resp}
     BuiltIn.Should_Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     Comment    Stream only shows in RFC URL.
@@ -124,7 +124,7 @@ Change_DS_Config
     ...    "${USE_RFC8040}" == "False"
     ...    /restconf/config/network-topology:network-topology
     ...    /rests/data/network-topology:network-topology
-    ${resp} =    RequestsLibrary.Put_Request
+    ${resp} =    RequestsLibrary.Put_On_Session
     ...    restconf
     ...    ${uri}
     ...    headers=${SEND_ACCEPT_XML_HEADERS}
@@ -135,7 +135,7 @@ Change_DS_Config
     ...    "${USE_RFC8040}" == "False"
     ...    /restconf/config/network-topology:network-topology/topology/netconf-notif
     ...    /rests/data/network-topology:network-topology/topology=netconf-notif
-    ${resp} =    RequestsLibrary.Delete_Request    restconf    ${uri}    headers=${SEND_ACCEPT_XML_HEADERS}
+    ${resp} =    RequestsLibrary.Delete_On_Session    restconf    ${uri}    headers=${SEND_ACCEPT_XML_HEADERS}
     Log_Response    ${resp}
     BuiltIn.Should_Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
 

diff --git a/csit/suites/netconf/ready/netconfready.robot b/csit/suites/netconf/ready/netconfready.robot
index f443256d0bbfb93ee48aad0a7ce8b83e730b4c7e..0ff14f34170bd9e4cc24a0fbcb9ba9e1f2b0d66a 100644 (file)
--- a/csit/suites/netconf/ready/netconfready.robot
+++ b/csit/suites/netconf/ready/netconfready.robot
@@ -237,7 +237,7 @@ Wait_Netconf_Device_Mounted
 Check_Netconf_Up_And_Running
     [Documentation]    Make a request to netconf connector's list of mounted devices and check that the request was successful.
     [Arguments]    ${pretty_print}=${EMPTY}
-    ${response}=    RequestsLibrary.Get_Request
+    ${response}=    RequestsLibrary.Get_On_Session
     ...    ses
     ...    rests/data/network-topology:network-topology/topology\=topology-netconf${netconf_connector}${pretty_print}
     BuiltIn.Log    ${response.text}