Changeset 7339 for branches

Timestamp:

01/16/12 18:24:58 (13 years ago)

Author:

spimming

Message:

#1680:

• List-Operations added to Interface and AzureProvider
• AddCertificate- and AddAzureService-Dialog added

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) (2 diffs)
• HeuristicLab.Clients.Hive.CloudManager-3.3.csproj (modified) (2 diffs)
• Views/AddAzureServiceDialog.Designer.cs (added)
• Views/AddAzureServiceDialog.cs (added)
• Views/AddCertificate.Designer.cs (added)
• Views/AddCertificate.cs (added)
• Views/CloudResourcesView.Designer.cs (modified) (1 diff)
• Views/CloudResourcesView.cs (modified) (1 diff)

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

@@ -44 +44 @@
       return ServiceManagementOperation.ListLocations(subscription.SubscriptionID, subscription.CertificateThumbprint);
     }
+
+    public List<HostedService> ListHostedServices(Subscription subscription) {
+      if (subscription == null) {
+        throw new ArgumentException("Subscription must not be null.", "subscription");
+      }
+      return ServiceManagementOperation.ListHostedServices(subscription.SubscriptionID, subscription.CertificateThumbprint);
+    }
+
+    public List<AffinityGroup> ListAffinityGroups(Subscription subscription) {
+      if (subscription == null) {
+        throw new ArgumentException("Subscription must not be null.", "subscription");
+      }
+      return ServiceManagementOperation.ListAffinityGroups(subscription.SubscriptionID, subscription.CertificateThumbprint);
+    }
   }
 }

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

@@ -27 +27 @@
     Subscription GetSubscriptionInfo(string subscriptionId, string thumbprint);
     List<string> ListLocations(Subscription subscription);
+    List<HostedService> ListHostedServices(Subscription subscription);
+    List<AffinityGroup> ListAffinityGroups(Subscription subscription);
+
   }
 }

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

@@ -161 +161 @@
     }
 
