Merge pull request #589 from carolynvs/fix-useinternalurl

carolynvs · carolynvs · commit ddff6b12d74a · 2016-02-08T13:05:27.000-06:00
Fix UseInternalUrl
diff --git a/src/corelib/Compute/v2_1/ComputeApiBuilder.cs b/src/corelib/Compute/v2_1/ComputeApiBuilder.cs
@@ -32,19 +32,26 @@ public class ComputeApiBuilder
         /// <summary />
         protected readonly ServiceEndpoint Endpoint;
 
-        /// <summary />
-        public ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region)
-            : this(serviceType, authenticationProvider, region, "2.1")
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ComputeApiBuilder"/> 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)
+            : this(serviceType, authenticationProvider, region, useInternalUrl, "2.1")
         { }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ComputeApiBuilder"/> 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 microversion.</param>
-        protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, string microversion)
+        /// <param name="microversion">The requested API microversion.</param>
+        protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl, string microversion)
         {
             if (serviceType == null)
                 throw new ArgumentNullException("serviceType");
@@ -54,7 +61,7 @@ protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider au
                 throw new ArgumentException("region cannot be null or empty", "region");
 
             AuthenticationProvider = authenticationProvider;
-            Endpoint = new ServiceEndpoint(serviceType, authenticationProvider, region, false, microversion, MicroversionHeader);
+            Endpoint = new ServiceEndpoint(serviceType, authenticationProvider, region, useInternalUrl, microversion, MicroversionHeader);
         }
 
         #region Servers
diff --git a/src/corelib/Compute/v2_1/ComputeService.cs b/src/corelib/Compute/v2_1/ComputeService.cs
@@ -22,9 +22,10 @@ public class ComputeService
         /// </summary>
         /// <param name="authenticationProvider">The authentication provider.</param>
         /// <param name="region">The region.</param>
-        public ComputeService(IAuthenticationProvider authenticationProvider, string region)
+        /// <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 ComputeService(IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl = false)
         {
-            _computeApi = new ComputeApiBuilder(ServiceType.Compute, authenticationProvider, region);
+            _computeApi = new ComputeApiBuilder(ServiceType.Compute, authenticationProvider, region, useInternalUrl);
         }
 
         #region Servers
diff --git a/src/corelib/Compute/v2_2/ComputeApiBuilder.cs b/src/corelib/Compute/v2_2/ComputeApiBuilder.cs
@@ -7,13 +7,13 @@ namespace OpenStack.Compute.v2_2
     public class ComputeApiBuilder : v2_1.ComputeApiBuilder
     {
         /// <summary />
-        public ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region)
-            : this(serviceType, authenticationProvider, region, "2.2")
+        public ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl)
+            : this(serviceType, authenticationProvider, region, useInternalUrl, "2.2")
         { }
 
         /// <summary />
-        protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, string microversion)
-            : base(serviceType, authenticationProvider, region, microversion)
+        protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl, string microversion)
+            : base(serviceType, authenticationProvider, region, useInternalUrl, microversion)
         { }
     }
 }
diff --git a/src/corelib/Compute/v2_2/ComputeService.cs b/src/corelib/Compute/v2_2/ComputeService.cs
@@ -12,9 +12,9 @@ public class ComputeService
         private readonly ComputeApiBuilder _computeApiBuilder;
 
         /// <summary />
-        public ComputeService(IAuthenticationProvider authenticationProvider, string region)
+        public ComputeService(IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl)
         {
-            _computeApiBuilder = new ComputeApiBuilder(ServiceType.Compute, authenticationProvider, region);
+            _computeApiBuilder = new ComputeApiBuilder(ServiceType.Compute, authenticationProvider, region, useInternalUrl);
         }
 
         #region Servers
diff --git a/src/corelib/Compute/v2_6/ComputeApiBuilder.cs b/src/corelib/Compute/v2_6/ComputeApiBuilder.cs
@@ -2,7 +2,6 @@
 using System.ComponentModel;
 using System.Threading;
 using System.Threading.Tasks;
-using Flurl;
 using Flurl.Extensions;
 using Flurl.Http;
 using OpenStack.Authentication;
@@ -14,13 +13,13 @@ namespace OpenStack.Compute.v2_6
     public class ComputeApiBuilder : v2_2.ComputeApiBuilder
     {
         /// <inheritdoc />
-        public ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region)
-            : this(serviceType, authenticationProvider, region, "2.6")
+        public ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl)
+            : this(serviceType, authenticationProvider, region, useInternalUrl, "2.6")
         { }
 
         /// <inheritdoc />
