Repository: stratos Updated Branches: refs/heads/tenant-isolation ca0333bb2 -> 5a28ca4aa
Refactoring the startos rest method Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5a28ca4a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5a28ca4a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5a28ca4a Branch: refs/heads/tenant-isolation Commit: 5a28ca4aac6dbc7d1d1696344c35d40ebe097184 Parents: ca0333b Author: Gayan Gunarathne <[email protected]> Authored: Tue Jul 21 17:01:29 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Tue Jul 21 17:01:29 2015 +0530 ---------------------------------------------------------------------- .../rest/endpoint/api/StratosApiV41Utils.java | 25 ++++++++++---------- .../util/converter/ObjectConverter.java | 6 +++-- 2 files changed, 17 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5a28ca4a/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 8e7bbf9..7f414c3 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 @@ -181,22 +181,22 @@ public class StratosApiV41Utils { public static void updateCartridge(CartridgeBean cartridgeBean) throws RestAPIException { try { if (log.isDebugEnabled()) { - log.debug(String.format("Updating cartridge: [cartridge-uuid] %s [cartridge-type] %s ", + log.debug(String.format("Updating cartridge: [cartridge-uuid] %s [cartridge-type] %s [tenant-id] %d", cartridgeBean.getUuid(), - cartridgeBean.getType())); + cartridgeBean.getType(),cartridgeBean.getTenantId())); } List<IaasProviderBean> iaasProviders = cartridgeBean.getIaasProvider(); if ((iaasProviders == null) || iaasProviders.size() == 0) { - throw new RestAPIException(String.format("IaaS providers not found in cartridge: [cartridge-uuid] %s " + - "[cartridge-type] %s", cartridgeBean.getUuid(), cartridgeBean.getType())); + throw new RestAPIException(String.format("IaaS providers not found in cartridge: [cartridge-uuid] %s [tenant-id] %d" + + "[cartridge-type] %s", cartridgeBean.getUuid(), cartridgeBean.getType(),cartridgeBean.getTenantId())); } Cartridge cartridgeConfig = createCartridgeConfig(cartridgeBean); CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance(); - cartridgeConfig.setUuid(cloudControllerServiceClient.getCartridgeByTenant(cartridgeBean.getType(), - cartridgeBean.getTenantId()).getUuid()); - + Cartridge existingCartridge=cloudControllerServiceClient.getCartridgeByTenant(cartridgeBean.getType(), + cartridgeBean.getTenantId()); + cartridgeConfig.setUuid(existingCartridge.getUuid()); cloudControllerServiceClient.updateCartridge(cartridgeConfig); if (log.isDebugEnabled()) { @@ -1106,7 +1106,8 @@ public class StratosApiV41Utils { InvalidCartridgeGroupDefinitionException, CloudControllerServiceCartridgeNotFoundExceptionException { try { AutoscalerServiceClient autoscalerServiceClient = AutoscalerServiceClient.getInstance(); - cartridgeGroup.setUuid(autoscalerServiceClient.getServiceGroupByTenant(cartridgeGroup.getName(),tenantId).getUuid()); + ServiceGroup existingServiceGroup =autoscalerServiceClient.getServiceGroupByTenant(cartridgeGroup.getName(), tenantId); + cartridgeGroup.setUuid(existingServiceGroup.getUuid()); cartridgeGroup.setTenantId(tenantId); ServiceGroup serviceGroup = ObjectConverter.convertServiceGroupDefinitionToASStubServiceGroup( cartridgeGroup); @@ -1304,7 +1305,7 @@ public class StratosApiV41Utils { StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient(); if (log.isDebugEnabled()) { - log.debug("Removing cartridge group: [cartridge-group-name] " + name); + log.debug(String.format("Removing cartridge group: [cartridge-group-name] %s [tenant-id] %d " ,name,tenantId)); } String serviceGroupUuid = null; // Check whether cartridge group exists @@ -1314,15 +1315,15 @@ public class StratosApiV41Utils { if (serviceGroup == null) { String message = "Cartridge group: [cartridge-group-name] " + name + " cannot be removed since it " + - "does not exist"; + "does not exist in tenant " + tenantId; log.error(message); throw new RestAPIException(message); } // Validate whether cartridge group can be removed if (!smServiceClient.canCartirdgeGroupBeRemoved(serviceGroup.getUuid())) { String message = String.format("Cannot remove cartridge group: [cartridge-group-uuid] %s [group-name]" + - " %s since it is used in another cartridge group or an application", serviceGroup.getUuid(), - serviceGroup.getName()); + " %s since it is used in another cartridge group or an application in tenant %d", serviceGroup.getUuid(), + serviceGroup.getName(),tenantId); log.error(message); throw new RestAPIException(message); } http://git-wip-us.apache.org/repos/asf/stratos/blob/5a28ca4a/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 ee368e0..c318532 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 @@ -69,7 +69,9 @@ import java.util.*; public class ObjectConverter { - public static Cartridge convertCartridgeBeanToStubCartridgeConfig( + public static final String CLUSTER_PROPERTY = "cluster"; + + public static Cartridge convertCartridgeBeanToStubCartridgeConfig( CartridgeBean cartridgeBean) throws RestAPIException { if (cartridgeBean == null) { @@ -290,7 +292,7 @@ public class ObjectConverter { org.apache.stratos.cloud.controller.stub.Property stubProperty = new org.apache.stratos.cloud.controller.stub.Property(); stubProperty.setName(propertyBean.getName()); - if(propertyBean.getName().equals("cluster")){ + if(propertyBean.getName().equals(CLUSTER_PROPERTY)){ stubProperty.setValue(StratosApiV41Utils.getKubernetesClusterUuidByTenant(propertyBean.getValue(),tenantId)); } else{
