Isolate ComputeApiBuilder to Serialization/ComputeApi

Hide stuff that a "regular user" doesn't need to use and cleanup the name
to better reflect its purpose.

Service -> Api -> Endpoint

Author: carolynvs

src/corelib/Compute/v2_1/ComputeService.cs

@@ -4,6 +4,7 @@
 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
@@ -21,11 +22,11 @@ public class FlavorReference : IHaveExtraData, IServiceResource
 
         object IServiceResource.Owner { get; set; }
 
-        /// <inheritdoc cref="ComputeApiBuilder.GetFlavorAsync{T}" />
+        /// <inheritdoc cref="ComputeApi.GetFlavorAsync{T}" />
         /// <exception cref="InvalidOperationException">When the <see cref="FlavorSummary"/> instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
         public Task<Flavor> GetFlavorAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
-            var owner = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var owner = this.GetOwnerOrThrow<ComputeApi>();
             return owner.GetFlavorAsync<Flavor>(Id, cancellationToken);
         }
     }

src/corelib/Compute/v2_1/FlavorReference.cs

@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using OpenStack.Compute.v2_1.Serialization;
 using OpenStack.Serialization;
 
 namespace OpenStack.Compute.v2_1
@@ -70,11 +71,11 @@ public ImageType Type
             }
         }
 
-        /// <inheritdoc cref="ComputeApiBuilder.WaitForImageStatusAsync{TImage,TStatus}" />
+        /// <inheritdoc cref="ComputeApi.WaitForImageStatusAsync{TImage,TStatus}" />
         /// <exception cref="InvalidOperationException">When this instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
         public async Task WaitForStatus(ImageStatus status, TimeSpan? refreshDelay = null, TimeSpan? timeout = null, IProgress<bool> progress = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            var owner = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var owner = this.GetOwnerOrThrow<ComputeApi>();
             var result = await owner.WaitForImageStatusAsync<Image, ImageStatus>(Id, status, refreshDelay, timeout, progress, cancellationToken).ConfigureAwait(false);
             result.CopyProperties(this);
         }
@@ -85,7 +86,7 @@ public ImageType Type
             return WaitForStatus(ImageStatus.Active, refreshDelay, timeout, progress, cancellationToken);
         }
 
-        /// <inheritdoc cref="ComputeApiBuilder.WaitUntilImageIsDeletedAsync{TImage,TStatus}" />
+        /// <inheritdoc cref="ComputeApi.WaitUntilImageIsDeletedAsync{TImage,TStatus}" />
         /// <exception cref="InvalidOperationException">When this instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
         public override async Task WaitUntilDeletedAsync(TimeSpan? refreshDelay = null, TimeSpan? timeout = null, IProgress<bool> progress = null, CancellationToken cancellationToken = default(CancellationToken))
         {

src/corelib/Compute/v2_1/Image.cs

@@ -5,6 +5,7 @@
 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
@@ -52,7 +53,7 @@ protected void AssertImageIsSet([CallerMemberName]string callerName = "")
         public async Task CreateAsync(string key, string value, CancellationToken cancellationToken = default(CancellationToken))
         {
             AssertImageIsSet();
-            var compute = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var compute = this.GetOwnerOrThrow<ComputeApi>();
             await compute.CreateImagMetadataAsync(Image.Id, key, value, cancellationToken);
             this[key] = value;
         }
@@ -61,7 +62,7 @@ protected void AssertImageIsSet([CallerMemberName]string callerName = "")
         public async Task UpdateAsync(bool overwrite = false, CancellationToken cancellationToken = default(CancellationToken))
         {
             AssertImageIsSet();
-            var compute = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var compute = this.GetOwnerOrThrow<ComputeApi>();
             var results = await compute.UpdateImageMetadataAsync<ImageMetadata>(Image.Id, this, overwrite, cancellationToken);
             Clear();
             foreach (var result in results)
@@ -77,7 +78,7 @@ protected void AssertImageIsSet([CallerMemberName]string callerName = "")
                 return;
 
             AssertImageIsSet();
-            var compute = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var compute = this.GetOwnerOrThrow<ComputeApi>();
             await compute.DeleteImageMetadataAsync(Image.Id, key, cancellationToken);
             Remove(key);
         }

src/corelib/Compute/v2_1/ImageMetadata.cs

@@ -4,6 +4,7 @@
 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
@@ -21,43 +22,43 @@ public class ImageReference : IHaveExtraData, IServiceResource
 
         object IServiceResource.Owner { get; set; }
 
-        /// <inheritdoc cref="ComputeApiBuilder.GetImageAsync{T}" />
+        /// <inheritdoc cref="ComputeApi.GetImageAsync{T}" />
         /// <exception cref="InvalidOperationException">When the <see cref="ImageReference"/> instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
         public Task<Image> GetImageAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
-            var owner = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var owner = this.GetOwnerOrThrow<ComputeApi>();
             return owner.GetImageAsync<Image>(Id, cancellationToken);
         }
 
