stackforge/openstack-sdk-php
Code Issues Proposed changes

Altered tenant name handling.

Browse Source
This commit is contained in:
Technosophos
2012-08-07 14:40:43 -05:00
parent e398aa0b41
commit 9b93527b13
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/HPCloud/Services/IdentityServices.php
View File

@@ -323,7 +323,7 @@ class IdentityServices /*implements Serializable*/ {
* HPCloud console.
* @param string $tenantName
* The tenant Name for this account. This can be obtained through the
* HPCloud console. NOTE: This is currently unused.
* HPCloud console.
* @throws HPCloud::Transport::AuthorizationException
* If authentication failed.
* @throws HPCloud::Exception
@@ -342,12 +342,9 @@ class IdentityServices /*implements Serializable*/ {
if (!empty($tenantId)) {
$ops['tenantId'] = $tenantId;
}
// Not currently working.
// If a tenant name is provided, add it to the auth array.
//if (!empty($tenantName)) {
// $ops['tenantName'] = $tenantName;
//}
elseif (!empty($tenantName)) {
$ops['tenantName'] = $tenantName;
}
return $this->authenticate($ops);
@@ -404,9 +401,9 @@ class IdentityServices /*implements Serializable*/ {
if (!empty($tenantId)) {
$ops['tenantId'] = $tenantId;
}
//if (!empty($tenantName)) {
// $ops['tenantName'] = $tenantName;
//}
elseif (!empty($tenantName)) {
$ops['tenantName'] = $tenantName;
}
return $this->authenticate($ops);
}