You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/25 11:27:31 UTC
stratos git commit:
s/CloudstackPartitionValidator.java/CloudstackPartitionValidator.java for fix
a build breack
Repository: stratos
Updated Branches:
refs/heads/master c4e4634d8 -> 3b6549ed4
s/CloudstackPartitionValidator.java/CloudstackPartitionValidator.java for fix a build breack
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3b6549ed
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3b6549ed
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3b6549ed
Branch: refs/heads/master
Commit: 3b6549ed4a83681390e0f1d4aa25bd36ae658647
Parents: c4e4634
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu Dec 25 15:57:40 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu Dec 25 15:57:40 2014 +0530
----------------------------------------------------------------------
.../CloudStackPartitionValidator.java | 54 ++++++++++++++++++++
.../CloudstackPartitionValidator.java | 54 --------------------
2 files changed, 54 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b6549ed/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java
new file mode 100644
index 0000000..4245a4b
--- /dev/null
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java
@@ -0,0 +1,54 @@
+package org.apache.stratos.cloud.controller.iaases.cloudstack;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.domain.Partition;
+import org.apache.stratos.cloud.controller.exception.InvalidPartitionException;
+import org.apache.stratos.cloud.controller.iaases.Iaas;
+import org.apache.stratos.cloud.controller.domain.IaasProvider;
+import org.apache.stratos.cloud.controller.iaases.ec2.EC2PartitionValidator;
+import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
+import org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceUtil;
+import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
+import org.apache.stratos.messaging.domain.topology.Scope;
+
+import java.util.Properties;
+
+
+public class CloudStackPartitionValidator implements PartitionValidator {
+
+ private static final Log log = LogFactory.getLog(EC2PartitionValidator.class);
+
+ private IaasProvider iaasProvider;
+ private Iaas iaas;
+
+ @Override
+ public void setIaasProvider(IaasProvider iaas) {
+ this.iaasProvider = iaas;
+ this.iaas = iaas.getIaas();
+ }
+
+ @Override
+ public IaasProvider validate(Partition partition, Properties properties) throws InvalidPartitionException {
+
+ try {
+ IaasProvider updatedIaasProvider = new IaasProvider(iaasProvider);
+ Iaas updatedIaas = CloudControllerServiceUtil.buildIaas(updatedIaasProvider);
+ updatedIaas.setIaasProvider(updatedIaasProvider);
+
+ if (properties.containsKey(Scope.zone.toString())) {
+ String zone = properties.getProperty(Scope.zone.toString());
+ iaas.isValidZone(null, zone);
+ updatedIaasProvider.setProperty(CloudControllerConstants.AVAILABILITY_ZONE, zone);
+ updatedIaas = CloudControllerServiceUtil.buildIaas(updatedIaasProvider);
+ updatedIaas.setIaasProvider(updatedIaasProvider);
+ }
+
+ } catch (Exception e) {
+ String msg = "Invalid partition detected: [partition-id] " + partition.getId() + e.getMessage();
+ log.error(msg, e);
+ throw new InvalidPartitionException(msg, e);
+ }
+ return iaasProvider;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b6549ed/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudstackPartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudstackPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudstackPartitionValidator.java
deleted file mode 100644
index 4245a4b..0000000
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudstackPartitionValidator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.apache.stratos.cloud.controller.iaases.cloudstack;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.cloud.controller.domain.Partition;
-import org.apache.stratos.cloud.controller.exception.InvalidPartitionException;
-import org.apache.stratos.cloud.controller.iaases.Iaas;
-import org.apache.stratos.cloud.controller.domain.IaasProvider;
-import org.apache.stratos.cloud.controller.iaases.ec2.EC2PartitionValidator;
-import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
-import org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceUtil;
-import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
-import org.apache.stratos.messaging.domain.topology.Scope;
-
-import java.util.Properties;
-
-
-public class CloudStackPartitionValidator implements PartitionValidator {
-
- private static final Log log = LogFactory.getLog(EC2PartitionValidator.class);
-
- private IaasProvider iaasProvider;
- private Iaas iaas;
-
- @Override
- public void setIaasProvider(IaasProvider iaas) {
- this.iaasProvider = iaas;
- this.iaas = iaas.getIaas();
- }
-
- @Override
- public IaasProvider validate(Partition partition, Properties properties) throws InvalidPartitionException {
-
- try {
- IaasProvider updatedIaasProvider = new IaasProvider(iaasProvider);
- Iaas updatedIaas = CloudControllerServiceUtil.buildIaas(updatedIaasProvider);
- updatedIaas.setIaasProvider(updatedIaasProvider);
-
- if (properties.containsKey(Scope.zone.toString())) {
- String zone = properties.getProperty(Scope.zone.toString());
- iaas.isValidZone(null, zone);
- updatedIaasProvider.setProperty(CloudControllerConstants.AVAILABILITY_ZONE, zone);
- updatedIaas = CloudControllerServiceUtil.buildIaas(updatedIaasProvider);
- updatedIaas.setIaasProvider(updatedIaasProvider);
- }
-
- } catch (Exception e) {
- String msg = "Invalid partition detected: [partition-id] " + partition.getId() + e.getMessage();
- log.error(msg, e);
- throw new InvalidPartitionException(msg, e);
- }
- return iaasProvider;
- }
-}
\ No newline at end of file