summaryrefslogtreecommitdiffstats
path: root/robot
diff options
context:
space:
mode:
authorJerry Flood <jf9860@att.com>2017-06-08 11:52:40 -0400
committerJerry Flood <jf9860@att.com>2017-06-08 11:53:00 -0400
commit46a20553fed5b238da1b27e6bc051dc825d77598 (patch)
tree784b752c19617a3c90f1a69321a56575518f52c4 /robot
parentc79c8279e1100171fd0cd5833e6a1d89f2edfe16 (diff)
Add tenant name to keystone authentication
Issue: TEST-28 Change-Id: I939a40b3fc9ae09a2b73df0e77ecc2b47ac9a255 Signed-off-by: Jerry Flood <jf9860@att.com>
Diffstat (limited to 'robot')
-rw-r--r--robot/assets/templates/keystone_get_auth.template1
-rw-r--r--robot/resources/openstack/keystone_interface.robot2
2 files changed, 2 insertions, 1 deletions
diff --git a/robot/assets/templates/keystone_get_auth.template b/robot/assets/templates/keystone_get_auth.template
index 255f8ffd..776ed49e 100644
--- a/robot/assets/templates/keystone_get_auth.template
+++ b/robot/assets/templates/keystone_get_auth.template
@@ -1,5 +1,6 @@
{
"auth": {
+ "tenantName" : "${tenantName}",
"passwordCredentials": {
"username": "${username}",
"password": "${password}"
diff --git a/robot/resources/openstack/keystone_interface.robot b/robot/resources/openstack/keystone_interface.robot
index 6bf1d1e7..ef9eca36 100644
--- a/robot/resources/openstack/keystone_interface.robot
+++ b/robot/resources/openstack/keystone_interface.robot
@@ -23,7 +23,7 @@ Run Openstack Auth Request
${session}= Create Session keystone ${GLOBAL_OPENSTACK_KEYSTONE_SERVER} verify=True
${uuid}= Generate UUID
${data_template}= OperatingSystem.Get File ${OPENSTACK_KEYSTONE_AUTH_BODY_FILE}
- ${arguments}= Create Dictionary username=${username} password=${password}
+ ${arguments}= Create Dictionary username=${username} password=${password} tenantName=${GLOBAL_OPENSTACK_TENANT_NAME}
${data}= Fill JSON Template ${data_template} ${arguments}
${data_path}= Catenate ${OPENSTACK_KEYSTONE_API_VERSION}${OPENSTACK_KEYSTONE_AUTH_PATH}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID}