Return summaries from list servers

* ListServers returns Server
* ListServerSummaries returns ServerSummary
* Image/ServerVolume has a ServerReference

Author: carolynvs

src/corelib/Compute/v2_1/ComputeApiBuilder.cs

@@ -160,16 +160,16 @@ protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider au
         }
 
         /// <summary />
-        public virtual async Task<TPage> ListServerReferencesAsync<TPage>(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual async Task<TPage> ListServerSummariesAsync<TPage>(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
             where TPage : IPageBuilder<TPage>, IEnumerable<IServiceResource>
         {
-            Url initialRequestUrl = await BuildListServerReferencesUrlAsync(queryString, cancellationToken);
+            Url initialRequestUrl = await BuildListServerSummariesUrl(queryString, cancellationToken);
             return await Endpoint.GetResourcePageAsync<TPage>(initialRequestUrl, cancellationToken)
                 .PropogateOwnerToChildren(this);
         }
 
         /// <summary />
-        public virtual async Task<Url> BuildListServerReferencesUrlAsync(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual async Task<Url> BuildListServerSummariesUrl(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
         {
             Url endpoint = await Endpoint.GetEndpoint(cancellationToken).ConfigureAwait(false);
 
@@ -182,13 +182,13 @@ protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider au
         public virtual async Task<TPage> ListServersAsync<TPage>(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
             where TPage : IPageBuilder<TPage>, IEnumerable<IServiceResource>
         {
-            Url initialRequestUrl = await BuildListServersUrlAsync(queryString, cancellationToken);
+            Url initialRequestUrl = await BuildListServersUrl(queryString, cancellationToken);
             return await Endpoint.GetResourcePageAsync<TPage>(initialRequestUrl, cancellationToken)
                 .PropogateOwnerToChildren(this);
         }
 
         /// <summary />
-        public virtual async Task<Url> BuildListServersUrlAsync(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual async Task<Url> BuildListServersUrl(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
         {
             Url endpoint = await Endpoint.GetEndpoint(cancellationToken).ConfigureAwait(false);
 

src/corelib/Compute/v2_1/ComputeService.cs

@@ -54,10 +54,10 @@ public ComputeService(IAuthenticationProvider authenticationProvider, string reg
             return _computeApi.WaitForServerStatusAsync<Server, ServerStatus>(serverId, statuses, refreshDelay, timeout, progress, cancellationToken);
         }
 
-        /// <inheritdoc cref="ComputeApiBuilder.ListServerReferencesAsync{TPage}(IQueryStringBuilder,CancellationToken)" />
-        public async Task<IPage<ServerReference>> ListServerReferencesAsync(ServerListOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+        /// <inheritdoc cref="ComputeApiBuilder.ListServerSummariesAsync{TPage}" />
+        public async Task<IPage<ServerSummary>> ListServerSummariesAsync(ServerListOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return await _computeApi.ListServerReferencesAsync<ServerReferenceCollection>(options, cancellationToken);
+            return await _computeApi.ListServerSummariesAsync<ServerSummaryCollection>(options, cancellationToken);
         }
 
         /// <inheritdoc cref="ComputeApiBuilder.ListServersAsync{TPage}(IQueryStringBuilder,CancellationToken)" />

src/corelib/Compute/v2_1/ComputeServiceExtensions.cs

@@ -36,10 +36,10 @@ public static Server WaitForServerStatus(this ComputeService service, Identifier
             return service.WaitForServerStatusAsync(serverId, statuses, refreshDelay, timeout, progress).ForceSynchronous();
         }
 
-        /// <inheritdoc cref="ComputeService.ListServerReferencesAsync" />
-        public static IPage<ServerReference> ListServerReferences(this ComputeService service, ServerListOptions options = null)
+        /// <inheritdoc cref="ComputeService.ListServerSummariesAsync" />
+        public static IPage<ServerSummary> ListServerSummaries(this ComputeService service, ServerListOptions options = null)
         {
-            return service.ListServerReferencesAsync(options).ForceSynchronous();
+            return service.ListServerSummariesAsync(options).ForceSynchronous();
         }
 
         /// <inheritdoc cref="ComputeService.ListServersAsync" />

src/corelib/Compute/v2_1/Serialization/ServerCollection.cs

@@ -26,10 +26,10 @@ public class ServerCollection<TPage, TItem> : Page<TPage, TItem, PageLink>
     }
 
     /// <summary>
-    /// Represents a collection of references to server resources of the <see cref="ComputeService"/>.
+    /// Represents a collection of server summary resources of the <see cref="ComputeService"/>.
     /// </summary>
     /// <exclude />
-    public class ServerReferenceCollection : ServerCollection<ServerReferenceCollection, ServerReference>
+    public class ServerSummaryCollection : ServerCollection<ServerSummaryCollection, ServerSummary>
     { }
 
     /// <inheritdoc cref="ServerCollection{TPage, TItem}" />

src/corelib/Compute/v2_1/Server.cs

@@ -11,7 +11,7 @@ namespace OpenStack.Compute.v2_1
 {
     /// <summary />
     [JsonConverterWithConstructor(typeof(RootWrapperConverter), "server")]
-    public class Server : ServerReference
+    public class Server : ServerSummary
     {
         /// <summary />
         public Server()

src/corelib/Compute/v2_1/ServerReference.cs

@@ -16,10 +16,6 @@ public class ServerReference : IHaveExtraData, IServiceResource
         [JsonProperty("id")]
         public Identifier Id { get; set; }
 
-        /// <summary />
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
         /// <summary />
         [JsonExtensionData]
         IDictionary<string, JToken> IHaveExtraData.Data { get; set; } = new Dictionary<string, JToken>();

src/corelib/Compute/v2_1/ServerSummary.cs

@@ -0,0 +1,12 @@
+using Newtonsoft.Json;
+
+namespace OpenStack.Compute.v2_1
+{
+    /// <summary />
+    public class ServerSummary : ServerReference
+    {
+        /// <summary />
+        [JsonProperty("name")]
+        public string Name { get; set; }
+    }
+}

src/corelib/Compute/v2_2/ComputeService.cs

@@ -1,6 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using OpenStack.Authentication;
+using OpenStack.Compute.v2_1;
 using OpenStack.Compute.v2_2.Serialization;
 using OpenStack.Serialization;
 
@@ -18,10 +19,10 @@ public ComputeService(IAuthenticationProvider authenticationProvider, string reg
         }
 
         #region Servers
-        /// <inheritdoc cref="v2_1.ComputeApiBuilder.ListServerReferencesAsync{TPage}(IQueryStringBuilder,CancellationToken)" />
+        /// <inheritdoc cref="v2_1.ComputeApiBuilder.ListServerSummariesAsync{TPage}" />
         public virtual async Task<IPage<ServerReference>> ListServerReferencesAsync(ServerListOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return await _computeApiBuilder.ListServerReferencesAsync<ServerCollection>(options, cancellationToken);
+            return await _computeApiBuilder.ListServerSummariesAsync<ServerCollection>(options, cancellationToken);
         }
 
         /// <summary />

src/corelib/Compute/v2_6/ComputeService.cs

@@ -21,7 +21,7 @@ public ComputeService(IAuthenticationProvider authenticationProvider, string reg
         /// <summary />
         public virtual async Task<IPage<ServerReference>> ListServerReferencesAsync(ServerListOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return await _computeApiBuilder.ListServerReferencesAsync<ServerCollection>(options, cancellationToken);
+            return await _computeApiBuilder.ListServerSummariesAsync<ServerCollection>(options, cancellationToken);
         }
 
         /// <summary />

src/corelib/OpenStack.csproj

@@ -125,6 +125,7 @@
     <Compile Include="Compute\v2_1\Serialization\VolumeSnapshotCollection.cs" />
     <Compile Include="Compute\v2_1\Serialization\VolumeTypeCollection.cs" />
     <Compile Include="Compute\v2_1\Serialization\VolumeCollection.cs" />
+    <Compile Include="Compute\v2_1\ServerSummary.cs" />
     <Compile Include="Compute\v2_1\VolumeSnapshotExtensions.cs" />
     <Compile Include="Compute\v2_1\VolumeExtensions.cs" />
     <Compile Include="Compute\v2_1\ServerGroupExtensions.cs" />