[Delivers #43559413 #43555603 #43555605 #43555607] Added User Agent header and new IdentityProvider tests

Alan Quillin · Alan Quillin · commit 742e1d474677 · 2013-02-08T15:41:21.000-06:00
diff --git a/lib/SimpleRestServices.dll b/lib/SimpleRestServices.dll
diff --git a/lib/SimpleRestServices.pdb b/lib/SimpleRestServices.pdb
diff --git a/src/corelib/Core/Domain/NewUser.cs b/src/corelib/Core/Domain/NewUser.cs
@@ -0,0 +1,23 @@
+﻿using System.Runtime.Serialization;
+
+namespace net.openstack.Core.Domain
+{
+    [DataContract]
+    public class NewUser
+    {
+        [DataMember(Name = "OS-KSADM:password")]
+        public string Password { get; set; }
+
+        [DataMember(Name = "id", EmitDefaultValue = true)]
+        public string Id { get; set; }
+
+        [DataMember(Name = "username")]
+        public string Username { get; set; }
+
+        [DataMember(Name = "email")]
+        public string Email { get; set; }
+
+        [DataMember(Name = "enabled")]
+        public bool Enabled { get; set; }
+    }
+}
diff --git a/src/corelib/Core/Domain/User.cs b/src/corelib/Core/Domain/User.cs
@@ -6,21 +6,19 @@ namespace net.openstack.Core.Domain
     [DataContract]
     public class User
     {
-
         [DataMember(Name = "RAX-AUTH:defaultRegion")]
         public string DefaultRegion { get; set; }
 
-        [DataMember]
+        [DataMember(Name="id", EmitDefaultValue = true)]
         public string Id { get; set; }
 
-        [DataMember]
+        [DataMember(Name="username")]
         public string Username { get; set; }
 
-        [DataMember]
+        [DataMember(Name="email")]
         public string Email { get; set; }
 
-        [DataMember]
+        [DataMember(Name = "enabled")]
         public bool Enabled { get; set; }
-
     }
 }
diff --git a/src/corelib/Core/IIdentityProvider.cs b/src/corelib/Core/IIdentityProvider.cs
@@ -13,7 +13,7 @@ public interface IIdentityProvider
         User[] ListUsers(CloudIdentity identity);
         User GetUserByName(CloudIdentity identity, string name);
         User GetUser(CloudIdentity identity, string id);
-        User AddUser(CloudIdentity identity, User user);
+        NewUser AddUser(CloudIdentity identity, NewUser user);
         User UpdateUser(CloudIdentity identity, User user);
         bool DeleteUser(CloudIdentity identity, string userId);
 
diff --git a/src/corelib/Providers/Rackspace/GeographicalIdentityProvider.cs b/src/corelib/Providers/Rackspace/GeographicalIdentityProvider.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SimpleRestServices.Client;
@@ -215,18 +216,27 @@ public User GetUser(CloudIdentity identity, string userId)
             return response.Data.User;
         }
 
