Changeset 7668

Timestamp:

03/28/12 14:38:56 (12 years ago)

Author:

spimming

Message:

#1680:

• restore subscription data on cloud manager startup
• correct idxs for parsing subscription string

Location:

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

Files:

• CloudManagerClient.cs (modified) (1 diff)
• Model/Subscription.cs (modified) (1 diff)
• Views/CloudResourcesView.cs (modified) (1 diff)

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

@@ -228 +228 @@
 
     public void RestoreSubscriptionsFromUserConfig() {
-      StringCollection strCol = new StringCollection();
+      StringCollection strCol = Settings.Default.AzureSubscriptions;
       foreach (string azureSub in strCol) {
         string setting = CryptoService.ToInsecureString(CryptoService.DecryptString(azureSub));
         Subscription s = Subscription.ParseSettingString(setting);
         s.SaveToConfig = true;
+        s.DiscoverServices = true;
         Add(s);
       }

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

@@ -109 +109 @@
       int idxSeparator = settingString.IndexOf(';');
       string subId = settingString.Substring(0, idxSeparator);
-      string certThumbprint = settingString.Substring(idxSeparator, settingString.Length);
+      int length = settingString.Length - 1 - idxSeparator;
+      string certThumbprint = settingString.Substring(idxSeparator + 1, length);
       Subscription sub = new Subscription();
       sub.SubscriptionID = subId;

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

@@ -51 +51 @@
       timer.Start();
       dueTime = DateTime.Now.AddMilliseconds(updateInterval);
+
+      CloudManagerClient.Instance.RestoreSubscriptionsFromUserConfig();
     }