Repository: stratos Updated Branches: refs/heads/tenant-isolation ff6c34aae -> 4642ea9c8
Update cartridge 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/c990b8d8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c990b8d8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c990b8d8 Branch: refs/heads/tenant-isolation Commit: c990b8d804d923cc2dd77173d3d8c5987cc660a0 Parents: ff6c34a Author: Gayan Gunarathne <[email protected]> Authored: Wed Jul 15 14:06:00 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Wed Jul 15 14:06:00 2015 +0530 ---------------------------------------------------------------------- .../applications/parser/DefaultApplicationParser.java | 14 +++++++------- .../common/client/StratosManagerServiceClient.java | 6 +++--- .../stratos/rest/endpoint/api/StratosApiV41Utils.java | 7 ++++--- 3 files changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/c990b8d8/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 33d767c..18979b9 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 @@ -339,7 +339,7 @@ public class DefaultApplicationParser implements ApplicationParser { /** * Parse Subscription Information * - * @param appId Application id + * @param appUuid Application id * @param tenantId Tenant id of tenant which deployed the Application * @param key Generated key for the Application * @param groupName Group name (if relevant) @@ -348,14 +348,14 @@ public class DefaultApplicationParser implements ApplicationParser { * @throws ApplicationDefinitionException */ private Map<String, Map<String, ClusterDataHolder>> parseLeafLevelSubscriptions( - String appId, int tenantId, String key, String groupName, + String appUuid, int tenantId, String key, String groupName, List<CartridgeContext> cartridgeContextList, Set<StartupOrder> dependencyOrder) throws ApplicationDefinitionException, CartridgeNotFoundException { Map<String, Map<String, ClusterDataHolder>> completeDataHolder = new HashMap<String, Map<String, ClusterDataHolder>>(); Map<String, ClusterDataHolder> clusterDataMap = new HashMap<String, ClusterDataHolder>(); Map<String, ClusterDataHolder> clusterDataMapByType = new HashMap<String, ClusterDataHolder>(); - createClusterDataMap(appId, cartridgeContextList, clusterDataMap, clusterDataMapByType,tenantId); + createClusterDataMap(appUuid, cartridgeContextList, clusterDataMap, clusterDataMapByType,tenantId); for (CartridgeContext cartridgeContext : cartridgeContextList) { List<String> dependencyClusterIDs = new ArrayList<String>(); @@ -390,8 +390,8 @@ public class DefaultApplicationParser implements ApplicationParser { clusterInfo = new STClusterInformation(); } - String hostname = clusterInfo.getHostName(appId, subscriptionAlias, cartridge.getHostName()); - String clusterId = clusterInfo.getClusterId(appId, subscriptionAlias, cartridgeType); + String hostname = clusterInfo.getHostName(appUuid, subscriptionAlias, cartridge.getHostName()); + String clusterId = clusterInfo.getClusterId(appUuid, subscriptionAlias, cartridgeType); String repoUrl = null; if (subscribableInfoContext.getArtifactRepositoryContext() != null) { repoUrl = subscribableInfoContext.getArtifactRepositoryContext().getRepoUrl(); @@ -410,7 +410,7 @@ public class DefaultApplicationParser implements ApplicationParser { if (StringUtils.isBlank(dependentCartridgeUuid)) { throw new CartridgeNotFoundException( String.format("Could not find dependent cartridge for " + - "application: %s cartridge-alias: %s", appId, cartridgeAlias)); + "application: %s cartridge-alias: %s", appUuid, cartridgeAlias)); } Cartridge dependencyCartridge = getCartridge(dependentCartridgeUuid); ClusterDataHolder dataHolder = clusterDataMapByType.get(dependentCartridgeUuid); @@ -452,7 +452,7 @@ public class DefaultApplicationParser implements ApplicationParser { isLB = true; } // create and collect this cluster's information - ApplicationClusterContext appClusterCtxt = createApplicationClusterContext(appId, groupName, cartridge, + ApplicationClusterContext appClusterCtxt = createApplicationClusterContext(appUuid, groupName, cartridge, key, tenantId, repoUrl, subscriptionAlias, clusterId, hostname, subscribableInfoContext.getDeploymentPolicyUuid(), isLB, tenantRange, subscribableInfoContext.getDependencyAliases(), http://git-wip-us.apache.org/repos/asf/stratos/blob/c990b8d8/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java index 7cef469..facf756 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java @@ -258,11 +258,11 @@ public class StratosManagerServiceClient { /** * Validates whether a cartridge group can be removed. * - * @param cartridgeGroupName the cartridge group name + * @param cartridgeGroupUuid the cartridge group name * @return true, if successful * @throws RemoteException the remote exception */ - public boolean canCartirdgeGroupBeRemoved(String cartridgeGroupName) throws RemoteException { - return stub.canCartirdgeGroupBeRemoved(cartridgeGroupName); + public boolean canCartirdgeGroupBeRemoved(String cartridgeGroupUuid) throws RemoteException { + return stub.canCartirdgeGroupBeRemoved(cartridgeGroupUuid); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/c990b8d8/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 f246e67..b1bcfd1 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 @@ -1331,20 +1331,21 @@ public class StratosApiV41Utils { // Check whether cartridge group exists try { - if (asServiceClient.getServiceGroupByTenant(name, tenantId) == null) { + + ServiceGroup serviceGroup = asServiceClient.getServiceGroupByTenant(name, tenantId); + if (serviceGroup == null) { String message = "Cartridge group: [group-name] " + name + " cannot be removed since it does not exist"; log.error(message); throw new RestAPIException(message); } // Validate whether cartridge group can be removed - if (!smServiceClient.canCartirdgeGroupBeRemoved(name)) { + if (!smServiceClient.canCartirdgeGroupBeRemoved(serviceGroup.getUuid())) { String message = "Cannot remove cartridge group: [group-name] " + name + " since it is used in another cartridge group or an application"; log.error(message); throw new RestAPIException(message); } - ServiceGroup serviceGroup = asServiceClient.getServiceGroupByTenant(name, tenantId); asServiceClient.undeployServiceGroupDefinition(serviceGroup.getUuid());
