Merge pull request #42 from carolynvs/#40-configure-rackspacenet

Improve RackspaceNet Configuration

Author: carolynvs

src/Rackspace/CloudNetworks/v2/CloudNetworkService.cs

@@ -24,6 +24,7 @@ public class CloudNetworkService
         /// <param name="region">The region.</param>
         public CloudNetworkService(OpenStack.Authentication.IAuthenticationProvider authenticationProvider, string region)
         {
+            RackspaceNet.Configure();
             _networkingApiBuilder = new NetworkingApiBuilder(ServiceType.CloudNetworks, authenticationProvider, region);
         }
 

src/Rackspace/RackConnect/v3/RackConnectService.cs

@@ -37,6 +37,8 @@ public RackConnectService(IAuthenticationProvider authenticationProvider, string
             if (string.IsNullOrEmpty(region))
                 throw new ArgumentException("region cannot be null or empty", "region");
 
+            RackspaceNet.Configure();
+
             _authenticationProvider = authenticationProvider;
             _urlBuilder = new ServiceUrlBuilder(ServiceType.RackConnect, authenticationProvider, region);
         }

src/Rackspace/RackspaceNet.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Diagnostics;
 using System.Extensions;
-using System.Linq;
 using System.Net.Http.Headers;
 using Flurl.Http;
 using Flurl.Http.Configuration;
-using net.openstack.Core;
 using Newtonsoft.Json;
 using OpenStack;
 
@@ -23,6 +21,7 @@ public static class RackspaceNet
         /// </summary>
         public static readonly RackspaceNetConfigurationOptions Configuration = new RackspaceNetConfigurationOptions();
         private static readonly object ConfigureLock = new object();
+        private static bool _isConfigured;
 
         /// <summary>
         /// Provides thread-safe accesss to Rackspace.NET's global configuration options.
@@ -35,16 +34,37 @@ public static class RackspaceNet
         /// <param name="configure">Additional configuration of Rackspace.NET's global settings.</param>
         public static void Configure(Action<FlurlHttpConfigurationOptions> configureFlurl = null, Action<JsonSerializerSettings> configureJson = null, Action<RackspaceNetConfigurationOptions> configure = null)
         {
-            if (configure != null)
-                lock (ConfigureLock) { configure(Configuration); }
+            lock (ConfigureLock)
+            {
+                if (_isConfigured)
+                    return;
+                
+                OpenStackNet.Configure(configureFlurl, configureJson);
+
+                configure?.Invoke(Configuration);
+                Configuration.Apply(OpenStackNet.Configuration);
 
-            Action<OpenStackNetConfigurationOptions> configureOpenStackNet = options =>
+                _isConfigured = true;
+            }
+        }
+
+        /// <summary>
+        /// Resets all configuration (Rackspace.NET, OpenStack.NET, Flurl and Json.NET) so that <see cref="Configure"/> can be called again.
+        /// </summary>
+        public static void ResetDefaults()
+        {
+            lock (ConfigureLock)
             {
-                Configuration.Apply(options);
-            };
-            OpenStackNet.Configure(configureFlurl, configureJson, configureOpenStackNet);
+                if (!_isConfigured)
+                    return;
+
+                Configuration.ResetDefaults();
+                OpenStackNet.ResetDefaults();
+
+                _isConfigured = false;
+            }
         }
