From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 7 Sep 2017 13:36:37 +0000 (+0200)
Subject: Update to Keystone v3 for basic neutron tests
X-Git-Tag: release/nitrogen~30
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=35e415b6873b39d72775c88a337e92dac26012e2;p=integration%2Ftest.git

Update to Keystone v3 for basic neutron tests

Keystone v2 has been deprecated for a while.
For instance OPNFV Euphrates is based on OpenStack stable/ocata then
Keystone v3 is recommended (see FUNCTEST-862 [1]).

[1] https://jira.opnfv.org/browse/FUNCTEST-862

Change-Id: If8ed4645eba0b42e3e7518896aa24d3db4feef6d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/csit/suites/openstack/neutron/__init__.robot b/csit/suites/openstack/neutron/__init__.robot
index 17a8771a88..0d0a0f2cb7 100644
--- a/csit/suites/openstack/neutron/__init__.robot
+++ b/csit/suites/openstack/neutron/__init__.robot
@@ -12,17 +12,18 @@ Variables         ../../../variables/Variables.py
 ${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}}}
 
 *** 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
+    ${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}