Changeset 7608

Timestamp:

03/13/12 13:57:24 (13 years ago)

Author:

spimming

Message:

#1680:

• New dialog to delete hosted services
• Delete deployments in parallel

Location:

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

Files:

• HeuristicLab.Clients.Hive.CloudManager-3.3.csproj (modified) (2 diffs)
• Views/CloudResourcesView.cs (modified) (1 diff)
• Views/DeleteDeploymentView.cs (modified) (2 diffs)
• Views/DeleteHostedServiceView.Designer.cs (added)
• Views/DeleteHostedServiceView.cs (added)

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

@@ -105 +105 @@
       <DependentUpon>CloudResourcesView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Views\DeleteHostedServiceView.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Views\DeleteHostedServiceView.Designer.cs">
+      <DependentUpon>DeleteHostedServiceView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Views\DeleteDeploymentView.cs">
       <SubType>Form</SubType>
@@ -222 +228 @@
     <EmbeddedResource Include="Views\CloudResourcesView.resx">
       <DependentUpon>CloudResourcesView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\DeleteHostedServiceView.resx">
+      <DependentUpon>DeleteHostedServiceView.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\DeleteDeploymentView.resx">

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

@@ -325 +325 @@
           CloudManagerClient.Instance.Delete((Subscription)obj);
         } else if (obj is HostedService) {
-          // nothing to do so far
+          HostedService hs = (HostedService)obj;
+          using (var form = new DeleteHostedServiceView(hs)) {
+            form.ShowDialog();
+          }
         } else if (obj is Deployment && objParent is HostedService) {
           HostedService hs = (HostedService)objParent;

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

@@ -1 +1 @@
 using System;
 using System.ComponentModel;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.Clients.Hive.CloudManager.Azure;
@@ -54 +55 @@
 
       if (DeleteHostedService) {
-        foreach (Deployment d in hs.Deployments) {
+        Parallel.ForEach(hs.Deployments, d => {
           string requestId = CloudManagerClient.Instance.AzureProvider.DeleteDeployment(hs.Subscription, hs.ServiceName, d.Name);
-          Constants.OperationResult result = CloudManagerClient.Instance.AzureProvider.PollGetOperationStatus(hs.Subscription, requestId, 5, 30);
-        }
+          Constants.OperationResult result = CloudManagerClient.Instance.AzureProvider.PollGetOperationStatus(hs.Subscription, requestId, 4, 30);
+        });
         CloudManagerClient.Instance.AzureProvider.DeleteHostedService(hs.Subscription, hs.ServiceName);
       } else {