Update the missing references
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5ef775a0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5ef775a0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5ef775a0 Branch: refs/heads/tenant-isolation Commit: 5ef775a08522b42f33fc43456b094d7c6e11faff Parents: 0bc4e8b Author: Gayan Gunarathne <[email protected]> Authored: Wed Jul 8 15:43:19 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Wed Jul 8 15:43:19 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 10 +- .../services/CloudControllerService.java | 15 +- .../impl/CloudControllerServiceImpl.java | 16 +- .../client/CloudControllerServiceClient.java | 11 +- .../rest/endpoint/api/StratosApiV40Utils.java | 2 +- .../rest/endpoint/api/StratosApiV41Utils.java | 12 +- .../util/converter/ObjectConverter.java | 13 +- .../main/resources/CloudControllerService.wsdl | 948 ++++++++++--------- 8 files changed, 557 insertions(+), 470 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5ef775a0/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 b286a80..1312df0 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,tenantId); + Cartridge cartridge = getCartridge(cartridgeType); 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,tenantId); + Cartridge dependencyCartridge = getCartridge(dependentCartridgeType); 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,tenantId); + Cartridge cartridge = getCartridge(cartridgeType); if (cartridge == null) { handleError("No deployed Cartridge found with type [ " + cartridgeType + " ] for Composite Application"); @@ -991,10 +991,10 @@ public class DefaultApplicationParser implements ApplicationParser { return token; } - private Cartridge getCartridge(String cartridgeType,int tenantId) throws ApplicationDefinitionException { + private Cartridge getCartridge(String cartridgeType) throws ApplicationDefinitionException { try { - return CloudControllerServiceClient.getInstance().getCartridge(cartridgeType,tenantId); + return CloudControllerServiceClient.getInstance().getCartridge(cartridgeType); } catch (Exception e) { log.error("Unable to get the cartridge: " + cartridgeType, e); throw new ApplicationDefinitionException(e); http://git-wip-us.apache.org/repos/asf/stratos/blob/5ef775a0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java index ecf6df4..2d82960 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java @@ -203,17 +203,30 @@ public interface CloudControllerService { */ public boolean unregisterService(String clusterId) throws UnregisteredClusterException; + /** + * This method will return the information regarding the given cartridge, if present. + * Else this will return <code>null</code>. + * + * @param cartridgeType type of the cartridge. + * @return {@link org.apache.stratos.cloud.controller.domain.Cartridge} of the given cartridge type or + * <code>null</code>. + * @throws org.apache.stratos.cloud.controller.exception.CartridgeNotFoundException if there is no registered + * cartridge with this type. + */ + public Cartridge getCartridge(String cartridgeType) throws CartridgeNotFoundException; /** * This method will return the information regarding the given cartridge, if present. * Else this will return <code>null</code>. * * @param cartridgeType type of the cartridge. + * @param tenantId tenant id. + * * @return {@link org.apache.stratos.cloud.controller.domain.Cartridge} of the given cartridge type or * <code>null</code>. * @throws org.apache.stratos.cloud.controller.exception.CartridgeNotFoundException if there is no registered * cartridge with this type. */ - Cartridge getCartridge(String cartridgeType,int tenantId) throws CartridgeNotFoundException; + Cartridge getCartridgeByTenant(String cartridgeType,int tenantId) throws CartridgeNotFoundException; /** * Calling this method will result in returning the types of {@link org.apache.stratos.cloud.controller.domain http://git-wip-us.apache.org/repos/asf/stratos/blob/5ef775a0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index 5ac1f93..6cd52f3 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -760,12 +760,22 @@ public class CloudControllerServiceImpl implements CloudControllerService { return cartridgeTypes; } + @Override + public Cartridge getCartridge(String cartridgeType) throws CartridgeNotFoundException { + Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeType); + if (cartridge != null) { + return cartridge; + } + + String msg = "Could not find cartridge: [cartridge-type] " + cartridgeType; + throw new CartridgeNotFoundException(msg); + } + @Override - public Cartridge getCartridge(String cartridgeType,int tenantId) throws CartridgeNotFoundException { + public Cartridge getCartridgeByTenant(String cartridgeType,int tenantId) throws CartridgeNotFoundException { // get the list of cartridges registered Collection<Cartridge> cartridges = CloudControllerContext.getInstance().getCartridges(); - Cartridge selectedCartridge=null; - if (cartridges == null) { + if (cartridges == null) { log.info("No registered Cartridge found."); return null; } http://git-wip-us.apache.org/repos/asf/stratos/blob/5ef775a0/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java index bf56b79..fa2c7d4 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java @@ -116,12 +116,17 @@ public class CloudControllerServiceClient { return stub.getCartridges(); } - public Cartridge getCartridge(String cartridgeType,int tenantId) throws RemoteException, + public Cartridge getCartridge(String cartridgeType) throws RemoteException, CloudControllerServiceCartridgeNotFoundExceptionException { - return stub.getCartridge(cartridgeType,tenantId); + return stub.getCartridge(cartridgeType); } - public ClusterContext getClusterContext(String clusterId) throws RemoteException { + public Cartridge getCartridgeByTenant(String cartridgeType,int tenantId) throws RemoteException, + CloudControllerServiceCartridgeNotFoundExceptionException { + return stub.getCartridgeByTenant(cartridgeType,tenantId); + } + + public ClusterContext getClusterContext(String clusterId) throws RemoteException { return stub.getClusterContext(clusterId); } http://git-wip-us.apache.org/repos/asf/stratos/blob/5ef775a0/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 dc9d7a2..3eb0b7e 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 @@ -371,7 +371,7 @@ public class StratosApiV40Utils { for (String cartridgeType : availableCartridges) { Cartridge cartridgeInfo = null; try { - cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType,-1234); + cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeByTenant(cartridgeType,-1234); } catch (Exception e) { if (log.isWarnEnabled()) { log.warn("Error when calling getCartridgeInfo for " + cartridgeType + ", Error: " http://git-wip-us.apache.org/repos/asf/stratos/blob/5ef775a0/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 a168174..4aee054 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 @@ -253,7 +253,7 @@ public class StratosApiV41Utils { } CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); - Cartridge cartridge= cloudControllerServiceClient.getCartridge(cartridgeType,tenantId); + Cartridge cartridge= cloudControllerServiceClient.getCartridgeByTenant(cartridgeType,tenantId); if (cartridge== null) { throw new RuntimeException("Cartridge not found: [cartridge-type] [tenant-id]" + cartridgeType + tenantId); } @@ -364,7 +364,7 @@ public class StratosApiV41Utils { for (String cartridgeType : availableCartridges) { Cartridge cartridgeInfo = null; try { - cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType,tenantId); + cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeByTenant(cartridgeType,tenantId); } catch (Exception e) { if (log.isWarnEnabled()) { log.warn("Error when calling getCartridgeInfo for " + cartridgeType + ", Error: " @@ -433,7 +433,7 @@ public class StratosApiV41Utils { for (String cartridgeType : availableCartridges) { Cartridge cartridgeInfo = null; try { - cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType,tenantId); + cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeByTenant(cartridgeType,tenantId); } catch (Exception e) { if (log.isWarnEnabled()) { log.warn("Error when calling getCartridgeInfo for " + cartridgeType + ", Error: " @@ -495,7 +495,7 @@ public class StratosApiV41Utils { */ public static CartridgeBean getCartridge(String cartridgeType,int tenantId) throws RestAPIException { try { - Cartridge cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType,tenantId); + Cartridge cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeByTenant(cartridgeType,tenantId); if (cartridgeInfo == null) { return null; } @@ -526,7 +526,7 @@ public class StratosApiV41Utils { public static CartridgeBean getCartridgeForValidate(String cartridgeType,int tenantId) throws RestAPIException, CloudControllerServiceCartridgeNotFoundExceptionException { try { - Cartridge cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType,tenantId); + Cartridge cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeByTenant(cartridgeType,tenantId); if (cartridgeInfo == null) { return null; } @@ -1051,7 +1051,7 @@ public class StratosApiV41Utils { int j = 0; for (String cartridgeType : cartridgeTypes) { try { - if (ccServiceClient.getCartridge(cartridgeType,serviceGroupDefinition.getTenantId()) == null) { + if (ccServiceClient.getCartridgeByTenant(cartridgeType,serviceGroupDefinition.getTenantId()) == null) { // cartridge is not deployed, can't continue log.error("Invalid cartridge found in cartridge group " + cartridgeType); throw new InvalidCartridgeException(); http://git-wip-us.apache.org/repos/asf/stratos/blob/5ef775a0/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 eb2ce8b..38da450 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 @@ -1396,10 +1396,12 @@ public class ObjectConverter { SubscribableInfoContext infoContext = new SubscribableInfoContext(); infoContext.setAlias(subscribableInfo.getAlias()); + infoContext.setAutoscalingPolicy(subscribableInfo.getAutoscalingPolicy()); + infoContext.setDeploymentPolicy(subscribableInfo.getDeploymentPolicy()); try { String autoScalerUuid= AutoscalerServiceClient.getInstance().getAutoScalePolicyForTenant(subscribableInfo.getAutoscalingPolicy(), - subscribableInfo.getTenantId()).getUuid(); - infoContext.setAutoscalingPolicy(autoScalerUuid); + tenantId).getUuid(); + infoContext.setAutoscalingPolicyUuid(autoScalerUuid); } catch (RemoteException e) { throw new RestAPIException(e); } @@ -1408,13 +1410,12 @@ public class ObjectConverter { try { String deploymentPolicyUuid = AutoscalerServiceClient.getInstance().getDeploymentPolicyForTenant( - subscribableInfo.getAutoscalingPolicy(), - subscribableInfo.getTenantId()).getUuid(); - infoContext.setAutoscalingPolicy(deploymentPolicyUuid); + subscribableInfo.getDeploymentPolicy(),tenantId).getUuid(); + infoContext.setDeploymentPolicyUuid(deploymentPolicyUuid); } catch (RemoteException e) { throw new RestAPIException(e); } - infoContext.setDeploymentPolicy(subscribableInfo.getDeploymentPolicy()); + infoContext.setMaxMembers(subscribableInfo.getMaxMembers()); infoContext.setMinMembers(subscribableInfo.getMinMembers());
