Repository: stratos Updated Branches: refs/heads/tenant-isolation 3c287ae05 -> 92547545b
Update the add tenant isolation to get cartridge Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/92547545 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/92547545 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/92547545 Branch: refs/heads/tenant-isolation Commit: 92547545bea3695002492b36ddfffcf576f03f8c Parents: 3c287ae Author: Gayan Gunarathne <[email protected]> Authored: Mon Jul 6 18:51:43 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Mon Jul 6 18:51:43 2015 +0530 ---------------------------------------------------------------------- .../rest/endpoint/api/StratosApiV41.java | 13 ++++++---- .../rest/endpoint/api/StratosApiV41Utils.java | 26 ++++++++++---------- 2 files changed, 21 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/92547545/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 5bc03fa..2c54388 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 @@ -343,8 +343,10 @@ public class StratosApiV41 extends AbstractApi { public Response getCartridges() throws RestAPIException { + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); //We pass null to searching string and multi-tenant parameter since we do not need to do any filtering - List<CartridgeBean> cartridges = StratosApiV41Utils.getAvailableCartridges(null, null, getConfigContext()); + List<CartridgeBean> cartridges = StratosApiV41Utils.getAvailableCartridges(null, null, getConfigContext(), + carbonContext.getTenantId()); if (cartridges == null || cartridges.isEmpty()) { return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "No cartridges found")).build(); @@ -384,7 +386,7 @@ public class StratosApiV41 extends AbstractApi { * @param filter Filter * @param criteria Criteria * @return 200 if cartridges are found for specified filter, 404 if none found - * @throws RestAPIException + * @throws RestAPIExcept */ @GET @Path("/cartridges/filter/{filter}") @@ -394,8 +396,9 @@ public class StratosApiV41 extends AbstractApi { public Response getCartridgesByFilter( @DefaultValue("") @PathParam("filter") String filter, @QueryParam("criteria") String criteria) throws RestAPIException { + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); List<CartridgeBean> cartridges = StratosApiV41Utils. - getCartridgesByFilter(filter, criteria, getConfigContext()); + getCartridgesByFilter(filter, criteria, getConfigContext(),carbonContext.getTenantId()); if (cartridges == null || cartridges.isEmpty()) { return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "No cartridges found")).build(); @@ -422,8 +425,8 @@ public class StratosApiV41 extends AbstractApi { @PathParam("cartridgeType") String cartridgeType, @DefaultValue("") @PathParam("filter") String filter) throws RestAPIException { CartridgeBean cartridge; - - cartridge = StratosApiV41Utils.getCartridgeByFilter(filter, cartridgeType, getConfigContext()); + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + cartridge = StratosApiV41Utils.getCartridgeByFilter(filter, cartridgeType, getConfigContext(),carbonContext.getTenantId()); if (cartridge == null) { return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "No cartridges found for this filter")).build(); http://git-wip-us.apache.org/repos/asf/stratos/blob/92547545/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 1e14632..adfc0da 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 @@ -282,15 +282,15 @@ public class StratosApiV41Utils { * @throws RestAPIException */ public static List<CartridgeBean> getCartridgesByFilter( - String filter, String criteria, ConfigurationContext configurationContext) throws RestAPIException { + String filter, String criteria, ConfigurationContext configurationContext,int tenantId) throws RestAPIException { List<CartridgeBean> cartridges = null; if (Constants.FILTER_TENANT_TYPE_SINGLE_TENANT.equals(filter)) { - cartridges = getAvailableCartridges(null, false, configurationContext); + cartridges = getAvailableCartridges(null, false, configurationContext,tenantId); } else if (Constants.FILTER_TENANT_TYPE_MULTI_TENANT.equals(filter)) { - cartridges = getAvailableCartridges(null, true, configurationContext); + cartridges = getAvailableCartridges(null, true, configurationContext,tenantId); } else if (Constants.FILTER_LOAD_BALANCER.equals(filter)) { - cartridges = getAvailableLbCartridges(false, configurationContext); + cartridges = getAvailableLbCartridges(false, configurationContext,tenantId); } else if (Constants.FILTER_PROVIDER.equals(filter)) { cartridges = getAvailableCartridgesByProvider(criteria); } @@ -309,8 +309,8 @@ public class StratosApiV41Utils { * @throws RestAPIException */ public static CartridgeBean getCartridgeByFilter( - String filter, String cartridgeType, ConfigurationContext configurationContext) throws RestAPIException { - List<CartridgeBean> cartridges = getCartridgesByFilter(filter, null, configurationContext); + String filter, String cartridgeType, ConfigurationContext configurationContext,int tenantId) throws RestAPIException { + List<CartridgeBean> cartridges = getCartridgesByFilter(filter, null, configurationContext,tenantId); for (CartridgeBean cartridge : cartridges) { if (cartridge.getType().equals(cartridgeType)) { @@ -329,9 +329,9 @@ public class StratosApiV41Utils { * @throws RestAPIException */ private static List<CartridgeBean> getAvailableLbCartridges( - boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException { + boolean multiTenant, ConfigurationContext configurationContext,int tenantId) throws RestAPIException { List<CartridgeBean> cartridges = getAvailableCartridges(null, multiTenant, - configurationContext); + configurationContext,tenantId); List<CartridgeBean> lbCartridges = new ArrayList<CartridgeBean>(); for (CartridgeBean cartridge : cartridges) { if (Constants.FILTER_LOAD_BALANCER.equalsIgnoreCase(cartridge.getCategory())) { @@ -413,7 +413,7 @@ public class StratosApiV41Utils { } public static List<CartridgeBean> getAvailableCartridges( - String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext) + String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext,int tenantId) throws RestAPIException { List<CartridgeBean> cartridges = new ArrayList<CartridgeBean>(); @@ -457,10 +457,10 @@ public class StratosApiV41Utils { if (!StratosApiV41Utils.cartridgeMatches(cartridgeInfo, searchPattern)) { continue; } - - CartridgeBean cartridge = ObjectConverter. - convertCartridgeToCartridgeDefinitionBean(cartridgeInfo); - cartridges.add(cartridge); + if(cartridgeInfo.getTenantId() == tenantId) { + CartridgeBean cartridge = ObjectConverter.convertCartridgeToCartridgeDefinitionBean(cartridgeInfo); + cartridges.add(cartridge); + } }
