Changeset 7429

Timestamp:

01/30/12 17:39:27 (12 years ago)

Author:

spimming

Message:

#1680:

• ChangeInstanceCount method added
• Deployment: added properties to indicate modification and the new instance count
• Textbox validation
• Form resized

Location:

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

Files:

• Azure/AzureProvider.cs (modified) (1 diff)
• Azure/IAzureProvider.cs (modified) (1 diff)
• Azure/ServiceManagementOperation.cs (modified) (1 diff)
• Model/Deployment.cs (modified) (3 diffs)
• Views/AddAzureServiceDialog.Designer.cs (modified) (9 diffs)
• Views/AddAzureServiceDialog.cs (modified) (2 diffs)

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

@@ -168 +168 @@
       return services;
     }
+
+    public string ChangeInstanceCount(Subscription subscription, string serviceName, string deploymentSlot, string roleName, int instanceCount) {
+      if (subscription == null) {
+        throw new ArgumentNullException("Subscription must not be null.", "subscription");
+      }
+      return ServiceManagementOperation.ChangeInstanceCount(subscription.SubscriptionID, subscription.CertificateThumbprint, serviceName, deploymentSlot, roleName, instanceCount);
+    }
   }
 }

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

@@ -38 +38 @@
 
     List<HostedService> DiscoverSlaveService(Subscription subscription);
+    string ChangeInstanceCount(Subscription subscription, string serviceName, string deploymentSlot, string roleName, int instanceCount);
+
   }
 }

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

@@ -232 +232 @@
     }
 
+    public static string ChangeInstanceCount(string subscriptionId, string thumbprint, string serviceName, string deploymentSlot, string roleName, int instanceCount) {
+      string requestId = string.Empty;
+      XElement configuration = LoadConfiguration(subscriptionId, thumbprint, serviceName, deploymentSlot);
+      if (instanceCount != GetInstanceCount(configuration, roleName)) {
+        SetInstanceCount(configuration, roleName, instanceCount);
+        requestId = SaveConfiguration(subscriptionId, thumbprint, serviceName, deploymentSlot, configuration);
+      }
+      return requestId;
+    }
+
     public static string GetOperationStatus(string subscriptionId, string thumbprint, string requestId) {
       string uri = string.Format(Constants.URIGetOperationStatusFormat, subscriptionId, requestId);

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

@@ -38 +38 @@
     public List<Role> RoleList { get; set; }
     public Subscription Subscription { get; set; }
+    public bool Modified { get; set; }
+    public int NewInstanceCount { get; set; }
 
     public Deployment() {
-
+      this.Modified = false;
     }
 
@@ -56 +58 @@
       this.RoleList = new List<Role>(original.RoleList);
       this.Subscription = cloner.Clone(original.Subscription);
+      this.Modified = original.Modified;
+      this.NewInstanceCount = original.NewInstanceCount;
 
     }
@@ -93 +97 @@
       this.RoleList = deployment.RoleList;
       this.Subscription = deployment.Subscription;
+      //this.Modified = deployment.Modified;
+      //this.NewInstanceCount = deployment.NewInstanceCount;
     }
   }

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

@@ -74 +74 @@
       this.cmbChooseSubscription.Location = new System.Drawing.Point(15, 25);
       this.cmbChooseSubscription.Name = "cmbChooseSubscription";
-      this.cmbChooseSubscription.Size = new System.Drawing.Size(471, 21);
+      this.cmbChooseSubscription.Size = new System.Drawing.Size(486, 21);
       this.cmbChooseSubscription.TabIndex = 2;
       this.cmbChooseSubscription.SelectedValueChanged += new System.EventHandler(this.cmbChooseSubscription_SelectedValueChanged);
@@ -92 +92 @@
       this.cmbChooseHostedService.Location = new System.Drawing.Point(15, 65);
       this.cmbChooseHostedService.Name = "cmbChooseHostedService";
-      this.cmbChooseHostedService.Size = new System.Drawing.Size(471, 21);
+      this.cmbChooseHostedService.Size = new System.Drawing.Size(486, 21);
       this.cmbChooseHostedService.TabIndex = 6;
       // 
@@ -109 +109 @@
       this.gbNewHostedService.Location = new System.Drawing.Point(15, 115);
       this.gbNewHostedService.Name = "gbNewHostedService";
-      this.gbNewHostedService.Size = new System.Drawing.Size(469, 145);
+      this.gbNewHostedService.Size = new System.Drawing.Size(486, 145);
       this.gbNewHostedService.TabIndex = 7;
       this.gbNewHostedService.TabStop = false;
