Changeset 7326 for branches

Timestamp:

01/13/12 16:01:39 (13 years ago)

Author:

spimming

Message:

#1680:

• New model classes
• New service operation methods added
• License information added

Location:

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

Files:

• Azure/ServiceManagementOperation.cs (modified) (1 diff)
• Azure/ServiceWebRequest.cs (modified) (1 diff)
• CloudManagerClient.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.CloudManager-3.3.csproj (modified) (1 diff)
• Model/AffinityGroup.cs (added)
• Model/Deployment.cs (added)
• Model/HostedService.cs (added)
• Model/HostedServiceProperties.cs (added)
• Model/Role.cs (added)
• Model/RoleInstance.cs (added)
• Model/Subscription.cs (modified) (1 diff)
• Model/UpgradeStatus.cs (added)

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

@@ -72 +72 @@
     }
 
+    public static List<AffinityGroup> ListAffinityGroups(string subscriptionId, string thumbprint) {
+      string uri = String.Format(Constants.URIAffinityGroupFormat, subscriptionId);
+      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
+      XDocument response = operation.Invoke(uri);
+      List<AffinityGroup> result = null;
+      if (response.Root.HasElements) {
+        result = (from s in response.Elements()
+                  select new AffinityGroup() {
+                    Name = s.Descendants(wa + "Name").Single().Value,
+                    Label = Utils.ConvertFromBase64String(s.Descendants(wa + "Label").Single().Value),
+                    Description = s.Descendants(wa + "Description").Single().Value,
+                    Location = s.Descendants(wa + "Location").Single().Value
+                  }).ToList();
+      }
+      return result;
+    }
+
+    public static List<HostedService> ListHostedServices(string subscriptionId, string thumbprint) {
+      string uri = String.Format(Constants.URIHostedServiceFormat, subscriptionId);
+      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
+      XDocument response = operation.Invoke(uri);
+      List<HostedService> result = null;
+      if (response.Root.HasElements) {
+
+        result = (from s in response.Elements()
+                  select new HostedService() {
+                    ServiceName = s.Descendants(wa + "ServiceName").Single().Value,
+                    Url = s.Descendants(wa + "Url").Single().Value
+                  }).ToList();
+      }
+
+      if (result != null)
+        return result;
+      else
+        return new List<HostedService>();
+    }
+
+    public static HostedService GetHostedService(string subscriptionId, string thumbprint, string serviceName) {
+      string uri = String.Format(Constants.URISpecificHostedServiceFormat, subscriptionId, serviceName);
+      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
+      XDocument response = operation.Invoke(uri);
+      HostedService service = new HostedService();
+      service.ServiceName = response.Descendants(wa + "ServiceName").Single().Value;
+      service.Url = response.Descendants(wa + "Url").Single().Value;
+      return service;
+    }
+
+    public static HostedService GetHostedServiceDetailed(string subscriptionId, string thumbprint, string serviceName) {
+      string uri = String.Format(Constants.URISpecificHostedServiceFormat + "?embed-detail=true", subscriptionId, serviceName);
+      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
+      XDocument response = operation.Invoke(uri);
+      HostedService service = new HostedService();
+      service.ServiceName = response.Descendants(wa + "ServiceName").Single().Value;
+      service.Url = response.Descendants(wa + "Url").First().Value;
+      if (response.Root.Elements(wa + "HostedServiceProperties").Any()) {
+        XElement xHostedServiceProperties = response.Descendants(wa + "HostedServiceProperties").Single();
+        string loc = string.Empty, affgroup = string.Empty;
+        if (xHostedServiceProperties.HasElements) {
+          string desc = xHostedServiceProperties.Descendants(wa + "Description").Single().Value;
+          if (xHostedServiceProperties.Descendants(wa + "Location").Any()) {
+            loc = xHostedServiceProperties.Descendants(wa + "Location").Single().Value;
+          } else {
+            affgroup = xHostedServiceProperties.Descendants(wa + "AffinityGroup").Single().Value;
+          }
+          string lbl = Utils.ConvertFromBase64String(xHostedServiceProperties.Descendants(wa + "Label").Single().Value);
+          HostedServiceProperties props = new HostedServiceProperties() {
+            Description = desc,
+            Location = loc,
+            AffinityGroup = affgroup,
+            Label = lbl
+          };
+          service.HostedServiceProperties = props;
+        }
+      }
+
+      if (response.Root.Elements(wa + "Deployments").Any()) {
+        XElement xDeployments = response.Descendants(wa + "Deployments").Single();
+        if (xDeployments.HasElements) {
+          IEnumerable<Deployment> deps = (from s in xDeployments.Elements()
+                                          select GetDeploymentFromXml(s)).ToList();
+          service.Deployments = new List<Deployment>(deps);
+        } else {
+          service.Deployments = new List<Deployment>();
+        }
+      }
+
+      return service;
+    }
+
+    private static Deployment GetDeploymentFromXml(XElement xDeployment) {
+      Deployment deployment = new Deployment();
+      deployment.Name = xDeployment.Descendants(wa + "Name").Single().Value;
+      deployment.DeploymentSlot = xDeployment.Descendants(wa + "DeploymentSlot").Single().Value;
+      deployment.PrivateID = xDeployment.Descendants(wa + "PrivateID").Single().Value;
+      deployment.Status = xDeployment.Descendants(wa + "Status").Single().Value;
+      deployment.Label = Utils.ConvertFromBase64String(xDeployment.Descendants(wa + "Label").Single().Value);
+      if (xDeployment.Descendants(wa + "Url").Any()) {
+        deployment.Url = xDeployment.Descendants(wa + "Url").Single().Value;
+      }
+      deployment.Configuration = Utils.ConvertFromBase64String(xDeployment.Descendants(wa + "Configuration").Single().Value);
+
+      XElement xRoleInstanceList = xDeployment.Descendants(wa + "RoleInstanceList").Single();
+      if (xRoleInstanceList.HasElements) {
+        IEnumerable<RoleInstance> instances = (from s in xRoleInstanceList.Elements()
+                                               select new RoleInstance() {
+                                                 RoleName = s.Descendants(wa + "RoleName").Single().Value,
+                                                 InstanceName = s.Descendants(wa + "InstanceName").Single().Value,
+                                                 InstanceStatus = s.Descendants(wa + "InstanceStatus").Single().Value
+                                               }).ToList();
+        deployment.RoleInstanceList = new List<RoleInstance>(instances);
+      }
+      if (xDeployment.Descendants(wa + "RoleList").Any()) {
+        XElement xRoleList = xDeployment.Descendants(wa + "RoleList").Single();
+        if (xRoleList.HasElements) {
+
+          IEnumerable<Role> roles = (from s in xRoleList.Elements()
+                                     select new Role() {
+                                       RoleName = s.Descendants(wa + "RoleName").Single().Value,
+                                       OsVersion = s.Descendants(wa + "OsVersion").Single().Value
+                                     }).ToList();
+          deployment.RoleList = new List<Role>(roles);
+        }
+      }
+
+      if (xDeployment.Descendants(wa + "UpgradeDomainCount").Any()) {
+        deployment.UpgradeDomainCount = Convert.ToInt32(xDeployment.Descendants(wa + "UpgradeDomainCount").Single().Value);
+      }
+
+      if (xDeployment.Elements("UpgradeStatus").Any()) {
+        XElement xUpgradeStatus = xDeployment.Descendants(wa + "UpgradeStatus").Single();
+        if (xUpgradeStatus.HasElements) {
+          UpgradeStatus upgradestatus = new UpgradeStatus() {
+            UpgradeType = xUpgradeStatus.Descendants(wa + "RoleName").Single().Value,
+            CurrentUpgradeDomain = Convert.ToInt32(xUpgradeStatus.Descendants(wa + "RoleName").Single().Value),
+            CurrentUpgradeDomainState = xUpgradeStatus.Descendants(wa + "RoleName").Single().Value
+          };
+          deployment.UpgradeStatus = upgradestatus;
+        }
+      }
+      return deployment;
+    }
+
+
+
     #endregion
 

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