-        public User AddUser(CloudIdentity identity, User user)
+        public NewUser AddUser(CloudIdentity identity, NewUser newUser)
         {
-            var response = ExecuteRESTRequest<UserResponse>(identity, "/v2.0/users", HttpMethod.POST, new AddUserRequest { User = user });
+            newUser.Id = null;
+
+            var response = ExecuteRESTRequest<NewUserResponse>(identity, "/v2.0/users", HttpMethod.POST, new AddUserRequest { User = newUser });
 
             if (response == null || response.Data == null)
                 return null;
 
-            return response.Data.User;
+            // If the user specifies a password, then the password will not be in the response, so we need to fill it in on the return object.
+            if (string.IsNullOrWhiteSpace(response.Data.NewUser.Password))
+                response.Data.NewUser.Password = newUser.Password;
+
+            return response.Data.NewUser;
         }
 
         public User UpdateUser(CloudIdentity identity, User user)
         {
+            if(user == null || string.IsNullOrWhiteSpace(user.Id))
+                throw new ArgumentException("The User or User.Id values cannot be null.");
+
             var urlPath = string.Format("v2.0/users/{0}", user.Id);
 
             var updateUserRequest = new UpdateUserRequest { User = user };
@@ -378,7 +388,7 @@ protected virtual Response ExecuteRESTRequest(CloudIdentity identity, string url
                     bodyStr = JsonConvert.SerializeObject(body, new JsonSerializerSettings{NullValueHandling = NullValueHandling.Ignore});
             }
 
-            var response = _restService.Execute<T>(url, method, bodyStr, headers, queryStringParameter, new JsonRequestSettings() { RetryCount = retryCount, RetryDelayInMS = retryDelay, Non200SuccessCodes = new[] { 401, 409 } });
+            var response = _restService.Execute<T>(url, method, bodyStr, headers, queryStringParameter, new JsonRequestSettings() { RetryCount = retryCount, RetryDelayInMS = retryDelay, Non200SuccessCodes = new[] { 401, 409 }, UserAgent = ProviderBase.GetUserAgentHeaderValue()});
 
             // on errors try again 1 time.
             if (response.StatusCode == 401 && !isRetry && !isTokenRequest)
diff --git a/src/corelib/Providers/Rackspace/IdentityProvider.cs b/src/corelib/Providers/Rackspace/IdentityProvider.cs
@@ -67,10 +67,10 @@ public User GetUser(CloudIdentity identity, string userId)
             return provider.GetUser(identity, userId);
         }
 
-        public User AddUser(CloudIdentity identity, User user)
+        public NewUser AddUser(CloudIdentity identity, NewUser newUser)
         {
             var provider = GetProvider(identity);
-            return provider.AddUser(identity, user);
+            return provider.AddUser(identity, newUser);
         }
 
         public User UpdateUser(CloudIdentity identity, User user)
@@ -168,7 +168,7 @@ private IExtendedIdentityProvider GetProvider(CloudIdentity identity)
             var rackspaceCloudIdentity = identity as RackspaceCloudIdentity;
 
             if (rackspaceCloudIdentity == null)
-                throw new InvalidCloudIdentityException(string.Format("Invalid Identity object.  Rackspace Identoty service requires an instance of type: {0}", typeof(RackspaceCloudIdentity)));
+                _factory.Get(CloudInstance.Default);
 
             return _factory.Get(rackspaceCloudIdentity.CloudInstance);
         }
diff --git a/src/corelib/Providers/Rackspace/Objects/Request/AddUserRequest.cs b/src/corelib/Providers/Rackspace/Objects/Request/AddUserRequest.cs
@@ -7,6 +7,6 @@ namespace net.openstack.Providers.Rackspace.Objects.Request
     internal class AddUserRequest
     {
         [DataMember(Name = "user")]
-        public User User { get; set; }
+        public NewUser User { get; set; }
     }
 }
diff --git a/src/corelib/Providers/Rackspace/Objects/Request/UpdateUserRequest.cs b/src/corelib/Providers/Rackspace/Objects/Request/UpdateUserRequest.cs
@@ -1,13 +1,16 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using net.openstack.Core.Domain;
 
 namespace net.openstack.Providers.Rackspace.Objects.Request
 {
+    [DataContract]
     internal class UpdateUserRequest
     {
+        [DataMember(Name = "user")]
         public User User { get; set; }
     }
 }
diff --git a/src/corelib/Providers/Rackspace/Objects/Response/NewUserResponse.cs b/src/corelib/Providers/Rackspace/Objects/Response/NewUserResponse.cs
@@ -0,0 +1,12 @@
+using System.Runtime.Serialization;
+using net.openstack.Core.Domain;
+
+namespace net.openstack.Providers.Rackspace.Objects.Response
+{
+    [DataContract]
+    internal class NewUserResponse
+    {
+        [DataMember(Name = "user")]
+        public NewUser NewUser { get; set; }
+    }
+}
diff --git a/src/corelib/Providers/Rackspace/Objects/Response/UserResponse.cs b/src/corelib/Providers/Rackspace/Objects/Response/UserResponse.cs
@@ -1,9 +1,12 @@
+using System.Runtime.Serialization;
 using net.openstack.Core.Domain;
 
 namespace net.openstack.Providers.Rackspace.Objects.Response
 {
+    [DataContract]
     internal class UserResponse
     {
+        [DataMember(Name = "user")]
         public User User { get; set; }
     }
 }
