Changeset 7441

Timestamp:

02/01/12 15:14:22 (13 years ago)

Author:

spimming

Message:

#1680: Implemented Save and Delete in CloudResourcesView and CloudManagerClient

Location:

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

Files:

• Azure/Constants.cs (modified) (1 diff)
• CloudManagerClient.cs (modified) (1 diff)
• Views/CloudResourcesView.Designer.cs (modified) (2 diffs)
• Views/CloudResourcesView.cs (modified) (1 diff)
• Views/DeploymentView.cs (modified) (1 diff)

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

@@ -85 +85 @@
     public const string DeploymentConfigurationPath = "files/ServiceConfiguration.Cloud.cscfg";
     public const string DeploymentLabel = "HeuristicLab.Hive.Slave";
+    public const string DeploymentRoleName = "HeuristicLab.Clients.Hive.Slave.AzureClient";
 
     #endregion

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

@@ -148 +148 @@
     }
 
+    public void ChangeIntances(Deployment deployment, HostedService hostedService) {
+      if (deployment == null) {
+        throw new ArgumentNullException("Deployment", "Deployment must not be null.");
+      }
+      if (hostedService == null) {
+        throw new ArgumentNullException("HostedService", "HostedService must not be null.");
+      }
+      if (deployment.Modified) {
+        AzureProvider.ChangeInstanceCount(deployment.Subscription,
+                                          hostedService.ServiceName,
+                                          deployment.DeploymentSlot,
+                                          HeuristicLab.Clients.Hive.CloudManager.Azure.Constants.DeploymentRoleName,
+                                          deployment.NewInstanceCount);
+        deployment.Modified = false;
+      }
+    }
+
+    public void Delete(Deployment deployment, HostedService hostedService) {
+      if (deployment == null) {
+        throw new ArgumentNullException("Deployment", "Deployment must not be null.");
+      }
+      if (hostedService == null) {
+        throw new ArgumentNullException("HostedService", "HostedService must not be null.");
+      }
+      //AzureProvider.DeleteDeployment();
+    }
+
+    public void Delete(HostedService hostedService) {
+      if (hostedService == null) {
+        throw new ArgumentNullException("HostedService", "HostedService must not be null.");
+      }
+      AzureProvider.DeleteHostedService(hostedService.Subscription, hostedService.ServiceName);
+    }
+
+    public void Delete(Subscription subscription) {
+      if (subscription == null) {
+        throw new ArgumentNullException("subscription", "Subscription must not be null.");
+      }
+      if (Subscriptions.Contains(subscription)) {
+        Subscriptions.Remove(subscription);
+      }
+    }
+
 
   }

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

@@ -71 +71 @@
       this.btnSave.TabIndex = 4;
       this.btnSave.UseVisualStyleBackColor = true;
+      this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
       // 
       // btnDelete
@@ -80 +81 @@
       this.btnDelete.TabIndex = 3;
       this.btnDelete.UseVisualStyleBackColor = true;
+      this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
       // 
       // btnAddSlaveService

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

@@ -292 +292 @@
       viewHost.Content = (IContent)e.Node.Tag;
     }
+
+    private void btnSave_Click(object sender, EventArgs e) {
+      if (treeCloudResources.SelectedNode != null) {
+        TreeNode tn = treeCloudResources.SelectedNode;
+        TreeNode tnParent = tn.Parent;
+        Object obj = tn.Tag;
+        Object objParent = tnParent.Tag;
+        if (obj is Subscription) {
+          // CloudManagerClient.Instance.Save((Subscription)obj);
+        } else if (obj is HostedService) {
+          // nothing to do so far
+        } else if (obj is Deployment && objParent is HostedService) {
+          HostedService hs = (HostedService)objParent;
+          Deployment dep = (Deployment)obj;
+          //call async
+          CloudManagerClient.Instance.ChangeIntances(dep, hs);
+        }
+      }
+    }
+
+    private void btnDelete_Click(object sender, EventArgs e) {
+      if (treeCloudResources.SelectedNode != null) {
+        TreeNode tn = treeCloudResources.SelectedNode;
+        TreeNode tnParent = tn.Parent;
+        Object obj = tn.Tag;
+        Object objParent = null;
+        if (tnParent != null) {
+          objParent = tnParent.Tag;
+        }
+        viewHost.Content = null;
+        if (obj is Subscription) {
+          CloudManagerClient.Instance.Delete((Subscription)obj);
+        } else if (obj is HostedService) {
+          // nothing to do so far
+        } else if (obj is Deployment && objParent is HostedService) {
+          HostedService hs = (HostedService)objParent;
+          Deployment dep = (Deployment)obj;
+          //call async
+          CloudManagerClient.Instance.Delete(dep, hs);
+        }
+      }
+    }
   }
 }

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

@@ -48 +48 @@
         } else {
           tbChangeCores.Value = Content.RoleInstanceList.Count;
+          lblChanges.Text = "";
         }