Add missing neutron cleanup

[integration/test.git] / csit / suites / openstack / neutron / __init__.robot

diff --git a/csit/suites/openstack/neutron/__init__.robot b/csit/suites/openstack/neutron/__init__.robot
index ecf8f12c02b1f194ffd7716bd54530084b7e71da..212d17c97efa39e7a3fd34d291b6013f0109c0af 100644 (file)
--- a/csit/suites/openstack/neutron/__init__.robot
+++ b/csit/suites/openstack/neutron/__init__.robot
@@ -6,25 +6,29 @@ Library           SSHLibrary
 Library           Collections
 Library           RequestsLibrary
 Library           ../../../libraries/Common.py
-Variables         ../../../variables/Variables.py
+Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${OSTENANTNAME}    "admin"
 ${OSUSERNAME}     "admin"
 ${OSPASSWORD}     "admin"
-${UserInfo}       {"auth": {"tenantName": ${OSTENANTNAME}, "passwordCredentials": {"username": ${OSUSERNAME}, "password": ${OSPASSWORD}}}}
+${OSUSERDOMAINNAME}    "Default"
+${OSPROJECTDOMAINNAME}    "Default"
+${PASSWORD}       {"user":{"name":${OSUSERNAME},"domain":{"name": ${OSUSERDOMAINNAME}},"password":${OSPASSWORD}}}
+${SCOPE}          {"project":{"name":${OSTENANTNAME},"domain":{"name": ${OSPROJECTDOMAINNAME}}}}
+${UserInfo}       {"auth":{"identity":{"methods":["password"],"password":${PASSWORD}},"scope":${SCOPE}}}
+${KEYSTONEURL}    http://${KEYSTONE}:5000
 
 *** Keywords ***
 Start Suite
-    Create Session    KeyStoneSession    http://${KEYSTONE}:5000    headers=${HEADERS}
-    ${resp}    post    KeyStoneSession    /v2.0/tokens    ${UserInfo}
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${result}    To JSON    ${resp.content}
-    ${result}    Get From Dictionary    ${result}    access
-    ${result}    Get From Dictionary    ${result}    token
-    ${TOKEN}    Get From Dictionary    ${result}    id
+    Create Session    KeyStoneSession    ${KEYSTONEURL}    headers=${HEADERS}
+    ${resp}    post    KeyStoneSession    /v3/auth/tokens    ${UserInfo}
+    Should Be Equal As Strings    ${resp.status_code}    201
+    ${TOKEN}    Get From Dictionary    ${resp.headers}    X-Subject-Token
     ${X-AUTH}    Create Dictionary    X-Auth-Token=${TOKEN}    Content-Type=application/json
+    ${X-AUTH-NOCONTENT}    Create Dictionary    X-Auth-Token=${TOKEN}
     Set Global Variable    ${X-AUTH}
+    Set Global Variable    ${X-AUTH-NOCONTENT}
 
 Stop Suite
     Delete All Sessions