Changeset 7577

Timestamp:

03/07/12 11:16:50 (13 years ago)

Author:

spimming

Message:

#1680:

• Check if role instance list is not null (while deploying a package)
• Remove a hosted service when it's deleted

Location:

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

Files:

• CloudManagerClient.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.CloudManager-3.3.csproj (modified) (1 diff)
• Model/HostedService.cs (modified) (1 diff)
• Views/DeploymentView.cs (modified) (3 diffs)

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

@@ -102 +102 @@
               Add(s);
             }
+
+            List<HostedService> listToDelete = new List<HostedService>();
+            foreach (HostedService s in HostedServices) {
+              if (!servs.Contains(s)) {
+                //Remove(s);
+                listToDelete.Add(s);
+              }
+            }
+            foreach (HostedService s in listToDelete) {
+              Remove(s);
+            }
           }
         }
@@ -131 +142 @@
       if (Subscriptions.Contains(subscription)) {
         Subscriptions.Remove(subscription);
+      }
+    }
+
+    public void Remove(HostedService hostedService) {
+      if (hostedService == null) {
+        throw new ArgumentNullException("hostedService", "HostedService must not be null.");
+      }
+      if (HostedServices.Contains(hostedService)) {
+        HostedServices.Remove(hostedService);
       }
     }

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

@@ -132 +132 @@
   <ItemGroup>
     <None Include="HeuristicLab.snk" />
+    <None Include="PackageFiles\HeuristicLab.Clients.Hive.Slave.Azure.ExtraLarge.cspkg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="PackageFiles\HeuristicLab.Clients.Hive.Slave.Azure.Large.cspkg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="PackageFiles\HeuristicLab.Clients.Hive.Slave.Azure.Medium.cspkg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="PackageFiles\HeuristicLab.Clients.Hive.Slave.Azure.Small.cspkg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="PackageFiles\ServiceConfiguration.Cloud.cscfg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />

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

@@ -81 +81 @@
       }
 
+      List<Deployment> listToDelete = new List<Deployment>();
       foreach (Deployment dep in this.Deployments) {
         int idx = hostedService.Deployments.IndexOf(dep);
         if (idx == -1) {
-          this.Deployments.Remove(dep);
+          //this.Deployments.Remove(dep);
+          listToDelete.Add(dep);
         }
+      }
+      foreach (Deployment d in listToDelete) {
+        this.Deployments.Remove(d);
       }
     }

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

@@ -36 +36 @@
         txtDeploymentSlot.Text = Content.DeploymentSlot;
         txtDeploymentStatus.Text = Content.Status;
-        txtInstanceCount.Text = Content.RoleInstanceList.Count.ToString();
-        if (Content.RoleInstanceList.Count > 0) {
-          txtInstanceSize.Text = Content.RoleInstanceList[0].InstanceSize;
+        if (Content.RoleInstanceList != null) {
+          txtInstanceCount.Text = Content.RoleInstanceList.Count.ToString();
+          if (Content.RoleInstanceList.Count > 0) {
+            txtInstanceSize.Text = Content.RoleInstanceList[0].InstanceSize;
+          }
+        } else {
+          txtInstanceCount.Text = "";
+          txtInstanceSize.Text = "";
         }
+
 
         tbChangeCores.Minimum = 1;
@@ -47 +53 @@
           lblChanges.Text = SaveChangesString;
         } else {
-          tbChangeCores.Value = Content.RoleInstanceList.Count;
+          if (Content.RoleInstanceList == null) {
+            tbChangeCores.Value = tbChangeCores.Minimum;
+          } else {
+            tbChangeCores.Value = Content.RoleInstanceList.Count;
+          }
           lblChanges.Text = "";
         }
@@ -75 +85 @@
 
     private int GetCoresFromInstanceSize(string instanceSize) {
-      HeuristicLab.Clients.Hive.CloudManager.Azure.Constants.InstanceSize size =
-       (HeuristicLab.Clients.Hive.CloudManager.Azure.Constants.InstanceSize)Enum.Parse(
-         typeof(HeuristicLab.Clients.Hive.CloudManager.Azure.Constants.InstanceSize),
-         instanceSize,
-         true);
-      return (int)size;
+      if (instanceSize != string.Empty) {
+        HeuristicLab.Clients.Hive.CloudManager.Azure.Constants.InstanceSize size =
+         (HeuristicLab.Clients.Hive.CloudManager.Azure.Constants.InstanceSize)Enum.Parse(
+           typeof(HeuristicLab.Clients.Hive.CloudManager.Azure.Constants.InstanceSize),
+           instanceSize,
+           true);
+        return (int)size;
+      } else {
+        return 0;
+      }
+
     }
   }