-        /// <inheritdoc cref="ComputeApiBuilder.GetImageMetadataAsync{T}" />
+        /// <inheritdoc cref="ComputeApi.GetImageMetadataAsync{T}" />
         /// <exception cref="InvalidOperationException">When the <see cref="ImageReference"/> instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
         public Task<ImageMetadata> GetMetadataAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
-            var owner = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var owner = this.GetOwnerOrThrow<ComputeApi>();
             return owner.GetImageMetadataAsync<ImageMetadata>(Id, cancellationToken);
         }
 
-        /// <inheritdoc cref="ComputeApiBuilder.GetImageMetadataItemAsync" />
+        /// <inheritdoc cref="ComputeApi.GetImageMetadataItemAsync" />
         /// <exception cref="InvalidOperationException">When the <see cref="ImageReference"/> instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
         public Task<string> GetMetadataItemAsync(string key, CancellationToken cancellationToken = default(CancellationToken))
         {
-            var owner = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var owner = this.GetOwnerOrThrow<ComputeApi>();
             return owner.GetImageMetadataItemAsync(Id, key, cancellationToken);
         }
 
-        /// <inheritdoc cref="ComputeApiBuilder.DeleteImageAsync" />
+        /// <inheritdoc cref="ComputeApi.DeleteImageAsync" />
         /// <exception cref="InvalidOperationException">When the <see cref="Server"/> instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
         public virtual async Task DeleteAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
-            var owner = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var owner = this.GetOwnerOrThrow<ComputeApi>();
             await owner.DeleteImageAsync(Id, cancellationToken);
         }
 
-        /// <inheritdoc cref="ComputeApiBuilder.WaitUntilImageIsDeletedAsync{TImage,TStatus}" />
+        /// <inheritdoc cref="ComputeApi.WaitUntilImageIsDeletedAsync{TImage,TStatus}" />
         /// <exception cref="InvalidOperationException">When this instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
         public virtual async Task WaitUntilDeletedAsync(TimeSpan? refreshDelay = null, TimeSpan? timeout = null, IProgress<bool> progress = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            var owner = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var owner = this.GetOwnerOrThrow<ComputeApi>();
             await owner.WaitUntilImageIsDeletedAsync<Image, ImageStatus>(Id, null, refreshDelay, timeout, progress, cancellationToken).ConfigureAwait(false);
         }
     }

src/corelib/Compute/v2_1/ImageReference.cs

@@ -30,10 +30,10 @@ public class KeyPairSummary : IHaveExtraData, IServiceResource
 
         object IServiceResource.Owner { get; set; }
 
-        /// <inheritdoc cref="ComputeApiBuilder.DeleteKeyPairAsync" />
+        /// <inheritdoc cref="ComputeApi.DeleteKeyPairAsync" />
         public Task DeleteAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
-            var compute = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var compute = this.GetOwnerOrThrow<ComputeApi>();
             return compute.DeleteKeyPairAsync(Name, cancellationToken);
         }
     }

src/corelib/Compute/v2_1/KeyPairSummary.cs

@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using OpenStack.Compute.v2_1.Serialization;
 using OpenStack.Serialization;
 
 namespace OpenStack.Compute.v2_1
@@ -30,22 +31,22 @@ public SecurityGroup()
         [JsonProperty("rules")]
         public IList<SecurityGroupRule> Rules { get; set; }
 
-        /// <inheritdoc cref="ComputeApiBuilder.UpdateSecurityGroupAsync{T}" />
+        /// <inheritdoc cref="ComputeApi.UpdateSecurityGroupAsync{T}" />
         /// <exception cref="InvalidOperationException">When the <see cref="Server"/> instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
         public async Task UpdateAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
-            var compute = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var compute = this.GetOwnerOrThrow<ComputeApi>();
             var request = new SecurityGroupDefinition(Name, Description);
 
             var result = await compute.UpdateSecurityGroupAsync<SecurityGroup>(Id, request, cancellationToken);
             result.CopyProperties(this);
         }
 
