Clean up new AAA auth suite

- make test case steps reflect test case names
- enhance variable scheme

Change-Id: I130669a7e29ecf17604924f3d03bd88666d45e28
Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>

diff --git a/csit/suites/aaa/authn/Restconf_Basic_Auth.robot b/csit/suites/aaa/authn/Restconf_Basic_Auth.robot
index b943838d462c13c101a37290f980468328366b44..064cb47f678622ca31a65493ba1bf950573f559a 100644 (file)
--- a/csit/suites/aaa/authn/Restconf_Basic_Auth.robot
+++ b/csit/suites/aaa/authn/Restconf_Basic_Auth.robot
@@ -15,12 +15,15 @@ Library           String
 Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 Resource          ../../../variables/Variables.robot
 
 *** Variables ***

+${ADMIN_USER}     ${ODL_RESTCONF_USER}
+${ADMIN_PW}       ${ODL_RESTCONF_PASSWORD}

 ${RESTCONF_TEST_URL}    ${MODULES_API}
 ${JOLOKIA_TEST_URL}    jolokia
 ${JOLOKIA_USER}    ${ODL_RESTCONF_USER}
 ${JOLOKIA_PW}     ${ODL_RESTCONF_PASSWORD}
 ${RESTCONF_TEST_URL}    ${MODULES_API}
 ${JOLOKIA_TEST_URL}    jolokia
 ${JOLOKIA_USER}    ${ODL_RESTCONF_USER}
 ${JOLOKIA_PW}     ${ODL_RESTCONF_PASSWORD}

-${JOLOKIA_BAD_USER}    bad_user
+${BAD_USER}       bad_user

 ${BAD_PW}         bad_pw
 ${BAD_PW}         bad_pw

+${JOLOKIA_BAD_USER}    ${BAD_USER}

 ${USERS_REST_URL}    auth/v1/users
 ${USER_USER}      user
 ${USER_PW}        user
 ${USERS_REST_URL}    auth/v1/users
 ${USER_USER}      user
 ${USER_PW}        user


@@ -32,15 +35,15 @@ No RESTCONF Credentials
 
 Incorrect RESTCONF Password
     [Documentation]    Given incorrect password GET RESTCONF fails
 
 Incorrect RESTCONF Password
     [Documentation]    Given incorrect password GET RESTCONF fails

-    Auth Should Fail    ${RESTCONF_TEST_URL}    some_user    ${ODL_RESTCONF_PASSWORD}
+    Auth Should Fail    ${RESTCONF_TEST_URL}    ${ADMIN_USER}    ${BAD_PW}

 
 Incorrect RESTCONF Username
     [Documentation]    Given incorrect username GET RESTCONF fails
 
 Incorrect RESTCONF Username
     [Documentation]    Given incorrect username GET RESTCONF fails

-    Auth Should Fail    ${RESTCONF_TEST_URL}    ${ODL_RESTCONF_USER}    ${BAD_PW}
+    Auth Should Fail    ${RESTCONF_TEST_URL}    ${BAD_USER}    ${ADMIN_PW}

 
 Correct RESTCONF Credentials
     [Documentation]    Given correct credentials GET RESTCONF succeeds
 
 Correct RESTCONF Credentials
     [Documentation]    Given correct credentials GET RESTCONF succeeds

-    Auth Should Pass    ${RESTCONF_TEST_URL}    ${ODL_RESTCONF_USER}    ${ODL_RESTCONF_PASSWORD}
+    Auth Should Pass    ${RESTCONF_TEST_URL}    ${ADMIN_USER}    ${ADMIN_PW}

 
 No Jolokia REST Credentials
     [Documentation]    Given no credentials, HTTP GET on a Jolokia endpoint fails
 
 No Jolokia REST Credentials
     [Documentation]    Given no credentials, HTTP GET on a Jolokia endpoint fails