Add the cartridges group with uuid
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7e6eb0bf Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7e6eb0bf Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7e6eb0bf Branch: refs/heads/tenant-isolation Commit: 7e6eb0bfc448961b2374461b5738a283070419d3 Parents: 9b9f022 Author: Gayan Gunarathne <gay...@wso2.com> Authored: Wed Jul 8 18:17:16 2015 +0530 Committer: Gayan Gunarathne <gay...@wso2.com> Committed: Wed Jul 8 18:17:16 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 4 +- .../stratos/autoscaler/pojo/ServiceGroup.java | 30 +- .../autoscaler/registry/RegistryManager.java | 16 +- .../services/impl/AutoscalerServiceImpl.java | 22 +- .../stratos/cli/RestCommandLineService.java | 2 +- .../beans/cartridge/CartridgeGroupBean.java | 20 +- .../rest/endpoint/api/StratosApiV41.java | 8 +- .../rest/endpoint/api/StratosApiV41Utils.java | 36 +- .../util/converter/ObjectConverter.java | 8 +- .../src/main/resources/AutoscalerService.wsdl | 588 ++++++++++--------- 10 files changed, 375 insertions(+), 359 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7e6eb0bf/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 1312df0..ed2959e 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 @@ -771,7 +771,7 @@ public class DefaultApplicationParser implements ApplicationParser { // get the complete Group Definition if (subGroupCtxt != null) { for (ServiceGroup nestedServiceGroup : serviceGroup.getGroups()) { - if (nestedServiceGroup.getName().equals(subGroupCtxt.getName())) { + if (nestedServiceGroup.getUuid().equals(subGroupCtxt.getName())) { Group nestedGroup = parseGroup(appId, tenantId, key, subGroupCtxt, subscribableInfoCtxts, nestedServiceGroup); @@ -888,7 +888,7 @@ public class DefaultApplicationParser implements ApplicationParser { } private ServiceGroup getNestedServiceGroup(String serviceGroupName, ServiceGroup serviceGroup) { - if (serviceGroup.getName().equals(serviceGroupName)) { + if (serviceGroup.getUuid().equals(serviceGroupName)) { return serviceGroup; } else if (serviceGroup.getGroups() != null) { ServiceGroup[] groups = serviceGroup.getGroups(); http://git-wip-us.apache.org/repos/asf/stratos/blob/7e6eb0bf/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 65a9c61..e2d8ae8 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 @@ -25,7 +25,9 @@ public class ServiceGroup implements Serializable { private static final long serialVersionUID = -7413745300105885793L; - private String name; + private String uuid; + + private String name; private ServiceGroup[] groups; @@ -33,12 +35,12 @@ public class ServiceGroup implements Serializable { private Dependencies dependencies; - public String getName() { - return name; + public String getUuid() { + return uuid; } - public void setName(String name) { - this.name = name; + public void setUuid(String uuid) { + this.uuid = uuid; } public String[] getCartridges() { @@ -64,4 +66,22 @@ public class ServiceGroup implements Serializable { public void setGroups(ServiceGroup[] groups) { this.groups = groups; } + + private int tenantId; + + public int getTenantId() { + return tenantId; + } + + public void setTenantId(int tenantId) { + this.tenantId = tenantId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/7e6eb0bf/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java index 57d318f..4dd7c86 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java @@ -336,13 +336,13 @@ public class RegistryManager { public void persistServiceGroup(ServiceGroup servicegroup) { try { startTenantFlow(); - if (servicegroup == null || StringUtils.isEmpty(servicegroup.getName())) { + if (servicegroup == null || StringUtils.isEmpty(servicegroup.getUuid())) { throw new IllegalArgumentException("Cartridge group or group name can not be null"); } - String resourcePath = AutoscalerConstants.AUTOSCALER_RESOURCE + AutoscalerConstants.SERVICE_GROUP + "/" + servicegroup.getName(); + String resourcePath = AutoscalerConstants.AUTOSCALER_RESOURCE + AutoscalerConstants.SERVICE_GROUP + "/" + servicegroup.getUuid(); persist(servicegroup, resourcePath); if (log.isDebugEnabled()) { - log.debug(String.format("Persisted cartridge group %s at path %s", servicegroup.getName(), resourcePath)); + log.debug(String.format("Persisted cartridge group %s at path %s", servicegroup.getUuid(), resourcePath)); } } finally { endTenantFlow(); @@ -352,22 +352,22 @@ public class RegistryManager { public void updateServiceGroup(ServiceGroup serviceGroup) throws InvalidServiceGroupException, RegistryException { try { - if (serviceGroup == null || StringUtils.isEmpty(serviceGroup.getName())) { + if (serviceGroup == null || StringUtils.isEmpty(serviceGroup.getUuid())) { throw new IllegalArgumentException("Cartridge group or group name cannot be null"); } - if (getServiceGroup(serviceGroup.getName()) == null) { + if (getServiceGroup(serviceGroup.getUuid()) == null) { throw new InvalidServiceGroupException(String.format("Cartridge group does not exist: " + - "[cartridge-group] %s", serviceGroup.getName())); + "[cartridge-group] %s", serviceGroup.getUuid())); } persistServiceGroup(serviceGroup); if (log.isDebugEnabled()) { - log.debug(String.format("Updated cartridge group: [group-name] %s", serviceGroup.getName())); + log.debug(String.format("Updated cartridge group: [group-name] %s", serviceGroup.getUuid())); } } catch (Exception e) { String message = (String.format("Unable to update cartridge group [group-name] %s", - serviceGroup.getName())); + serviceGroup.getUuid())); log.error(message, e); throw new RegistryException(message, e); } http://git-wip-us.apache.org/repos/asf/stratos/blob/7e6eb0bf/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java index 1a1d691..2967368 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java @@ -679,23 +679,23 @@ public class AutoscalerServiceImpl implements AutoscalerService { public boolean addServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException { - if (servicegroup == null || StringUtils.isEmpty(servicegroup.getName())) { + if (servicegroup == null || StringUtils.isEmpty(servicegroup.getUuid())) { String msg = "Cartridge group is null or cartridge group name is empty."; log.error(msg); throw new InvalidServiceGroupException(msg); } if (log.isInfoEnabled()) { - log.info(String.format("Adding cartridge group: [group-name] %s", servicegroup.getName())); + log.info(String.format("Adding cartridge group: [group-name] %s", servicegroup.getUuid())); } - String groupName = servicegroup.getName(); + String groupName = servicegroup.getUuid(); if (RegistryManager.getInstance().serviceGroupExist(groupName)) { throw new InvalidServiceGroupException("Cartridge group with the name " + groupName + " already exists."); } if (log.isDebugEnabled()) { - log.debug(String.format("Adding cartridge group %s", servicegroup.getName())); + log.debug(String.format("Adding cartridge group %s", servicegroup.getUuid())); } String[] subGroups = servicegroup.getCartridges(); @@ -743,27 +743,27 @@ public class AutoscalerServiceImpl implements AutoscalerService { RegistryManager.getInstance().persistServiceGroup(servicegroup); if (log.isInfoEnabled()) { - log.info(String.format("Cartridge group successfully added: [group-name] %s", servicegroup.getName())); + log.info(String.format("Cartridge group successfully added: [group-name] %s", servicegroup.getUuid())); } return true; } public boolean updateServiceGroup(ServiceGroup cartridgeGroup) throws InvalidServiceGroupException { - if (cartridgeGroup == null || StringUtils.isEmpty(cartridgeGroup.getName())) { + if (cartridgeGroup == null || StringUtils.isEmpty(cartridgeGroup.getUuid())) { String msg = "Cartridge group cannot be null or service name cannot be empty."; log.error(msg); throw new IllegalArgumentException(msg); } if (log.isInfoEnabled()) { - log.info(String.format("Updating cartridge group: [group-name] %s", cartridgeGroup.getName())); + log.info(String.format("Updating cartridge group: [group-name] %s", cartridgeGroup.getUuid())); } - String groupName = cartridgeGroup.getName(); + String groupName = cartridgeGroup.getUuid(); if (!RegistryManager.getInstance().serviceGroupExist(groupName)) { throw new InvalidServiceGroupException(String.format("Cartridge group does not exist: [cartridge-group] %s", - cartridgeGroup.getName())); + cartridgeGroup.getUuid())); } Dependencies dependencies = cartridgeGroup.getDependencies(); @@ -799,13 +799,13 @@ public class AutoscalerServiceImpl implements AutoscalerService { RegistryManager.getInstance().updateServiceGroup(cartridgeGroup); } catch (org.wso2.carbon.registry.core.exceptions.RegistryException e) { String message = (String.format("Cannot update cartridge group: [group-name] %s", - cartridgeGroup.getName())); + cartridgeGroup.getUuid())); throw new RuntimeException(message, e); } if (log.isInfoEnabled()) { - log.info(String.format("Cartridge group successfully updated: [group-name] %s", cartridgeGroup.getName())); + log.info(String.format("Cartridge group successfully updated: [group-name] %s", cartridgeGroup.getUuid())); } return true; } http://git-wip-us.apache.org/repos/asf/stratos/blob/7e6eb0bf/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 a06cb3b..d6316eb 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 @@ -387,7 +387,7 @@ public class RestCommandLineService { RowMapper<CartridgeGroupBean> cartridgeGroupMapper = new RowMapper<CartridgeGroupBean>() { public String[] getData(CartridgeGroupBean cartridgeGroup) { String[] data = new String[3]; - data[0] = cartridgeGroup.getName(); + data[0] = cartridgeGroup.getUuid(); data[1] = cartridgeGroup.getCartridges() == null ? "" : String.valueOf(cartridgeGroup.getCartridges().size()); data[2] = cartridgeGroup.getGroups() == null ? "0" : String.valueOf(cartridgeGroup.getGroups().size()); return data; http://git-wip-us.apache.org/repos/asf/stratos/blob/7e6eb0bf/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeGroupBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeGroupBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeGroupBean.java index e75f7c8..b884e90 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeGroupBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeGroupBean.java @@ -30,19 +30,19 @@ public class CartridgeGroupBean implements Serializable { private static final long serialVersionUID = 4696832597498594267L; - private String uuid; - private String name; + private String uuid; + private String name; private List<CartridgeGroupBean> groups; private List<String> cartridges; private DependencyBean dependencies; private int tenantId; - public String getName() { - return name; + public String getUuid() { + return uuid; } - public void setName(String name) { - this.name = name; + public void setUuid(String uuid) { + this.uuid = uuid; } public List<String> getCartridges() { @@ -69,14 +69,6 @@ public class CartridgeGroupBean implements Serializable { this.groups = groups; } - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - public int getTenantId() { return tenantId; } http://git-wip-us.apache.org/repos/asf/stratos/blob/7e6eb0bf/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 de8df20..7690818 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 @@ -497,11 +497,11 @@ public class StratosApiV41 extends AbstractApi { cartridgeGroupBean.setTenantId(carbonContext.getTenantId()); try { StratosApiV41Utils.addCartridgeGroup(cartridgeGroupBean); - URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeGroupBean.getName()).build(); + URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeGroupBean.getUuid()).build(); return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format("Cartridge Group added successfully: [cartridge-group] %s", - cartridgeGroupBean.getName()))).build(); + cartridgeGroupBean.getUuid()))).build(); } catch (InvalidCartridgeGroupDefinitionException e) { return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, e.getMessage())).build(); @@ -534,11 +534,11 @@ public class StratosApiV41 extends AbstractApi { try { StratosApiV41Utils.updateServiceGroup(cartridgeGroupBean); - URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeGroupBean.getName()).build(); + URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeGroupBean.getUuid()).build(); return Response.ok(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format("Cartridge group updated successfully: [cartridge-group] %s", - cartridgeGroupBean.getName()))).build(); + cartridgeGroupBean.getUuid()))).build(); } catch (InvalidCartridgeGroupDefinitionException e) { return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean( http://git-wip-us.apache.org/repos/asf/stratos/blob/7e6eb0bf/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 a61ac2e..f117247 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 @@ -1033,7 +1033,7 @@ public class StratosApiV41Utils { String[] cartridgeGroupNames; if (log.isDebugEnabled()) { - log.debug("Checking cartridges in cartridge group " + serviceGroupDefinition.getName()); + log.debug("Checking cartridges in cartridge group " + serviceGroupDefinition.getUuid()); } findCartridgesInGroupBean(serviceGroupDefinition, cartridgeTypes); @@ -1060,7 +1060,7 @@ public class StratosApiV41Utils { j++; } } catch (RemoteException e) { - String message = "Could not add the cartridge group: " + serviceGroupDefinition.getName(); + String message = "Could not add the cartridge group: " + serviceGroupDefinition.getUuid(); log.error(message, e); throw new RestAPIException(message, e); } @@ -1070,7 +1070,7 @@ public class StratosApiV41Utils { // if any sub groups are specified in the group, they should be already deployed if (serviceGroupDefinition.getGroups() != null) { if (log.isDebugEnabled()) { - log.debug("checking subGroups in cartridge group " + serviceGroupDefinition.getName()); + log.debug("checking subGroups in cartridge group " + serviceGroupDefinition.getUuid()); } List<CartridgeGroupBean> groupDefinitions = serviceGroupDefinition.getGroups(); @@ -1078,8 +1078,8 @@ public class StratosApiV41Utils { cartridgeGroupNames = new String[groupDefinitions.size()]; int i = 0; for (CartridgeGroupBean groupList : groupDefinitions) { - groupNames.add(groupList.getName()); - cartridgeGroupNames[i] = groupList.getName(); + groupNames.add(groupList.getUuid()); + cartridgeGroupNames[i] = groupList.getUuid(); i++; } @@ -1106,10 +1106,10 @@ public class StratosApiV41Utils { asServiceClient.addServiceGroup(serviceGroup); // Add cartridge group elements to SM cache - done after service group has been added StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient(); - smServiceClient.addUsedCartridgesInCartridgeGroups(serviceGroupDefinition.getName(), cartridgeNames); + smServiceClient.addUsedCartridgesInCartridgeGroups(serviceGroupDefinition.getUuid(), cartridgeNames); } catch (RemoteException e) { - String message = "Could not add the cartridge group: " + serviceGroupDefinition.getName(); + String message = "Could not add the cartridge group: " + serviceGroupDefinition.getUuid(); log.error(message, e); throw new RestAPIException(message, e); } @@ -1131,8 +1131,8 @@ public class StratosApiV41Utils { StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient(); // Validate whether cartridge group can be updated - if (!smServiceClient.canCartirdgeGroupBeRemoved(cartridgeGroup.getName())) { - String message = "Cannot update cartridge group: [group-name] " + cartridgeGroup.getName() + + if (!smServiceClient.canCartirdgeGroupBeRemoved(cartridgeGroup.getUuid())) { + String message = "Cannot update cartridge group: [group-name] " + cartridgeGroup.getUuid() + " since it is used in another cartridge group or an application"; log.error(message); throw new RestAPIException(message); @@ -1152,7 +1152,7 @@ public class StratosApiV41Utils { List<String> cartridgesBeforeUpdating = new ArrayList<String>(); List<String> cartridgesAfterUpdating = new ArrayList<String>(); - ServiceGroup serviceGroupToBeUpdated = autoscalerServiceClient.getServiceGroup(cartridgeGroup.getName()); + ServiceGroup serviceGroupToBeUpdated = autoscalerServiceClient.getServiceGroup(cartridgeGroup.getUuid()); findCartridgesInServiceGroup(serviceGroupToBeUpdated, cartridgesBeforeUpdating); findCartridgesInGroupBean(cartridgeGroup, cartridgesAfterUpdating); @@ -1192,7 +1192,7 @@ public class StratosApiV41Utils { if (cartridgesToAdd != null) { if (!cartridgesToAdd.isEmpty()) { { - smServiceClient.addUsedCartridgesInCartridgeGroups(cartridgeGroup.getName(), + smServiceClient.addUsedCartridgesInCartridgeGroups(cartridgeGroup.getUuid(), cartridgesToAdd.toArray(new String[cartridgesToRemove.size()])); } } @@ -1201,23 +1201,23 @@ public class StratosApiV41Utils { // Remove cartridge group elements from SM cache - done after cartridge group has been updated if (cartridgesToRemove != null) { if (!cartridgesToRemove.isEmpty()) { - smServiceClient.removeUsedCartridgesInCartridgeGroups(cartridgeGroup.getName(), + smServiceClient.removeUsedCartridgesInCartridgeGroups(cartridgeGroup.getUuid(), cartridgesToRemove.toArray(new String[cartridgesToRemove.size()])); } } } } catch (RemoteException e) { String message = String.format("Could not update cartridge group: [group-name] %s,", - cartridgeGroup.getName()); + cartridgeGroup.getUuid()); log.error(message); throw new RestAPIException(message, e); } catch (AutoscalerServiceInvalidServiceGroupExceptionException e) { String message = String.format("Autoscaler invalid cartridge group definition: [group-name] %s", - cartridgeGroup.getName()); + cartridgeGroup.getUuid()); log.error(message); throw new InvalidCartridgeGroupDefinitionException(message, e); } catch (ServiceGroupDefinitionException e) { - String message = String.format("Invalid cartridge group definition: [group-name] %s", cartridgeGroup.getName()); + String message = String.format("Invalid cartridge group definition: [group-name] %s", cartridgeGroup.getUuid()); log.error(message); throw new InvalidCartridgeGroupDefinitionException(message, e); } @@ -3743,11 +3743,11 @@ public class StratosApiV41Utils { return; } List<String> groups = new ArrayList<String>(); - parentGroups.add(groupBean.getName()); + parentGroups.add(groupBean.getUuid()); if (groupBean.getGroups() != null) { if (!groupBean.getGroups().isEmpty()) { for (CartridgeGroupBean g : groupBean.getGroups()) { - groups.add(g.getName()); + groups.add(g.getUuid()); } validateGroupDuplicationInGroup(groups, parentGroups); } @@ -3756,7 +3756,7 @@ public class StratosApiV41Utils { //Recursive because to check groups inside groups for (CartridgeGroupBean group : groupBean.getGroups()) { validateGroupDuplicationInGroupDefinition(group, parentGroups); - parentGroups.remove(group.getName()); + parentGroups.remove(group.getUuid()); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/7e6eb0bf/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 38da450..93281ed 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 @@ -1798,8 +1798,10 @@ public class ObjectConverter { List<CartridgeGroupBean> groupsDefinitions = groupBean.getGroups(); List<String> cartridgesDefinitions = groupBean.getCartridges(); - servicegroup.setName(groupBean.getName()); - + servicegroup.setName(groupBean.getUuid()); + servicegroup.setUuid(groupBean.getUuid()); + servicegroup.setTenantId(groupBean.getTenantId()); + if (groupsDefinitions == null) { groupsDefinitions = new ArrayList<CartridgeGroupBean>(0); } @@ -1865,7 +1867,7 @@ public class ObjectConverter { } CartridgeGroupBean serviceGroupDefinition = new CartridgeGroupBean(); - serviceGroupDefinition.setName(serviceGroup.getName()); + serviceGroupDefinition.setUuid(serviceGroup.getName()); String[] cartridges = serviceGroup.getCartridges(); ServiceGroup[] groups = serviceGroup.getGroups(); org.apache.stratos.autoscaler.stub.pojo.Dependencies dependencies = serviceGroup.getDependencies();
