diff options
| author |   Yang Xu <xuyang11@gmail.com> | 2017-09-11 00:10:43 -0400 |
|---|---|---|
| committer | Yang Xu <xuyang11@gmail.com> | 2017-09-11 17:42:07 -0400 |
| commit | f7087f5a3fba5a5744118c92aaee53bc06cad9aa (patch) | |
| tree | 7ddd72b11b222d3460759ab133f30a19e1310dfd | |
| parent | 073fa3a3fd89807622d7769c066667dead891248 (diff) | |
Automatically Set Tenant in Robot VM
Issue-Id: INT-192
Change-Id: I9f8a4bb3dc0131385ef6316548a8d2b52eb53037
Signed-off-by: Yang Xu <xuyang11@gmail.com>
| -rw-r--r-- | robot/assets/templates/keystone_get_auth.template | 4 | ||||
| -rw-r--r-- | robot/resources/openstack/keystone_interface.robot | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/robot/assets/templates/keystone_get_auth.template b/robot/assets/templates/keystone_get_auth.template index 776ed49e..c3fa82f6 100644 --- a/robot/assets/templates/keystone_get_auth.template +++ b/robot/assets/templates/keystone_get_auth.template @@ -1,9 +1,9 @@ { "auth": { - "tenantName" : "${tenantName}", + "tenantId" : "${tenantId}", "passwordCredentials": { "username": "${username}", "password": "${password}" } } -}
\ No newline at end of file +} diff --git a/robot/resources/openstack/keystone_interface.robot b/robot/resources/openstack/keystone_interface.robot index 1243a193..3c3de90c 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_INJECTED_KEYSTONE} verify=True ${uuid}= Generate UUID ${data_template}= OperatingSystem.Get File ${OPENSTACK_KEYSTONE_AUTH_BODY_FILE} - ${arguments}= Create Dictionary username=${username} password=${password} tenantName=${GLOBAL_OPENSTACK_TENANT_NAME} + ${arguments}= Create Dictionary username=${username} password=${password} tenantId=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} ${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} @@ -52,4 +52,4 @@ Set Openstack Credentials [Return] ${user} ${pass} Get Openstack Credentials - [Return] ${GLOBAL_INJECTED_OPENSTACK_USERNAME} ${GLOBAL_INJECTED_OPENSTACK_PASSWORD}
\ No newline at end of file + [Return] ${GLOBAL_INJECTED_OPENSTACK_USERNAME} ${GLOBAL_INJECTED_OPENSTACK_PASSWORD} |