+    public static Deployment GetDeployment(string subscriptionId, string thumbprint, string serviceName, string deploymentName) {
+      string uri = String.Format(Constants.URISpecificDeploymentFormat, subscriptionId, serviceName, deploymentName);
+      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
+      XDocument response = operation.Invoke(uri);
+      Deployment deployment = GetDeploymentFromXml(response.Root);
+      return deployment;
+    }
+
+    #endregion
+
+    #region Private Methods
+
+    private static int GetInstanceCount(XElement configuration, string roleName) {
+      XElement instanceElement = (from s in configuration.Elements(sh + "Role")
+                                  where s.Attribute("name").Value == roleName
+                                  select s.Element(sh + "Instances")).First();
+      int instanceCount = Convert.ToInt32(instanceElement.Attribute("count").Value);
+      return instanceCount;
+    }
+
+    private static void SetInstanceCount(XElement configuration, string roleName, int value) {
+      XElement instanceElement = (from s in configuration.Elements(sh + "Role")
+                                  where s.Attribute("name").Value == roleName
+                                  select s.Element(sh + "Instances")).First();
+      instanceElement.SetAttributeValue("count", value);
+    }
+
+    private static string CreateHostedService(string subscriptionId, string thumbprint, string serviceName, string label, string description, string location, string affinityGroup) {
+      string uri = string.Format(Constants.URIHostedServiceFormat, subscriptionId);
+      XDocument payload = CreateHostedServicePayload(serviceName, label, description, location, affinityGroup);
+      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
+      string requestId = operation.Invoke(uri, payload);
+      return requestId;
+    }
+
+    private static XDocument CreateHostedServicePayload(string serviceName, string label, string description, string location, string affinityGroup) {
+      string base64LabelName = Utils.ConvertToBase64String(label);
+      XElement xServiceName = new XElement(wa + "ServiceName", serviceName);
+      XElement xLabel = new XElement(wa + "Label", base64LabelName);
+      XElement xDescription = new XElement(wa + "Description", description);
+      XElement createHostedService = new XElement(wa + "CreateHostedService");
+      createHostedService.Add(xServiceName);
+      createHostedService.Add(xLabel);
+      createHostedService.Add(xDescription);
+
+      if (location != String.Empty) {
+        XElement xLocation = new XElement(wa + "Location", location);
+        createHostedService.Add(xLocation);
+      } else {
+        XElement xAffinityGroup = new XElement(wa + "AffinityGroup", affinityGroup);
+        createHostedService.Add(xAffinityGroup);
+      }
+
+      XDocument payload = new XDocument();
+      payload.Add(createHostedService);
+      payload.Declaration = new XDeclaration("1.0", "UTF-8", "no");
+
+      return payload;
+    }
+
+    private static XDocument CreateAddCertificatePayload(string certificateFilePath, string password) {
+      XElement xData = new XElement(wa + "Data", Convert.ToBase64String(File.ReadAllBytes(certificateFilePath)));
+      XElement xCertificateFormat = new XElement(wa + "CertificateFormat", "pfx");
+      XElement xPassword = new XElement(wa + "Password", password);
+
+      XElement addcert = new XElement(wa + "CertificateFile");
+      addcert.Add(xData);
+      addcert.Add(xCertificateFormat);
+      addcert.Add(xPassword);
+
+      XDocument payload = new XDocument();
+      payload.Add(addcert);
+      payload.Declaration = new XDeclaration("1.0", "UTF-8", "no");
+
+      return payload;
+    }
+
+    private static XDocument CreateDeploymentPayload(string deploymentName, string packageUrl, string pathToConfigurationFile, string label) {
+      string configurationFile = File.ReadAllText(pathToConfigurationFile);
+      XElement xConfig = XElement.Parse(configurationFile);
+      return CreateDeploymentPayload(deploymentName, packageUrl, xConfig, label);
+    }
+
+    private static XDocument CreateDeploymentPayload(string deploymentName, string packageUrl, XElement configuration, string label) {
+      string base64ConfigurationFile = Utils.ConvertToBase64String(configuration.ToString());
+      string base64Label = Utils.ConvertToBase64String(label);
+
+      XElement xName = new XElement(wa + "Name", deploymentName);
+      XElement xPackageUrl = new XElement(wa + "PackageUrl", packageUrl);
+      XElement xLabel = new XElement(wa + "Label", base64Label);
+      XElement xConfiguration = new XElement(wa + "Configuration", base64ConfigurationFile);
+      XElement xStartDeployment = new XElement(wa + "StartDeployment", "true");
+      XElement xTreatWarningsAsError = new XElement(wa + "TreatWarningsAsError", "false");
+
+      XElement createDeployment = new XElement(wa + "CreateDeployment");
+      createDeployment.Add(xName);
+      createDeployment.Add(xPackageUrl);
+      createDeployment.Add(xLabel);
+      createDeployment.Add(xConfiguration);
+      createDeployment.Add(xStartDeployment);
+      createDeployment.Add(xTreatWarningsAsError);
+
+      XDocument payload = new XDocument();
+      payload.Add(createDeployment);
+      payload.Declaration =
+      new XDeclaration("1.0", "UTF-8", "no");
+      return payload;
+    }
+
+    private static XElement LoadConfiguration(String subscriptionId, String thumbprint, String serviceName, String deploymentSlot) {
+      string uri = string.Format(Constants.URIDeploymentFormat, subscriptionId, serviceName, deploymentSlot);
+      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
+      XDocument deployment = operation.Invoke(uri);
+      string base64Configuration = deployment.Element(wa + "Deployment").Element(wa + "Configuration").Value;
+      string stringConfiguration = Utils.ConvertFromBase64String(base64Configuration);
+      XElement configuration = XElement.Parse(stringConfiguration);
+      return configuration;
+    }
+
+    private static string SaveConfiguration(String subscriptionId, String thumbprint, String serviceName, String deploymentSlot, XElement configuration) {
+      string uri = string.Format(Constants.URIDeploymentConfigurationFormat, subscriptionId, serviceName, deploymentSlot);
+      XDocument payload = CreateConfigurationPayload(configuration);
+      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
+      string requestId = operation.Invoke(uri, payload);
+      return requestId;
+    }
+
+    private static XDocument CreateConfigurationPayload(XElement configuration) {
+      string configurationString = configuration.ToString();
+      string base64Configuration = Utils.ConvertToBase64String(configurationString);
+
+      XElement xConfiguration = new XElement(wa + "Configuration", base64Configuration);
+      XElement xChangeConfiguration = new XElement(wa + "ChangeConfiguration", xConfiguration);
+
+      XDocument payload = new XDocument();
+      payload.Add(xChangeConfiguration);
+      payload.Declaration = new XDeclaration("1.0", "UTF-8", "no");
+
+      return payload;
+    }
+
+    private static XDocument GetConfigurationFromDeployment(string subscriptionId, string thumbprint, string serviceName, string deploymentName) {
+      Deployment deployment = GetDeployment(subscriptionId, thumbprint, serviceName, deploymentName);
+      XDocument config = XDocument.Parse(deployment.Configuration);
+      return config;
+    }
+
+    private static bool ContainsRoleNameInConfiguration(XDocument configuration, string roleName) {
+      if (configuration.Root.Name != sh + "ServiceConfiguration")
+        throw new ArgumentException("No valid configuration", "configuration");
+
+
+      IEnumerable<XElement> role = (from s in configuration.Root.Elements(sh + "Role")
+                                    where s.Attribute("name").Value == roleName
+                                    select s);
+      return role.Count() > 0;
+    }
+
     private static Deployment GetDeploymentFromXml(XElement xDeployment) {
       Deployment deployment = new Deployment();
@@ -214 +372 @@
     }
 
