Return summaries from list keypairs

carolynvs · carolynvs · commit f622ab9b922b · 2016-02-09T10:28:46.000-06:00
diff --git a/src/corelib/Compute/v2_1/ComputeService.cs b/src/corelib/Compute/v2_1/ComputeService.cs
@@ -323,9 +323,9 @@ public ComputeService(IAuthenticationProvider authenticationProvider, string reg
         #region Keypairs
 
         /// <inheritdoc cref="ComputeApiBuilder.GetKeyPairAsync{T}" />
-        public virtual Task<KeyPairDetails> GetKeyPairAsync(string keypairName, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual Task<KeyPair> GetKeyPairAsync(string keypairName, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return _computeApi.GetKeyPairAsync<KeyPairDetails>(keypairName, cancellationToken);
+            return _computeApi.GetKeyPairAsync<KeyPair>(keypairName, cancellationToken);
         }
 
         /// <inheritdoc cref="ComputeApiBuilder.CreateKeyPairAsync{T}" />
@@ -335,15 +335,15 @@ public ComputeService(IAuthenticationProvider authenticationProvider, string reg
         }
 
         /// <summary />
-        public virtual Task<KeyPair> ImportKeyPairAsync(KeyPairDefinition keypair, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual Task<KeyPairSummary> ImportKeyPairAsync(KeyPairDefinition keypair, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return _computeApi.CreateKeyPairAsync<KeyPair>(keypair, cancellationToken);
+            return _computeApi.CreateKeyPairAsync<KeyPairSummary>(keypair, cancellationToken);
         }
 
         /// <inheritdoc cref="ComputeApiBuilder.ListKeyPairsAsync{T}" />
-        public virtual async Task<IEnumerable<KeyPair>> ListKeyPairsAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public virtual async Task<IEnumerable<KeyPairSummary>> ListKeyPairsAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
-            return await _computeApi.ListKeyPairsAsync<KeyPairCollection>(cancellationToken);
+            return await _computeApi.ListKeyPairsAsync<KeyPairSummaryCollection>(cancellationToken);
         }
 
         /// <summary />
diff --git a/src/corelib/Compute/v2_1/ComputeServiceExtensions.cs b/src/corelib/Compute/v2_1/ComputeServiceExtensions.cs
@@ -301,7 +301,7 @@ public static void DetachVolume(this ComputeService service, Identifier serverId
 
         #region KeyPairs
         /// <inheritdoc cref="ComputeService.GetKeyPairAsync" />
-        public static KeyPairDetails GetKeyPair(this ComputeService service, string keypairName)
+        public static KeyPair GetKeyPair(this ComputeService service, string keypairName)
         {
             return service.GetKeyPairAsync(keypairName).ForceSynchronous();
         }
@@ -313,13 +313,13 @@ public static KeyPairResponse CreateKeyPair(this ComputeService service, KeyPair
         }
 
         /// <inheritdoc cref="ComputeService.ImportKeyPairAsync" />
-        public static KeyPair ImportKeyPair(this ComputeService service, KeyPairDefinition keyPair)
+        public static KeyPairSummary ImportKeyPair(this ComputeService service, KeyPairDefinition keyPair)
         {
             return service.ImportKeyPairAsync(keyPair).ForceSynchronous();
         }
 
         /// <inheritdoc cref="ComputeService.ListKeyPairsAsync" />
-        public static IEnumerable<KeyPair> ListKeyPairs(this ComputeService service)
+        public static IEnumerable<KeyPairSummary> ListKeyPairs(this ComputeService service)
         {
             return service.ListKeyPairsAsync().ForceSynchronous();
         }
diff --git a/src/corelib/Compute/v2_1/KeyPair.cs b/src/corelib/Compute/v2_1/KeyPair.cs
@@ -1,40 +1,17 @@
-﻿using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
+using System;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using OpenStack.Compute.v2_1.Serialization;
-using OpenStack.Serialization;
 
 namespace OpenStack.Compute.v2_1
 {
     /// <summary />
-    [JsonConverter(typeof(KeyPairConverter))]
-    public class KeyPair : IHaveExtraData, IServiceResource
+    public class KeyPair : KeyPairSummary
     {
         /// <summary />
-        [JsonProperty("name")]
-        public string Name { get; set; }
+        [JsonProperty("id")]
+        public Identifier Id { get; set; }
 
         /// <summary />
-        [JsonProperty("public_key")]
-        public string PublicKey { get; set; }
-
-        /// <summary />
-        [JsonProperty("fingerprint")]
-        public string Fingerprint { get; set; }
-
-        /// <summary />
-        [JsonExtensionData]
-        IDictionary<string, JToken> IHaveExtraData.Data { get; set; } = new Dictionary<string, JToken>();
-
-        object IServiceResource.Owner { get; set; }
-
-        /// <inheritdoc cref="ComputeApiBuilder.DeleteKeyPairAsync" />
-        public Task DeleteAsync(CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var compute = this.GetOwnerOrThrow<ComputeApiBuilder>();
-            return compute.DeleteKeyPairAsync(Name, cancellationToken);
-        }
+        [JsonProperty("created_at")]
+        public DateTimeOffset Created { get; set; }
     }
 }
diff --git a/src/corelib/Compute/v2_1/KeyPairDetails.cs b/src/corelib/Compute/v2_1/KeyPairDetails.cs
diff --git a/src/corelib/Compute/v2_1/KeyPairExtensions.cs b/src/corelib/Compute/v2_1/KeyPairExtensions.cs
@@ -7,8 +7,8 @@ namespace OpenStack.Synchronous
     /// <summary />
     public static class KeypairExtensions_v2_1
     {
-        /// <inheritdoc cref="KeyPair.DeleteAsync" />
-        public static void Delete(this KeyPair keypair)
+        /// <inheritdoc cref="KeyPairSummary.DeleteAsync" />
+        public static void Delete(this KeyPairSummary keypair)
         {
             keypair.DeleteAsync().ForceSynchronous();
         }
diff --git a/src/corelib/Compute/v2_1/KeyPairResponse.cs b/src/corelib/Compute/v2_1/KeyPairResponse.cs
@@ -3,7 +3,7 @@
 namespace OpenStack.Compute.v2_1
 {
     /// <summary />
-    public class KeyPairResponse : KeyPair
+    public class KeyPairResponse : KeyPairSummary
     {
         /// <summary />
         [JsonProperty("private_key")]
diff --git a/src/corelib/Compute/v2_1/KeyPairSummary.cs b/src/corelib/Compute/v2_1/KeyPairSummary.cs
@@ -0,0 +1,40 @@
+﻿using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using OpenStack.Compute.v2_1.Serialization;
+using OpenStack.Serialization;
+
+namespace OpenStack.Compute.v2_1
+{
+    /// <summary />
+    [JsonConverter(typeof(KeyPairConverter))]
+    public class KeyPairSummary : IHaveExtraData, IServiceResource
+    {
+        /// <summary />
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        /// <summary />
+        [JsonProperty("public_key")]
+        public string PublicKey { get; set; }
+
+        /// <summary />
+        [JsonProperty("fingerprint")]
+        public string Fingerprint { get; set; }
+
+        /// <summary />
+        [JsonExtensionData]
+        IDictionary<string, JToken> IHaveExtraData.Data { get; set; } = new Dictionary<string, JToken>();
+
+        object IServiceResource.Owner { get; set; }
+
+        /// <inheritdoc cref="ComputeApiBuilder.DeleteKeyPairAsync" />
+        public Task DeleteAsync(CancellationToken cancellationToken = default(CancellationToken))
+        {
+            var compute = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            return compute.DeleteKeyPairAsync(Name, cancellationToken);
+        }
+    }
+}
diff --git a/src/corelib/Compute/v2_1/Serialization/KeyPairCollection.cs b/src/corelib/Compute/v2_1/Serialization/KeyPairCollection.cs
@@ -20,6 +20,6 @@ public class KeyPairCollection<T> : ResourceCollection<T>
 
     /// <inheritdoc cref="KeyPairCollection{T}" />
     /// <exclude />
-    public class KeyPairCollection : KeyPairCollection<KeyPair>
+    public class KeyPairSummaryCollection : KeyPairCollection<KeyPairSummary>
     { }
 }
diff --git a/src/corelib/Compute/v2_2/KeyPair.cs b/src/corelib/Compute/v2_2/KeyPair.cs
@@ -3,7 +3,7 @@
 namespace OpenStack.Compute.v2_2
 {
     /// <summary />
-    public class KeyPair : v2_1.KeyPair
+    public class KeyPair : v2_1.KeyPairSummary
     {
         /// <summary />
         [JsonProperty("type")]
diff --git a/src/corelib/OpenStack.csproj b/src/corelib/OpenStack.csproj
@@ -105,7 +105,7 @@
     <Compile Include="Compute\v2_1\ImageStatus.cs" />
     <Compile Include="Compute\v2_1\ImageType.cs" />
     <Compile Include="Compute\v2_1\IPProtocol.cs" />
-    <Compile Include="Compute\v2_1\KeyPairDetails.cs" />
+    <Compile Include="Compute\v2_1\KeyPair.cs" />
     <Compile Include="Compute\v2_1\KeyPairRequest.cs" />
     <Compile Include="Compute\v2_1\KeyPairResponse.cs" />
     <Compile Include="Compute\v2_1\NetworkAttachDefinition.cs" />
@@ -152,7 +152,7 @@
     <Compile Include="Compute\v2_1\DiskConfiguration.cs" />
     <Compile Include="Compute\v2_1\FlavorReference.cs" />
     <Compile Include="Compute\v2_1\ImageReference.cs" />
-    <Compile Include="Compute\v2_1\KeyPair.cs" />
+    <Compile Include="Compute\v2_1\KeyPairSummary.cs" />
     <Compile Include="Compute\v2_1\KeyPairDefinition.cs" />
     <Compile Include="Compute\v2_1\ServerListOptions.cs" />
     <Compile Include="Compute\v2_1\SecurityGroupReference.cs" />
diff --git a/src/testing/integration/Compute/v2_1/ComputeTestDataManager.cs b/src/testing/integration/Compute/v2_1/ComputeTestDataManager.cs
@@ -79,7 +79,7 @@ public void Dispose()
 
             try
             {
-                DeleteKeyPairs(_testData.OfType<KeyPair>());
+                DeleteKeyPairs(_testData.OfType<KeyPairSummary>());
             }
             catch (AggregateException ex) { errors.AddRange(ex.InnerExceptions); }
 
@@ -285,7 +285,7 @@ public async Task<KeyPairResponse> CreateKeyPair(KeyPairRequest request)
             return keypair;
         }
 
-        public void DeleteKeyPairs(IEnumerable<KeyPair> keypairs)
+        public void DeleteKeyPairs(IEnumerable<KeyPairSummary> keypairs)
         {
             var deletes = keypairs.Select(x => x.DeleteAsync()).ToArray();
             Task.WaitAll(deletes);
diff --git a/src/testing/unit/Compute/v2_1/KeyPairTests.cs b/src/testing/unit/Compute/v2_1/KeyPairTests.cs
@@ -43,7 +43,7 @@ public void DeserializeKeyPairCollection()
   ]
 }").ToString();
 
-            var results = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<KeyPairCollection>(json);
+            var results = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<KeyPairSummaryCollection>(json);
             Assert.NotNull(results);
             Assert.Equal(2, results.Count());
             var result = results.First();
@@ -57,8 +57,8 @@ public void GetKeyPair()
             using (var httpTest = new HttpTest())
             {
                 const string name = "keypair-name";
-                httpTest.RespondWithJson(new KeyPairDetails { Name = name });
-                KeyPairDetails result = _computeService.GetKeyPair(name);
+                httpTest.RespondWithJson(new KeyPair { Name = name });
+                KeyPair result = _computeService.GetKeyPair(name);
 
                 httpTest.ShouldHaveCalled($"*/os-keypairs/{name}");
                 Assert.NotNull(result);
@@ -88,8 +88,8 @@ public void ImportKeyPair()
             using (var httpTest = new HttpTest())
             {
                 const string name = "keypair-name";
-                httpTest.RespondWithJson(new KeyPair {Name = name});
-                KeyPair result = _computeService.ImportKeyPair(new KeyPairDefinition(name, Guid.NewGuid().ToString()));
+                httpTest.RespondWithJson(new KeyPairSummary {Name = name});
+                KeyPairSummary result = _computeService.ImportKeyPair(new KeyPairDefinition(name, Guid.NewGuid().ToString()));
 
                 httpTest.ShouldHaveCalled("*/os-keypairs");
                 Assert.NotNull(result);
@@ -103,11 +103,11 @@ public void ListKeypairs()
             using (var httpTest = new HttpTest())
             {
                 const string name = "keypair-name";
-                httpTest.RespondWithJson(new KeyPairCollection
+                httpTest.RespondWithJson(new KeyPairSummaryCollection
                 {
-                    new KeyPair { Name = name }
+                    new KeyPairSummary { Name = name }
                 });
-                IEnumerable<KeyPair> results = _computeService.ListKeyPairs();
+                IEnumerable<KeyPairSummary> results = _computeService.ListKeyPairs();
 
                 httpTest.ShouldHaveCalled("*/os-keypairs");
                 Assert.NotNull(results);
@@ -123,10 +123,10 @@ public void DeleteKeyPair(HttpStatusCode responseCode)
         {
             using (var httpTest = new HttpTest())
             {
-                httpTest.RespondWithJson(new KeyPairDetails {Name = "keypair-name"});
+                httpTest.RespondWithJson(new KeyPair {Name = "keypair-name"});
                 httpTest.RespondWith((int) responseCode, "All gone!");
 
-                KeyPair result = _computeService.GetKeyPair("keypair-name");
+                KeyPairSummary result = _computeService.GetKeyPair("keypair-name");
                 result.Delete();
 
                 httpTest.ShouldHaveCalled("*/os-keypairs");

Original file line number	Diff line number	Diff line change
`@@ -323,9 +323,9 @@ public ComputeService(IAuthenticationProvider authenticationProvider, string reg`
`323`	`323`	`#region Keypairs`
`324`	`324`
`325`	`325`	`/// <inheritdoc cref="ComputeApiBuilder.GetKeyPairAsync{T}" />`
`326`		`- public virtual Task<KeyPairDetails> GetKeyPairAsync(string keypairName, CancellationToken cancellationToken = default(CancellationToken))`
	`326`	`+ public virtual Task<KeyPair> GetKeyPairAsync(string keypairName, CancellationToken cancellationToken = default(CancellationToken))`
`327`	`327`	`{`
`328`		`- return _computeApi.GetKeyPairAsync<KeyPairDetails>(keypairName, cancellationToken);`
	`328`	`+ return _computeApi.GetKeyPairAsync<KeyPair>(keypairName, cancellationToken);`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`/// <inheritdoc cref="ComputeApiBuilder.CreateKeyPairAsync{T}" />`
`@@ -335,15 +335,15 @@ public ComputeService(IAuthenticationProvider authenticationProvider, string reg`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`/// <summary />`
`338`		`- public virtual Task<KeyPair> ImportKeyPairAsync(KeyPairDefinition keypair, CancellationToken cancellationToken = default(CancellationToken))`
	`338`	`+ public virtual Task<KeyPairSummary> ImportKeyPairAsync(KeyPairDefinition keypair, CancellationToken cancellationToken = default(CancellationToken))`
`339`	`339`	`{`
`340`		`- return _computeApi.CreateKeyPairAsync<KeyPair>(keypair, cancellationToken);`
	`340`	`+ return _computeApi.CreateKeyPairAsync<KeyPairSummary>(keypair, cancellationToken);`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`/// <inheritdoc cref="ComputeApiBuilder.ListKeyPairsAsync{T}" />`
`344`		`- public virtual async Task<IEnumerable<KeyPair>> ListKeyPairsAsync(CancellationToken cancellationToken = default(CancellationToken))`
	`344`	`+ public virtual async Task<IEnumerable<KeyPairSummary>> ListKeyPairsAsync(CancellationToken cancellationToken = default(CancellationToken))`
`345`	`345`	`{`
`346`		`- return await _computeApi.ListKeyPairsAsync<KeyPairCollection>(cancellationToken);`
	`346`	`+ return await _computeApi.ListKeyPairsAsync<KeyPairSummaryCollection>(cancellationToken);`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`/// <summary />`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ public static void DetachVolume(this ComputeService service, Identifier serverId`
`301`	`301`
`302`	`302`	`#region KeyPairs`
`303`	`303`	`/// <inheritdoc cref="ComputeService.GetKeyPairAsync" />`
`304`		`- public static KeyPairDetails GetKeyPair(this ComputeService service, string keypairName)`
	`304`	`+ public static KeyPair GetKeyPair(this ComputeService service, string keypairName)`
`305`	`305`	`{`
`306`	`306`	`return service.GetKeyPairAsync(keypairName).ForceSynchronous();`
`307`	`307`	`}`
`@@ -313,13 +313,13 @@ public static KeyPairResponse CreateKeyPair(this ComputeService service, KeyPair`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`/// <inheritdoc cref="ComputeService.ImportKeyPairAsync" />`
`316`		`- public static KeyPair ImportKeyPair(this ComputeService service, KeyPairDefinition keyPair)`
	`316`	`+ public static KeyPairSummary ImportKeyPair(this ComputeService service, KeyPairDefinition keyPair)`
`317`	`317`	`{`
`318`	`318`	`return service.ImportKeyPairAsync(keyPair).ForceSynchronous();`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`/// <inheritdoc cref="ComputeService.ListKeyPairsAsync" />`
`322`		`- public static IEnumerable<KeyPair> ListKeyPairs(this ComputeService service)`
	`322`	`+ public static IEnumerable<KeyPairSummary> ListKeyPairs(this ComputeService service)`
`323`	`323`	`{`
`324`	`324`	`return service.ListKeyPairsAsync().ForceSynchronous();`
`325`	`325`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ namespace OpenStack.Synchronous`
`7`	`7`	`/// <summary />`
`8`	`8`	`public static class KeypairExtensions_v2_1`
`9`	`9`	`{`
`10`		`- /// <inheritdoc cref="KeyPair.DeleteAsync" />`
`11`		`- public static void Delete(this KeyPair keypair)`
	`10`	`+ /// <inheritdoc cref="KeyPairSummary.DeleteAsync" />`
	`11`	`+ public static void Delete(this KeyPairSummary keypair)`
`12`	`12`	`{`
`13`	`13`	`keypair.DeleteAsync().ForceSynchronous();`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace OpenStack.Compute.v2_1`
`4`	`4`	`{`
`5`	`5`	`/// <summary />`
`6`		`- public class KeyPairResponse : KeyPair`
	`6`	`+ public class KeyPairResponse : KeyPairSummary`
`7`	`7`	`{`
`8`	`8`	`/// <summary />`
`9`	`9`	`[JsonProperty("private_key")]`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ public class KeyPairCollection<T> : ResourceCollection<T>`
`20`	`20`
`21`	`21`	`/// <inheritdoc cref="KeyPairCollection{T}" />`
`22`	`22`	`/// <exclude />`
`23`		`- public class KeyPairCollection : KeyPairCollection<KeyPair>`
	`23`	`+ public class KeyPairSummaryCollection : KeyPairCollection<KeyPairSummary>`
`24`	`24`	`{ }`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace OpenStack.Compute.v2_2`
`4`	`4`	`{`
`5`	`5`	`/// <summary />`
`6`		`- public class KeyPair : v2_1.KeyPair`
	`6`	`+ public class KeyPair : v2_1.KeyPairSummary`
`7`	`7`	`{`
`8`	`8`	`/// <summary />`
`9`	`9`	`[JsonProperty("type")]`