Migrate Get Requests invocations(libraries)

[integration/test.git] / csit / libraries / TemplatedRequests.robot

diff --git a/csit/libraries/TemplatedRequests.robot b/csit/libraries/TemplatedRequests.robot
index 67cb62ae3a8541c73b7ab8aa0117480129b013a6..73fc5ab08ac71a41180d16672dac2bc30e22d342 100644 (file)
--- a/csit/libraries/TemplatedRequests.robot
+++ b/csit/libraries/TemplatedRequests.robot
@@ -125,6 +125,7 @@ Resource            ${CURDIR}/../variables/Variables.robot
 ...                                 ${201}
 ...                                 ${204}
 ...                                 ${404}
+...                                 ${409}
 # List of integers, not strings. Used by both PUT and DELETE (if the resource should have been present).
 @{ALLOWED_STATUS_CODES}
 ...                                 ${200}
@@ -150,7 +151,7 @@ Create_Default_Session
     ...    This Keyword is in this Resource only so that user do not need to call RequestsLibrary directly.
     [Arguments]    ${url}=http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    ${auth}=${AUTH}    ${timeout}=${DEFAULT_TIMEOUT_HTTP}    ${max_retries}=0
     RequestsLibrary.Create_Session
-    ...    alias=default
+    ...    default
     ...    url=${url}
     ...    auth=${auth}
     ...    timeout=${timeout}
@@ -507,9 +508,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 +665,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}    url=${uri}    headers=${accept}
     ELSE
-        ${response} =    RequestsLibrary.Get_Request
-        ...    alias=${session}
-        ...    uri=${uri}
+        ${response} =    RequestsLibrary.Get_On_Session
+        ...    ${session}
+        ...    url=${uri}
         ...    headers=${accept}
         ...    timeout=${http_timeout}
     END
@@ -692,15 +693,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 +723,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}