Repository: stratos Updated Branches: refs/heads/docker-grouping-merge b110067c7 -> 262b674dc
Adding properties to application definition and propagating them to clusters Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/262b674d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/262b674d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/262b674d Branch: refs/heads/docker-grouping-merge Commit: 262b674dc19c0e7e7d22485ae93cea997550974c Parents: b110067 Author: Imesh Gunaratne <[email protected]> Authored: Sat Nov 1 13:23:54 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sat Nov 1 13:23:54 2014 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 25 +- .../impl/CloudControllerServiceImpl.java | 5 +- .../pojo/ApplicationClusterContext.java | 17 +- .../pojo/application/ApplicationContext.java | 15 + .../controller/topology/TopologyBuilder.java | 1 + .../beans/ApplicationDefinition.java | 11 + .../application/beans/PropertyBean.java | 46 +++ .../DefaultCompositeApplicationParser.java | 15 +- .../structure/CompositeAppContext.java | 11 + .../rest/endpoint/services/ServiceUtils.java | 14 +- .../main/resources/CloudControllerService.wsdl | 386 ++++++++++--------- 11 files changed, 330 insertions(+), 216 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/262b674d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java index 8f031a7..b3692f0 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java @@ -30,6 +30,7 @@ import org.apache.stratos.cloud.controller.exception.ApplicationDefinitionExcept import org.apache.stratos.cloud.controller.interfaces.ApplicationParser; import org.apache.stratos.cloud.controller.pojo.*; import org.apache.stratos.cloud.controller.pojo.Cartridge; +import org.apache.stratos.cloud.controller.pojo.Properties; import org.apache.stratos.cloud.controller.pojo.application.*; import org.apache.stratos.cloud.controller.pojo.payload.MetaDataHolder; import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder; @@ -253,7 +254,7 @@ public class DefaultApplicationParser implements ApplicationParser { if (appCtxt.getComponents().getSubscribableContexts() != null) { clusterDataMap = parseLeafLevelSubscriptions(appCtxt.getApplicationId(), appCtxt.getTenantId(), application.getKey(), null, Arrays.asList(appCtxt.getComponents().getSubscribableContexts()), - subscribableInfoCtxts); + subscribableInfoCtxts, appCtxt.getProperties()); application.setClusterData(clusterDataMap); //clusters.addAll(clusterDataHolder.getApplicationClusterContexts()); } @@ -262,7 +263,7 @@ public class DefaultApplicationParser implements ApplicationParser { if (appCtxt.getComponents().getGroupContexts() != null) { application.setGroups(parseGroups(appCtxt.getApplicationId(), appCtxt.getTenantId(), application.getKey(), Arrays.asList(appCtxt.getComponents().getGroupContexts()), - subscribableInfoCtxts, definedGroupCtxts)); + subscribableInfoCtxts, definedGroupCtxts, appCtxt.getProperties())); } // get top level Dependency definitions @@ -306,13 +307,13 @@ public class DefaultApplicationParser implements ApplicationParser { */ private Map<String, Group> parseGroups (String appId, int tenantId, String key, List<GroupContext> groupCtxts, Map<String, SubscribableInfoContext> subscribableInformation, - Map<String, GroupContext> definedGroupCtxts) + Map<String, GroupContext> definedGroupCtxts, Properties properties) throws ApplicationDefinitionException { Map<String, Group> groupAliasToGroup = new HashMap<String, Group>(); for (GroupContext groupCtxt : groupCtxts) { - Group group = parseGroup(appId, tenantId, key, groupCtxt, subscribableInformation, definedGroupCtxts); + Group group = parseGroup(appId, tenantId, key, groupCtxt, subscribableInformation, definedGroupCtxts, properties); groupAliasToGroup.put(group.getAlias(), group); } @@ -383,7 +384,7 @@ public class DefaultApplicationParser implements ApplicationParser { */ private Group parseGroup (String appId, int tenantId, String key, GroupContext groupCtxt, Map<String, SubscribableInfoContext> subscribableInfoCtxts, - Map<String, GroupContext> definedGroupCtxts) + Map<String, GroupContext> definedGroupCtxts, Properties properties) throws ApplicationDefinitionException { // check if are in the defined Group set @@ -411,7 +412,7 @@ public class DefaultApplicationParser implements ApplicationParser { // get group level Subscribables if (groupCtxt.getSubscribableContexts() != null) { clusterDataMap = parseLeafLevelSubscriptions(appId, tenantId, key, groupCtxt.getName(), - Arrays.asList(groupCtxt.getSubscribableContexts()), subscribableInfoCtxts); + Arrays.asList(groupCtxt.getSubscribableContexts()), subscribableInfoCtxts, properties); group.setClusterData(clusterDataMap); } @@ -424,7 +425,7 @@ public class DefaultApplicationParser implements ApplicationParser { subGroupCtxt = definedGroupCtxts.get(subGroupCtxt.getAlias()); Group nestedGroup = parseGroup(appId, tenantId, key, subGroupCtxt, subscribableInfoCtxts, - definedGroupCtxts); + definedGroupCtxts, properties); nestedGroups.put(nestedGroup.getAlias(), nestedGroup); } @@ -512,7 +513,8 @@ public class DefaultApplicationParser implements ApplicationParser { */ private Map<String, ClusterDataHolder> parseLeafLevelSubscriptions (String appId, int tenantId, String key, String groupName, List<SubscribableContext> subscribableCtxts, - Map<String, SubscribableInfoContext> subscribableInfoCtxts) + Map<String, SubscribableInfoContext> subscribableInfoCtxts, + Properties properties) throws ApplicationDefinitionException { Map<String, ClusterDataHolder> clusterDataMap = new HashMap<String, ClusterDataHolder>(); @@ -557,7 +559,7 @@ public class DefaultApplicationParser implements ApplicationParser { ApplicationClusterContext appClusterCtxt = createApplicationClusterContext(appId, groupName, cartridge, key, tenantId, subscribableInfoCtxt.getRepoUrl(), subscribableCtxt.getAlias(), clusterId, hostname, subscribableInfoCtxt.getDeploymentPolicy(), - false, isKubernetesCluster, subscribableInfoCtxt.getDependencyAliases()); + false, isKubernetesCluster, subscribableInfoCtxt.getDependencyAliases(), properties); appClusterCtxt.setAutoscalePolicyName(subscribableInfoCtxt.getAutoscalingPolicy()); this.applicationClusterContexts.add(appClusterCtxt); @@ -592,7 +594,8 @@ public class DefaultApplicationParser implements ApplicationParser { String subscriptionKey, int tenantId, String repoUrl, String alias, String clusterId, String hostname, String deploymentPolicy, boolean isLBCluster, - boolean isKubernetesCluster, String[] dependencyAliases) + boolean isKubernetesCluster, String[] dependencyAliases, + Properties properties) throws ApplicationDefinitionException { // Create text payload @@ -600,7 +603,7 @@ public class DefaultApplicationParser implements ApplicationParser { hostname, repoUrl, alias, null, dependencyAliases).toString(); return new ApplicationClusterContext(cartridge.getType(), clusterId, hostname, textPayload, deploymentPolicy, - isLBCluster, isKubernetesCluster); + isLBCluster, isKubernetesCluster, properties); } private Cartridge getCartridge (String cartridgeType) { http://git-wip-us.apache.org/repos/asf/stratos/blob/262b674d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index 901082c..10b0730 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -1439,7 +1439,8 @@ public class CloudControllerServiceImpl implements CloudControllerService { for (ApplicationClusterContext applicationClusterContext : applicationParser.getApplicationClusterContexts()) { dataHolder.addClusterContext(new ClusterContext(applicationClusterContext.getClusterId(), applicationClusterContext.getCartridgeType(), applicationClusterContext.getTextPayload(), - applicationClusterContext.getHostName(), applicationClusterContext.isLbCluster(), null)); + applicationClusterContext.getHostName(), applicationClusterContext.isLbCluster(), + CloudControllerUtil.toJavaUtilProperties(applicationClusterContext.getProperties()))); } TopologyBuilder.handleApplicationDeployed(application, applicationParser.getApplicationClusterContexts(), @@ -1448,7 +1449,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { persist(); } - @Override + @Override public MemberContext[] startContainers(ContainerClusterContext containerClusterContext) throws UnregisteredCartridgeException { http://git-wip-us.apache.org/repos/asf/stratos/blob/262b674d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java index ffb0b76..fb52ece 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java @@ -43,10 +43,12 @@ public class ApplicationClusterContext implements Serializable { private final String deploymentPolicyName; // tenant rance private final String tenantRange; + // properties + private Properties properties; - public ApplicationClusterContext (String cartridgeType, String clusterId, String hostName, - String textPayload, String deploymentPolicyName, boolean isLbCluster, - boolean isKubernetesCluster) { + public ApplicationClusterContext(String cartridgeType, String clusterId, String hostName, + String textPayload, String deploymentPolicyName, boolean isLbCluster, + boolean isKubernetesCluster, Properties properties) { this.cartridgeType = cartridgeType; this.clusterId = clusterId; @@ -56,6 +58,7 @@ public class ApplicationClusterContext implements Serializable { this.isLbCluster = isLbCluster; this.isKubernetesCluster = isKubernetesCluster; this.tenantRange = "*"; + this.properties = properties; } public String getClusterId() { @@ -125,4 +128,12 @@ public class ApplicationClusterContext implements Serializable { public boolean isKubernetesCluster() { return isKubernetesCluster; } + + public Properties getProperties() { + return properties; + } + + public void setProperties(Properties properties) { + this.properties = properties; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/262b674d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java index 804babf..19ef8b6 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java @@ -19,6 +19,8 @@ package org.apache.stratos.cloud.controller.pojo.application; +import org.apache.stratos.cloud.controller.pojo.Properties; + import java.io.Serializable; public class ApplicationContext implements Serializable { @@ -39,6 +41,11 @@ public class ApplicationContext implements Serializable { private SubscribableInfoContext[] subscribableInfoContexts; + private Properties properties; + + public ApplicationContext() { + } + public String getApplicationId() { return applicationId; } @@ -94,4 +101,12 @@ public class ApplicationContext implements Serializable { public void setTeantAdminUsername(String teantAdminUsername) { this.teantAdminUsername = teantAdminUsername; } + + public Properties getProperties() { + return properties; + } + + public void setProperties(Properties properties) { + this.properties = properties; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/262b674d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java index fa1a3ee..2c01be7 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java @@ -568,6 +568,7 @@ public class TopologyBuilder { cluster.setTenantRange(applicationClusterContext.getTenantRange()); cluster.setLbCluster(applicationClusterContext.isLbCluster()); cluster.setKubernetesCluster(applicationClusterContext.isKubernetesCluster()); + cluster.setProperties(CloudControllerUtil.toJavaUtilProperties(applicationClusterContext.getProperties())); clusters.add(cluster); Service service = topology.getService(applicationClusterContext.getCartridgeType()); http://git-wip-us.apache.org/repos/asf/stratos/blob/262b674d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ApplicationDefinition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ApplicationDefinition.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ApplicationDefinition.java index fb201f8..1c316af 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ApplicationDefinition.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/ApplicationDefinition.java @@ -33,6 +33,9 @@ public class ApplicationDefinition { private List<SubscribableInfo> subscribableInfo; + private List<PropertyBean> property; + + public String getApplicationId() { return applicationId; } @@ -64,4 +67,12 @@ public class ApplicationDefinition { public void setSubscribableInfo(List<SubscribableInfo> subscribableInfo) { this.subscribableInfo = subscribableInfo; } + + public List<PropertyBean> getProperty() { + return property; + } + + public void setProperty(List<PropertyBean> property) { + this.property = property; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/262b674d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/PropertyBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/PropertyBean.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/PropertyBean.java new file mode 100644 index 0000000..c5c4c56 --- /dev/null +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/PropertyBean.java @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.stratos.manager.composite.application.beans; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "property") +public class PropertyBean { + + private String name; + + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/262b674d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java index 9a49e2c..c16c248 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java @@ -24,10 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; import org.apache.stratos.manager.client.CloudControllerServiceClient; -import org.apache.stratos.manager.composite.application.beans.ApplicationDefinition; -import org.apache.stratos.manager.composite.application.beans.GroupDefinition; -import org.apache.stratos.manager.composite.application.beans.SubscribableDefinition; -import org.apache.stratos.manager.composite.application.beans.SubscribableInfo; +import org.apache.stratos.manager.composite.application.beans.*; import org.apache.stratos.manager.composite.application.structure.CompositeAppContext; import org.apache.stratos.manager.composite.application.structure.GroupContext; import org.apache.stratos.manager.composite.application.structure.StartupOrder; @@ -210,7 +207,6 @@ public class DefaultCompositeApplicationParser implements CompositeApplicationPa } // get top level Dependency definitions - if (compositeAppDefinition.getComponents().getDependencies() != null) { List<String> startupOrderList = compositeAppDefinition.getComponents().getDependencies().getStartupOrders(); String [] startupOrders = new String [startupOrderList.size()]; @@ -219,6 +215,15 @@ public class DefaultCompositeApplicationParser implements CompositeApplicationPa compositeAppContext.setKillBehaviour(compositeAppDefinition.getComponents().getDependencies().getKillBehaviour()); } + + // Set application properties + if(compositeAppDefinition.getProperty() != null) { + Properties properties = new Properties(); + for(PropertyBean propertyBean : compositeAppDefinition.getProperty()) { + properties.put(propertyBean.getName(), propertyBean.getValue()); + } + compositeAppContext.setProperties(properties); + } } return compositeAppContext; http://git-wip-us.apache.org/repos/asf/stratos/blob/262b674d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/CompositeAppContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/CompositeAppContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/CompositeAppContext.java index 287d475..c3ffdd6 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/CompositeAppContext.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/structure/CompositeAppContext.java @@ -19,6 +19,7 @@ package org.apache.stratos.manager.composite.application.structure; +import java.util.Properties; import java.util.Set; public class CompositeAppContext { @@ -35,6 +36,8 @@ public class CompositeAppContext { private String killBehaviour; + private Properties properties; + public CompositeAppContext (String appId) { this.appId = appId; } @@ -104,4 +107,12 @@ public class CompositeAppContext { return appId.hashCode(); } + + public Properties getProperties() { + return properties; + } + + public void setProperties(Properties properties) { + this.properties = properties; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/262b674d/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index dc164b8..b3e8747 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -30,9 +30,8 @@ import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCar import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPartitionExceptionException; import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPolicyExceptionException; import org.apache.stratos.cloud.controller.stub.*; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeConfig; -import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.cloud.controller.stub.pojo.*; +import org.apache.stratos.cloud.controller.stub.pojo.Properties; import org.apache.stratos.manager.client.AutoscalerServiceClient; import org.apache.stratos.manager.client.CloudControllerServiceClient; import org.apache.stratos.manager.deploy.cartridge.CartridgeDeploymentManager; @@ -136,6 +135,15 @@ public class ServiceUtils { applicationContext.setTenantDomain(tenantDomain); applicationContext.setTeantAdminUsername(userName); + Properties properties = new Properties(); + for(org.apache.stratos.manager.composite.application.beans.PropertyBean propertyBean : appDefinition.getProperty()) { + Property property = new Property(); + property.setName(propertyBean.getName()); + property.setValue(propertyBean.getValue()); + properties.addProperties(property); + } + applicationContext.setProperties(properties); + try { CloudControllerServiceClient.getServiceClient().deployApplicationDefinition(applicationContext); http://git-wip-us.apache.org/repos/asf/stratos/blob/262b674d/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl index c0d1955..a1af8a4 100644 --- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl +++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl @@ -1,4 +1,4 @@ -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ns="http://impl.controller.cloud.stratos.apache.org"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax229="http://application.pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax221="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:ax231="http://util.java/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax223="http://pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax225="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://impl.controller.cloud.stratos.apache.org";> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ns="http://impl.controller.cloud.stratos.apache.org"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax228="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; xmlns:ax232="http://util.java/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax221="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax223="http://pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax225="http://application.pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://impl.controller.cloud.stratos.apache.org";> <wsdl:documentation>CloudControllerService</wsdl:documentation> <wsdl:types> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://util.java/xsd";> @@ -6,13 +6,15 @@ <xs:sequence></xs:sequence> </xs:complexType> </xs:schema> - <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://application.pojo.controller.cloud.stratos.apache.org/xsd";> + <xs:schema xmlns:ax226="http://pojo.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://application.pojo.controller.cloud.stratos.apache.org/xsd";> + <xs:import namespace="http://pojo.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:complexType name="ApplicationContext"> <xs:sequence> <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="components" nillable="true" type="ax229:ComponentContext"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax229:SubscribableInfoContext"></xs:element> + <xs:element minOccurs="0" name="components" nillable="true" type="ax225:ComponentContext"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax223:Properties"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax225:SubscribableInfoContext"></xs:element> <xs:element minOccurs="0" name="teantAdminUsername" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> @@ -20,9 +22,9 @@ </xs:complexType> <xs:complexType name="ComponentContext"> <xs:sequence> - <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax229:DependencyContext"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax229:GroupContext"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax229:SubscribableContext"></xs:element> + <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax225:DependencyContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax225:GroupContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax225:SubscribableContext"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="DependencyContext"> @@ -36,9 +38,9 @@ <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="autoscalingPolicy" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax229:GroupContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax225:GroupContext"></xs:element> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax229:SubscribableContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax225:SubscribableContext"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="SubscribableContext"> @@ -61,7 +63,7 @@ </xs:complexType> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.controller.cloud.stratos.apache.org/xsd";> - <xs:complexType name="UnregisteredCartridgeException"> + <xs:complexType name="UnregisteredClusterException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> @@ -71,27 +73,27 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="UnregisteredClusterException"> + <xs:complexType name="ApplicationDefinitionException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidClusterException"> + <xs:complexType name="InvalidCartridgeDefinitionException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidPartitionException"> + <xs:complexType name="InvalidIaasProviderException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidIaasProviderException"> + <xs:complexType name="UnregisteredCartridgeException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="MemberTerminationFailedException"> + <xs:complexType name="InvalidCartridgeTypeException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> @@ -101,191 +103,194 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidCartridgeTypeException"> + <xs:complexType name="InvalidClusterException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="ApplicationDefinitionException"> + <xs:complexType name="InvalidPartitionException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidCartridgeDefinitionException"> + <xs:complexType name="MemberTerminationFailedException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax228="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; xmlns:ax230="http://application.pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ax222="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:ax224="http://pojo.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.controller.cloud.stratos.apache.org";> + <xs:schema xmlns:ax227="http://application.pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ax222="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:ax231="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; xmlns:ax224="http://pojo.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.controller.cloud.stratos.apache.org";> <xs:import namespace="http://exception.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://pojo.controller.cloud.stratos.apache.org/xsd";></xs:import> - <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://application.pojo.controller.cloud.stratos.apache.org/xsd";></xs:import> - <xs:element name="CloudControllerServiceUnregisteredCartridgeException"> + <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";></xs:import> + <xs:element name="CloudControllerServiceUnregisteredClusterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="UnregisteredCartridgeException" nillable="true" type="ax221:UnregisteredCartridgeException"></xs:element> + <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax221:UnregisteredClusterException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="registerService"> + <xs:element name="unregisterService"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="registrant" nillable="true" type="ax223:Registrant"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="registerServiceResponse"> + <xs:element name="CloudControllerServiceInvalidServiceGroupException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax221:InvalidServiceGroupException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidServiceGroupException"> + <xs:element name="getServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax221:InvalidServiceGroupException"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="undeployServiceGroup"> + <xs:element name="getServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax223:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupSubGroups"> + <xs:element name="CloudControllerServiceApplicationDefinitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax221:ApplicationDefinitionException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupSubGroupsResponse"> + <xs:element name="deployApplicationDefinition"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax225:ApplicationContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceUnregisteredClusterException"> + <xs:element name="unDeployApplicationDefinition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax221:UnregisteredClusterException"></xs:element> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> + <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="unregisterDockerService"> + <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax221:InvalidCartridgeDefinitionException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getRegisteredCartridges"> + <xs:element name="CloudControllerServiceInvalidIaasProviderException"> <xs:complexType> - <xs:sequence></xs:sequence> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax221:InvalidIaasProviderException"></xs:element> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getRegisteredCartridgesResponse"> + <xs:element name="deployCartridgeDefinition"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax223:CartridgeConfig"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidClusterException"> + <xs:element name="CloudControllerServiceUnregisteredCartridgeException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax221:InvalidClusterException"></xs:element> + <xs:element minOccurs="0" name="UnregisteredCartridgeException" nillable="true" type="ax221:UnregisteredCartridgeException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateAllContainers"> + <xs:element name="getCartridgeInfo"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateAllContainersResponse"> + <xs:element name="getCartridgeInfoResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:MemberContext"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax223:CartridgeInfo"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateContainers"> + <xs:element name="registerService"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="replicas" type="xs:int"></xs:element> + <xs:element minOccurs="0" name="registrant" nillable="true" type="ax223:Registrant"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateContainersResponse"> + <xs:element name="registerServiceResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:MemberContext"></xs:element> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidPartitionException"> + <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax221:InvalidPartitionException"></xs:element> + <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax221:InvalidCartridgeTypeException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="validatePartition"> + <xs:element name="undeployCartridgeDefinition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="partition" nillable="true" type="ax225:Partition"></xs:element> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="validatePartitionResponse"> + <xs:element name="deployServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax223:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupCartridges"> + <xs:element name="undeployServiceGroup"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupCartridgesResponse"> + <xs:element name="getServiceGroupSubGroups"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidIaasProviderException"> + <xs:element name="getServiceGroupSubGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax221:InvalidIaasProviderException"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstance"> + <xs:element name="getServiceGroupCartridges"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="memberContext" nillable="true" type="ax223:MemberContext"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstanceResponse"> + <xs:element name="getServiceGroupCartridgesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax223:MemberContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -303,186 +308,183 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceMemberTerminationFailedException"> + <xs:element name="startInstance"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="MemberTerminationFailedException" nillable="true" type="ax221:MemberTerminationFailedException"></xs:element> + <xs:element minOccurs="0" name="memberContext" nillable="true" type="ax223:MemberContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateContainer"> + <xs:element name="startInstanceResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax223:MemberContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateContainerResponse"> + <xs:element name="CloudControllerServiceInvalidMemberException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax223:MemberContext"></xs:element> + <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax221:InvalidMemberException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="unregisterService"> + <xs:element name="terminateInstance"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroup"> + <xs:element name="CloudControllerServiceInvalidClusterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax221:InvalidClusterException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupResponse"> + <xs:element name="terminateAllInstances"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax223:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidMemberException"> + <xs:element name="getRegisteredCartridges"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax221:InvalidMemberException"></xs:element> - </xs:sequence> + <xs:sequence></xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> + <xs:element name="getRegisteredCartridgesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax221:InvalidCartridgeTypeException"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstance"> + <xs:element name="unregisterDockerService"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateAllInstances"> + <xs:element name="CloudControllerServiceInvalidPartitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax221:InvalidPartitionException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceApplicationDefinitionException"> + <xs:element name="validatePartition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax221:ApplicationDefinitionException"></xs:element> + <xs:element minOccurs="0" name="partition" nillable="true" type="ax231:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployApplicationDefinition"> + <xs:element name="validatePartitionResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax230:ApplicationContext"></xs:element> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="unDeployApplicationDefinition"> + <xs:element name="startContainers"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> - <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="containerClusterContext" nillable="true" type="ax223:ContainerClusterContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException"> + <xs:element name="startContainersResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax221:InvalidCartridgeDefinitionException"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:MemberContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployCartridgeDefinition"> + <xs:element name="terminateAllContainers"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax223:CartridgeConfig"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getCartridgeInfo"> + <xs:element name="terminateAllContainersResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:MemberContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getCartridgeInfoResponse"> + <xs:element name="updateContainers"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax223:CartridgeInfo"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="replicas" type="xs:int"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getClusterContext"> + <xs:element name="updateContainersResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:MemberContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getClusterContextResponse"> + <xs:element name="CloudControllerServiceMemberTerminationFailedException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax223:ClusterContext"></xs:element> + <xs:element minOccurs="0" name="MemberTerminationFailedException" nillable="true" type="ax221:MemberTerminationFailedException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="validateDeploymentPolicy"> + <xs:element name="terminateContainer"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax225:Partition"></xs:element> + <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="validateDeploymentPolicyResponse"> + <xs:element name="terminateContainerResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax223:MemberContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="undeployCartridgeDefinition"> + <xs:element name="validateDeploymentPolicy"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax231:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployServiceGroup"> + <xs:element name="validateDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax223:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startContainers"> + <xs:element name="getClusterContext"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="containerClusterContext" nillable="true" type="ax223:ContainerClusterContext"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startContainersResponse"> + <xs:element name="getClusterContextResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:MemberContext"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax223:ClusterContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> </xs:schema> - <xs:schema xmlns:ax226="http://pojo.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";> + <xs:schema xmlns:ax229="http://pojo.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";> <xs:import namespace="http://pojo.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:complexType name="Partition"> <xs:sequence> @@ -496,38 +498,21 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax232="http://util.java/xsd"; xmlns:ax227="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.controller.cloud.stratos.apache.org/xsd";> + <xs:schema xmlns:ax233="http://util.java/xsd"; xmlns:ax230="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.controller.cloud.stratos.apache.org/xsd";> <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://util.java/xsd";></xs:import> - <xs:complexType name="Registrant"> - <xs:sequence> - <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="persistence" nillable="true" type="ax223:Persistence"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax223:Properties"></xs:element> - <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="Persistence"> + <xs:complexType name="ServiceGroup"> <xs:sequence> - <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax223:Volume"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax223:Dependencies"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="Volume"> + <xs:complexType name="Dependencies"> <xs:sequence> - <xs:element minOccurs="0" name="device" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="iaasType" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="mappingPath" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="removeOntermination" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="size" type="xs:int"></xs:element> - <xs:element minOccurs="0" name="snapshotId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="volumeId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrders" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="Properties"> @@ -541,37 +526,6 @@ <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="MemberContext"> - <xs:sequence> - <xs:element minOccurs="0" name="allocatedIpAddress" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="initTime" type="xs:long"></xs:element> - <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="nodeId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="partition" nillable="true" type="ax225:Partition"></xs:element> - <xs:element minOccurs="0" name="privateIpAddress" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax223:Properties"></xs:element> - <xs:element minOccurs="0" name="publicIpAddress" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="Dependencies"> - <xs:sequence> - <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrders" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="ServiceGroup"> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax223:Dependencies"></xs:element> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> <xs:complexType name="CartridgeConfig"> <xs:sequence> <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"></xs:element> @@ -637,6 +591,24 @@ <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> + <xs:complexType name="Persistence"> + <xs:sequence> + <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax223:Volume"></xs:element> + </xs:sequence> + </xs:complexType> + <xs:complexType name="Volume"> + <xs:sequence> + <xs:element minOccurs="0" name="device" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="iaasType" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="mappingPath" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="removeOntermination" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="size" type="xs:int"></xs:element> + <xs:element minOccurs="0" name="snapshotId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="volumeId" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> <xs:complexType name="PortMapping"> <xs:sequence> <xs:element minOccurs="0" name="port" nillable="true" type="xs:string"></xs:element> @@ -672,17 +644,34 @@ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="ClusterContext"> + <xs:complexType name="Registrant"> <xs:sequence> + <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element> <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax232:Properties"></xs:element> - <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"></xs:element> - <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax223:Volume"></xs:element> + <xs:element minOccurs="0" name="persistence" nillable="true" type="ax223:Persistence"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax223:Properties"></xs:element> + <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> + <xs:complexType name="MemberContext"> + <xs:sequence> + <xs:element minOccurs="0" name="allocatedIpAddress" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="initTime" type="xs:long"></xs:element> + <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="nodeId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="partition" nillable="true" type="ax230:Partition"></xs:element> + <xs:element minOccurs="0" name="privateIpAddress" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax223:Properties"></xs:element> + <xs:element minOccurs="0" name="publicIpAddress" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="ContainerClusterContext"> @@ -691,6 +680,19 @@ <xs:element minOccurs="0" name="properties" nillable="true" type="ax223:Properties"></xs:element> </xs:sequence> </xs:complexType> + <xs:complexType name="ClusterContext"> + <xs:sequence> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax232:Properties"></xs:element> + <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"></xs:element> + <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax223:Volume"></xs:element> + </xs:sequence> + </xs:complexType> </xs:schema> </wsdl:types> <wsdl:message name="validatePartitionRequest"> @@ -1756,22 +1758,22 @@ </wsdl:binding> <wsdl:service name="CloudControllerService"> <wsdl:port name="CloudControllerServiceHttpSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> - <soap:address location="http://10.10.10.237:9763/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/";></soap:address> + <soap:address location="http://192.168.43.91:9763/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/";></soap:address> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> - <soap:address location="https://10.10.10.237:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/";></soap:address> + <soap:address location="https://192.168.43.91:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/";></soap:address> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> - <soap12:address location="http://10.10.10.237:9763/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/";></soap12:address> + <soap12:address location="http://192.168.43.91:9763/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/";></soap12:address> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> - <soap12:address location="https://10.10.10.237:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/";></soap12:address> + <soap12:address location="https://192.168.43.91:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/";></soap12:address> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpEndpoint" binding="ns:CloudControllerServiceHttpBinding"> - <http:address location="http://10.10.10.237:9763/services/CloudControllerService.CloudControllerServiceHttpEndpoint/";></http:address> + <http:address location="http://192.168.43.91:9763/services/CloudControllerService.CloudControllerServiceHttpEndpoint/";></http:address> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsEndpoint" binding="ns:CloudControllerServiceHttpBinding"> - <http:address location="https://10.10.10.237:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/";></http:address> + <http:address location="https://192.168.43.91:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/";></http:address> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file
