Repository: stratos Updated Branches: refs/heads/master 491b26474 -> a60271a0f
Fixing compilation errors in cloud controller Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a60271a0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a60271a0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a60271a0 Branch: refs/heads/master Commit: a60271a0fce357315ed9076e9b967b74ad4c0a54 Parents: 491b264 Author: Imesh Gunaratne <[email protected]> Authored: Fri Nov 28 08:38:38 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Nov 28 08:38:57 2014 +0530 ---------------------------------------------------------------------- components/org.apache.stratos.cloud.controller/pom.xml | 7 +++++-- .../stratos/cloud/controller/iaases/CloudstackIaas.java | 11 +++++------ .../cloud/controller/util/CloudControllerConstants.java | 5 +++++ 3 files changed, 15 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a60271a0/components/org.apache.stratos.cloud.controller/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml index fa7af66..f09c150 100644 --- a/components/org.apache.stratos.cloud.controller/pom.xml +++ b/components/org.apache.stratos.cloud.controller/pom.xml @@ -155,8 +155,11 @@ <artifactId>reflections</artifactId> <version>0.9.9-RC1</version> </dependency> - - + <dependency> + <groupId>org.apache.jclouds.api</groupId> + <artifactId>cloudstack</artifactId> + <version>${jclouds.version}</version> + </dependency> <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.securevault</artifactId> http://git-wip-us.apache.org/repos/asf/stratos/blob/a60271a0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java index 6f17725..f036a72 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java @@ -12,7 +12,7 @@ import org.apache.stratos.cloud.controller.interfaces.Iaas; import org.apache.stratos.cloud.controller.jcloud.ComputeServiceBuilderUtil; import org.apache.stratos.cloud.controller.pojo.IaasProvider; import org.apache.stratos.cloud.controller.util.CloudControllerConstants; -import org.apache.stratos.cloud.controller.validate.CloudStackPartitionValidator; +import org.apache.stratos.cloud.controller.validate.CloudstackPartitionValidator; import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions; @@ -35,9 +35,9 @@ import java.util.concurrent.TimeoutException; public class CloudstackIaas extends Iaas { - private static final Log log = LogFactory.getLog(CloudStackIaas.class); + private static final Log log = LogFactory.getLog(CloudstackIaas.class); - public CloudStackIaas(IaasProvider iaasProvider) { + public CloudstackIaas(IaasProvider iaasProvider) { super(iaasProvider); } @@ -317,14 +317,13 @@ public class CloudstackIaas extends Iaas { @Override public PartitionValidator getPartitionValidator() { - return new CloudStackPartitionValidator(); + return new CloudstackPartitionValidator(); } @Override - public String createVolume(int sizeGB) { + public String createVolume(int sizeGB, String snapshotId) { // Snapshot id is not there in IaaS.createVolume() method in stratos 4.0.0 - String snapshotId = null; //todo return volume ID if volume is created IaasProvider iaasInfo = getIaasProvider(); ComputeServiceContext context = iaasInfo.getComputeService() http://git-wip-us.apache.org/repos/asf/stratos/blob/a60271a0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java index 892ab5c..a729ea8 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java @@ -278,4 +278,9 @@ public final class CloudControllerConstants { public static final String NETWORK_PORT = "portUuid"; public static final String NETWORK_UUID = "networkUuid"; + // CloudStack specific + public static final String USER_NAME = "username"; + public static final String DOMAIN_ID = "domainId"; + public static final String DISK_OFFERING = "diskOffering"; + public static final String NETWORK_IDS= "networkIds"; }