-
-
-    #endregion
-
-    #region Private Methods
-
-    private static int GetInstanceCount(XElement configuration, string roleName) {
-      XElement instanceElement = (from s in configuration.Elements(sh + "Role")
-                                  where s.Attribute("name").Value == roleName
-                                  select s.Element(sh + "Instances")).First();
-      int instanceCount = Convert.ToInt32(instanceElement.Attribute("count").Value);
-      return instanceCount;
-    }
-
-    private static void SetInstanceCount(XElement configuration, string roleName, int value) {
-      XElement instanceElement = (from s in configuration.Elements(sh + "Role")
-                                  where s.Attribute("name").Value == roleName
-                                  select s.Element(sh + "Instances")).First();
-      instanceElement.SetAttributeValue("count", value);
-    }
-
-    private static string CreateHostedService(string subscriptionId, string thumbprint, string serviceName, string label, string description, string location, string affinityGroup) {
-      string uri = string.Format(Constants.URIHostedServiceFormat, subscriptionId);
-      XDocument payload = CreateHostedServicePayload(serviceName, label, description, location, affinityGroup);
-      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
-      string requestId = operation.Invoke(uri, payload);
-      return requestId;
-    }
-
-    private static XDocument CreateHostedServicePayload(string serviceName, string label, string description, string location, string affinityGroup) {
-      string base64LabelName = Utils.ConvertToBase64String(label);
-      XElement xServiceName = new XElement(wa + "ServiceName", serviceName);
-      XElement xLabel = new XElement(wa + "Label", base64LabelName);
-      XElement xDescription = new XElement(wa + "Description", description);
-      XElement createHostedService = new XElement(wa + "CreateHostedService");
-      createHostedService.Add(xServiceName);
-      createHostedService.Add(xLabel);
-      createHostedService.Add(xDescription);
-
-      if (location != String.Empty) {
-        XElement xLocation = new XElement(wa + "Location", location);
-        createHostedService.Add(xLocation);
-      } else {
-        XElement xAffinityGroup = new XElement(wa + "AffinityGroup", affinityGroup);
-        createHostedService.Add(xAffinityGroup);
-      }
-
-      XDocument payload = new XDocument();
-      payload.Add(createHostedService);
-      payload.Declaration = new XDeclaration("1.0", "UTF-8", "no");
-
-      return payload;
-    }
-
-    private static XDocument CreateAddCertificatePayload(string certificateFilePath, string password) {
-      XElement xData = new XElement(wa + "Data", Convert.ToBase64String(File.ReadAllBytes(certificateFilePath)));
-      XElement xCertificateFormat = new XElement(wa + "CertificateFormat", "pfx");
-      XElement xPassword = new XElement(wa + "Password", password);
-
-      XElement addcert = new XElement(wa + "CertificateFile");
-      addcert.Add(xData);
-      addcert.Add(xCertificateFormat);
-      addcert.Add(xPassword);
-
-      XDocument payload = new XDocument();
-      payload.Add(addcert);
-      payload.Declaration = new XDeclaration("1.0", "UTF-8", "no");
-
-      return payload;
-    }
-
-    private static XDocument CreateDeploymentPayload(string deploymentName, string packageUrl, string pathToConfigurationFile, string label) {
-      string configurationFile = File.ReadAllText(pathToConfigurationFile);
-      XElement xConfig = XElement.Parse(configurationFile);
-      return CreateDeploymentPayload(deploymentName, packageUrl, xConfig, label);
-    }
-
-    private static XDocument CreateDeploymentPayload(string deploymentName, string packageUrl, XElement configuration, string label) {
-      string base64ConfigurationFile = Utils.ConvertToBase64String(configuration.ToString());
-      string base64Label = Utils.ConvertToBase64String(label);
-
-      XElement xName = new XElement(wa + "Name", deploymentName);
-      XElement xPackageUrl = new XElement(wa + "PackageUrl", packageUrl);
-      XElement xLabel = new XElement(wa + "Label", base64Label);
-      XElement xConfiguration = new XElement(wa + "Configuration", base64ConfigurationFile);
-      XElement xStartDeployment = new XElement(wa + "StartDeployment", "true");
-      XElement xTreatWarningsAsError = new XElement(wa + "TreatWarningsAsError", "false");
-
-      XElement createDeployment = new XElement(wa + "CreateDeployment");
-      createDeployment.Add(xName);
-      createDeployment.Add(xPackageUrl);
-      createDeployment.Add(xLabel);
-      createDeployment.Add(xConfiguration);
-      createDeployment.Add(xStartDeployment);
-      createDeployment.Add(xTreatWarningsAsError);
-
-      XDocument payload = new XDocument();
-      payload.Add(createDeployment);
-      payload.Declaration =
-      new XDeclaration("1.0", "UTF-8", "no");
-      return payload;
-    }
-
-    private static XElement LoadConfiguration(String subscriptionId, String thumbprint, String serviceName, String deploymentSlot) {
-      string uri = string.Format(Constants.URIDeploymentFormat, subscriptionId, serviceName, deploymentSlot);
-      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
-      XDocument deployment = operation.Invoke(uri);
-      string base64Configuration = deployment.Element(wa + "Deployment").Element(wa + "Configuration").Value;
-      string stringConfiguration = Utils.ConvertFromBase64String(base64Configuration);
-      XElement configuration = XElement.Parse(stringConfiguration);
-      return configuration;
-    }
-
-    private static string SaveConfiguration(String subscriptionId, String thumbprint, String serviceName, String deploymentSlot, XElement configuration) {
-      string uri = string.Format(Constants.URIDeploymentConfigurationFormat, subscriptionId, serviceName, deploymentSlot);
-      XDocument payload = CreateConfigurationPayload(configuration);
-      ServiceWebRequest operation = new ServiceWebRequest(thumbprint);
-      string requestId = operation.Invoke(uri, payload);
-      return requestId;
-    }
-
-    private static XDocument CreateConfigurationPayload(XElement configuration) {
-      string configurationString = configuration.ToString();
-      string base64Configuration = Utils.ConvertToBase64String(configurationString);
-
-      XElement xConfiguration = new XElement(wa + "Configuration", base64Configuration);
-      XElement xChangeConfiguration = new XElement(wa + "ChangeConfiguration", xConfiguration);
-
-      XDocument payload = new XDocument();
-      payload.Add(xChangeConfiguration);
-      payload.Declaration = new XDeclaration("1.0", "UTF-8", "no");
-
-      return payload;
-    }
-
-    private static XDocument GetConfigurationFromDeployment(string subscriptionId, string thumbprint, string serviceName, string deploymentName) {
-      //Deployment deployment = GetDeployment(subscriptionId, thumbprint, serviceName, deploymentName);
-      //XDocument config = XDocument.Parse(deployment.Configuration);
-      return null;//config;
-    }
-
-    private static bool ContainsRoleNameInConfiguration(XDocument configuration, string roleName) {
-      if (configuration.Root.Name != sh + "ServiceConfiguration")
-        throw new ArgumentException("No valid configuration", "configuration");
-
-
-      IEnumerable<XElement> role = (from s in configuration.Root.Elements(sh + "Role")
-                                    where s.Attribute("name").Value == roleName
-                                    select s);
-      return role.Count() > 0;
-    }
-
     #endregion
   }

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

@@ -76 +76 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="Views\AddAzureServiceDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Views\AddAzureServiceDialog.Designer.cs">
+      <DependentUpon>AddAzureServiceDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\AddCertificate.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Views\AddCertificate.Designer.cs">
+      <DependentUpon>AddCertificate.cs</DependentUpon>
+    </Compile>
     <Compile Include="Views\AddSubscriptionDialog.cs">
       <SubType>Form</SubType>
@@ -160 +172 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\AddAzureServiceDialog.resx">
+      <DependentUpon>AddAzureServiceDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\AddCertificate.resx">
+      <DependentUpon>AddCertificate.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\AddSubscriptionDialog.resx">

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

@@ -92 +92 @@
       this.btnAddSlaveService.TabIndex = 2;
       this.btnAddSlaveService.UseVisualStyleBackColor = true;
+      this.btnAddSlaveService.Click += new System.EventHandler(this.btnAddSlaveService_Click);
       // 
       // btnAddSubscription

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

@@ -138 +138 @@
       }
     }
+
+    private void btnAddSlaveService_Click(object sender, EventArgs e) {
+      using (var form = new AddAzureServiceDialog(Content)) {
+        form.ShowDialog();
+
+      }
+    }
   }
 }