Repository: stratos Updated Branches: refs/heads/master 4bfd66583 -> 5c326250e
adding proper naming for the deployment policy Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5c326250 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5c326250 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5c326250 Branch: refs/heads/master Commit: 5c326250e9470c378993c7b12ca531e530d8c277 Parents: 4bfd665 Author: reka <[email protected]> Authored: Mon Dec 1 16:58:28 2014 +0530 Committer: reka <[email protected]> Committed: Mon Dec 1 16:58:48 2014 +0530 ---------------------------------------------------------------------- .../ApplicationLevelNetworkPartition.java | 2 +- .../deployment/partition/network/Partition.java | 6 +++-- .../rest/endpoint/api/StratosApiV40Utils.java | 12 +++++----- .../rest/endpoint/api/StratosApiV41.java | 6 ++--- .../rest/endpoint/api/StratosApiV41Utils.java | 24 ++++++++++---------- .../partition/ChildLevelNetworkPartition.java | 4 +--- .../bean/autoscaler/partition/Partition.java | 4 ---- .../policy/deployment/ChildPolicy.java | 2 +- .../bean/util/converter/PojoConverter.java | 12 +++++----- .../stratos/rest/endpoint/mock/MockContext.java | 2 +- .../src/main/resources/AutoScalerService.wsdl | 8 +++++++ 11 files changed, 43 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5c326250/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ApplicationLevelNetworkPartition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ApplicationLevelNetworkPartition.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ApplicationLevelNetworkPartition.java index 91e2748..f1c05b7 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ApplicationLevelNetworkPartition.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/ApplicationLevelNetworkPartition.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** * The model class for NetworkPartition definition. */ -public class ApplicationLevelNetworkPartition implements Serializable{ +public class ApplicationLevelNetworkPartition implements Serializable { private static final long serialVersionUID = -8043298009352097370L; private String id; http://git-wip-us.apache.org/repos/asf/stratos/blob/5c326250/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/Partition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/Partition.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/Partition.java index 8dba5a6..1980374 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/Partition.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/Partition.java @@ -20,12 +20,14 @@ package org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network; import org.apache.stratos.common.Properties; +import java.io.Serializable; + /** * This is keep the partition information */ -public class Partition { +public class Partition implements Serializable { - private static final long serialVersionUID = 3725971214092010720L; + private static final long serialVersionUID = 3725971287992010720L; /** * provider should match with an IaasProvider type. */ http://git-wip-us.apache.org/repos/asf/stratos/blob/5c326250/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java index 3379d94..407b7fa 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java @@ -277,10 +277,10 @@ public class StratosApiV40Utils { AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { // try { -// childLevelPartitions = autoscalerServiceClient.getAvailablePartitions(); +// partitions = autoscalerServiceClient.getAvailablePartitions(); // // } catch (RemoteException e) { -// String errorMsg = "Error while getting available childLevelPartitions. Cause : " + e.getMessage(); +// String errorMsg = "Error while getting available partitions. Cause : " + e.getMessage(); // log.error(errorMsg, e); // throw new RestAPIException(errorMsg, e); // } @@ -296,11 +296,11 @@ public class StratosApiV40Utils { AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); // if (autoscalerServiceClient != null) { // try { -// childLevelPartitions = +// partitions = // autoscalerServiceClient.getPartitionsOfDeploymentPolicy(deploymentPolicyId); // // } catch (RemoteException e) { -// String errorMsg = "Error while getting available childLevelPartitions for deployment policy id " + +// String errorMsg = "Error while getting available partitions for deployment policy id " + // deploymentPolicyId+". Cause: "+e.getMessage(); // log.error(errorMsg, e); // throw new RestAPIException(errorMsg, e); @@ -317,11 +317,11 @@ public class StratosApiV40Utils { AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); // if (autoscalerServiceClient != null) { // try { -// childLevelPartitions = +// partitions = // autoscalerServiceClient.getPartitionsOfGroup(deploymentPolicyId, groupId); // // } catch (RemoteException e) { -// String errorMsg = "Error while getting available childLevelPartitions for deployment policy id " + deploymentPolicyId + +// String errorMsg = "Error while getting available partitions for deployment policy id " + deploymentPolicyId + // ", group id " + groupId+". Cause: "+e.getMessage(); // log.error(errorMsg, e); // throw new RestAPIException(errorMsg, e); http://git-wip-us.apache.org/repos/asf/stratos/blob/5c326250/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 bbe281f..f50869f 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 @@ -282,7 +282,7 @@ public class StratosApiV41 extends AbstractApi { } // @GET -// @Path("/childLevelPartitions") +// @Path("/partitions") // @Produces("application/json") // @Consumes("application/json") // @AuthorizationAction("/permission/admin/manage/view/partition") @@ -291,7 +291,7 @@ public class StratosApiV41 extends AbstractApi { // } // @POST -// @Path("/childLevelPartitions") +// @Path("/partitions") // @Produces("application/json") // @Consumes("application/json") // @AuthorizationAction("/permission/admin/manage/add/partition") @@ -304,7 +304,7 @@ public class StratosApiV41 extends AbstractApi { // } // // @GET -// @Path("/childLevelPartitions/{partitionId}") +// @Path("/partitions/{partitionId}") // @Produces("application/json") // @Consumes("application/json") // @AuthorizationAction("/permission/admin/manage/view/partition") http://git-wip-us.apache.org/repos/asf/stratos/blob/5c326250/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 7322165..ffd40fc 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 @@ -454,62 +454,62 @@ public class StratosApiV41Utils { // public static Partition[] getAvailablePartitions() throws RestAPIException { // -// org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] childLevelPartitions = null; +// org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null; // AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); // if (autoscalerServiceClient != null) { // try { -// childLevelPartitions = autoscalerServiceClient.getAvailablePartitions(); +// partitions = autoscalerServiceClient.getAvailablePartitions(); // // } catch (RemoteException e) { -// String errorMsg = "Error while getting available childLevelPartitions. Cause : " + e.getMessage(); +// String errorMsg = "Error while getting available partitions. Cause : " + e.getMessage(); // log.error(errorMsg, e); // throw new RestAPIException(errorMsg, e); // } // } // -// return PojoConverter.populatePartitionPojos(childLevelPartitions); +// return PojoConverter.populatePartitionPojos(partitions); // } // // public static Partition[] getPartitionsOfDeploymentPolicy(String deploymentPolicyId) // throws RestAPIException { // -// org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] childLevelPartitions = null; +// org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null; // AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); // if (autoscalerServiceClient != null) { // try { -// childLevelPartitions = +// partitions = // autoscalerServiceClient.getPartitionsOfDeploymentPolicy(deploymentPolicyId); // // } catch (RemoteException e) { -// String errorMsg = "Error while getting available childLevelPartitions for deployment policy id " + +// String errorMsg = "Error while getting available partitions for deployment policy id " + // deploymentPolicyId + ". Cause: " + e.getMessage(); // log.error(errorMsg, e); // throw new RestAPIException(errorMsg, e); // } // } // -// return PojoConverter.populatePartitionPojos(childLevelPartitions); +// return PojoConverter.populatePartitionPojos(partitions); // } // // public static Partition[] // getPartitionsOfGroup(String deploymentPolicyId, String groupId) throws RestAPIException { // -// org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] childLevelPartitions = null; +// org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null; // AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); // if (autoscalerServiceClient != null) { // try { -// childLevelPartitions = +// partitions = // autoscalerServiceClient.getPartitionsOfGroup(deploymentPolicyId, groupId); // // } catch (RemoteException e) { -// String errorMsg = "Error while getting available childLevelPartitions for deployment policy id " + deploymentPolicyId + +// String errorMsg = "Error while getting available partitions for deployment policy id " + deploymentPolicyId + // ", group id " + groupId + ". Cause: " + e.getMessage(); // log.error(errorMsg, e); // throw new RestAPIException(errorMsg, e); // } // } // -// return PojoConverter.populatePartitionPojos(childLevelPartitions); +// return PojoConverter.populatePartitionPojos(partitions); // } // // public static Partition getPartition(String partitionId) throws RestAPIException { http://git-wip-us.apache.org/repos/asf/stratos/blob/5c326250/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/ChildLevelNetworkPartition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/ChildLevelNetworkPartition.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/ChildLevelNetworkPartition.java index 7e2d14b..40d3400 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/ChildLevelNetworkPartition.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/ChildLevelNetworkPartition.java @@ -27,7 +27,5 @@ public class ChildLevelNetworkPartition { public String partitionAlgo; - public int min; - - public List<ChildLevelPartition> childLevelPartitions; + public List<ChildLevelPartition> partitions; } http://git-wip-us.apache.org/repos/asf/stratos/blob/5c326250/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/Partition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/Partition.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/Partition.java index 744b261..98c5141 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/Partition.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/Partition.java @@ -33,10 +33,6 @@ public class Partition { public boolean isPublic; - public int partitionMin; - - public int partitionMax; - public String provider; public List<PropertyBean> property; http://git-wip-us.apache.org/repos/asf/stratos/blob/5c326250/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/ChildPolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/ChildPolicy.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/ChildPolicy.java index 56e7dd3..a010318 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/ChildPolicy.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/ChildPolicy.java @@ -27,5 +27,5 @@ import java.util.List; public class ChildPolicy { public String childId; - public List<ChildLevelNetworkPartition> childLevelNetworkPartition; + public List<ChildLevelNetworkPartition> networkPartition; } http://git-wip-us.apache.org/repos/asf/stratos/blob/5c326250/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index 4304d1c..64e9bc6 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@ -409,7 +409,7 @@ public class PojoConverter { for (int i = 0; i < childPolicies.size(); i++) { ChildPolicy childPolicy = new ChildPolicy(); childPolicy.setId(childPolicies.get(i).childId); - childPolicy.setChildLevelNetworkPartitions(convertToCCChildNetworkPartition(childPolicies.get(i).childLevelNetworkPartition)); + childPolicy.setChildLevelNetworkPartitions(convertToCCChildNetworkPartition(childPolicies.get(i).networkPartition)); childPolicies1[i] = childPolicy; @@ -426,7 +426,7 @@ public class PojoConverter { ChildLevelNetworkPartition childLevelNetworkPartition = new ChildLevelNetworkPartition(); childLevelNetworkPartition.setId(networkPartitions.get(i).id); childLevelNetworkPartition.setPartitionAlgo(networkPartitions.get(i).partitionAlgo); - childLevelNetworkPartition.setChildLevelPartitions(convertToCCChildPartitionPojos(networkPartitions.get(i).childLevelPartitions)); + childLevelNetworkPartition.setChildLevelPartitions(convertToCCChildPartitionPojos(networkPartitions.get(i).partitions)); childLevelNetworkPartitions[i] = childLevelNetworkPartition; } @@ -532,8 +532,8 @@ public class PojoConverter { partitionBeans.description = partition.getDescription(); partitionBeans.isPublic = partition.getIsPublic(); partitionBeans.provider = partition.getProvider(); - partitionBeans.partitionMin = partition.getPartitionMin(); - partitionBeans.partitionMax = partition.getPartitionMax(); + /*partitionBeans.partitionMin = partition.getPartitionMin(); + partitionBeans.partitionMax = partition.getPartitionMax();*/ //properties if (partition.getProperties() != null) { List<PropertyBean> propertyBeans = getPropertyBeans(partition.getProperties()); @@ -750,8 +750,8 @@ public class PojoConverter { Partition partition = new Partition(); partition.id = partitions[i].getId(); partition.provider = partitions[i].getProvider(); - partition.partitionMin = partitions[i].getPartitionMin(); - partition.partitionMax = partitions[i].getPartitionMax(); + /*partition.partitionMin = partitions[i].getPartitionMin(); + partition.partitionMax = partitions[i].getPartitionMax();*/ if (partitions[i].getProperties() != null) { partition.property = getPropertyBeans(partitions[i].getProperties()); } http://git-wip-us.apache.org/repos/asf/stratos/blob/5c326250/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java index 5ec01cd..19c4d14 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java @@ -597,7 +597,7 @@ public class MockContext { int tenantId = getTenantId(); if(!partitionMap.containsKey(tenantId)){ if(!partitionMap.containsKey(PUBLIC_DEFINITION)){ - throw new RestAPIException(Status.NO_CONTENT,"No childLevelPartitions have been defined for the tenant"); + throw new RestAPIException(Status.NO_CONTENT,"No partitions have been defined for the tenant"); } if(!(partitionMap.get(PUBLIC_DEFINITION)).containsKey(partitionId)){ throw new RestAPIException("There is no partition with the id: " + partitionId); http://git-wip-us.apache.org/repos/asf/stratos/blob/5c326250/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl index d521414..f27a244 100644 --- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl +++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl @@ -129,6 +129,7 @@ <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationLevelNetworkPartitions" nillable="true" type="ax214:ApplicationLevelNetworkPartition"></xs:element> <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelNetworkPartitions" nillable="true" type="ax214:ChildLevelNetworkPartition"></xs:element> <xs:element maxOccurs="unbounded" minOccurs="0" name="childPolicies" nillable="true" type="ax211:ChildPolicy"></xs:element> + <xs:element minOccurs="0" name="childPolicyHolder" nillable="true" type="ax214:ChildPolicyHolder"></xs:element> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element> @@ -171,6 +172,7 @@ <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelPartitions" nillable="true" type="ax212:ChildLevelPartition"></xs:element> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="min" type="xs:int"></xs:element> <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> @@ -181,6 +183,12 @@ <xs:element minOccurs="0" name="partitionId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> + <xs:complexType name="ChildPolicyHolder"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelNetworkPartitions" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://common.stratos.apache.org/xsd";> <xs:complexType name="Properties">
