Code Review / integration / test.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 1feeb85)
Migrate request invocations (aaa) 14/111114/9
authorYaroslav Lastivka <yaroslav.lastivka@pantheon.tech>
Wed, 27 Mar 2024 16:38:58 +0000 (18:38 +0200)
committerSangwook Ha <sangwook.ha@verizon.com>
Fri, 29 Mar 2024 16:00:03 +0000 (09:00 -0700)
The '* Request' RequestsLibrary keyword has been deprecated.
'* Request' keywords have been replaced by '* On Session'.

JIRA: INTTEST-141
Change-Id: I00b92feced48fae4bc40ada42795d48f51e60df7
Signed-off-by: Yaroslav Lastivka <yaroslav.lastivka@pantheon.tech>
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
csit/libraries/AAAKeywords.robot patch | blob | history
csit/suites/aaa/authn/Restconf_Basic_Auth.robot patch | blob | history
csit/suites/aaa/keystone/010__keystone_authn.robot patch | blob | history
csit/suites/aaa/tls/010__aaa_restconf_tls.robot patch | blob | history

diff --git a/csit/libraries/AAAKeywords.robot b/csit/libraries/AAAKeywords.robot
index 9735f5b2c4031e2926593bfc302d49800a1835a9..33e56505ecbe8015f4d3a1f18080024520bb0fac 100644 (file)
--- a/csit/libraries/AAAKeywords.robot
+++ b/csit/libraries/AAAKeywords.robot
@@ -87,8 +87,8 @@ Get User From IDM DB
     [Arguments]    ${user_id}=${EMPTY}
     Create Session    httpbin    http://${ODL_SYSTEM_IP}:${RESTPORT}
     ${headers}=    Create Dictionary    Content-Type=application/x-www-form-urlencoded
-    ${resp}=    RequestsLibrary.GET Request    httpbin    ${idmurl}/users/${user_id}    headers=${headers}
-    Should Be Equal As Strings    ${resp.status_code}    200
+    ${resp}=    RequestsLibrary.GET On Session    httpbin    url=${idmurl}/users/${user_id}    headers=${headers}
+    ...    expected_status=200
     Log    ${resp.text}
     RETURN    ${resp}
 
diff --git a/csit/suites/aaa/authn/Restconf_Basic_Auth.robot b/csit/suites/aaa/authn/Restconf_Basic_Auth.robot
index ce29321cce01daa2c6a4cf5526b5b902a8df165c..85c701ae42bfcddcccbfdff58520be090768ff24 100644 (file)
--- a/csit/suites/aaa/authn/Restconf_Basic_Auth.robot
+++ b/csit/suites/aaa/authn/Restconf_Basic_Auth.robot
@@ -71,8 +71,7 @@ IDM Endpoints Only Available To admin Role
     [Documentation]    A user with a non-"admin" role should not have access to AAA endpoints
     ${auth} =    Create List    ${USER_USER}    ${USER_PW}
     Create Session    httpbin    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${auth}    headers=${HEADERS}
-    ${resp} =    RequestsLibrary.Get Request    httpbin    ${USERS_REST_URL}
-    Should Be Equal As Numbers    ${resp.status_code}    401
+    ${resp} =    RequestsLibrary.GET On Session    httpbin    url=${USERS_REST_URL}    expected_status=401
 
 
 *** Keywords ***
@@ -81,8 +80,7 @@ Auth Should Fail
     [Arguments]    ${url}    ${user}    ${password}
     @{auth} =    Create List    ${user}    ${password}
     Create Session    httpbin    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${auth}    headers=${HEADERS}
-    ${resp} =    RequestsLibrary.Get Request    httpbin    ${url}
-    Should Be Equal As Strings    ${resp.status_code}    401
+    ${resp} =    RequestsLibrary.GET On Session    httpbin    url=${url}    expected_status=401
     ${header_value} =    Convert To Uppercase    ${resp.headers}[www-authenticate]
     Should Contain    ${header_value}    BASIC
     Log    ${resp.content}
@@ -92,5 +90,4 @@ Auth Should Pass
     [Arguments]    ${url}    ${user}    ${password}
     @{auth} =    Create List    ${user}    ${password}
     Create Session    httpbin    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${auth}    headers=${HEADERS}
-    ${resp} =    RequestsLibrary.Get Request    httpbin    ${url}
-    Should Be Equal As Strings    ${resp.status_code}    200
+    ${resp} =    RequestsLibrary.GET On Session    httpbin    url=${url}    expected_status=200
diff --git a/csit/suites/aaa/keystone/010__keystone_authn.robot b/csit/suites/aaa/keystone/010__keystone_authn.robot
index 7977a2d9afa2097fc26638971d55b074b31446ba..3927d727a7eae3b69716a612a7741f8735b5c630 100644 (file)
--- a/csit/suites/aaa/keystone/010__keystone_authn.robot
+++ b/csit/suites/aaa/keystone/010__keystone_authn.robot
@@ -48,9 +48,11 @@ Successful Authentication Including Domain
     ...    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
     ...    auth=${AUTH_SDN_DOMAIN}
     ...    headers=${HEADERS}