@@ -277 +277 @@
       this.tbInstanceCount.Location = new System.Drawing.Point(13, 378);
       this.tbInstanceCount.Name = "tbInstanceCount";
-      this.tbInstanceCount.Size = new System.Drawing.Size(469, 20);
+      this.tbInstanceCount.Size = new System.Drawing.Size(488, 20);
       this.tbInstanceCount.TabIndex = 13;
+      this.tbInstanceCount.Validating += new System.ComponentModel.CancelEventHandler(this.tbInstanceCount_Validating);
       // 
       // lblCores
       // 
       this.lblCores.AutoSize = true;
-      this.lblCores.Location = new System.Drawing.Point(452, 361);
+      this.lblCores.Location = new System.Drawing.Point(471, 361);
       this.lblCores.Name = "lblCores";
       this.lblCores.Size = new System.Drawing.Size(30, 13);
@@ -292 +293 @@
       // 
       this.label10.AutoSize = true;
-      this.label10.Location = new System.Drawing.Point(417, 361);
+      this.label10.Location = new System.Drawing.Point(436, 361);
       this.label10.Name = "label10";
       this.label10.Size = new System.Drawing.Size(40, 13);
@@ -303 +304 @@
       this.progressBar.MarqueeAnimationSpeed = 10;
       this.progressBar.Name = "progressBar";
-      this.progressBar.Size = new System.Drawing.Size(307, 23);
+      this.progressBar.Size = new System.Drawing.Size(326, 23);
       this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
       this.progressBar.TabIndex = 16;
@@ -309 +310 @@
       // btnOk
       // 
-      this.btnOk.Location = new System.Drawing.Point(326, 404);
+      this.btnOk.Location = new System.Drawing.Point(345, 404);
       this.btnOk.Name = "btnOk";
       this.btnOk.Size = new System.Drawing.Size(75, 23);
@@ -319 +320 @@
       // btnCancel
       // 
-      this.btnCancel.Location = new System.Drawing.Point(407, 404);
+      this.btnCancel.Location = new System.Drawing.Point(426, 404);
       this.btnCancel.Name = "btnCancel";
       this.btnCancel.Size = new System.Drawing.Size(75, 23);
@@ -344 +345 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.AutoValidate = System.Windows.Forms.AutoValidate.EnableAllowFocusChange;
-      this.ClientSize = new System.Drawing.Size(496, 436);
+      this.ClientSize = new System.Drawing.Size(517, 436);
       this.Controls.Add(this.lblCertificateFile);
       this.Controls.Add(this.lblCores);

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

@@ -306 +306 @@
           e.Cancel = true;
         } else if (!isValidHostedServiceUrl(url)) {
-          errorProvider.SetError(tbLabel, "A hosted service name must be between 1 and 63 " +
-                                          "characters long, and be composed of letters, numbers " +
-                                          "and hyphens. Hyphens shouldn't be first or last letter.");
+          errorProvider.SetError(tbServiceName, "A hosted service name must be between 1 and 63 " +
+                                                "characters long, and be composed of letters, numbers " +
+                                                "and hyphens. Hyphens shouldn't be first or last letter.");
           e.Cancel = true;
         } else {
@@ -336 +336 @@
       }
     }
+
+    private void tbInstanceCount_Validating(object sender, CancelEventArgs e) {
+      if (!isValidInstanceCount(tbInstanceCount.Text)) {
+        errorProvider.SetError(tbInstanceCount, "Instance count must be a number greater than 0 and " +
+                                                 "less or equal than the difference between maximum and available cores.");
+        e.Cancel = true;
+      } else {
+        int instanceCount = Convert.ToInt32(tbInstanceCount.Text);
+        Subscription subscription = (Subscription)cmbChooseSubscription.SelectedItem;
+        if (instanceCount > subscription.MaxCoreCount - subscription.CurrentCoreCount) {
+          errorProvider.SetError(tbInstanceCount, "Instance count must be less or equal than the difference between maximum and available cores.");
+        } else {
+          e.Cancel = true;
+          errorProvider.SetError(tbInstanceCount, "");
+        }
+      }
+    }
+
+    private bool isValidInstanceCount(string text) {
+      string regexString = @"[1-9]+[0-9-]*";  //TODO
+      Regex regex = new Regex(regexString);
+      if (regex.IsMatch(text)) {
+        return true;
+      } else {
+        return false;
+      }
+    }
   }
 }