Update the application with UUID
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f6eb57e2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f6eb57e2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f6eb57e2 Branch: refs/heads/tenant-isolation Commit: f6eb57e2e053991cc2c711b8d683a898f92e947d Parents: eac4c96 Author: Gayan Gunarathne <[email protected]> Authored: Thu Jul 9 13:29:33 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Thu Jul 9 13:29:33 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 8 +- .../applications/parser/ParserUtils.java | 2 +- .../applications/pojo/CartridgeContext.java | 18 +- .../services/impl/AutoscalerServiceImpl.java | 2 +- components/org.apache.stratos.cli/pom.xml | 2 +- .../beans/application/SubscribableInfo.java | 2 + .../rest/endpoint/api/StratosApiV41Utils.java | 4 +- .../util/converter/ObjectConverter.java | 11 +- .../src/main/conf/cipher-tool.properties | 10 +- .../src/main/resources/AutoscalerService.wsdl | 710 ++++++++++--------- 10 files changed, 395 insertions(+), 374 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/f6eb57e2/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 0228f2b..bbd0c1c 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 @@ -132,7 +132,7 @@ public class DefaultApplicationParser implements ApplicationParser { for (CartridgeContext cartridgeContext : cartridgeContexts) { if (cartridgeContext != null) { SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext(); - addSubscribableInfo(applicationId, cartridgeContext.getType(), subscribableInfoContextMap, subscribableInfoContext); + addSubscribableInfo(applicationId, cartridgeContext.getUuid(), subscribableInfoContextMap, subscribableInfoContext); } } } @@ -360,7 +360,7 @@ public class DefaultApplicationParser implements ApplicationParser { List<String> dependencyClusterIDs = new ArrayList<String>(); List<String> exportMetadataKeys = new ArrayList<String>(); List<String> importMetadataKeys = new ArrayList<String>(); - String cartridgeType = cartridgeContext.getType(); + String cartridgeType = cartridgeContext.getUuid(); SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext(); String subscriptionAlias = subscribableInfoContext.getAlias(); @@ -481,7 +481,7 @@ public class DefaultApplicationParser implements ApplicationParser { private String findCartridgeTypeFromAlias(List<CartridgeContext> cartridgeContextList, String alias) { for (CartridgeContext cartridgeContext : cartridgeContextList) { if (alias.equals(cartridgeContext.getSubscribableInfoContext().getAlias())) { - return cartridgeContext.getType(); + return cartridgeContext.getUuid(); } } return null; @@ -493,7 +493,7 @@ public class DefaultApplicationParser implements ApplicationParser { throws ApplicationDefinitionException { for (CartridgeContext cartridgeContext : cartridgeContextList) { - String cartridgeType = cartridgeContext.getType(); + String cartridgeType = cartridgeContext.getUuid(); SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext(); String subscriptionAlias = subscribableInfoContext.getAlias(); http://git-wip-us.apache.org/repos/asf/stratos/blob/f6eb57e2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java index 904ab53..92590dc 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java @@ -247,7 +247,7 @@ public class ParserUtils { private static String getAliasForServiceType(String serviceType, GroupContext groupContext) { for (CartridgeContext subCtxt : groupContext.getCartridgeContexts()) { - if (serviceType.equals(subCtxt.getType())) { + if (serviceType.equals(subCtxt.getUuid())) { return subCtxt.getSubscribableInfoContext().getAlias(); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/f6eb57e2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java index fc84f0b8..6a83a84 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java @@ -25,17 +25,18 @@ public class CartridgeContext implements Serializable { private static final long serialVersionUID = 7782017881026018352L; - private String type; + private String uuid; + private String type; private int cartridgeMin; private int cartridgeMax; private SubscribableInfoContext subscribableInfoContext; - public String getType() { - return type; + public String getUuid() { + return uuid; } - public void setType(String type) { - this.type = type; + public void setUuid(String uuid) { + this.uuid = uuid; } public int getCartridgeMin() { @@ -63,4 +64,11 @@ public class CartridgeContext implements Serializable { this.subscribableInfoContext = subscribableInfoContext; } + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/f6eb57e2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java index c568a32..b1ad16b 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java @@ -529,7 +529,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { if (artifactRepositoryContext != null) { ArtifactRepository artifactRepository = new ArtifactRepository(); - artifactRepository.setCartridgeType(cartridgeContext.getType()); + artifactRepository.setCartridgeType(cartridgeContext.getUuid()); artifactRepository.setAlias(subscribableInfoContext.getAlias()); artifactRepository.setRepoUrl(artifactRepositoryContext.getRepoUrl()); artifactRepository.setPrivateRepo(artifactRepositoryContext.isPrivateRepo()); http://git-wip-us.apache.org/repos/asf/stratos/blob/f6eb57e2/components/org.apache.stratos.cli/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/pom.xml b/components/org.apache.stratos.cli/pom.xml index eafec42..3174cbf 100644 --- a/components/org.apache.stratos.cli/pom.xml +++ b/components/org.apache.stratos.cli/pom.xml @@ -144,7 +144,7 @@ <artifactId>wiremock</artifactId> <version>${wiremock.version}</version> <classifier>standalone</classifier> - <type>jar</type> + <uuid>jar</uuid> <overWrite>true</overWrite> <outputDirectory>${maven.output.build.path}</outputDirectory> </artifactItem> http://git-wip-us.apache.org/repos/asf/stratos/blob/f6eb57e2/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java index 8e65160..1bb5e48 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java @@ -35,6 +35,8 @@ public class SubscribableInfo implements Serializable { private String alias; private String deploymentPolicy; private String autoscalingPolicy; + private String deploymentPolicyUuid; + private String autoscalingPolicyUuid; private int maxMembers; private int minMembers; private String[] dependencyAliases; http://git-wip-us.apache.org/repos/asf/stratos/blob/f6eb57e2/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 de8b826..09a887c 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 @@ -1442,7 +1442,7 @@ public class StratosApiV41Utils { throw new RestAPIException("Could not read application", e); } - validateApplication(appDefinition); + validateApplication(appDefinition); // To validate groups have unique alias in the application definition validateGroupsInApplicationDefinition(appDefinition); @@ -1488,7 +1488,7 @@ public class StratosApiV41Utils { } } - /** + /** * Update the existence of the application and update it. * * @param appDefinition Application definition http://git-wip-us.apache.org/repos/asf/stratos/blob/f6eb57e2/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 8322457..fa79ed3 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 @@ -27,6 +27,7 @@ import org.apache.stratos.autoscaler.stub.partition.PartitionRef; import org.apache.stratos.autoscaler.stub.pojo.*; import org.apache.stratos.autoscaler.stub.pojo.Dependencies; import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup; +import org.apache.stratos.cloud.controller.stub.CloudControllerServiceCartridgeNotFoundExceptionException; import org.apache.stratos.cloud.controller.stub.domain.*; import org.apache.stratos.common.beans.IaasProviderInfoBean; import org.apache.stratos.common.beans.application.*; @@ -44,6 +45,7 @@ import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean; import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean; import org.apache.stratos.common.beans.topology.*; import org.apache.stratos.common.client.AutoscalerServiceClient; +import org.apache.stratos.common.client.CloudControllerServiceClient; import org.apache.stratos.common.util.CommonUtil; import org.apache.stratos.manager.service.stub.domain.application.signup.ApplicationSignUp; import org.apache.stratos.manager.service.stub.domain.application.signup.ArtifactRepository; @@ -1382,7 +1384,14 @@ public class ObjectConverter { context.setCartridgeMax(cartridgeDefinition.getCartridgeMax()); context.setCartridgeMin(cartridgeDefinition.getCartridgeMin()); context.setType(cartridgeDefinition.getType()); - context.setSubscribableInfoContext(convertSubscribableInfo(cartridgeDefinition.getSubscribableInfo(),tenantId)); + try { + context.setUuid(CloudControllerServiceClient.getInstance().getCartridgeByTenant(cartridgeDefinition.getType(),tenantId).getUuid()); + } catch (RemoteException e) { + throw new RestAPIException(e); + } catch (CloudControllerServiceCartridgeNotFoundExceptionException e) { + throw new RestAPIException(e); + } + context.setSubscribableInfoContext(convertSubscribableInfo(cartridgeDefinition.getSubscribableInfo(),tenantId)); cartridgeContextArray[i++] = context; } http://git-wip-us.apache.org/repos/asf/stratos/blob/f6eb57e2/products/stratos/modules/distribution/src/main/conf/cipher-tool.properties ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/cipher-tool.properties b/products/stratos/modules/distribution/src/main/conf/cipher-tool.properties index 4097330..c28254c 100644 --- a/products/stratos/modules/distribution/src/main/conf/cipher-tool.properties +++ b/products/stratos/modules/distribution/src/main/conf/cipher-tool.properties @@ -27,7 +27,7 @@ Carbon.Security.KeyStore.Password=carbon.xml//Server/Security/KeyStore/KeyPasswo Carbon.Security.KeyStore.KeyPassword=carbon.xml//Server/Security/KeyStore/Password,true Carbon.Security.TrustStore.Password=carbon.xml//Server/Security/TrustStore/Password,true UserManager.AdminUser.Password=user-mgt.xml//UserManager/Realm/Configuration/AdminUser/Password,true -Datasources.WSO2_CARBON_DB.Configuration.Password=master-datasources.xml//datasources-configuration/datasources/datasource[name='WSO2_CARBON_DB']/definition[@type='RDBMS']/configuration/password,false +Datasources.WSO2_CARBON_DB.Configuration.Password=master-datasources.xml//datasources-configuration/datasources/datasource[name='WSO2_CARBON_DB']/definition[@uuid='RDBMS']/configuration/password,false #datasource.WSO2AM_DB.configuration.password=master-datasources.xml//datasources-configuration/datasources/datasource[name='WSO2AM_DB']/definition[@type='RDBMS']/configuration/password,false #UserStoreManager.Property.ConnectionPassword=user-mgt.xml//UserManager/Realm/UserStoreManager/Property[@name='ConnectionPassword'],true #UserStoreManager.Property.password=user-mgt.xml//UserManager/Realm/UserStoreManager/Property[@name='password'],true @@ -49,9 +49,9 @@ Axis2.Https.Sender.KeyStore.Password=axis2.xml//axisconfig/transportSender[@name Axis2.Https.Sender.KeyStore.KeyPassword=axis2.xml//axisconfig/transportSender[@name='https']/parameter[@name='keystore']/KeyStore/KeyPassword,false Axis2.Mailto.Parameter.Password=axis2.xml//axisconfig/transportSender[@name='mailto']/parameter[@name='mail.smtp.password'],false eventBrokerConfig.eventBroker.deliveryManager.remoteMessageBroker.password=event-broker.xml//eventBrokerConfig/eventBroker/deliveryManager/remoteMessageBroker/password,false -cloud.controller.openstack.credential=cloud-controller.xml//cloudController/iaasProviders/iaasProvider[@type='openstack']/credential,true -cloud.controller.openstack.identity=cloud-controller.xml//cloudController/iaasProviders/iaasProvider[@type='openstack']/identity,true -cloud.controller.ec2.credential=cloud-controller.xml//cloudController/iaasProviders/iaasProvider[@type='openstack']/credential,true -cloud.controller.ec2.identity=cloud-controller.xml//cloudController/iaasProviders/iaasProvider[@type='openstack']/identity,true +cloud.controller.openstack.credential=cloud-controller.xml//cloudController/iaasProviders/iaasProvider[@uuid='openstack']/credential,true +cloud.controller.openstack.identity=cloud-controller.xml//cloudController/iaasProviders/iaasProvider[@uuid='openstack']/identity,true +cloud.controller.ec2.credential=cloud-controller.xml//cloudController/iaasProviders/iaasProvider[@uuid='openstack']/credential,true +cloud.controller.ec2.identity=cloud-controller.xml//cloudController/iaasProviders/iaasProvider[@uuid='openstack']/identity,true thrift.client.configuration.password=thrift-client-config.xml//thriftClientConfiguration/password,true