-    ${resp}    RequestsLibrary.Post Request    session    ${URI_CERTIFICATE}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.POST On Session    session    url=${URI_CERTIFICATE}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
-    ${resp}    RequestsLibrary.Get Request    session    ${URI_RESTCONF}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.GET On Session    session    url=${URI_RESTCONF}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
 
 Successful Authentication Without Domain
@@ -67,9 +69,11 @@ Successful Authentication Without Domain
     ...
     ...    - URL "/restconf/operational/ietf-restconf-monitoring:restconf-state" is not specified neither in shiro.ini nor in MDSAL Dynamic Authorization so no specific role is required
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH_CSC_SDN}    headers=${HEADERS}
-    ${resp}    RequestsLibrary.Post Request    session    ${URI_CERTIFICATE}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.POST On Session    session    url=${URI_CERTIFICATE}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
-    ${resp}    RequestsLibrary.Get Request    session    ${URI_RESTCONF}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.GET On Session    session    url=${URI_RESTCONF}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
 
 Unsuccessful Authentication Wrong User
@@ -84,9 +88,11 @@ Unsuccessful Authentication Wrong User
     ...
     ...    Due to authentication fails, authorization is not evaluated
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH_INVALID}    headers=${HEADERS}
-    ${resp}    RequestsLibrary.Post Request    session    ${URI_CERTIFICATE}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.POST On Session    session    url=${URI_CERTIFICATE}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp.status_code}
-    ${resp}    RequestsLibrary.Get Request    session    ${URI_RESTCONF}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.GET On Session    session    url=${URI_RESTCONF}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp.status_code}
 
 UnSuccessful Authentication Without Domain
@@ -102,9 +108,11 @@ UnSuccessful Authentication Without Domain
     ...
     ...    Due to authentication fails, authorization is not evaluated
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH_SDN}    headers=${HEADERS}
-    ${resp}    RequestsLibrary.Post Request    session    ${URI_CERTIFICATE}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.POST On Session    session    url=${URI_CERTIFICATE}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp.status_code}
-    ${resp}    RequestsLibrary.Get Request    session    ${URI_RESTCONF}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.GET On Session    session    url=${URI_RESTCONF}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp.status_code}
 
 Unsuccessful Authentication Wrong Domain
@@ -125,9 +133,11 @@ Unsuccessful Authentication Wrong Domain
     ...    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
     ...    auth=${AUTH_SDN_WRONG_DOM}
     ...    headers=${HEADERS}
-    ${resp}    RequestsLibrary.Post Request    session    ${URI_CERTIFICATE}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.POST On Session    session    url=${URI_CERTIFICATE}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp.status_code}
-    ${resp}    RequestsLibrary.Get Request    session    ${URI_RESTCONF}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.GET On Session    session    url=${URI_RESTCONF}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp.status_code}
 
 Unsuccessful Basic Authorization
@@ -146,9 +156,11 @@ Unsuccessful Basic Authorization
     ...    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
     ...    auth=${AUTH_CSC_NO_ADMIN}
     ...    headers=${HEADERS}
-    ${resp_ok}    RequestsLibrary.Get Request    session    ${URI_RESTCONF}    headers=${HEADERS}
+    ${resp_ok}    RequestsLibrary.GET On Session    session    url=${URI_RESTCONF}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp_ok.status_code}
-    ${resp_nook}    RequestsLibrary.Post Request    session    ${URI_CERTIFICATE}    headers=${HEADERS}
+    ${resp_nook}    RequestsLibrary.POST On Session    session    url=${URI_CERTIFICATE}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp_nook.status_code}
 
 Unsuccessful Dynamic Authorization
@@ -167,9 +179,11 @@ Unsuccessful Dynamic Authorization
     ...    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
     ...    auth=${AUTH_CSC_NO_ADMIN}
     ...    headers=${HEADERS}
-    ${resp_nook}    RequestsLibrary.Get Request    session    ${URI_RESTCONF}    headers=${HEADERS}
+    ${resp_nook}    RequestsLibrary.GET On Session    session    url=${URI_RESTCONF}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp_nook.status_code}
-    ${resp_nook}    RequestsLibrary.Post Request    session    ${URI_CERTIFICATE}    headers=${HEADERS}
+    ${resp_nook}    RequestsLibrary.POST On Session    session    url=${URI_CERTIFICATE}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp_nook.status_code}
 
 Unsuccessful Dynamic Authorization 2
@@ -196,18 +210,22 @@ Unsuccessful Dynamic Authorization 2
     ...    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
     ...    auth=${AUTH_SDN_DOMAIN}
     ...    headers=${HEADERS}
