Merge pull request #1622 from sergeybykov/azure-config

Add helper methods to AzureClient and AzureSilo for easier programmatic config
dotnet · Mar 30, 2016 · 691208e · 691208e
2 parents 77f1593 + 506dc2b
commit 691208e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/src/OrleansAzureUtils/Hosting/AzureClient.cs b/src/OrleansAzureUtils/Hosting/AzureClient.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Net;
 using System.Threading;
 using Orleans.Runtime.Configuration;
 
@@ -74,6 +75,22 @@ public static void Uninitialize()
             GrainClient.Uninitialize();
         }
 
+        /// <summary>
+        /// Returns default client configuration object for passing to AzureClient.
+        /// </summary>
+        /// <returns></returns>
+        public static ClientConfiguration DefaultConfiguration()
+        {
+            var config = new ClientConfiguration
+            {
+                GatewayProvider = ClientConfiguration.GatewayProviderType.AzureTable,
+                DeploymentId = GetDeploymentId(),
+                DataConnectionString = GetDataConnectionString(),
+            };
+
+            return config;
+        }
+
         #region Internal implementation of client initialization processing
 
         private static void InitializeImpl_FromFile(FileInfo configFile)
@@ -123,12 +140,12 @@ private static void InitializeImpl_FromFile(FileInfo configFile)
             InitializeImpl_FromConfig(config);
         }
 
-        private static string GetDeploymentId()
+        internal static string GetDeploymentId()
         {
             return GrainClient.TestOnlyNoConnect ? "FakeDeploymentId" : serviceRuntimeWrapper.DeploymentId;
         }
 
-        private static string GetDataConnectionString()
+        internal static string GetDataConnectionString()
         {
             return GrainClient.TestOnlyNoConnect
                 ? "FakeConnectionString"

diff --git a/src/OrleansAzureUtils/Hosting/AzureSilo.cs b/src/OrleansAzureUtils/Hosting/AzureSilo.cs
@@ -61,6 +61,17 @@ public AzureSilo()
             logger = TraceLogger.GetLogger("OrleansAzureSilo", TraceLogger.LoggerType.Runtime);
         }
 
+        public static ClusterConfiguration DefaultConfiguration()
+        {
+            var config = new ClusterConfiguration();
+
+            config.Globals.LivenessType = GlobalConfiguration.LivenessProviderType.AzureTable;
+            config.Globals.DeploymentId = AzureClient.GetDeploymentId();
+            config.Globals.DataConnectionString = AzureClient.GetDataConnectionString();
+
+            return config;
+        }
+
         #region Azure RoleEntryPoint methods
 
         /// <summary>