-        /// <inheritdoc cref="ComputeApiBuilder.CreateSecurityGroupRuleAsync{T}" />
+        /// <inheritdoc cref="ComputeApi.CreateSecurityGroupRuleAsync{T}" />
         /// <exception cref="InvalidOperationException">When the <see cref="Server"/> instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
         public async Task<SecurityGroupRule> AddRuleAsync(SecurityGroupRuleDefinition rule, CancellationToken cancellationToken = default(CancellationToken))
         {
-            var compute = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var compute = this.GetOwnerOrThrow<ComputeApi>();
             rule.GroupId = Id;
 
             var result = await compute.CreateSecurityGroupRuleAsync<SecurityGroupRule>(rule, cancellationToken);

src/corelib/Compute/v2_1/SecurityGroup.cs

@@ -29,7 +29,7 @@ private async Task<SecurityGroup> LoadSecurityGroup(CancellationToken cancellati
             if (securityGroup != null)
                 return securityGroup;
 
-            var owner = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var owner = this.GetOwnerOrThrow<ComputeApi>();
 
             // In some cases, such as when working with the groups on a server, we only have the name and not the id
             var groups = await owner.ListSecurityGroupsAsync<SecurityGroupCollection>(cancellationToken: cancellationToken);
@@ -40,18 +40,18 @@ private async Task<SecurityGroup> LoadSecurityGroup(CancellationToken cancellati
             return securityGroup;
         }
 
-        /// <inheritdoc cref="ComputeApiBuilder.GetSecurityGroupAsync{T}" />
+        /// <inheritdoc cref="ComputeApi.GetSecurityGroupAsync{T}" />
         /// <exception cref="InvalidOperationException">When this instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
         public async Task<SecurityGroup> GetSecurityGroupAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
             return await LoadSecurityGroup(cancellationToken);
         }
 
-        /// <inheritdoc cref="ComputeApiBuilder.DeleteSecurityGroupAsync" />
+        /// <inheritdoc cref="ComputeApi.DeleteSecurityGroupAsync" />
         /// <exception cref="InvalidOperationException">When this instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
         public async Task DeleteAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
-            var owner = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var owner = this.GetOwnerOrThrow<ComputeApi>();
             var securityGroup = await LoadSecurityGroup(cancellationToken);
 
             await owner.DeleteSecurityGroupAsync(securityGroup.Id, cancellationToken);

src/corelib/Compute/v2_1/SecurityGroupReference.cs

@@ -4,6 +4,7 @@
 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
@@ -54,11 +55,11 @@ public string CIDR
 
         object IServiceResource.Owner { get; set; }
 
-        /// <inheritdoc cref="ComputeApiBuilder.DeleteSecurityGroupRuleAsync" />
+        /// <inheritdoc cref="ComputeApi.DeleteSecurityGroupRuleAsync" />
         /// <exception cref="InvalidOperationException">When this instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
         public async Task DeleteAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
-            var owner = this.GetOwnerOrThrow<ComputeApiBuilder>();
+            var owner = this.GetOwnerOrThrow<ComputeApi>();
             await owner.DeleteSecurityGroupRuleAsync(Id, cancellationToken);
         }
 

src/corelib/Compute/v2_1/SecurityGroupRule.cs

@@ -11,15 +11,15 @@
 using OpenStack.Authentication;
 using OpenStack.Serialization;
 
-namespace OpenStack.Compute.v2_1
+namespace OpenStack.Compute.v2_1.Serialization
 {
     /// <summary>
     /// Builds requests to the Compute API which can be further customized and then executed.
     /// <para>Intended for custom implementations.</para>
     /// </summary>
     /// <exclude />
     /// <seealso href="http://developer.openstack.org/api-ref-compute-v2.1.html">OpenStack Compute API v2.1 Overview</seealso>
-    public class ComputeApiBuilder
+    public class ComputeApi
     {
         /// <summary />
         protected readonly IAuthenticationProvider AuthenticationProvider;
@@ -33,25 +33,25 @@ public class ComputeApiBuilder
         protected readonly ServiceEndpoint Endpoint;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ComputeApiBuilder"/> class.
+        /// Initializes a new instance of the <see cref="ComputeApi"/> class.
         /// </summary>
         /// <param name="serviceType">The service type for the desired compute provider.</param>
         /// <param name="authenticationProvider">The authentication provider.</param>
         /// <param name="region">The region.</param>
         /// <param name="useInternalUrl">if set to <c>true</c> uses the internal URLs specified in the ServiceCatalog, otherwise the public URLs are used.</param>
-        public ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl)
+        public ComputeApi(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl)
             : this(serviceType, authenticationProvider, region, useInternalUrl, "2.1")
         { }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ComputeApiBuilder"/> class.
+        /// Initializes a new instance of the <see cref="ComputeApi"/> class.
         /// </summary>
         /// <param name="serviceType">The service type for the desired compute provider.</param>
         /// <param name="authenticationProvider">The authentication provider.</param>
         /// <param name="useInternalUrl">if set to <c>true</c> uses the internal URLs specified in the ServiceCatalog, otherwise the public URLs are used.</param>
         /// <param name="region">The region.</param>
         /// <param name="microversion">The requested API microversion.</param>
-        protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl, string microversion)
+        protected ComputeApi(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl, string microversion)
         {
             if (serviceType == null)
                 throw new ArgumentNullException("serviceType");