Merge pull request #226 from fogbow/Azure

Azure

Author: giovannifs

manager.conf.example

@@ -59,6 +59,14 @@ compute_novav2_network_id=ea51ed0c-0e8a-448d-8202-c79777109ffe
 # compute_cloudstack_hypervisor=KVM
 # compute_cloudstack_image_download_os_type_id=ea51ed0c-0e8a-448d-8202-c79777109ffe
 
+##Compute Plugin (Azure)
+# compute_class=org.fogbowcloud.manager.core.plugins.compute.cloudstack.AzureComputePlugin
+# compute_azure_max_vcpu=10
+# compute_azure_max_ram=10240
+# compute_azure_region=East US
+# compute_azure_storage_account_name=storage1
+# compute_azure_storage_key=abcd12345
+
 ## Compute Plugin (EC2)
 # compute_ec2_region=us-east-1
 # compute_ec2_security_group_id=sg-12345678
@@ -158,6 +166,12 @@ federation_identity_url=http://localhost:5000
 # path_trust_anchors=/etc/grid-security/certificates
 # path_vomsdir=/etc/grid-security/vomsdir
 
+## Identity (Azure)
+# federation_identity_class=org.fogbowcloud.manager.core.plugins.identity.azure.AzureIdentityPlugin
+# proxy_account_subscription_id=subscription_id
+# proxy_account_keystore_path=/etc/keystore/azure
+# proxy_account_keystore_password=test123
+
 ## Member Validator
 member_validator_class=org.fogbowcloud.manager.core.plugins.memberauthorization.DefaultMemberAuthorizationPlugin
 member_validator_ca_dir=

pom.xml

@@ -236,6 +236,21 @@
 		<version>1.10.11</version>
 	</dependency>
 	<dependency>
+	    <groupId>com.microsoft.azure</groupId>
+	    <artifactId>azure-management-compute</artifactId>
+	    <version>0.8.0</version>
+	</dependency>
+	<dependency>
+	    <groupId>com.microsoft.azure</groupId>
+	    <artifactId>azure-storage</artifactId>
+	    <version>3.0.0</version>
+	</dependency>
+	<dependency>
+	    <groupId>com.microsoft.azure</groupId>
+	    <artifactId>azure-management</artifactId>
+	    <version>0.8.0</version>
+	</dependency>
+    <dependency>
 		<groupId>org.opensaml</groupId>
 		<artifactId>opensaml</artifactId>
 		<version>2.6.4</version>

src/main/java/org/fogbowcloud/manager/core/model/Flavor.java

@@ -5,8 +5,20 @@ public class Flavor {
 	private Integer capacity;
 	private String name;
 	private String id;
+	
+	/**
+	 * Number of cores of the CPU.
+	 */
 	private String cpu;
+	
+	/**
+	 * RAM memory in MB.
+	 */
 	private String memInMB;
+	
+	/**
+	 * Disk in GB.
+	 */
 	private String disk;
 
 	public Flavor(String name, String cpu, String memInMB, String disk) {

src/main/java/org/fogbowcloud/manager/core/plugins/ComputePlugin.java

@@ -13,6 +13,13 @@
 
 public interface ComputePlugin {
 
+	/**
+	 * @param token
+	 * @param categories, list of categories.
+	 * @param xOCCIAtt
+	 * @param imageId
+	 * @return the instance ID
+	 */
 	public String requestInstance(Token token,List<Category> categories, 
 			Map<String, String> xOCCIAtt, String imageId);
 
@@ -24,6 +31,10 @@ public String requestInstance(Token token,List<Category> categories,
 
 	public void removeInstances(Token token);
 
+	/**
+	 * @param token
+	 * @return the amount of resources still available in the cloud.
+	 */
 	public ResourcesInfo getResourcesInfo(Token token);
 
 	/**

src/main/java/org/fogbowcloud/manager/core/plugins/common/azure/AzureAttributes.java

@@ -0,0 +1,7 @@
+package org.fogbowcloud.manager.core.plugins.common.azure;
+
+public class AzureAttributes {
+	public static final String SUBSCRIPTION_ID_KEY = "subscriptionID";
+	public static final String KEYSTORE_PATH_KEY = "keystorePath";
+	public static final String KEYSTORE_PASSWORD_KEY = "keystorePassword";	
+}

…dentity/cloudstack/CloudStackHelper.java …/common/cloudstack/CloudStackHelper.javasrc/main/java/org/fogbowcloud/manager/core/plugins/identity/cloudstack/CloudStackHelper.java renamed to src/main/java/org/fogbowcloud/manager/core/plugins/common/cloudstack/CloudStackHelper.java src/main/java/org/fogbowcloud/manager/core/plugins/identity/cloudstack/CloudStackHelper.java renamed to src/main/java/org/fogbowcloud/manager/core/plugins/common/cloudstack/CloudStackHelper.java

@@ -1,4 +1,4 @@
-package org.fogbowcloud.manager.core.plugins.identity.cloudstack;
+package org.fogbowcloud.manager.core.plugins.common.cloudstack;
 
 import java.security.Key;
 import java.util.Map.Entry;
@@ -11,6 +11,7 @@
 import org.apache.commons.io.Charsets;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.log4j.Logger;
+import org.fogbowcloud.manager.core.plugins.identity.cloudstack.CloudStackIdentityPlugin;
 import org.fogbowcloud.manager.occi.model.ErrorType;
 import org.fogbowcloud.manager.occi.model.OCCIException;
 import org.fogbowcloud.manager.occi.model.ResponseConstants;