-    ${resp}    RequestsLibrary.Post Request    session    ${URI_CERTIFICATE}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.POST On Session    session    url=${URI_CERTIFICATE}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp.status_code}
-    ${resp}    RequestsLibrary.Get Request    session    ${URI_RESTCONF}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.GET On Session    session    url=${URI_RESTCONF}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp.status_code}
     Create Session
     ...    session
     ...    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
     ...    auth=${AUTH_CSC_NO_ADMIN}
     ...    headers=${HEADERS}
-    ${resp}    RequestsLibrary.Get Request    session    ${URI_RESTCONF}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.GET On Session    session    url=${URI_RESTCONF}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
-    ${resp}    RequestsLibrary.Post Request    session    ${URI_CERTIFICATE}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.POST On Session    session    url=${URI_CERTIFICATE}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp.status_code}
 
 Unsuccessful No Keystone Connection
@@ -223,18 +241,21 @@ Unsuccessful No Keystone Connection
     ...    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
     ...    auth=${AUTH_SDN_DOMAIN}
     ...    headers=${HEADERS}
-    ${resp}    RequestsLibrary.Post Request    session    ${URI_CERTIFICATE}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.POST On Session    session    url=${URI_CERTIFICATE}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp.status_code}
-    ${resp}    RequestsLibrary.Get Request    session    ${URI_RESTCONF}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.GET On Session    session    url=${URI_RESTCONF}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp.status_code}
     Create Session
     ...    session
     ...    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
     ...    auth=${AUTH_CSC_NO_ADMIN}
     ...    headers=${HEADERS}
-    ${resp}    RequestsLibrary.Get Request    session    ${URI_RESTCONF}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.GET On Session    session    url=${URI_RESTCONF}    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp.status_code}
-    ${resp}    RequestsLibrary.Post Request    session    ${URI_CERTIFICATE}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.POST On Session    session    url=${URI_CERTIFICATE}    headers=${HEADERS}
     Should Contain    ${UNAUTHORIZED_STATUS_CODES}    ${resp.status_code}
 
 
@@ -346,13 +367,14 @@ Provision MDSAL
     Create Session    session_admin    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
     Set Suite Variable    ${PUT_DYNAMIC_AUTH_URI}    /restconf/config/aaa:http-authorization
     ${body_dyn}    OperatingSystem.Get File    ${PUT_DYNAMIC_AUTH_FILE}
-    ${resp}    RequestsLibrary.Put Request
+    ${resp}    RequestsLibrary.PUT On Session
     ...    session_admin
-    ...    ${PUT_DYNAMIC_AUTH_URI}
+    ...    url=${PUT_DYNAMIC_AUTH_URI}
     ...    data=${body_dyn}
     ...    headers=${HEADERS}
+    ...    expected_status=anything
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
-    Delete Request    session_admin    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
+    DELETE On Session    session_admin    url=http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
 
 Restart Controller
     [Documentation]    Controller restart is needed in order the new shiro.ini config takes effect
@@ -367,7 +389,7 @@ Restart Controller
 Get Controller Modules
     [Documentation]    Get the restconf modules, check 200 status and ietf-restconf presence
     Create Session    session1    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-    ${resp}    RequestsLibrary.Get_Request    session1    ${MODULES_API}
+    ${resp}    RequestsLibrary.GET On Session    session1    url=${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/aaa/tls/010__aaa_restconf_tls.robot b/csit/suites/aaa/tls/010__aaa_restconf_tls.robot
index 945fb3b7b244979e44c968a5422300518409e423..1ce552a1b27682b136e1f45b817a4ca2455cdd8b 100644 (file)
--- a/csit/suites/aaa/tls/010__aaa_restconf_tls.robot
+++ b/csit/suites/aaa/tls/010__aaa_restconf_tls.robot
@@ -27,7 +27,7 @@ ${RESTCONF_MONITORING_URL}      https://${ODL_SYSTEM_IP}:${RESTCONFPORT_TLS}${RE
 Basic Unsecure Restconf Request
     [Documentation]    Tests a basic HTTP request, just to ensure that system is working fine with normal, unsecure reqs
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-    ${resp}    RequestsLibrary.Get Request    session    ${RESTCONF_MONITORING_URI}
+    ${resp}    RequestsLibrary.GET On Session    session    ${RESTCONF_MONITORING_URI}    expected_status=anything
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     Delete All Sessions
 
@@ -47,7 +47,7 @@ Activate TLS
     Enable TLS in ODL
     # Check ODL was restarted properly
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-    ${resp}    RequestsLibrary.Get Request    session    ${RESTCONF_MONITORING_URI}
+    ${resp}    RequestsLibrary.GET On Session    session    ${RESTCONF_MONITORING_URI}    expected_status=anything
     Delete All Sessions
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
 
@@ -91,7 +91,7 @@ Activate Client Authentication
     Enable Client TLS Authentication in ODL
     # Check ODL was restarted properly
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-    ${resp}    RequestsLibrary.Get Request    session    ${RESTCONF_MONITORING_URI}
+    ${resp}    RequestsLibrary.GET On Session    session    ${RESTCONF_MONITORING_URI}    expected_status=anything
     Delete All Sessions
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
 
Integration test