diff --git a/src/corelib/Providers/Rackspace/ProviderBase.cs b/src/corelib/Providers/Rackspace/ProviderBase.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SimpleRestServices.Client;
@@ -16,6 +17,7 @@ public class ProviderBase
     {
         private readonly IIdentityProvider _identityProvider;
         private readonly IRestService _restService;
+        private static Version _currentVersion;
 
         protected ProviderBase(IIdentityProvider identityProvider, IRestService restService)
         {
@@ -42,6 +44,9 @@ protected Response<T> ExecuteRESTRequest<T>(CloudIdentity identity, Uri absolute
                     bodyStr = JsonConvert.SerializeObject(body, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
             }
 
+            if (string.IsNullOrWhiteSpace(requestSettings.UserAgent))
+                requestSettings.UserAgent = GetUserAgentHeaderValue();
+
             var response = _restService.Execute<T>(absoluteUri, method, bodyStr, headers, queryStringParameter, requestSettings);
 
             // on errors try again 1 time.
@@ -77,6 +82,9 @@ protected Response ExecuteRESTRequest(CloudIdentity identity, Uri absoluteUri, H
                     bodyStr = JsonConvert.SerializeObject(body, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
             }
 
+            if (string.IsNullOrWhiteSpace(requestSettings.UserAgent))
+                requestSettings.UserAgent = GetUserAgentHeaderValue();
+
             var response = _restService.Execute(absoluteUri, method, bodyStr, headers, queryStringParameter, requestSettings);
 
             // on errors try again 1 time.
@@ -99,7 +107,7 @@ internal JsonRequestSettings BuildDefaultRequestSettings(IEnumerable<int> non200
             if(non200SuccessCodes != null)
                 non200SuccessCodesAggregate.AddRange(non200SuccessCodes);
 
-            return new JsonRequestSettings { RetryCount = 2, RetryDelayInMS = 200, Non200SuccessCodes = non200SuccessCodesAggregate};
+            return new JsonRequestSettings { RetryCount = 2, RetryDelayInMS = 200, Non200SuccessCodes = non200SuccessCodesAggregate, UserAgent = GetUserAgentHeaderValue()};
         }
 
         protected virtual string GetServiceEndpoint(CloudIdentity identity, string serviceName, string region = null)
@@ -150,5 +158,13 @@ internal static void CheckResponse(Response response)
                     throw new ServiceUnavailableException(response);
             }
         }
+
+        internal static string GetUserAgentHeaderValue()
+        {
+            if (_currentVersion == null)
+                _currentVersion = Assembly.GetExecutingAssembly().GetName().Version;
+
+            return string.Format("openstack.net/{0}", _currentVersion.ToString());
+        }
     }
 }
diff --git a/src/corelib/corelib.csproj b/src/corelib/corelib.csproj
@@ -58,6 +58,7 @@
     <Compile Include="Core\Domain\Mapping\IObjectMapper.cs" />
     <Compile Include="Core\Domain\Mapping\MetaDataJsonMapper.cs" />
     <Compile Include="Core\Domain\Network.cs" />
+    <Compile Include="Core\Domain\NewUser.cs" />
     <Compile Include="Core\Domain\Personality.cs" />
     <Compile Include="Core\Domain\RebootType.cs" />
     <Compile Include="Core\Domain\ServerAddresses.cs" />
