Added missing identity methods for listing Tenants

Author: Alan Quillin

src/console/Program.cs

@@ -8,5 +8,8 @@ namespace net.openstack.console
 {
     class Program
     {
+        static void Main(string[] args)
+        {
+        }
     }
 }

src/corelib/Core/Domain/IdentityToken.cs

@@ -8,6 +8,8 @@ public class IdentityToken
 
         public string Id { get; set; }
 
+        public Tenant Tenant { get; set; }
+
         public bool IsExpired()
         {
             if (string.IsNullOrWhiteSpace(Expires))

src/corelib/Core/Domain/Tenant.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace net.openstack.Core.Domain
+{
+    public class Tenant
+    {
+        public string Id { get; set; }
+
+        public string Name { get; set; }
+    }
+}

src/corelib/Core/IIdentityProvider.cs

@@ -27,5 +27,7 @@ public interface IIdentityProvider
         UserCredential[] ListUserCredentials(CloudIdentity identity, string userId);
         UserCredential UpdateUserCredentials(CloudIdentity identity, string userId);
         bool DeleteUserCredentials(CloudIdentity identity, string userId);
+
+        Tenant[] ListTenants(CloudIdentity identity);
     }
 }

src/corelib/Providers/Rackspace/GeographicalIdentityProvider.cs

@@ -204,6 +204,20 @@ public bool DeleteUser(CloudIdentity identity, string userId)
 
         #endregion
 
+        #region Tenants
+
+        public Tenant[] ListTenants(CloudIdentity identity)
+        {
+            var response = ExecuteRESTRequest<TenantsResponse>(identity, "v2.0/tenants", HttpMethod.GET);
+
+            if (response == null || response.Data == null)
+                return null;
+
+            return response.Data.Tenants;
+        }
+
+        #endregion
+
         #region Token and Authentication
 
         public string GetToken(CloudIdentity idenity, bool forceCacheRefresh = false)

src/corelib/Providers/Rackspace/IdentityProvider.cs

@@ -17,7 +17,6 @@ public IdentityProvider(IRestService restService = null, ICache<UserAccess> toke
         public Role[] ListRoles(CloudIdentity identity)
         {
             var provider = GetProvider(identity);
-
             return provider.ListRoles(identity);
         }
 
@@ -36,7 +35,6 @@ public Role GetRole(CloudIdentity identity, string roleId)
         public Role[] GetRolesByUser(CloudIdentity identity, string userId)
         {
             var provider = GetProvider(identity);
-
             return provider.GetRolesByUser(identity, userId);
         }
 
@@ -49,28 +47,24 @@ public User[] ListUsers(CloudIdentity identity)
         public User GetUserByName(CloudIdentity identity, string name)
         {
             var provider = GetProvider(identity);
-
             return provider.GetUserByName(identity, name);
         }
 
         public UserAccess Authenticate(CloudIdentity identity, bool forceCacheRefresh = false)
         {
             var provider = GetProvider(identity);
-
             return provider.Authenticate(identity, forceCacheRefresh);
         }
 
         public bool AddRoleToUser(CloudIdentity identity, string userId, string roleId)
         {
             var provider = GetProvider(identity);
-
             return provider.AddRoleToUser(identity, userId, roleId);
         }
 
         public User GetUser(CloudIdentity identity, string userId)
         {
             var provider = GetProvider(identity);
-
             return provider.GetUser(identity, userId);
         }
 
@@ -83,7 +77,6 @@ public User AddUser(CloudIdentity identity, User user)
         public User UpdateUser(CloudIdentity identity, User user)
         {
             var provider = GetProvider(identity);
-
             return provider.UpdateUser(identity, user);
         }
 
@@ -117,24 +110,27 @@ public bool DeleteUserCredentials(CloudIdentity identity, string userId)
             return provider.DeleteUserCredentials(identity, userId);
         }
 
-        public string GetToken(CloudIdentity identity, bool forceCacheRefresh = false)
+        public Tenant[] ListTenants(CloudIdentity identity)
         {
             var provider = GetProvider(identity);
+            return provider.ListTenants(identity);
+        }
 
+        public string GetToken(CloudIdentity identity, bool forceCacheRefresh = false)
+        {
+            var provider = GetProvider(identity);
             return provider.GetToken(identity, forceCacheRefresh);
         }
 
         public bool DeleteRoleFromUser(CloudIdentity identity, string userId, string roleId)
         {
             var provider = GetProvider(identity);
-
             return provider.DeleteRoleFromUser(identity, userId, roleId);
         }
 
         public IdentityToken GetTokenInfo(CloudIdentity identity, bool forceCacheRefresh = false)
         {
             var provider = GetProvider(identity);
-
             return provider.GetTokenInfo(identity);
         }
 

src/corelib/Providers/Rackspace/Objects/Response/TenantsResponse.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using net.openstack.Core.Domain;
+
+namespace net.openstack.Providers.Rackspace.Objects.Response
+{
+    internal class TenantsResponse
+    {
+        public Tenant[] Tenants { get; set; }
+    }
+}

src/corelib/corelib.csproj

@@ -60,6 +60,7 @@
     <Compile Include="Core\Domain\Personality.cs" />
     <Compile Include="Core\Domain\RebootType.cs" />
     <Compile Include="Core\Domain\ServerAddresses.cs" />
+    <Compile Include="Core\Domain\Tenant.cs" />
     <Compile Include="Core\Domain\UserCredential.cs" />
     <Compile Include="Core\Exceptions\Response\BadServiceRequestException.cs" />
     <Compile Include="Core\Exceptions\Response\ItemNotFoundException.cs" />
@@ -92,6 +93,7 @@
     <Compile Include="Providers\Rackspace\Objects\AuthDetails.cs" />
     <Compile Include="Providers\Rackspace\Objects\Request\CreateServerRequest.cs" />
     <Compile Include="Providers\Rackspace\Objects\Response\CreateServerResponse.cs" />
+    <Compile Include="Providers\Rackspace\Objects\Response\TenantsResponse.cs" />
     <Compile Include="Providers\Rackspace\Objects\Response\UserCredentialResponse.cs" />
     <Compile Include="Providers\Rackspace\Objects\Response\UsersResponse.cs" />
     <Compile Include="Providers\Rackspace\RackspaceImpersonationIdentity.cs" />

src/testing/integration/Providers/Rackspace/IdentityTests.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Text;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Net.OpenStack.Testing.Integration.Providers.Rackspace
+{
+    [TestClass]
+    public class IdentityTests
+    {
+        [TestMethod]
+        public void TestMethod1()
+        {
+        }
+    }
+}

src/testing/integration/integration.csproj

@@ -54,6 +54,7 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Providers\Rackspace\ComputeTests.cs" />
+    <Compile Include="Providers\Rackspace\IdentityTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\corelib\corelib.csproj">