-        
+
         /// <inheritdoc cref="OpenStack.OpenStackNet.Tracing" />
         public static class Tracing
         {

test/Rackspace.UnitTests/CloudNetworks/v2/CloudNetworkServiceTests.cs

@@ -0,0 +1,27 @@
+using System;
+using Flurl.Http;
+using Xunit;
+
+namespace Rackspace.CloudNetworks.v2
+{
+    public class CloudNetworkServiceTests : IDisposable
+    {
+        public CloudNetworkServiceTests()
+        {
+            RackspaceNet.ResetDefaults();
+        }
+
+        public void Dispose()
+        {
+            RackspaceNet.ResetDefaults();
+        }
+
+        [Fact]
+        public void RackspaceNetIsConfiguredByService()
+        {
+            Assert.Null(FlurlHttp.Configuration.BeforeCall);
+            new CloudNetworkService(Stubs.IdentityService, "region");
+            Assert.NotNull(FlurlHttp.Configuration.BeforeCall);
+        }
+    }
+}

test/Rackspace.UnitTests/RackConnect/v3/RackConnectServiceTests.cs

@@ -0,0 +1,27 @@
+using System;
+using Flurl.Http;
+using Xunit;
+
+namespace Rackspace.RackConnect.v3
+{
+    public class RackConnectServiceTests : IDisposable
+    {
+        public RackConnectServiceTests()
+        { 
+            RackspaceNet.ResetDefaults();
+        }
+
+        public void Dispose()
+        {
+            RackspaceNet.ResetDefaults();
+        }
+
+        [Fact]
+        public void RackspaceNetIsConfiguredByService()
+        {
+            Assert.Null(FlurlHttp.Configuration.BeforeCall);
+            new RackConnectService(Stubs.IdentityService, "region");
+            Assert.NotNull(FlurlHttp.Configuration.BeforeCall);
+        }
+    }
+}

test/Rackspace.UnitTests/Rackspace.UnitTests.csproj

@@ -79,11 +79,13 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CloudNetworks\v2\CloudNetworkServiceTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="CloudNetworks\v2\NetworkTests.cs" />
     <Compile Include="CloudNetworks\v2\PortTests.cs" />
     <Compile Include="CloudNetworks\v2\SubnetTests.cs" />
     <Compile Include="IdentifierTests.cs" />
+    <Compile Include="RackConnect\v3\RackConnectServiceTests.cs" />
     <Compile Include="RackConnect\v3\NetworkTests.cs" />
     <Compile Include="RackConnect\v3\PublicIPTests.cs" />
     <Compile Include="RackspaceNetTests.cs" />

test/Rackspace.UnitTests/RackspaceNetTests.cs

@@ -1,20 +1,77 @@
 using System;
 using System.Net.Http.Headers;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using Flurl.Http;
+using OpenStack;
 using Rackspace.Testing;
 using Xunit;
 
 namespace Rackspace
 {
     public class RackspaceNetTests : IDisposable
     {
+        public RackspaceNetTests()
+        {
+            RackspaceNet.ResetDefaults();
+        }
+
         public void Dispose()
         {
-            RackspaceNet.Configuration.ResetDefaults();
+            RackspaceNet.ResetDefaults();
+        }
+
+        [Fact]
+        public async Task UseBothOpenStackAndRackspace_OpenStackConfiguredFirst()
+        {
+            using (var httpTest = new HttpTest())
+            {
+                OpenStackNet.Configure();
+                RackspaceNet.Configure();
+
+                await "http://api.com".GetAsync();
+
+                var userAgent = httpTest.CallLog[0].Request.Headers.UserAgent.ToString();
+
+                var rackspaceMatches = new Regex("rackspace").Matches(userAgent);
+                Assert.Equal(1, rackspaceMatches.Count);
+
+                var openstackMatches = new Regex("openstack").Matches(userAgent);
+                Assert.Equal(1, openstackMatches.Count);
+            }
+        }
+
+        [Fact]
+        public async Task UseBothOpenStackAndRackspace_RackspaceConfiguredFirst()
+        {
+            using (var httpTest = new HttpTest())
+            {
+                RackspaceNet.Configure();
+                OpenStackNet.Configure();
+
+                await "http://api.com".GetAsync();
+
+                var userAgent = httpTest.CallLog[0].Request.Headers.UserAgent.ToString();
+
+                var rackspaceMatches = new Regex("rackspace").Matches(userAgent);
+                Assert.Equal(1, rackspaceMatches.Count);
+
+                var openstackMatches = new Regex("openstack").Matches(userAgent);
+                Assert.Equal(1, openstackMatches.Count);
+            }
+        }
+
+        [Fact]
+        public void ResetDefaults_ResetsFlurlConfiguration()
+        {
+            RackspaceNet.Configure();
+            Assert.NotNull(FlurlHttp.Configuration.BeforeCall);
+            RackspaceNet.ResetDefaults();
+            Assert.Null(FlurlHttp.Configuration.BeforeCall);
         }
 
         [Fact]
-        public async void UserAgentTest()
+        public async Task UserAgentTest()
         {
             using (var httpTest = new HttpTest())
             {
@@ -29,7 +86,27 @@ public async void UserAgentTest()
         }
 
         [Fact]
-        public async void UserAgentWithApplicationSuffixTest()
+        public async Task UserAgentOnlyListedOnceTest()
+        {
+            using (var httpTest = new HttpTest())
+            {
+                RackspaceNet.Configure();
+                RackspaceNet.Configure();
+
+                await "http://api.com".GetAsync();
+
+                var userAgent = httpTest.CallLog[0].Request.Headers.UserAgent.ToString();
+
+                var rackspaceMatches = new Regex("rackspace").Matches(userAgent);
+                Assert.Equal(1, rackspaceMatches.Count);
+
+                var openstackMatches = new Regex("openstack").Matches(userAgent);
+                Assert.Equal(1, openstackMatches.Count);
+            }
+        }
+
+        [Fact]
+        public async Task UserAgentWithApplicationSuffixTest()
         {
             using (var httpTest = new HttpTest())
             {