@@ -165 +165 @@
       catch (Exception e) {
         if (e is CryptographicException)
-          Debug.WriteLine("Error: The sotre is unreadable.");
+          throw new SystemException("Error: The certificate store is unreadable.");
         else if (e is SecurityException)
-          Debug.WriteLine("Error: You don't have the required permission.");
+          throw new SystemException("Error: You don't have the required permission.");
         else if (e is ArgumentException)
-          Debug.WriteLine("Error: Invalid values in the store.");
+          throw new SystemException("Error: Invalid values in the certificate store.");
         else
-          throw;
+          throw new SystemException(e.Message, e);
       }
       finally {

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

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using HeuristicLab.Clients.Hive.CloudManager.Azure;
 using HeuristicLab.Clients.Hive.CloudManager.Model;
@@ -63 +84 @@
       try {
         IItemList<Subscription> subs = new ItemList<Subscription>(Subscriptions);
-        // TODO ...
+        foreach (Subscription subscription in subs) {
+          if (subscription.DiscoverServices) {
+            //Discover
+          }
+        }
       }
       catch {

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

@@ -61 +61 @@
     <Compile Include="CloudManagerClient.cs" />
     <Compile Include="MenuItems\CloudManagerMenuItem.cs" />
+    <Compile Include="Model\AffinityGroup.cs" />
+    <Compile Include="Model\Deployment.cs" />
+    <Compile Include="Model\HostedService.cs" />
+    <Compile Include="Model\HostedServiceProperties.cs" />
+    <Compile Include="Model\Role.cs" />
+    <Compile Include="Model\RoleInstance.cs" />
     <Compile Include="Model\Subscription.cs" />
+    <Compile Include="Model\UpgradeStatus.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

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

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Text;
 using HeuristicLab.Common;