-        protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, string microversion)
-            : base(serviceType, authenticationProvider, region, microversion)
+        protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl, string microversion)
+            : base(serviceType, authenticationProvider, region, useInternalUrl, microversion)
         { }
 
 #pragma warning disable 809
diff --git a/src/corelib/Compute/v2_6/ComputeService.cs b/src/corelib/Compute/v2_6/ComputeService.cs
@@ -10,14 +10,10 @@ public class ComputeService
     {
         private readonly ComputeApiBuilder _computeApiBuilder;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ComputeService"/> class.
-        /// </summary>
-        /// <param name="authenticationProvider">The authentication provider.</param>
-        /// <param name="region">The region.</param>
-        public ComputeService(IAuthenticationProvider authenticationProvider, string region)
+        /// <summary />
+        public ComputeService(IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl = false)
         {
-            _computeApiBuilder = new ComputeApiBuilder(ServiceType.Compute, authenticationProvider, region);
+            _computeApiBuilder = new ComputeApiBuilder(ServiceType.Compute, authenticationProvider, region, useInternalUrl);
         }
 
         #region Servers
diff --git a/src/corelib/Networking/v2/NetworkingApiBuilder.cs b/src/corelib/Networking/v2/NetworkingApiBuilder.cs
@@ -30,7 +30,8 @@ public class NetworkingApiBuilder
         /// <param name="serviceType">The service type for the desired networking provider.</param>
         /// <param name="authenticationProvider">The authentication provider.</param>
         /// <param name="region">The region.</param>
-        public NetworkingApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region)
+        /// <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 NetworkingApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl)
         {
             if(serviceType == null)
                 throw new ArgumentNullException("serviceType");
@@ -40,7 +41,7 @@ public NetworkingApiBuilder(IServiceType serviceType, IAuthenticationProvider au
                 throw new ArgumentException("region cannot be null or empty", "region");
 
             AuthenticationProvider = authenticationProvider;
-            Endpoint = new ServiceEndpoint(serviceType, authenticationProvider, region);
+            Endpoint = new ServiceEndpoint(serviceType, authenticationProvider, region, useInternalUrl);
         }
 
         #region Networks
diff --git a/src/corelib/Networking/v2/NetworkingService.cs b/src/corelib/Networking/v2/NetworkingService.cs
@@ -22,9 +22,10 @@ public class NetworkingService
         /// </summary>
         /// <param name="authenticationProvider">The authentication provider.</param>
         /// <param name="region">The region.</param>
-        public NetworkingService(IAuthenticationProvider authenticationProvider, string region)
+        /// <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 NetworkingService(IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl = false)
         {
-            _networkingApiBuilder = new NetworkingApiBuilder(ServiceType.Networking, authenticationProvider, region);
+            _networkingApiBuilder = new NetworkingApiBuilder(ServiceType.Networking, authenticationProvider, region, useInternalUrl);
         }
 
         #region Networks
diff --git a/src/corelib/ServiceEndpoint.cs b/src/corelib/ServiceEndpoint.cs
@@ -25,6 +25,17 @@ public class ServiceEndpoint
         private readonly string _microversion;
         private readonly string _microversionHeader;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ServiceEndpoint"/> class.
+        /// </summary>
+        /// <param name="serviceType">Type of the service.</param>
+        /// <param name="authenticationProvider">The authentication provider.</param>
+        /// <param name="region">The region.</param>
+        /// <param name="useInternalUrl">Specifies if internal URLs should be used.</param>
+        public ServiceEndpoint(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl)
+            : this(serviceType, authenticationProvider, region, useInternalUrl, microversion: null, microversionHeader: null)
+        {}
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServiceEndpoint"/> class.
         /// </summary>
@@ -34,8 +45,8 @@ public class ServiceEndpoint
         /// <param name="useInternalUrl">Specifies if internal URLs should be used.</param>
         /// <param name="microversion">Specifies the microversion to send with each request.</param>
         /// <param name="microversionHeader">Specifies the header to use when setting the microversion.</param>
-        public ServiceEndpoint(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl = false,
-            string microversion = null, string microversionHeader = null)
+        public ServiceEndpoint(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl,
+            string microversion, string microversionHeader)
         {
             _serviceType = serviceType;
             _authenticationProvider = authenticationProvider;

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,10 @@ public class ComputeService`
`22`	`22`	`/// </summary>`
`23`	`23`	`/// <param name="authenticationProvider">The authentication provider.</param>`
`24`	`24`	`/// <param name="region">The region.</param>`
`25`		`- public ComputeService(IAuthenticationProvider authenticationProvider, string region)`
	`25`	`+ /// <param name="useInternalUrl">if set to <c>true</c> uses the internal URLs specified in the ServiceCatalog, otherwise the public URLs are used.</param>`
	`26`	`+ public ComputeService(IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl = false)`
`26`	`27`	`{`
`27`		`- _computeApi = new ComputeApiBuilder(ServiceType.Compute, authenticationProvider, region);`
	`28`	`+ _computeApi = new ComputeApiBuilder(ServiceType.Compute, authenticationProvider, region, useInternalUrl);`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`#region Servers`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@ namespace OpenStack.Compute.v2_2`
`7`	`7`	`public class ComputeApiBuilder : v2_1.ComputeApiBuilder`
`8`	`8`	`{`
`9`	`9`	`/// <summary />`
`10`		`- public ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region)`
`11`		`- : this(serviceType, authenticationProvider, region, "2.2")`
	`10`	`+ public ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl)`
	`11`	`+ : this(serviceType, authenticationProvider, region, useInternalUrl, "2.2")`
`12`	`12`	`{ }`
`13`	`13`
`14`	`14`	`/// <summary />`
`15`		`- protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, string microversion)`
`16`		`- : base(serviceType, authenticationProvider, region, microversion)`
	`15`	`+ protected ComputeApiBuilder(IServiceType serviceType, IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl, string microversion)`
	`16`	`+ : base(serviceType, authenticationProvider, region, useInternalUrl, microversion)`
`17`	`17`	`{ }`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ public class ComputeService`
`12`	`12`	`private readonly ComputeApiBuilder _computeApiBuilder;`
`13`	`13`
`14`	`14`	`/// <summary />`
`15`		`- public ComputeService(IAuthenticationProvider authenticationProvider, string region)`
	`15`	`+ public ComputeService(IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl)`
`16`	`16`	`{`
`17`		`- _computeApiBuilder = new ComputeApiBuilder(ServiceType.Compute, authenticationProvider, region);`
	`17`	`+ _computeApiBuilder = new ComputeApiBuilder(ServiceType.Compute, authenticationProvider, region, useInternalUrl);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`#region Servers`
Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,10 @@ public class ComputeService`
`10`	`10`	`{`
`11`	`11`	`private readonly ComputeApiBuilder _computeApiBuilder;`
`12`	`12`
`13`		`- /// <summary>`
`14`		`- /// Initializes a new instance of the <see cref="ComputeService"/> class.`
`15`		`- /// </summary>`
`16`		`- /// <param name="authenticationProvider">The authentication provider.</param>`
`17`		`- /// <param name="region">The region.</param>`
`18`		`- public ComputeService(IAuthenticationProvider authenticationProvider, string region)`
	`13`	`+ /// <summary />`
	`14`	`+ public ComputeService(IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl = false)`
`19`	`15`	`{`
`20`		`- _computeApiBuilder = new ComputeApiBuilder(ServiceType.Compute, authenticationProvider, region);`
	`16`	`+ _computeApiBuilder = new ComputeApiBuilder(ServiceType.Compute, authenticationProvider, region, useInternalUrl);`
`21`	`17`	`}`
`22`	`18`
`23`	`19`	`#region Servers`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,10 @@ public class NetworkingService`
`22`	`22`	`/// </summary>`
`23`	`23`	`/// <param name="authenticationProvider">The authentication provider.</param>`
`24`	`24`	`/// <param name="region">The region.</param>`
`25`		`- public NetworkingService(IAuthenticationProvider authenticationProvider, string region)`
	`25`	`+ /// <param name="useInternalUrl">if set to <c>true</c> uses the internal URLs specified in the ServiceCatalog, otherwise the public URLs are used.</param>`
	`26`	`+ public NetworkingService(IAuthenticationProvider authenticationProvider, string region, bool useInternalUrl = false)`
`26`	`27`	`{`
`27`		`- _networkingApiBuilder = new NetworkingApiBuilder(ServiceType.Networking, authenticationProvider, region);`
	`28`	`+ _networkingApiBuilder = new NetworkingApiBuilder(ServiceType.Networking, authenticationProvider, region, useInternalUrl);`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`#region Networks`