You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/03/18 04:58:56 UTC
git commit: fixng https://issues.apache.org/jira/browse/STRATOS-470
for Openstack availability zones
Repository: incubator-stratos
Updated Branches:
refs/heads/master 2ef562e1e -> 87be512ee
fixng https://issues.apache.org/jira/browse/STRATOS-470 for Openstack availability zones
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/87be512e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/87be512e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/87be512e
Branch: refs/heads/master
Commit: 87be512ee0e921c4c101d286b7b8c73ffb0b204b
Parents: 2ef562e
Author: Nirmal Fernando <ni...@apache.org>
Authored: Tue Mar 18 09:28:34 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Tue Mar 18 09:28:34 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/iaases/OpenstackNovaIaas.java | 11 ++++++++++-
.../validate/OpenstackNovaPartitionValidator.java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/87be512e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
index d0f50e9..7378776 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
@@ -36,12 +36,16 @@ import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
import org.apache.stratos.cloud.controller.validate.OpenstackNovaPartitionValidator;
import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator;
+import org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.NodeMetadataBuilder;
import org.jclouds.compute.domain.Template;
import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.options.TemplateOptions;
+import org.jclouds.domain.Location;
+import org.jclouds.domain.LocationBuilder;
+import org.jclouds.domain.LocationScope;
import org.jclouds.openstack.nova.v2_0.NovaApi;
import org.jclouds.openstack.nova.v2_0.NovaApiMetadata;
import org.jclouds.openstack.nova.v2_0.NovaAsyncApi;
@@ -104,7 +108,7 @@ public class OpenstackNovaIaas extends Iaas {
if(!(iaasInfo instanceof IaasProvider)) {
templateBuilder.locationId(iaasInfo.getType());
}
-
+
// to avoid creation of template objects in each and every time, we
// create all at once!
@@ -152,6 +156,11 @@ public class OpenstackNovaIaas extends Iaas {
.as(NovaTemplateOptions.class).networks(Arrays.asList(networksArray));
}
+ if (iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE) != null) {
+ template.getOptions().as(NovaTemplateOptions.class)
+ .availabilityZone(iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE));
+ }
+
//TODO
// if (iaas.getProperty(CloudControllerConstants.HOST) != null) {
// template.getOptions().as(NovaTemplateOptions.class)
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/87be512e/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 920d02c..a6dfa56 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
@@ -68,7 +68,7 @@ public class OpenstackNovaPartitionValidator implements PartitionValidator {
String zone = properties.getProperty(Scope.zone.toString());
iaas.isValidZone(region, zone);
- updatedIaasProvider.setProperty(CloudControllerConstants.ZONE_ELEMENT, zone);
+ updatedIaasProvider.setProperty(CloudControllerConstants.AVAILABILITY_ZONE, zone);
updatedIaas = CloudControllerUtil.getIaas(updatedIaasProvider);
updatedIaas.setIaasProvider(updatedIaasProvider);
}