Changeset 7354 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Azure

Timestamp:

01/18/12 09:41:57 (13 years ago)

Author:

spimming

Message:

#1680:

• Methods to create hosted services added
• Method to add a certificate to a hosted service
• update bindinglist from worker

Location:

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

Files:

• AzureProvider.cs (modified) (3 diffs)
• IAzureProvider.cs (modified) (1 diff)
• ServiceManagementOperation.cs (modified) (1 diff)

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

@@ -40 +40 @@
     public List<string> ListLocations(Subscription subscription) {
       if (subscription == null) {
-        throw new ArgumentException("Subscription must not be null.", "subscription");
+        throw new ArgumentNullException("Subscription must not be null.", "subscription");
       }
       return ServiceManagementOperation.ListLocations(subscription.SubscriptionID, subscription.CertificateThumbprint);
@@ -47 +47 @@
     public List<HostedService> ListHostedServices(Subscription subscription) {
       if (subscription == null) {
-        throw new ArgumentException("Subscription must not be null.", "subscription");
+        throw new ArgumentNullException("Subscription must not be null.", "subscription");
       }
       return ServiceManagementOperation.ListHostedServices(subscription.SubscriptionID, subscription.CertificateThumbprint);
@@ -54 +54 @@
     public List<AffinityGroup> ListAffinityGroups(Subscription subscription) {
       if (subscription == null) {
-        throw new ArgumentException("Subscription must not be null.", "subscription");
+        throw new ArgumentNullException("Subscription must not be null.", "subscription");
       }
       return ServiceManagementOperation.ListAffinityGroups(subscription.SubscriptionID, subscription.CertificateThumbprint);
     }
+
+    public string CreateHostedService(Subscription subscription, string serviceName, string label, string description, AffinityGroup affinityGroup) {
+      if (subscription == null) {
+        throw new ArgumentNullException("Subscription must not be null.", "subscription");
+      }
+      if (serviceName.Length == 0) {
+        throw new ArgumentException("Servicename is not valid.", "serviceName");
+      }
+      if (label.Length == 0) {
+        throw new ArgumentException("Label is not valid.", "label");
+      }
+      if (affinityGroup == null) {
+        throw new ArgumentNullException("AffinityGroup must not be null.", "affinityGroup");
+      }
+
+      return ServiceManagementOperation.CreateHostedServiceWithAffinityGroup(subscription.SubscriptionID, subscription.CertificateThumbprint, serviceName, label, description, affinityGroup.Name);
+    }
+
+    public string CreateHostedService(Subscription subscription, string serviceName, string label, string description, string location) {
+      if (subscription == null) {
+        throw new ArgumentNullException("Subscription must not be null.", "subscription");
+      }
+      if (serviceName.Length == 0) {
+        throw new ArgumentException("Servicename is not valid.", "serviceName");
+      }
+      if (label.Length == 0) {
+        throw new ArgumentException("Label is not valid.", "label");
+      }
+      if (location.Length == 0) {
+        throw new ArgumentException("Location is not valid.", "location");
+      }
+
+      return ServiceManagementOperation.CreateHostedServiceWithLocation(subscription.SubscriptionID, subscription.CertificateThumbprint, serviceName, label, description, location);
+    }
+
+    public string AddCertificate(Subscription subscription, HostedService service, string certficateFilePath, string certificatePassword) {
+      if (subscription == null) {
+        throw new ArgumentNullException("Subscription must not be null.", "subscription");
+      }
+      if (service == null) {
+        throw new ArgumentNullException("HostedService must not be null.", "service");
+      }
+      return ServiceManagementOperation.AddCertificate(subscription.SubscriptionID, subscription.CertificateThumbprint, service.ServiceName, certficateFilePath, certificatePassword);
+    }
+
   }
 }

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

@@ -29 +29 @@
     List<HostedService> ListHostedServices(Subscription subscription);
     List<AffinityGroup> ListAffinityGroups(Subscription subscription);
-
+    string CreateHostedService(Subscription subscription, string serviceName, string label, string description, AffinityGroup affinityGroup);
+    string CreateHostedService(Subscription subscription, string serviceName, string label, string description, string location);
+    string AddCertificate(Subscription subscription, HostedService service, string certficateFilePath, string certificatePassword);
   }
 }

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

@@ -169 +169 @@
     }
 
+    public static string AddCertificate(string subscriptionId, string thumbprint, string serviceName, string certificateFilePath, string password) {
+      string uri = String.Format(Constants.URICertificateFormat, subscriptionId, serviceName);
+      XDocument payload = CreateAddCertificatePayload(certificateFilePath, password);
+      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
+      string requestId = operation.Invoke(uri, payload);
+      return requestId;
+    }
+
+    public static string CreateHostedServiceWithLocation(string subscriptionId, string thumbprint, string serviceName, string label, string description, string location) {
+      return CreateHostedService(subscriptionId, thumbprint, serviceName, label, description, location, String.Empty);
+    }
+
+    public static string CreateHostedServiceWithAffinityGroup(string subscriptionId, string thumbprint, string serviceName, string label, string description, string affinityGroup) {
+      return CreateHostedService(subscriptionId, thumbprint, serviceName, label, description, String.Empty, affinityGroup);
+    }
+
+
+
     #endregion