Changeset 7386

Timestamp:

01/20/12 16:52:52 (13 years ago)

Author:

spimming

Message:

#1680:

• Added property to refer to the corresponding subscription
• Added new methods to azure management utils

Location:

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

Files:

• Azure/AzureProvider.cs (modified) (2 diffs)
• Azure/IAzureProvider.cs (modified) (2 diffs)
• Azure/ServiceManagementOperation.cs (modified) (3 diffs)
• Model/HostedService.cs (modified) (1 diff)

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

@@ -36 +36 @@
       }
       return ServiceManagementOperation.GetSubscriptionInfo(subscriptionId, thumbprint);
+    }
+
+    public HostedService GetHostedService(Subscription subscription, string serviceName) {
+      if (subscription == null) {
+        throw new ArgumentNullException("Subscription must not be null.", "subscription");
+      }
+      if (serviceName.Length == 0) {
+        throw new ArgumentException("Servicename is not valid.", "serviceName");
+      }
+      return ServiceManagementOperation.GetHostedServiceDetailed(subscription.SubscriptionID, subscription.CertificateThumbprint, serviceName);
     }
 
@@ -119 +129 @@
 
     }
+
+    public string DeleteHostedService(Subscription subscription, string serviceName) {
+      if (subscription == null) {
+        throw new ArgumentNullException("Subscription must not be null.", "subscription");
+      }
+      if (serviceName.Length == 0) {
+        throw new ArgumentException("Servicename is not valid.", "serviceName");
+      }
+
+      return ServiceManagementOperation.DeleteHostedService(subscription.SubscriptionID, subscription.CertificateThumbprint, serviceName);
+    }
+
+    public List<HostedService> DiscoverSlaveService(Subscription subscription) {
+      if (subscription == null) {
+        throw new ArgumentNullException("Subscription must not be null.", "subscription");
+      }
+      return ServiceManagementOperation.DiscoverSlaveService(subscription.SubscriptionID, subscription.CertificateThumbprint);
+    }
   }
 }

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

@@ -26 +26 @@
   public interface IAzureProvider {
     Subscription GetSubscriptionInfo(string subscriptionId, string thumbprint);
+    HostedService GetHostedService(Subscription subscription, string serviceName);
     List<string> ListLocations(Subscription subscription);
     List<HostedService> ListHostedServices(Subscription subscription);
@@ -34 +35 @@
     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);
+    string DeleteHostedService(Subscription subscription, string serviceName);
+
+    List<HostedService> DiscoverSlaveService(Subscription subscription);
   }
 }

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

@@ -117 +117 @@
       service.ServiceName = response.Descendants(wa + "ServiceName").Single().Value;
       service.Url = response.Descendants(wa + "Url").Single().Value;
+      service.SubscriptionId = subscriptionId;
       return service;
     }
@@ -127 +128 @@
       service.ServiceName = response.Descendants(wa + "ServiceName").Single().Value;
       service.Url = response.Descendants(wa + "Url").First().Value;
+      service.SubscriptionId = subscriptionId;
       if (response.Root.Elements(wa + "HostedServiceProperties").Any()) {
         XElement xHostedServiceProperties = response.Descendants(wa + "HostedServiceProperties").Single();
@@ -210 +212 @@
     }
 
+    public static List<HostedService> DiscoverSlaveService(string subscriptionId, string thumbprint) {
+      List<HostedService> hostedServices = new List<HostedService>();
+      foreach (HostedService hostedService in ListHostedServices(subscriptionId, thumbprint)) {
+        HostedService hs = GetHostedServiceDetailed(subscriptionId, thumbprint, hostedService.ServiceName);
+        foreach (Deployment deployment in hs.Deployments) {
+          if (ContainsRoleNameInConfiguration(XDocument.Parse(deployment.Configuration), Constants.HLSlaveRoleName)) {
+            if (!hostedServices.Contains(hs)) {
+              hostedServices.Add(hs);
+            }
+          }
+        }
+      }
+      return hostedServices;
+    }
+
+    public static string DeleteHostedService(string subscriptionId, string thumbprint, string serviceName) {
+      string uri = String.Format(Constants.URISpecificHostedServiceFormat, subscriptionId, serviceName);
+      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
+      string requestId = operation.Invoke(uri, Constants.HttpMethodDELETE);
+      return requestId;
+    }
+
     #endregion
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Model/HostedService.cs

@@ -28 +28 @@
     public string ServiceName { get; set; }
     public string Url { get; set; }
+    public string SubscriptionId { get; set; }
     public HostedServiceProperties HostedServiceProperties { get; set; }
     public List<Deployment> Deployments { get; set; }