X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FAAAKeywords.robot;h=eb2313315fadb36a28dfb0131c64399c3873ff96;hb=9481d21ef0f8ae7747d78de305c41ee7850c24f7;hp=bb2899b56f28a929141a364f8961d36a728ac1c6;hpb=fbbb139f748f85eeb6ca3c434f6ba3cf72db8699;p=integration%2Ftest.git diff --git a/csit/libraries/AAAKeywords.robot b/csit/libraries/AAAKeywords.robot index bb2899b56f..eb2313315f 100644 --- a/csit/libraries/AAAKeywords.robot +++ b/csit/libraries/AAAKeywords.robot @@ -1,12 +1,10 @@ *** Settings *** Library RequestsLibrary -Variables ../variables/Variables.py +Resource ../variables/Variables.robot *** Variables *** ${WORKSPACE} /tmp -${BUNDLEFOLDER} distribution-karaf-0.3.0-SNAPSHOT ${AUTHN_CFG_FILE} ${WORKSPACE}/${BUNDLEFOLDER}/etc/org.opendaylight.aaa.authn.cfg -${CONTROLLER_USER} ${MININET_USER} *** Keywords *** AAA Login @@ -14,7 +12,7 @@ AAA Login [Documentation] Makes a POST REST call to the AUTH_TOKEN_API with the given auth_data and returns the response Create Session ODL_SESSION http://${controller_ip}:8181 ${headers}= Create Dictionary Content-Type=application/x-www-form-urlencoded - ${resp}= RequestsLibrary.POST ODL_SESSION ${AUTH_TOKEN_API} data=${auth_data} headers=${headers} + ${resp}= RequestsLibrary.POST Request ODL_SESSION ${AUTH_TOKEN_API} data=${auth_data} headers=${headers} Delete All Sessions [Return] ${resp} @@ -23,17 +21,17 @@ Create Auth Data [Documentation] returns a string in the direct authentacation format (e.g., grant_type=password&username=admin&password=admin). ... It can also be passed scope, client_id and client_secret arguments for the case of client specific authorization ${data}= Set Variable grant_type=password&username=${user}&password=${password}&scope=${scope} - ${data}= Run Keyword If "${client_id}" != "${EMPTY}" Set Variable ${data}&client_id=${client_id} ELSE Set Variable - ... ${data} - ${data}= Run Keyword If "${client_secret}" != "${EMPTY}" Set Variable ${data}&client_secret=${client_secret} ELSE Set Variable - ... ${data} + ${data}= Run Keyword If "${client_id}" != "${EMPTY}" Set Variable ${data}&client_id=${client_id} + ... ELSE Set Variable ${data} + ${data}= Run Keyword If "${client_secret}" != "${EMPTY}" Set Variable ${data}&client_secret=${client_secret} + ... ELSE Set Variable ${data} [Return] ${data} Disable Authentication On Controller [Arguments] ${controller_ip} [Documentation] Will disable token based authentication. Currently, that is done with a config file change SSHLibrary.Open Connection ${controller_ip} - Login With Public Key ${CONTROLLER_USER} ${USER_HOME}/.ssh/${SSH_KEY} any + Login With Public Key ${ODL_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any ${cmd}= Set Variable sed -i 's/^authEnabled=.*$/authEnabled=false/g' ${AUTHN_CFG_FILE} SSHLibrary.Execute Command ${cmd} SSHLibrary.Close Connection @@ -42,7 +40,7 @@ Enable Authentication On Controller [Arguments] ${controller_ip} [Documentation] Will enable token based authentication. Currently, that is done with a config file change SSHLibrary.Open Connection ${controller_ip} - Login With Public Key ${CONTROLLER_USER} ${USER_HOME}/.ssh/${SSH_KEY} any + Login With Public Key ${ODL_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any ${cmd}= Set Variable sed -i 's/^authEnabled=.*$/authEnabled=true/g' ${AUTHN_CFG_FILE} SSHLibrary.Execute Command ${cmd} SSHLibrary.Close Connection @@ -51,7 +49,7 @@ Get Auth Token [Arguments] ${user}=${USER} ${password}=${PWD} ${scope}=${SCOPE} ${client_id}=${EMPTY} ${client_secret}=${EMPTY} [Documentation] Wrapper used to login to controller and retrieve an auth token. Optional argumented available for client based credentials. ${auth_data}= Create Auth Data ${USER} ${PWD} ${scope} ${client_id} ${client_secret} - ${resp}= AAA Login ${CONTROLLER} ${auth_data} + ${resp}= AAA Login ${ODL_SYSTEM_IP} ${auth_data} Should Be Equal As Strings ${resp.status_code} 201 ${auth_token}= Extract Value From Content ${resp.content} /access_token strip [Return] ${auth_token} @@ -60,7 +58,7 @@ Revoke Auth Token [Arguments] ${token} [Documentation] Requests the given token be revoked via POST to ${REVOKE_TOKEN_API} ${headers}= Create Dictionary Content-Type=application/x-www-form-urlencoded - ${resp}= RequestsLibrary.POST ODL_SESSION ${REVOKE_TOKEN_API} data=${token} headers=${headers} + ${resp}= RequestsLibrary.POST Request ODL_SESSION ${REVOKE_TOKEN_API} data=${token} headers=${headers} Should Be Equal As Strings ${resp.status_code} 204 Validate Token Format @@ -69,21 +67,21 @@ Validate Token Format Should Match Regexp ${token} [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} Get User From IDM DB - [Documentation] Will return user information. If no user id is passed, it will retrieve all users in DB [Arguments] ${user_id}=${EMPTY} - Create Session httpbin http://${CONTROLLER}:${RESTPORT} + [Documentation] Will return user information. If no user id is passed, it will retrieve all users in DB + Create Session httpbin http://${ODL_SYSTEM_IP}:${RESTPORT} ${headers}= Create Dictionary Content-Type=application/x-www-form-urlencoded - ${resp}= RequestsLibrary.GET httpbin ${idmurl}/users/${user_id} headers=${headers} + ${resp}= RequestsLibrary.GET Request httpbin ${idmurl}/users/${user_id} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 Log ${resp.content} [Return] ${resp} Create User - [Documentation] Will return user information. If no user id is passed, it will retrieve all users in DB [Arguments] ${user_data} - Create Session httpbin http://${CONTROLLER}:${RESTPORT} + [Documentation] Will return user information. If no user id is passed, it will retrieve all users in DB + Create Session httpbin http://${ODL_SYSTEM_IP}:${RESTPORT} ${headers}= Create Dictionary Content-Type=application/json - ${resp}= RequestsLibrary.POST httpbin ${idmurl}/users headers=${headers} data=${user_data} + ${resp}= RequestsLibrary.POST Request httpbin ${idmurl}/users headers=${headers} data=${user_data} Should Be Equal As Strings ${resp.status_code} 201 Log ${resp.content} [Return] ${resp}