Code Review
/
integration
/
test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Migrate Get Requests invocations(libraries)
[integration/test.git]
/
csit
/
libraries
/
Utils.robot
diff --git
a/csit/libraries/Utils.robot
b/csit/libraries/Utils.robot
index 449b9a1d39abaff4d0d12070f8b080bdd5df727e..17077d466caa6c10a471b7f0a5d0a631a42732d5 100644
(file)
--- a/
csit/libraries/Utils.robot
+++ b/
csit/libraries/Utils.robot
@@
-114,7
+114,9
@@
Check For Specific Number Of Elements At URI
Log Content
[Arguments] ${resp_content}
IF '''${resp_content}''' != '${EMPTY}'
Log Content
[Arguments] ${resp_content}
IF '''${resp_content}''' != '${EMPTY}'
- ${resp_json}= RequestsLibrary.To Json ${resp_content} pretty_print=True
+ ${resp_json}= BuiltIn.Evaluate
+ ... json.dumps(json.loads('''${resp_content}'''), sort_keys=True, indent=4, separators=(',', ': '))
+ ... modules=json
ELSE
${resp_json}= BuiltIn.Set Variable ${EMPTY}
END
ELSE
${resp_json}= BuiltIn.Set Variable ${EMPTY}
END
@@
-176,7
+178,7
@@
Clean Up Ovs
Extract Value From Content
[Documentation] Will take the given response content and return the value at the given index as a string
[Arguments] ${content} ${index}
Extract Value From Content
[Documentation] Will take the given response content and return the value at the given index as a string
[Arguments] ${content} ${index}
- ${JSON}=
Evaluate json.loads('''${content}''')
json
+ ${JSON}=
BuiltIn.Evaluate json.loads('''${content}''') modules=
json
${value}= Set Variable ${JSON${index}}
RETURN ${value}
${value}= Set Variable ${JSON${index}}
RETURN ${value}
@@
-365,18
+367,18
@@
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
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 On Session ${session} ${rest_uri} data=${data} headers=${headers}
+ ${resp}= RequestsLibrary.Post On Session ${session}
url=
${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
Log ${resp.text}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
Remove All Elements At URI
[Arguments] ${uri} ${session}=session
- ${resp}= RequestsLibrary.Delete On Session ${session} ${uri}
+ ${resp}= RequestsLibrary.Delete On Session ${session}
url=
${uri}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
Remove All Elements At URI And Verify
[Arguments] ${uri} ${session}=session
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
Remove All Elements At URI And Verify
[Arguments] ${uri} ${session}=session
- ${resp}= RequestsLibrary.Delete On Session ${session} ${uri}
+ ${resp}= RequestsLibrary.Delete On Session ${session}
url=
${uri}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
${resp}= RequestsLibrary.Get On Session ${session} url=${uri}
Should Contain ${DELETED_STATUS_CODES} ${resp.status_code}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
${resp}= RequestsLibrary.Get On Session ${session} url=${uri}
Should Contain ${DELETED_STATUS_CODES} ${resp.status_code}
@@
-393,7
+395,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}
[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 On Session ${session} ${dest_uri} data=${body} headers=${headers}
+ ${resp}= RequestsLibrary.Put On Session ${session}
url=
${dest_uri} data=${body} headers=${headers}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
Add Elements To URI From File And Verify
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
Add Elements To URI From File And Verify
@@
-405,7
+407,7
@@
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
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 On Session ${session} ${dest_uri} ${data} headers=${headers}
+ ${resp}= RequestsLibrary.Put On Session ${session}
url=
${dest_uri} ${data} headers=${headers}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
${resp}= RequestsLibrary.Get On Session ${session} url=${dest_uri}
Should Not Contain ${DELETED_STATUS_CODES} ${resp.status_code}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
${resp}= RequestsLibrary.Get On Session ${session} url=${dest_uri}
Should Not Contain ${DELETED_STATUS_CODES} ${resp.status_code}
@@
-415,7
+417,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}
[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 On Session ${session} ${dest_uri} data=${body} headers=${headers}
+ ${resp}= RequestsLibrary.Put On Session ${session}
url=
${dest_uri} data=${body} headers=${headers}
Should Contain ${DATA_VALIDATION_ERROR} ${resp.status_code}
Add Elements To URI From File And Check Server Error
Should Contain ${DATA_VALIDATION_ERROR} ${resp.status_code}
Add Elements To URI From File And Check Server Error
@@
-424,13
+426,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}
[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 On Session ${session} ${dest_uri} data=${body} headers=${headers}
+ ${resp}= RequestsLibrary.Put On Session ${session}
url=
${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}
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 On Session ${session} ${dest_uri} data=${body} headers=${headers}
+ ${resp}= RequestsLibrary.Post On Session ${session}
url=
${dest_uri} data=${body} headers=${headers}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
Run Process With Logging And Status Check
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
Run Process With Logging And Status Check
@@
-467,7
+469,11
@@
No Content From URI
... ${headers}. If the request returns a HTTP error, fails. Otherwise
... returns the data obtained by the request.
[Arguments] ${session} ${uri} ${headers}=${NONE}
... ${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 On Session ${session} url=${uri} expected_status=any headers=${headers}
+ ${resp}= RequestsLibrary.Get On Session
+ ... ${session}
+ ... url=${uri}
+ ... headers=${headers}
+ ... expected_status=anything
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}
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}
@@
-495,7
+501,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
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 On Session ${session}
${uri}
${body}
+ ${resp}= RequestsLibrary.Post On Session ${session}
url=${uri} data=
${body}
Log ${resp.text}
TemplatedRequests.Check Status Code ${resp} ${status_codes}
RETURN ${resp}
Log ${resp.text}
TemplatedRequests.Check Status Code ${resp} ${status_codes}
RETURN ${resp}