Changeset 7402

Timestamp:

01/24/12 13:48:19 (12 years ago)

Author:

spimming

Message:

#1680:

• Enum for instance size of roles
• Set reference to subscription in hosted services and deployments
• Add properties for subscription in hosted services and deployments
• Extend properties in RoleInstance

Location:

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

Files:

• Azure/AzureProvider.cs (modified) (3 diffs)
• Azure/Constants.cs (modified) (1 diff)
• Azure/ServiceManagementOperation.cs (modified) (3 diffs)
• Model/Deployment.cs (modified) (3 diffs)
• Model/HostedService.cs (modified) (2 diffs)
• Model/RoleInstance.cs (modified) (2 diffs)

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

@@ -45 +45 @@
         throw new ArgumentException("Servicename is not valid.", "serviceName");
       }
-      return ServiceManagementOperation.GetHostedServiceDetailed(subscription.SubscriptionID, subscription.CertificateThumbprint, serviceName);
+      HostedService service = ServiceManagementOperation.GetHostedServiceDetailed(subscription.SubscriptionID, subscription.CertificateThumbprint, serviceName);
+      service.Subscription = subscription;
+      foreach (Deployment dep in service.Deployments) {
+        dep.Subscription = subscription;
+      }
+      return service;
     }
 
@@ -59 +64 @@
         throw new ArgumentNullException("Subscription must not be null.", "subscription");
       }
-      return ServiceManagementOperation.ListHostedServices(subscription.SubscriptionID, subscription.CertificateThumbprint);
+      List<HostedService> services = ServiceManagementOperation.ListHostedServices(subscription.SubscriptionID, subscription.CertificateThumbprint);
+      foreach (HostedService serv in services) {
+        serv.Subscription = subscription;
+        foreach (Deployment dep in serv.Deployments) {
+          dep.Subscription = subscription;
+        }
+      }
+      return services;
     }
 
@@ -145 +157 @@
         throw new ArgumentNullException("Subscription must not be null.", "subscription");
       }
-      return ServiceManagementOperation.DiscoverSlaveService(subscription.SubscriptionID, subscription.CertificateThumbprint);
+      List<HostedService> services = ServiceManagementOperation.DiscoverSlaveService(subscription.SubscriptionID, subscription.CertificateThumbprint);
+      foreach (HostedService serv in services) {
+        serv.Subscription = subscription;
+        foreach (Deployment dep in serv.Deployments) {
+          dep.Subscription = subscription;
+        }
+      }
+      return services;
     }
   }

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

@@ -86 +86 @@
 
     #endregion
+
+    #region Enums
+
+    public enum InstanceSize {
+      ExtraSmall = 0,
+      Small = 1,
+      Medium = 2,
+      Large = 4,
+      ExtraLarge = 8
+    }
+
+    #endregion
   }
 }

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

@@ -117 +117 @@
       service.ServiceName = response.Descendants(wa + "ServiceName").Single().Value;
       service.Url = response.Descendants(wa + "Url").Single().Value;
-      service.SubscriptionId = subscriptionId;
       return service;
     }
@@ -128 +127 @@
       service.ServiceName = response.Descendants(wa + "ServiceName").Single().Value;
       service.Url = response.Descendants(wa + "Url").First().Value;
-      service.SubscriptionId = subscriptionId;
       if (response.Root.Elements(wa + "HostedServiceProperties").Any()) {
         XElement xHostedServiceProperties = response.Descendants(wa + "HostedServiceProperties").Single();
@@ -402 +400 @@
                                                  RoleName = s.Descendants(wa + "RoleName").Single().Value,
                                                  InstanceName = s.Descendants(wa + "InstanceName").Single().Value,
-                                                 InstanceStatus = s.Descendants(wa + "InstanceStatus").Single().Value
+                                                 InstanceStatus = s.Descendants(wa + "InstanceStatus").Single().Value,
+                                                 InstanceSize = s.Descendants(wa + "InstanceSize").Single().Value,
+                                                 InstanceStateDetails = s.Descendants(wa + "InstanceStateDetails").Single().Value
                                                }).ToList();
         deployment.RoleInstanceList = new List<RoleInstance>(instances);

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

@@ -37 +37 @@
     public int UpgradeDomainCount;
     public List<Role> RoleList { get; set; }
+    public Subscription Subscription { get; set; }
 
     public Deployment() {
@@ -54 +55 @@
       this.UpgradeDomainCount = original.UpgradeDomainCount;
       this.RoleList = new List<Role>(original.RoleList);
+      this.Subscription = cloner.Clone(original.Subscription);
 
     }
@@ -90 +92 @@
       this.UpgradeDomainCount = deployment.UpgradeDomainCount;
       this.RoleList = deployment.RoleList;
+      this.Subscription = deployment.Subscription;
     }
   }

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

@@ -28 +28 @@
     public string ServiceName { get; set; }
     public string Url { get; set; }
-    public string SubscriptionId { get; set; }
+    public Subscription Subscription { get; set; }
     public HostedServiceProperties HostedServiceProperties { get; set; }
     public List<Deployment> Deployments { get; set; }
@@ -39 +39 @@
       this.ServiceName = original.ServiceName;
       this.Url = original.Url;
-      this.HostedServiceProperties = cloner.Clone(HostedServiceProperties);
+      this.Subscription = cloner.Clone(original.Subscription);
+      this.HostedServiceProperties = cloner.Clone(original.HostedServiceProperties);
       this.Deployments = new List<Deployment>(original.Deployments);
     }

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

@@ -28 +28 @@
     public string InstanceName { get; set; }
     public string InstanceStatus { get; set; }
+    public string InstanceSize { get; set; }
+    public string InstanceStateDetails { get; set; }
+    public string InstanceErrorCode { get; set; }
 
     public RoleInstance() {
@@ -37 +40 @@
       this.InstanceName = original.InstanceName;
       this.InstanceStatus = original.InstanceStatus;
+      this.InstanceSize = original.InstanceSize;
+      this.InstanceStateDetails = original.InstanceStateDetails;
+      this.InstanceErrorCode = original.InstanceErrorCode;
     }