Repository: stratos Updated Branches: refs/heads/tenant-isolation 8382dd71f -> 464ee1e1a
Remove UUID and tenantId from CartridgeBean Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/70e21951 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/70e21951 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/70e21951 Branch: refs/heads/tenant-isolation Commit: 70e21951827b4029aeaf76fd14524edb769a036d Parents: 8382dd7 Author: Dinithi <[email protected]> Authored: Thu Aug 6 20:07:03 2015 +0530 Committer: Dinithi <[email protected]> Committed: Thu Aug 6 20:07:03 2015 +0530 ---------------------------------------------------------------------- .../common/beans/cartridge/CartridgeBean.java | 18 ------- .../rest/endpoint/api/StratosApiV40Utils.java | 3 +- .../rest/endpoint/api/StratosApiV41.java | 13 ++---- .../rest/endpoint/api/StratosApiV41Utils.java | 45 ++++++++++-------- .../util/converter/ObjectConverter.java | 49 ++++++++++---------- 5 files changed, 57 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/70e21951/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java index b8afa84..482c566 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java @@ -27,7 +27,6 @@ import java.util.List; @XmlRootElement(name = "cartridgeBean") public class CartridgeBean { - private String uuid; private String type; private String provider; /** @@ -49,7 +48,6 @@ public class CartridgeBean { */ private String loadBalancingIPType; private List<PropertyBean> property; - private int tenantId; private String getDeploymentDetails() { if (getDeployment() != null) { @@ -228,20 +226,4 @@ public class CartridgeBean { public void setMetadataKeys(List<String> metadataKeys) { this.metadataKeys = metadataKeys; } - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - public int getTenantId() { - return tenantId; - } - - public void setTenantId(int tenantId) { - this.tenantId = tenantId; - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/70e21951/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 552fe1c..eeab1bb 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 @@ -69,7 +69,8 @@ public class StratosApiV40Utils { if (cloudControllerServiceClient != null) { - Cartridge cartridgeConfig = ObjectConverter.convertCartridgeBeanToStubCartridgeConfig(cartridgeDefinitionBean); + Cartridge cartridgeConfig = ObjectConverter.convertCartridgeBeanToStubCartridgeConfig + (cartridgeDefinitionBean, null, -1); if (cartridgeConfig == null) { throw new RestAPIException("Populated CartridgeConfig instance is null, cartridge deployment aborted"); http://git-wip-us.apache.org/repos/asf/stratos/blob/70e21951/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 baa06c6..4adf1b6 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 @@ -289,10 +289,10 @@ public class StratosApiV41 extends AbstractApi { CartridgeBean cartridgeDefinitionBean) throws RestAPIException { String cartridgeType = cartridgeDefinitionBean.getType(); - cartridgeDefinitionBean.setUuid(UUID.randomUUID().toString()); + String cartridgeUuid = UUID.randomUUID().toString(); PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - cartridgeDefinitionBean.setTenantId(carbonContext.getTenantId()); + int tenantId = carbonContext.getTenantId(); CartridgeBean cartridgeBean = null; try { @@ -302,17 +302,17 @@ public class StratosApiV41 extends AbstractApi { } if (cartridgeBean != null) { String msg = String.format("Cartridge already exists: [cartridge-type] %s [cartridge-uuid] %s [tenant-id] %d", - cartridgeType,cartridgeDefinitionBean.getUuid(),cartridgeDefinitionBean.getTenantId()); + cartridgeType, cartridgeUuid, tenantId); log.warn(msg); return Response.status(Response.Status.CONFLICT) .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, msg)).build(); } - StratosApiV41Utils.addCartridge(cartridgeDefinitionBean); + StratosApiV41Utils.addCartridge(cartridgeDefinitionBean, cartridgeUuid, tenantId); URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeType).build(); return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format("Cartridge added successfully: [cartridge-type] %s [cartridge-uuid] %s [tenant-id] %d", - cartridgeType,cartridgeDefinitionBean.getUuid(),cartridgeDefinitionBean.getTenantId()))).build(); + cartridgeType,cartridgeUuid, tenantId))).build(); } /** @@ -329,9 +329,6 @@ public class StratosApiV41 extends AbstractApi { @AuthorizationAction("/permission/admin/stratos/cartridges/manage") public Response updateCartridge( CartridgeBean cartridgeDefinitionBean) throws RestAPIException { - - PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - cartridgeDefinitionBean.setTenantId(carbonContext.getTenantId()); StratosApiV41Utils.updateCartridge(cartridgeDefinitionBean); URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeDefinitionBean.getType()).build(); return Response.ok(url) http://git-wip-us.apache.org/repos/asf/stratos/blob/70e21951/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 b825d14..d9934b3 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 @@ -119,12 +119,13 @@ public class StratosApiV41Utils { * @param cartridgeBean Cartridge definition * @throws RestAPIException */ - public static void addCartridge(CartridgeBean cartridgeBean) throws RestAPIException { + public static void addCartridge(CartridgeBean cartridgeBean, String cartridgeUuid, + int tenantId) throws RestAPIException { try { if (log.isDebugEnabled()) { log.debug(String.format("Adding cartridge: [cartridge-uuid] %s[cartridge-type] %s ", - cartridgeBean.getUuid(), cartridgeBean.getType())); + cartridgeUuid, cartridgeBean.getType())); } List<IaasProviderBean> iaasProviders = cartridgeBean.getIaasProvider(); @@ -139,19 +140,19 @@ public class StratosApiV41Utils { if (log.isInfoEnabled()) { log.info(String.format("Port mapping name not found, default value generated: " + "[cartridge-uuid] %s [cartridge-type] %s [port-mapping-name] %s", - cartridgeBean.getUuid(), cartridgeBean.getType(), portMapping.getName())); + cartridgeUuid, cartridgeBean.getType(), portMapping.getName())); } } } - Cartridge cartridgeConfig = createCartridgeConfig(cartridgeBean); + Cartridge cartridgeConfig = createCartridgeConfig(cartridgeBean, cartridgeUuid, tenantId); CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance(); cloudControllerServiceClient.addCartridge(cartridgeConfig); if (log.isDebugEnabled()) { log.debug(String.format( "Successfully added cartridge: [cartridge-uuid] %s [cartridge-type] %s ", - cartridgeBean.getUuid(), cartridgeBean.getType())); + cartridgeUuid, cartridgeBean.getType())); } } catch (CloudControllerServiceCartridgeAlreadyExistsExceptionException e) { String msg = "Could not add cartridge as it is already exits"; @@ -182,28 +183,34 @@ public class StratosApiV41Utils { */ public static void updateCartridge(CartridgeBean cartridgeBean) throws RestAPIException { try { + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + + CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance(); + Cartridge existingCartridge = cloudControllerServiceClient.getCartridgeByTenant(cartridgeBean.getType(), + carbonContext.getTenantId()); + Cartridge cartridgeConfig = createCartridgeConfig(cartridgeBean, existingCartridge.getUuid(), + existingCartridge.getTenantId()); + cartridgeConfig.setUuid(existingCartridge.getUuid()); + if (log.isDebugEnabled()) { log.debug(String.format("Updating cartridge: [cartridge-uuid] %s [cartridge-type] %s [tenant-id] %d", - cartridgeBean.getUuid(), - cartridgeBean.getType(),cartridgeBean.getTenantId())); + existingCartridge.getUuid(), cartridgeBean.getType(), existingCartridge.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 [tenant-id] %d" + - "[cartridge-type] %s", cartridgeBean.getUuid(), cartridgeBean.getType(),cartridgeBean.getTenantId())); + throw new RestAPIException(String.format("IaaS providers not found in cartridge: [cartridge-uuid] %s " + + "[cartridge-type] %s [tenant-id] %d", existingCartridge.getUuid(), cartridgeBean.getType(), + existingCartridge.getTenantId())); } - Cartridge cartridgeConfig = createCartridgeConfig(cartridgeBean); - CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance(); - Cartridge existingCartridge=cloudControllerServiceClient.getCartridgeByTenant(cartridgeBean.getType(), - cartridgeBean.getTenantId()); - cartridgeConfig.setUuid(existingCartridge.getUuid()); + cloudControllerServiceClient.updateCartridge(cartridgeConfig); if (log.isDebugEnabled()) { - log.debug(String.format("Successfully updated cartridge: [cartridge-uuid] %s [cartridge-type] %s [tenant-id]", - cartridgeBean.getUuid() ,cartridgeBean.getType(), cartridgeBean.getTenantId())); + log.debug(String.format("Successfully updated cartridge: [cartridge-uuid] %s [cartridge-type] %s " + + "[tenant-id] %d", existingCartridge.getUuid(), cartridgeBean.getType(), + existingCartridge.getTenantId())); } } catch (CloudControllerServiceCartridgeDefinitionNotExistsExceptionException e) { String msg = "Could not add cartridge"; @@ -235,10 +242,10 @@ public class StratosApiV41Utils { * @return Created cartridge * @throws RestAPIException */ - private static Cartridge createCartridgeConfig(CartridgeBean cartridgeDefinition) - throws RestAPIException { + private static Cartridge createCartridgeConfig(CartridgeBean cartridgeDefinition, String cartridgeUuid, + int tenantId) throws RestAPIException { Cartridge cartridgeConfig = - ObjectConverter.convertCartridgeBeanToStubCartridgeConfig(cartridgeDefinition); + ObjectConverter.convertCartridgeBeanToStubCartridgeConfig(cartridgeDefinition, cartridgeUuid, tenantId); if (cartridgeConfig == null) { throw new RestAPIException("Could not read cartridge definition, cartridge deployment failed"); } http://git-wip-us.apache.org/repos/asf/stratos/blob/70e21951/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 2fce76b..861fd20 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 @@ -72,15 +72,15 @@ public class ObjectConverter { public static final String CLUSTER_PROPERTY = "cluster"; public static Cartridge convertCartridgeBeanToStubCartridgeConfig( - CartridgeBean cartridgeBean) throws RestAPIException { + CartridgeBean cartridgeBean, String cartridgeUuid, int tenantId) throws RestAPIException { if (cartridgeBean == null) { return null; } Cartridge cartridge = new Cartridge(); - cartridge.setUuid(cartridgeBean.getUuid()); - cartridge.setTenantId(cartridgeBean.getTenantId()); + cartridge.setUuid(cartridgeUuid); + cartridge.setTenantId(tenantId); cartridge.setType(cartridgeBean.getType()); cartridge.setHostName(cartridgeBean.getHost()); cartridge.setProvider(cartridgeBean.getProvider()); @@ -114,13 +114,13 @@ public class ObjectConverter { // iaas providers if (cartridgeBean.getIaasProvider() != null && !cartridgeBean.getIaasProvider().isEmpty()) { - cartridge.setIaasConfigs(convertIaasProviderBeansToStubIaasConfig(cartridgeBean.getIaasProvider(),cartridgeBean.getTenantId())); + cartridge.setIaasConfigs(convertIaasProviderBeansToStubIaasConfig(cartridgeBean.getIaasProvider(), + tenantId)); } // properties if (cartridgeBean.getProperty() != null && !cartridgeBean.getProperty().isEmpty()) { - cartridge.setProperties(convertPropertyBeansToCCStubProperties(cartridgeBean.getProperty(), - cartridgeBean.getTenantId())); + cartridge.setProperties(convertPropertyBeansToCCStubProperties(cartridgeBean.getProperty(), tenantId)); } return cartridge; } @@ -1675,42 +1675,41 @@ public class ObjectConverter { * @return CartridgeBean */ public static CartridgeBean convertCartridgeToCartridgeDefinitionBean(Cartridge cartridgeInfo) { - CartridgeBean cartridge = new CartridgeBean(); - cartridge.setUuid(cartridgeInfo.getUuid()); - cartridge.setType(cartridgeInfo.getType()); - cartridge.setProvider(cartridgeInfo.getProvider()); - cartridge.setCategory(cartridgeInfo.getCategory()); - cartridge.setHost(cartridgeInfo.getHostName()); - cartridge.setDisplayName(cartridgeInfo.getDisplayName()); - cartridge.setDescription(cartridgeInfo.getDescription()); - cartridge.setVersion(cartridgeInfo.getVersion()); - cartridge.setMultiTenant(cartridgeInfo.getMultiTenant()); - cartridge.setDescription(cartridgeInfo.getDescription()); - cartridge.setLoadBalancingIPType(cartridgeInfo.getLoadBalancingIPType()); + CartridgeBean cartridgeBean = new CartridgeBean(); + cartridgeBean.setType(cartridgeInfo.getType()); + cartridgeBean.setProvider(cartridgeInfo.getProvider()); + cartridgeBean.setCategory(cartridgeInfo.getCategory()); + cartridgeBean.setHost(cartridgeInfo.getHostName()); + cartridgeBean.setDisplayName(cartridgeInfo.getDisplayName()); + cartridgeBean.setDescription(cartridgeInfo.getDescription()); + cartridgeBean.setVersion(cartridgeInfo.getVersion()); + cartridgeBean.setMultiTenant(cartridgeInfo.getMultiTenant()); + cartridgeBean.setDescription(cartridgeInfo.getDescription()); + cartridgeBean.setLoadBalancingIPType(cartridgeInfo.getLoadBalancingIPType()); if (cartridgeInfo.getMetadataKeys() != null && cartridgeInfo.getMetadataKeys()[0] != null) { - cartridge.setMetadataKeys(Arrays.asList(cartridgeInfo.getMetadataKeys())); + cartridgeBean.setMetadataKeys(Arrays.asList(cartridgeInfo.getMetadataKeys())); } //convert persistence - cartridge.setPersistence(convertPersistenceToPersistenceBean(cartridgeInfo.getPersistence())); + cartridgeBean.setPersistence(convertPersistenceToPersistenceBean(cartridgeInfo.getPersistence())); //convert deployment - cartridge.setDeployment(convertDeploymentToDeploymentBean(cartridgeInfo.getDeploymentDirs(), + cartridgeBean.setDeployment(convertDeploymentToDeploymentBean(cartridgeInfo.getDeploymentDirs(), cartridgeInfo.getBaseDir())); //convert IaaSProvider - cartridge.setIaasProvider(convertIaaSProviderToIaaSProviderBean( + cartridgeBean.setIaasProvider(convertIaaSProviderToIaaSProviderBean( cartridgeInfo.getIaasConfigs())); //Convert Port-mappings - cartridge.setPortMapping(convertPortMappingsToStubPortMappingBeans( + cartridgeBean.setPortMapping(convertPortMappingsToStubPortMappingBeans( cartridgeInfo.getPortMappings())); //convert properties - cartridge.setProperty(convertCCStubPropertiesToPropertyBeans(cartridgeInfo.getProperties())); + cartridgeBean.setProperty(convertCCStubPropertiesToPropertyBeans(cartridgeInfo.getProperties())); - return cartridge; + return cartridgeBean; } public static ApplicationInfoBean convertApplicationToApplicationBean(Application application) {
