You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/05/17 22:04:12 UTC
stratos git commit: Adding new validation to make iaas providers
mandatory when adding and updating cartridges
Repository: stratos
Updated Branches:
refs/heads/master 2bfeb678b -> 0ec11292c
Adding new validation to make iaas providers mandatory when adding and updating cartridges
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0ec11292
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0ec11292
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0ec11292
Branch: refs/heads/master
Commit: 0ec11292c9ce4a394f881de037c046ed5a5d6d58
Parents: 2bfeb67
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon May 18 01:32:05 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon May 18 01:34:01 2015 +0530
----------------------------------------------------------------------
.../rest/endpoint/api/StratosApiV41.java | 1 -
.../rest/endpoint/api/StratosApiV41Utils.java | 32 ++++++++++++++------
2 files changed, 22 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0ec11292/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index 85d7033..64feff5 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -161,7 +161,6 @@ public class StratosApiV41 extends AbstractApi {
String deploymentPolicyID = deploymentPolicyDefinitionBean.getId();
try {
- // TODO :: Deployment policy validation
StratosApiV41Utils.addDeploymentPolicy(deploymentPolicyDefinitionBean);
} catch (AutoscalerServiceInvalidDeploymentPolicyExceptionException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
http://git-wip-us.apache.org/repos/asf/stratos/blob/0ec11292/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index f73a4a2..71af68e 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -107,25 +107,31 @@ public class StratosApiV41Utils {
/**
* Add New Cartridge
*
- * @param cartridgeDefinition Cartridge definition
+ * @param cartridgeBean Cartridge definition
* @throws RestAPIException
*/
// Util methods for cartridges
- public static void addCartridge(CartridgeBean cartridgeDefinition) throws RestAPIException {
+ public static void addCartridge(CartridgeBean cartridgeBean) throws RestAPIException {
try {
if (log.isDebugEnabled()) {
- log.debug(String.format("Adding cartridge: [cartridge-type] %s ", cartridgeDefinition.getType()));
+ log.debug(String.format("Adding cartridge: [cartridge-type] %s ", cartridgeBean.getType()));
+ }
+
+ List<IaasProviderBean> iaasProviders = cartridgeBean.getIaasProvider();
+ if((iaasProviders == null) || iaasProviders.size() == 0) {
+ throw new RestAPIException(String.format("IaaS providers not found in cartridge: %s",
+ cartridgeBean.getType()));
}
- Cartridge cartridgeConfig = createCartridgeConfig(cartridgeDefinition);
+ Cartridge cartridgeConfig = createCartridgeConfig(cartridgeBean);
CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance();
cloudControllerServiceClient.addCartridge(cartridgeConfig);
if (log.isDebugEnabled()) {
log.debug(String.format(
"Successfully added cartridge: [cartridge-type] %s ",
- cartridgeDefinition.getType()));
+ cartridgeBean.getType()));
}
} catch (CloudControllerServiceCartridgeAlreadyExistsExceptionException e) {
String msg = "Could not add cartridge";
@@ -149,23 +155,29 @@ public class StratosApiV41Utils {
/**
* Update Cartridge
*
- * @param cartridgeDefinition Cartridge Definition
+ * @param cartridgeBean Cartridge Definition
* @throws RestAPIException
*/
- public static void updateCartridge(CartridgeBean cartridgeDefinition) throws RestAPIException {
+ public static void updateCartridge(CartridgeBean cartridgeBean) throws RestAPIException {
try {
if (log.isDebugEnabled()) {
- log.debug(String.format("Updating cartridge: [cartridge-type] %s ", cartridgeDefinition.getType()));
+ log.debug(String.format("Updating cartridge: [cartridge-type] %s ", cartridgeBean.getType()));
+ }
+
+ List<IaasProviderBean> iaasProviders = cartridgeBean.getIaasProvider();
+ if((iaasProviders == null) || iaasProviders.size() == 0) {
+ throw new RestAPIException(String.format("IaaS providers not found in cartridge: %s",
+ cartridgeBean.getType()));
}
- Cartridge cartridgeConfig = createCartridgeConfig(cartridgeDefinition);
+ Cartridge cartridgeConfig = createCartridgeConfig(cartridgeBean);
CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance();
cloudControllerServiceClient.updateCartridge(cartridgeConfig);
if (log.isDebugEnabled()) {
log.debug(String.format("Successfully updated cartridge: [cartridge-type] %s ",
- cartridgeDefinition.getType()));
+ cartridgeBean.getType()));
}
} catch (CloudControllerServiceCartridgeDefinitionNotExistsExceptionException e) {
String msg = "Could not add cartridge";