Repository: incubator-stratos Updated Branches: refs/heads/master ee5e08218 -> a9fcde9e0
fixing issue when deploying partition- expects a image id Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a9fcde9e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a9fcde9e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a9fcde9e Branch: refs/heads/master Commit: a9fcde9e08f8501409255f21e6d094da31e1d055 Parents: ee5e082 Author: rekathiru <[email protected]> Authored: Thu Feb 20 18:20:55 2014 +0530 Committer: rekathiru <[email protected]> Committed: Thu Feb 20 18:20:55 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/validate/AWSEC2PartitionValidator.java | 7 ++++--- .../controller/validate/OpenstackNovaPartitionValidator.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a9fcde9e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java index fe480ac..191d1da 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java @@ -18,8 +18,6 @@ */ package org.apache.stratos.cloud.controller.validate; -import java.util.Properties; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.exception.InvalidPartitionException; @@ -30,6 +28,8 @@ import org.apache.stratos.cloud.controller.util.CloudControllerUtil; import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator; import org.apache.stratos.messaging.domain.topology.Scope; +import java.util.Properties; + /** * AWS-EC2 {@link PartitionValidator} implementation. @@ -69,7 +69,8 @@ public class AWSEC2PartitionValidator implements PartitionValidator { String zone = properties.getProperty(Scope.zone.toString()); iaas.isValidZone(region, zone); updatedIaasProvider.setProperty(CloudControllerConstants.AVAILABILITY_ZONE, zone); - updatedIaas.buildTemplate(); + updatedIaas = CloudControllerUtil.getIaas(updatedIaasProvider); + updatedIaas.setIaasProvider(updatedIaasProvider); } return updatedIaasProvider; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a9fcde9e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/OpenstackNovaPartitionValidator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/OpenstackNovaPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/OpenstackNovaPartitionValidator.java index b2c9904..13a459c 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/OpenstackNovaPartitionValidator.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/OpenstackNovaPartitionValidator.java @@ -18,8 +18,6 @@ */ package org.apache.stratos.cloud.controller.validate; -import java.util.Properties; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.exception.InvalidPartitionException; @@ -30,6 +28,8 @@ import org.apache.stratos.cloud.controller.util.CloudControllerUtil; import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator; import org.apache.stratos.messaging.domain.topology.Scope; +import java.util.Properties; + /** * The Openstack Nova {@link PartitionValidator} implementation. @@ -69,7 +69,8 @@ public class OpenstackNovaPartitionValidator implements PartitionValidator { iaas.isValidZone(region, zone); updatedIaasProvider.setProperty(CloudControllerConstants.ZONE_ELEMENT, zone); - updatedIaas.buildTemplate(); + updatedIaas = CloudControllerUtil.getIaas(updatedIaasProvider); + updatedIaas.setIaasProvider(updatedIaasProvider); } return updatedIaasProvider;
