Return summaries from list images

* ListImages returns Image
* ListImageSummaries returns ImageSummary
* Server has an ImageReference

Author: carolynvs

src/corelib/Compute/v2_1/ComputeApiBuilder.cs

@@ -576,16 +576,16 @@ protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider au
         }
 
         /// <summary />
-        public virtual async Task<TPage> ListImagesAsync<TPage>(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual async Task<TPage> ListImageSummariesAsync<TPage>(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
             where TPage : IPageBuilder<TPage>, IEnumerable<IServiceResource>
         {
-            Url initialRequestUrl = await BuildListImagesUrlAsync(queryString, cancellationToken);
+            Url initialRequestUrl = await BuildListImageSummariesRequest(queryString, cancellationToken);
             return await Endpoint.GetResourcePageAsync<TPage>(initialRequestUrl, cancellationToken)
                 .PropogateOwnerToChildren(this);
         }
 
         /// <summary />
-        public virtual async Task<Url> BuildListImagesUrlAsync(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual async Task<Url> BuildListImageSummariesRequest(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
         {
             Url endpoint = await Endpoint.GetEndpoint(cancellationToken).ConfigureAwait(false);
 
@@ -595,16 +595,16 @@ protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider au
         }
 
         /// <summary />
-        public virtual async Task<TPage> ListImageDetailsAsync<TPage>(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual async Task<TPage> ListImagesAsync<TPage>(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
             where TPage : IPageBuilder<TPage>, IEnumerable<IServiceResource>
         {
-            Url initialRequestUrl = await BuildListImageDetailsUrlAsync(queryString, cancellationToken);
+            Url initialRequestUrl = await BuildListImagesRequest(queryString, cancellationToken);
             return await Endpoint.GetResourcePageAsync<TPage>(initialRequestUrl, cancellationToken)
                 .PropogateOwnerToChildren(this);
         }
 
         /// <summary />
-        public virtual async Task<Url> BuildListImageDetailsUrlAsync(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual async Task<Url> BuildListImagesRequest(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken))
         {
             Url endpoint = await Endpoint.GetEndpoint(cancellationToken).ConfigureAwait(false);
 

src/corelib/Compute/v2_1/ComputeService.cs

@@ -241,16 +241,16 @@ public ComputeService(IAuthenticationProvider authenticationProvider, string reg
             return _computeApi.CreateImagMetadataAsync(imageId, key, value, cancellationToken);
         }
 
-        /// <inheritdoc cref="ComputeApiBuilder.ListImagesAsync{TPage}(IQueryStringBuilder,CancellationToken)" />
-        public async Task<IPage<ImageReference>> ListImagesAsync(ImageListOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+        /// <inheritdoc cref="ComputeApiBuilder.ListImageSummariesAsync{TPage}" />
+        public async Task<IPage<ImageSummary>> ListImageSummariesAsync(ImageListOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return await _computeApi.ListImagesAsync<ImageReferenceCollection>(options, cancellationToken);
+            return await _computeApi.ListImageSummariesAsync<ImageSummaryCollection>(options, cancellationToken);
         }
 
-        /// <inheritdoc cref="ComputeApiBuilder.ListImageDetailsAsync{TPage}(IQueryStringBuilder,CancellationToken)" />
-        public async Task<IPage<Image>> ListImageDetailsAsync(ImageListOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+        /// <inheritdoc cref="ComputeApiBuilder.ListImagesAsync{TPage}" />
+        public async Task<IPage<Image>> ListImagesAsync(ImageListOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return await _computeApi.ListImageDetailsAsync<ImageCollection>(options, cancellationToken);
+            return await _computeApi.ListImagesAsync<ImageCollection>(options, cancellationToken);
         }
 
         /// <inheritdoc cref="ComputeApiBuilder.UpdateImageMetadataAsync{T}" />

src/corelib/Compute/v2_1/ComputeServiceExtensions.cs

@@ -220,16 +220,16 @@ public static void CreateImagMetadata(this ComputeService service, Identifier im
             service.CreateImagMetadataAsync(imageId, key, value).ForceSynchronous();
         }
 
-        /// <inheritdoc cref="ComputeService.ListImagesAsync" />
-        public static IPage<ImageReference> ListImages(this ComputeService service, ImageListOptions options = null)
+        /// <inheritdoc cref="ComputeService.ListImageSummariesAsync" />
+        public static IPage<ImageSummary> ListImageSummaries(this ComputeService service, ImageListOptions options = null)
         {
-            return service.ListImagesAsync(options).ForceSynchronous();
+            return service.ListImageSummariesAsync(options).ForceSynchronous();
         }
 
-        /// <inheritdoc cref="ComputeService.ListImageDetailsAsync" />
-        public static IPage<Image> ListImageDetails(this ComputeService service, ImageListOptions options = null)
+        /// <inheritdoc cref="ComputeService.ListImagesAsync" />
+        public static IPage<Image> ListImages(this ComputeService service, ImageListOptions options = null)
         {
-            return service.ListImageDetailsAsync(options).ForceSynchronous();
+            return service.ListImagesAsync(options).ForceSynchronous();
         }
 
         /// <inheritdoc cref="ComputeService.UpdateImageMetadataAsync" />

src/corelib/Compute/v2_1/Image.cs

@@ -10,7 +10,7 @@ namespace OpenStack.Compute.v2_1
 {
     /// <summary />
     [JsonConverterWithConstructor(typeof(RootWrapperConverter), "image")]
-    public class Image : ImageReference
+    public class Image : ImageSummary
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Image"/> class.

src/corelib/Compute/v2_1/ImageReference.cs

@@ -12,11 +12,9 @@ namespace OpenStack.Compute.v2_1
     public class ImageReference : IHaveExtraData, IServiceResource
     {
         /// <summary />
+        [JsonProperty("id")]
         public virtual Identifier Id { get; set; }
 
-        /// <summary />
-        public string Name { get; set; }
-
         /// <summary />
         [JsonExtensionData]
         IDictionary<string, JToken> IHaveExtraData.Data { get; set; } = new Dictionary<string, JToken>();

src/corelib/Compute/v2_1/ImageSummary.cs

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

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

@@ -26,10 +26,10 @@ public class ImageCollection<TPage, TItem> : Page<TPage, TItem, PageLink>
     }
 
     /// <summary>
-    /// Represents a collection of references to image resources of the <see cref="ComputeService"/>.
+    /// Represents a collection of image summary resources of the <see cref="ComputeService"/>.
     /// </summary>
     /// <exclude />
-    public class ImageReferenceCollection : ImageCollection<ImageReferenceCollection, ImageReference>
+    public class ImageSummaryCollection : ImageCollection<ImageSummaryCollection, ImageSummary>
     { }
 
     /// <inheritdoc cref="FlavorCollection{T}" />

src/corelib/OpenStack.csproj

@@ -104,6 +104,7 @@
     <Compile Include="Compute\v2_1\ImageListOptions.cs" />
     <Compile Include="Compute\v2_1\ImageMetadata.cs" />
     <Compile Include="Compute\v2_1\ImageStatus.cs" />
+    <Compile Include="Compute\v2_1\ImageSummary.cs" />
     <Compile Include="Compute\v2_1\ImageType.cs" />
     <Compile Include="Compute\v2_1\IPProtocol.cs" />
     <Compile Include="Compute\v2_1\KeyPair.cs" />

src/testing/integration/Compute/v2_1/ComputeTestDataManager.cs

@@ -119,7 +119,7 @@ private async Task<Identifier> GetDefaultImage()
         {
             if (_defaultImage == null)
             {
-                var images = await _compute.ListImagesAsync(new ImageListOptions {Name = "cirros"});
+                var images = await _compute.ListImageSummariesAsync(new ImageListOptions {Name = "cirros"});
                 _defaultImage = images.First().Id;
             }
             return _defaultImage;

src/testing/integration/Compute/v2_1/ImageTests.cs

@@ -2,7 +2,6 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
-using Flurl.Http;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -34,9 +33,9 @@ public void Dispose()
         }
 
         [Fact]
-        public async Task ListImagesTest()
+        public async Task ListImageSummariesTest()
         {
-            var results = await _compute.ListImagesAsync(new ImageListOptions {PageSize = 1});
+            var results = await _compute.ListImageSummariesAsync(new ImageListOptions {PageSize = 1});
 
             while (results.Any())
             {
@@ -60,16 +59,16 @@ public async Task FindSnapshotsTest()
             _testData.Register(snapshot);
 
             Trace.WriteLine("Getting snapshot details...");
-            var results = await _compute.ListImageDetailsAsync(new ImageListOptions {Type = ImageType.Snapshot});
+            var results = await _compute.ListImagesAsync(new ImageListOptions {Type = ImageType.Snapshot});
             Assert.NotNull(results);
             Assert.All(results, x => Assert.Equal(ImageType.Snapshot, x.Type));
             Assert.Contains(results, image => image.Id == snapshot.Id);
         }
 
         [Fact]
-        public async Task ListImageDetailsTest()
+        public async Task ListImagesTest()
         {
-            var results = await _compute.ListImageDetailsAsync(new ImageListOptions { PageSize = 1 });
+            var results = await _compute.ListImagesAsync(new ImageListOptions { PageSize = 1 });
 
             while (results.Any())
             {