Changeset 7374 for branches

Timestamp:

01/19/12 17:45:21 (13 years ago)

Author:

spimming

Message:

#1680:

• Methods to create a deployment added
• Download blob block from public blob container
• Constants for deployment and storage api version added

Location:

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3

Files:

• Azure/AzureProvider.cs (modified) (1 diff)
• Azure/Constants.cs (modified) (2 diffs)
• Azure/IAzureProvider.cs (modified) (1 diff)
• Azure/ServiceManagementOperation.cs (modified) (2 diffs)
• Views/AddAzureServiceDialog.cs (modified) (4 diffs)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Azure/AzureProvider.cs

@@ -103 +103 @@
     }
 
+    public string CreateDeployment(Subscription subscription, string serviceName, string deploymentName, string deploymentSlot, string packageUrl, string configurationUrl, string label) {
+      return CreateDeployment(subscription, serviceName, deploymentName, deploymentSlot, packageUrl, configurationUrl, label, 1);
+    }
+
+    public string CreateDeployment(Subscription subscription, string serviceName, string deploymentName, string deploymentSlot, string packageUrl, string configurationUrl, string label, int instanceCount) {
+      if (subscription == null) {
+        throw new ArgumentNullException("Subscription must not be null.", "subscription");
+      }
+      if (instanceCount <= 0) {
+        throw new ArgumentException("Instance count must be greater than zero.", "instanceCount");
+      }
+
+      string configuration = ServiceManagementOperation.DownloadBlobAsString(new Uri(Constants.DeploymentConfigurationUrl));
+      return ServiceManagementOperation.CreateDeployment(subscription.SubscriptionID, subscription.CertificateThumbprint, serviceName, deploymentName, deploymentSlot, packageUrl, configuration, label, instanceCount);
+
+    }
   }
 }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Azure/Constants.cs

@@ -35 +35 @@
     public const string APIVersion20111001 = "2011-10-01";
     public const string APIVersion20110225 = "2011-02-25";
+    public const string APIVersion20110818 = "2011-08-18";
 
     #endregion
@@ -80 +81 @@
     public const string DeploymentSlotProduction = "production";
     public const string DeploymentPackageUrl = "https://hivestorage.blob.core.windows.net/hiveslave/HeuristicLab.Clients.Hive.Slave.Azure.cspkg";
-    public const string DeploymentConfigurationUrl = "files/ServiceConfiguration.Cloud.cscfg";
+    public const string DeploymentConfigurationUrl = "https://hivestorage.blob.core.windows.net/hiveslave/ServiceConfiguration.Cloud.cscfg";
+    public const string DeploymentConfigurationPath = "files/ServiceConfiguration.Cloud.cscfg";
     public const string DeploymentLabel = "HeuristicLab.Hive.Slave";
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Azure/IAzureProvider.cs

@@ -32 +32 @@
     string CreateHostedService(Subscription subscription, string serviceName, string label, string description, string location);
     string AddCertificate(Subscription subscription, HostedService service, string certficateFilePath, string certificatePassword);
+    string CreateDeployment(Subscription subscription, string serviceName, string deploymentName, string deploymentSlot, string packageUrl, string configurationUrl, string label);
+    string CreateDeployment(Subscription subscription, string serviceName, string deploymentName, string deploymentSlot, string packageUrl, string configurationUrl, string label, int instanceCount);
   }
 }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Azure/ServiceManagementOperation.cs

@@ -24 +24 @@
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Xml.Linq;
 using HeuristicLab.Clients.Hive.CloudManager.Model;
@@ -185 +186 @@
     }
 
-
+    public static string CreateDeployment(string subscriptionId, string thumbprint, string serviceName, string deploymentName, string deploymentSlot, string packageUrl, string configuration, string label, int instanceCount) {
+      string uri = String.Format(Constants.URIDeploymentFormat, subscriptionId, serviceName, deploymentSlot);
+      XElement xConfig = XElement.Parse(configuration);
+      SetInstanceCount(xConfig, Constants.HLSlaveRoleName, instanceCount);
+
+      XDocument payload = CreateDeploymentPayload(deploymentName, packageUrl, xConfig, label);
+      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
+      string requestId = operation.Invoke(uri, payload);
+      return requestId;
+    }
+
+    public static string DownloadBlobAsString(Uri uri) {
+      HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(uri);
+      request.Headers.Add(Constants.HeaderVersionName, Constants.APIVersion20110818);
+      request.Method = Constants.HttpMethodGET;
+      request.ContentType = Constants.ContentTypeAppXml;
+      string result = string.Empty;
+      WebResponse response = request.GetResponse();
+      using (StreamReader reader = new StreamReader(response.GetResponseStream())) {
+        result = reader.ReadToEnd();
+      }
+      return result;
+    }
 
     #endregion

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/AddAzureServiceDialog.cs

@@ -3 +3 @@
 using System.ComponentModel;
 using System.Windows.Forms;
+using HeuristicLab.Clients.Hive.CloudManager.Azure;
 using HeuristicLab.Clients.Hive.CloudManager.Model;
 using HeuristicLab.Core;
@@ -41 +42 @@
         SetGroupBoxControlsEnabled(gbNewHostedService, cbNewHostedService.Checked);
       }
+
+      certificateFile = string.Empty;
+      certificatePassword = string.Empty;
 
       workerUpdate = new BackgroundWorker();
@@ -224 +228 @@
       int instanceCount = parameters.Item7;
 
-      //STEP 1 - Create Hosted Service
+      // STEP 1 - Create Hosted Service
       if (newHostedServiceChecked) {
         if (regionChecked) {
@@ -232 +236 @@
         }
       }
+
+      // STEP 2 - Add Certificate
+      if (certFile != string.Empty) {
+        CloudManagerClient.Instance.AzureProvider.AddCertificate(sub, hostedService, certFile, certPw);
+      }
+
+      // STEP 3 - Create Deployment
+      CloudManagerClient.Instance.AzureProvider.CreateDeployment(sub, hostedService.ServiceName, Guid.NewGuid().ToString(), Constants.DeploymentSlotStaging, Constants.DeploymentPackageUrl, Constants.DeploymentConfigurationUrl, Constants.DeploymentLabel, instanceCount);
 
     }