Removing groupScalingEnabled attribute from cartridge group
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d7be9af8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d7be9af8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d7be9af8 Branch: refs/heads/master Commit: d7be9af89f3ff0df738102cc52fd03fd07b8d46a Parents: 7d0a9d1 Author: Imesh Gunaratne <[email protected]> Authored: Wed Apr 29 15:14:27 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Apr 29 18:51:20 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 20 +- .../applications/pojo/GroupContext.java | 43 -- .../applications/topic/ApplicationBuilder.java | 2 +- .../stratos/autoscaler/pojo/ServiceGroup.java | 10 - .../stratos/cli/RestCommandLineService.java | 3 +- .../common/beans/application/GroupBean.java | 9 - .../util/converter/ObjectConverter.java | 16 +- .../src/main/resources/AutoscalerService.wsdl | 511 ++++++++----------- 8 files changed, 212 insertions(+), 402 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d7be9af8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index 1c83eff..67d2342 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -707,7 +707,7 @@ public class DefaultApplicationParser implements ApplicationParser { throws ApplicationDefinitionException { Group group = new Group(appId, groupCtxt.getName(), groupCtxt.getAlias()); - group.setGroupScalingEnabled(isGroupScalingEnabled(groupCtxt.getName(), serviceGroup)); + group.setGroupScalingEnabled(groupCtxt.getGroupMaxInstances() > 1); group.setGroupMinInstances(groupCtxt.getGroupMinInstances()); group.setGroupMaxInstances(groupCtxt.getGroupMaxInstances()); @@ -873,24 +873,6 @@ public class DefaultApplicationParser implements ApplicationParser { } - /** - * Checks if group scaling is enabled for Service Group with name serviceGroupName - * - * @param serviceGroupName name of the Service Group - * @return true if group scaling is enabled, else false - * @throws ApplicationDefinitionException if no Service Group found for the given serviceGroupName - */ - private boolean isGroupScalingEnabled(String serviceGroupName, ServiceGroup serviceGroup) throws ApplicationDefinitionException { - - ServiceGroup nestedGroup = getNestedServiceGroup(serviceGroupName, serviceGroup); - - if (nestedGroup == null) { - handleError("Service Group Definition not found for name " + serviceGroupName); - } - - return nestedGroup.isGroupscalingEnabled(); - } - private ServiceGroup getNestedServiceGroup(String serviceGroupName, ServiceGroup serviceGroup) { if (serviceGroup.getName().equals(serviceGroupName)) { return serviceGroup; http://git-wip-us.apache.org/repos/asf/stratos/blob/d7be9af8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java index 2f1cd6b..2a344de 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java @@ -35,19 +35,10 @@ public class GroupContext implements Serializable { private String deploymentPolicy; - //private boolean isGroupInstanceMonitoringEnabled; - - private boolean isGroupScalingEnabled; - - //private String autoscalingPolicy; - private CartridgeContext[] cartridgeContexts; - //private SubscribableContext[] subscribableContexts; - private GroupContext[] groupContexts; - public String getName() { return name; } @@ -64,22 +55,6 @@ public class GroupContext implements Serializable { this.alias = alias; } - /*public String getAutoscalingPolicy() { - return autoscalingPolicy; - } - - public void setAutoscalingPolicy(String autoscalingPolicy) { - this.autoscalingPolicy = autoscalingPolicy; - }*/ - - /* public SubscribableContext[] getSubscribableContexts() { - return subscribableContexts; - } - - public void setSubscribableContexts(SubscribableContext[] subscribableContexts) { - this.subscribableContexts = subscribableContexts; - }*/ - public GroupContext[] getGroupContexts() { return groupContexts; } @@ -104,22 +79,6 @@ public class GroupContext implements Serializable { this.groupMaxInstances = groupMaxInstances; } - /*public boolean isGroupInstanceMonitoringEnabled() { - return isGroupInstanceMonitoringEnabled; - } - - public void setGroupInstanceMonitoringEnabled(boolean isGroupInstanceMonitoringEnabled) { - this.isGroupInstanceMonitoringEnabled = isGroupInstanceMonitoringEnabled; - }*/ - - public boolean isGroupScalingEnabled() { - return isGroupScalingEnabled; - } - - public void setGroupScalingEnabled(boolean isGroupScalingEnabled) { - this.isGroupScalingEnabled = isGroupScalingEnabled; - } - public CartridgeContext[] getCartridgeContexts() { return cartridgeContexts; } @@ -135,6 +94,4 @@ public class GroupContext implements Serializable { public void setDeploymentPolicy(String deploymentPolicy) { this.deploymentPolicy = deploymentPolicy; } - - } http://git-wip-us.apache.org/repos/asf/stratos/blob/d7be9af8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java index ecb07ab..08d8841 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java @@ -515,7 +515,7 @@ public class ApplicationBuilder { * When min != 1 or max != 1, we need to generate * instance ids as it is having more than one group instances */ - if (minGroupInstances > 1 || maxGroupInstances > 1 || group.isGroupScalingEnabled()) { + if (group.isGroupScalingEnabled()) { instanceId = group.getNextInstanceId(groupId); } http://git-wip-us.apache.org/repos/asf/stratos/blob/d7be9af8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/ServiceGroup.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/ServiceGroup.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/ServiceGroup.java index d2ddca4..65a9c61 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/ServiceGroup.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/ServiceGroup.java @@ -27,8 +27,6 @@ public class ServiceGroup implements Serializable { private String name; - private boolean isGroupscalingEnabled; - private ServiceGroup[] groups; private String[] cartridges; @@ -59,14 +57,6 @@ public class ServiceGroup implements Serializable { this.dependencies = dependencies; } - public boolean isGroupscalingEnabled() { - return isGroupscalingEnabled; - } - - public void setGroupscalingEnabled(boolean isGroupscalingEnabled) { - this.isGroupscalingEnabled = isGroupscalingEnabled; - } - public ServiceGroup[] getGroups() { return groups; } http://git-wip-us.apache.org/repos/asf/stratos/blob/d7be9af8/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java index 8ca3a2a..8e891b2 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java @@ -369,11 +369,10 @@ public class RestCommandLineService { RowMapper<GroupBean> cartridgeGroupMapper = new RowMapper<GroupBean>() { public String[] getData(GroupBean cartridgeGroup) { - String[] data = new String[4]; + String[] data = new String[3]; data[0] = cartridgeGroup.getName(); data[1] = cartridgeGroup.getCartridges()==null ? "" :String.valueOf(cartridgeGroup.getCartridges().size()); data[2] = cartridgeGroup.getGroups() == null ? "0" : String.valueOf(cartridgeGroup.getGroups().size()); - data[3] = String.valueOf(cartridgeGroup.isGroupScalingEnabled()); return data; } }; http://git-wip-us.apache.org/repos/asf/stratos/blob/d7be9af8/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupBean.java index 3c1d02f..0067883 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupBean.java @@ -29,7 +29,6 @@ public class GroupBean implements Serializable { private String name; private List<GroupBean> groups; private List<String> cartridges; - private boolean groupScalingEnabled; private DependencyBean dependencies; public String getName() { @@ -63,12 +62,4 @@ public class GroupBean implements Serializable { public void setGroups(List<GroupBean> groups) { this.groups = groups; } - - public boolean isGroupScalingEnabled() { - return groupScalingEnabled; - } - - public void setGroupScalingEnabled(boolean isGroupScalingEnabled) { - this.groupScalingEnabled = isGroupScalingEnabled; - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/d7be9af8/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index af51882..8fa4049 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -1288,7 +1288,6 @@ public class ObjectConverter { groupDefinition.setAlias(groupContext.getAlias()); groupDefinition.setGroupMaxInstances(groupContext.getGroupMaxInstances()); groupDefinition.setGroupMinInstances(groupContext.getGroupMinInstances()); - groupDefinition.setGroupScalingEnabled(groupContext.getGroupScalingEnabled()); groupDefinition.setName(groupContext.getName()); groupDefinition.setGroups(convertStubGroupContextsToGroupDefinitions(groupContext.getGroupContexts())); groupDefinition.setCartridges(convertStubCartridgeContextsToCartridgeReferenceBeans( @@ -1557,7 +1556,6 @@ public class ObjectConverter { groupContext.setAlias(groupDefinition.getAlias()); groupContext.setGroupMaxInstances(groupDefinition.getGroupMaxInstances()); groupContext.setGroupMinInstances(groupDefinition.getGroupMinInstances()); - groupContext.setGroupScalingEnabled(groupDefinition.isGroupScalingEnabled()); groupContext.setDeploymentPolicy(groupDefinition.getDeploymentPolicy()); // Groups @@ -1736,20 +1734,19 @@ public class ObjectConverter { return carbonTenantInfoBean; } - public static ServiceGroup convertServiceGroupDefinitionToASStubServiceGroup(GroupBean serviceGroupDefinition) + public static ServiceGroup convertServiceGroupDefinitionToASStubServiceGroup(GroupBean groupBean) throws ServiceGroupDefinitionException { - if (serviceGroupDefinition == null) { + if (groupBean == null) { return null; } ServiceGroup servicegroup = new ServiceGroup(); // implement conversion (mostly List -> Array) - servicegroup.setGroupscalingEnabled(serviceGroupDefinition.isGroupScalingEnabled()); - List<GroupBean> groupsDef = serviceGroupDefinition.getGroups(); - List<String> cartridgesDef = serviceGroupDefinition.getCartridges(); + List<GroupBean> groupsDef = groupBean.getGroups(); + List<String> cartridgesDef = groupBean.getCartridges(); - servicegroup.setName(serviceGroupDefinition.getName()); + servicegroup.setName(groupBean.getName()); if (groupsDef == null) { groupsDef = new ArrayList<GroupBean>(0); @@ -1772,7 +1769,7 @@ public class ObjectConverter { cartridges = cartridgesDef.toArray(cartridges); servicegroup.setCartridges(cartridges); - DependencyBean depDefs = serviceGroupDefinition.getDependencies(); + DependencyBean depDefs = groupBean.getDependencies(); if (depDefs != null) { Dependencies dependencies = new Dependencies(); @@ -1802,7 +1799,6 @@ public class ObjectConverter { GroupBean servicegroupDef = new GroupBean(); servicegroupDef.setName(serviceGroup.getName()); - servicegroupDef.setGroupScalingEnabled(serviceGroup.getGroupscalingEnabled()); String[] cartridges = serviceGroup.getCartridges(); ServiceGroup[] groups = serviceGroup.getGroups(); org.apache.stratos.autoscaler.stub.pojo.Dependencies deps = serviceGroup.getDependencies();
