Repository: stratos Updated Branches: refs/heads/tenant-isolation 7e6eb0bfc -> e0f6286ec
Add missing references Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5bad93fb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5bad93fb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5bad93fb Branch: refs/heads/tenant-isolation Commit: 5bad93fb946c4ec482f82452ea5434a953058767 Parents: 7e6eb0b Author: Gayan Gunarathne <[email protected]> Authored: Wed Jul 8 21:09:30 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Wed Jul 8 21:09:30 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 16 +++++++++++++--- .../stratos/autoscaler/util/AutoscalerUtil.java | 2 +- .../endpoint/util/converter/ObjectConverter.java | 2 ++ 3 files changed, 16 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5bad93fb/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 ed2959e..e8dfc67 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 @@ -364,7 +364,7 @@ public class DefaultApplicationParser implements ApplicationParser { SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext(); String subscriptionAlias = subscribableInfoContext.getAlias(); - Cartridge cartridge = getCartridge(cartridgeType); + Cartridge cartridge = getCartridgeByTenant(cartridgeType,tenantId); if (cartridge == null) { throw new CartridgeNotFoundException("Cartridge not found " + cartridgeType); } @@ -410,7 +410,7 @@ public class DefaultApplicationParser implements ApplicationParser { String.format("Could not find dependent cartridge for " + "application: %s cartridge-alias: %s", appId, cartridgeAlias)); } - Cartridge dependencyCartridge = getCartridge(dependentCartridgeType); + Cartridge dependencyCartridge = getCartridgeByTenant(dependentCartridgeType,tenantId); ClusterDataHolder dataHolder = clusterDataMapByType.get(dependentCartridgeType); if (dataHolder != null) { @@ -498,7 +498,7 @@ public class DefaultApplicationParser implements ApplicationParser { String subscriptionAlias = subscribableInfoContext.getAlias(); // check if a cartridge with relevant type is already deployed. else, can't continue - Cartridge cartridge = getCartridge(cartridgeType); + Cartridge cartridge = getCartridgeByTenant(cartridgeType,tenantId); if (cartridge == null) { handleError("No deployed Cartridge found with type [ " + cartridgeType + " ] for Composite Application"); @@ -1001,6 +1001,16 @@ public class DefaultApplicationParser implements ApplicationParser { } } + private Cartridge getCartridgeByTenant(String cartridgeType,int tenantId) throws ApplicationDefinitionException { + + try { + return CloudControllerServiceClient.getInstance().getCartridgeByTenant(cartridgeType,tenantId); + } catch (Exception e) { + log.error(String.format("Unable to get the cartridge: %s %d " , cartridgeType , tenantId), e); + throw new ApplicationDefinitionException(e); + } + } + private void handleError(String errorMsg) throws ApplicationDefinitionException { log.error(errorMsg); throw new ApplicationDefinitionException(errorMsg); http://git-wip-us.apache.org/repos/asf/stratos/blob/5bad93fb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java index 1851064..2466b5a 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java @@ -742,7 +742,7 @@ public class AutoscalerUtil { throw new ApplicatioinPolicyNotExistsException(msg); } - String[] networkPartitionIds = applicationPolicy.getNetworkPartitions(); + String[] networkPartitionIds = applicationPolicy.getNetworkPartitionsUuid(); for (String applicationPolicyNetworkPartitionerence : networkPartitionIds) { String networkPartitionId = applicationPolicyNetworkPartitionerence; http://git-wip-us.apache.org/repos/asf/stratos/blob/5bad93fb/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 93281ed..341c346 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 @@ -74,6 +74,7 @@ public class ObjectConverter { Cartridge cartridge = new Cartridge(); cartridge.setUuid(cartridgeBean.getUuid()); + cartridge.setTenantId(cartridgeBean.getTenantId()); cartridge.setType(cartridgeBean.getType()); cartridge.setHostName(cartridgeBean.getHost()); cartridge.setProvider(cartridgeBean.getProvider()); @@ -1116,6 +1117,7 @@ public class ObjectConverter { applicationContext.setName(applicationDefinition.getName()); applicationContext.setDescription(applicationDefinition.getDescription()); applicationContext.setStatus(applicationDefinition.getStatus()); + applicationContext.setTenantId(applicationDefinition.getTenantId()); // convert and set components if (applicationDefinition.getComponents() != null) {