@@ -101,6 +102,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\NewUserResponse.cs" />
     <Compile Include="Providers\Rackspace\Objects\Response\PasswordCredencialResponse.cs" />
     <Compile Include="Providers\Rackspace\Objects\Response\TenantsResponse.cs" />
     <Compile Include="Providers\Rackspace\Objects\Response\UserCredentialResponse.cs" />
diff --git a/src/testing/integration/Providers/Rackspace/ComputeTests.cs b/src/testing/integration/Providers/Rackspace/ComputeTests.cs
@@ -333,12 +333,22 @@ public void Test025_Should_Successfully_To_And_Login_With_New_Password()
         {
             var provider = new net.openstack.Providers.Rackspace.ComputeProvider();
             var serverDetails = provider.GetDetails(_testIdentity, _testServer.Id);
-            using(var client = new Renci.SshNet.SshClient(serverDetails.AccessIPv4, "root", NewPassword))
+            bool sucess = false;
+            for (int i = 0; i < 10; i++ )
             {
-                client.Connect();
+                using (var client = new Renci.SshNet.SshClient(serverDetails.AccessIPv4, "root", NewPassword))
+                {
+                    client.Connect();
 
-                Assert.IsTrue(client.IsConnected);
+                    sucess = client.IsConnected;
+
+                    if (sucess)
+                        break;
+                }
+                Thread.Sleep(1000);
             }
+            
+            Assert.IsTrue(sucess);
         }
 
         [TestMethod]
diff --git a/src/testing/integration/Providers/Rackspace/IdentityFull.orderedtest b/src/testing/integration/Providers/Rackspace/IdentityFull.orderedtest
diff --git a/src/testing/integration/Providers/Rackspace/IdentityTests.cs b/src/testing/integration/Providers/Rackspace/IdentityTests.cs

Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,10 @@ public User GetUser(CloudIdentity identity, string userId)`
`67`	`67`	`return provider.GetUser(identity, userId);`
`68`	`68`	`}`
`69`	`69`
`70`		`- public User AddUser(CloudIdentity identity, User user)`
	`70`	`+ public NewUser AddUser(CloudIdentity identity, NewUser newUser)`
`71`	`71`	`{`
`72`	`72`	`var provider = GetProvider(identity);`
`73`		`- return provider.AddUser(identity, user);`
	`73`	`+ return provider.AddUser(identity, newUser);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`public User UpdateUser(CloudIdentity identity, User user)`
`@@ -168,7 +168,7 @@ private IExtendedIdentityProvider GetProvider(CloudIdentity identity)`
`168`	`168`	`var rackspaceCloudIdentity = identity as RackspaceCloudIdentity;`
`169`	`169`
`170`	`170`	`if (rackspaceCloudIdentity == null)`
`171`		`- throw new InvalidCloudIdentityException(string.Format("Invalid Identity object. Rackspace Identoty service requires an instance of type: {0}", typeof(RackspaceCloudIdentity)));`
	`171`	`+ _factory.Get(CloudInstance.Default);`
`172`	`172`
`173`	`173`	`return _factory.Get(rackspaceCloudIdentity.CloudInstance);`
`174`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ namespace net.openstack.Providers.Rackspace.Objects.Request`
`7`	`7`	`internal class AddUserRequest`
`8`	`8`	`{`
`9`	`9`	`[DataMember(Name = "user")]`
`10`		`- public User User { get; set; }`
	`10`	`+ public NewUser User { get; set; }`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,16 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
	`4`	`+using System.Runtime.Serialization;`
`4`	`5`	`using System.Text;`
`5`	`6`	`using net.openstack.Core.Domain;`
`6`	`7`
`7`	`8`	`namespace net.openstack.Providers.Rackspace.Objects.Request`
`8`	`9`	`{`
	`10`	`+ [DataContract]`
`9`	`11`	`internal class UpdateUserRequest`
`10`	`12`	`{`
	`13`	`+ [DataMember(Name = "user")]`
`11`	`14`	`public User User { get; set; }`
`12`	`15`	`}`
`13`	`16`	`}`