add dependencyAliases to application
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/08dcefb5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/08dcefb5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/08dcefb5 Branch: refs/heads/4.0.0-grouping Commit: 08dcefb58b263efa6cc243ae06b971f6499dff07 Parents: 5f09121 Author: Udara Liyanage <[email protected]> Authored: Sun Oct 5 21:49:45 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Sun Oct 5 21:49:45 2014 +0530 ---------------------------------------------------------------------- .../application/SubscribableInfoContext.java | 10 + .../application/beans/SubscribableInfo.java | 10 +- .../main/resources/CloudControllerService.wsdl | 549 ++++++++++--------- 3 files changed, 290 insertions(+), 279 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/08dcefb5/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableInfoContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableInfoContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableInfoContext.java index 6812962..5f75a7c 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableInfoContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableInfoContext.java @@ -35,6 +35,8 @@ public class SubscribableInfoContext { private String repoPassword; + private String[] dependencyAliases; + public String getAlias() { return alias; } @@ -90,4 +92,12 @@ public class SubscribableInfoContext { public void setRepoPassword(String repoPassword) { this.repoPassword = repoPassword; } + + public String[] getDependencyAliases() { + return dependencyAliases; + } + + public void setDependencyAliases(String[] dependencyAliases) { + this.dependencyAliases = dependencyAliases; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/08dcefb5/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableInfo.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableInfo.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableInfo.java index 72385dc..27353fa 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableInfo.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/beans/SubscribableInfo.java @@ -38,7 +38,7 @@ public class SubscribableInfo { private String repoPassword; - private String metaInfoAlias; + private String[] dependencyAliases; public String getAlias() { return alias; @@ -96,11 +96,11 @@ public class SubscribableInfo { this.repoPassword = repoPassword; } - public String getMetaInfoAlias() { - return metaInfoAlias; + public String[] getDependencyAliases() { + return dependencyAliases; } - public void setMetaInfoAlias(String metaInfoAlias) { - this.metaInfoAlias = metaInfoAlias; + public void setDependencyAliases(String[] dependencyAliases) { + this.dependencyAliases = dependencyAliases; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/08dcefb5/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 876fcd8..a469880 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:ax220="http://application.pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ns="http://impl.controller.cloud.stratos.apache.org"; xmlns:ax222="http://pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax224="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax218="http://exception.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:ax218="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:ax220="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax221="http://pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax226="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://application.pojo.controller.cloud.stratos.apache.org/xsd";> @@ -6,8 +6,8 @@ <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="ax220:ComponentContext"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax220:SubscribableInfoContext"></xs:element> + <xs:element minOccurs="0" name="components" nillable="true" type="ax226:ComponentContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax226: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> @@ -15,15 +15,15 @@ </xs:complexType> <xs:complexType name="ComponentContext"> <xs:sequence> - <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax220:DependencyContext"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax220:GroupContext"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax220:SubscribableContext"></xs:element> + <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax226:DependencyContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax226:GroupContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax226:SubscribableContext"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="DependencyContext"> <xs:sequence> <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrderContext" nillable="true" type="ax220:StartupOrderContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrderContext" nillable="true" type="ax226:StartupOrderContext"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="StartupOrderContext"> @@ -37,9 +37,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="ax220:GroupContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax226: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="ax220:SubscribableContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax226:SubscribableContext"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="SubscribableContext"> @@ -52,6 +52,7 @@ <xs:sequence> <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 maxOccurs="unbounded" minOccurs="0" name="dependencyAliases" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="privateRepo" type="xs:boolean"></xs:element> <xs:element minOccurs="0" name="repoPassword" nillable="true" type="xs:string"></xs:element> @@ -61,305 +62,298 @@ </xs:complexType> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.controller.cloud.stratos.apache.org/xsd";> - <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="InvalidCartridgeTypeException"> <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="UnregisteredClusterException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidCompositeApplicationDefinitionException"> + <xs:complexType name="InvalidServiceGroupException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="UnregisteredCartridgeException"> + <xs:complexType name="InvalidCompositeApplicationDefinitionException"> <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="InvalidCartridgeTypeException"> + <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="InvalidServiceGroupException"> + <xs:complexType name="InvalidMemberException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidMemberException"> + <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="InvalidClusterException"> + <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="UnregisteredClusterException"> + <xs:complexType name="InvalidCartridgeDefinitionException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax219="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:ax221="http://application.pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ax223="http://pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ax226="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.controller.cloud.stratos.apache.org";> + <xs:schema xmlns:ax219="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:ax227="http://application.pojo.controller.cloud.stratos.apache.org/xsd"; xmlns:ax223="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"; xmlns:ax225="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://application.pojo.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:element name="CloudControllerServiceApplicationDefinitionException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax219:ApplicationDefinitionException"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="deployApplicationDefinition"> + <xs:import namespace="http://pojo.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="CloudControllerServiceInvalidPartitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax220:ApplicationContext"></xs:element> + <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax219:InvalidPartitionException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="unDeployApplicationDefinition"> + <xs:element name="validatePartition"> <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="partition" nillable="true" type="ax220:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException"> + <xs:element name="validatePartitionResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax219:InvalidCartridgeDefinitionException"></xs:element> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidIaasProviderException"> + <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax219:InvalidIaasProviderException"></xs:element> + <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax219:InvalidCartridgeTypeException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployCartridgeDefinition"> + <xs:element name="validateDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax222:CartridgeConfig"></xs:element> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax220:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getClusterContext"> + <xs:element name="validateDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getClusterContextResponse"> + <xs:element name="CloudControllerServiceUnregisteredClusterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax222:ClusterContext"></xs:element> + <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax219:UnregisteredClusterException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidCompositeApplicationDefinitionException"> + <xs:element name="unregisterService"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidCompositeApplicationDefinitionException" nillable="true" type="ax219:InvalidCompositeApplicationDefinitionException"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployCompositeApplicationDefinition"> + <xs:element name="CloudControllerServiceInvalidServiceGroupException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="compositeApplicationDefinition" nillable="true" type="ax222:CompositeApplicationDefinition"></xs:element> + <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax219:InvalidServiceGroupException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceUnregisteredCartridgeException"> + <xs:element name="undeployServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="UnregisteredCartridgeException" nillable="true" type="ax219:UnregisteredCartridgeException"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getCartridgeInfo"> + <xs:element name="undeployCartridgeDefinition"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getCartridgeInfoResponse"> + <xs:element name="CloudControllerServiceInvalidCompositeApplicationDefinitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax222:CartridgeInfo"></xs:element> + <xs:element minOccurs="0" name="InvalidCompositeApplicationDefinitionException" nillable="true" type="ax219:InvalidCompositeApplicationDefinitionException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidPartitionException"> + <xs:element name="CloudControllerServiceInvalidIaasProviderException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax219:InvalidPartitionException"></xs:element> + <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax219:InvalidIaasProviderException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> + <xs:element name="unDeployCompositeApplicationDefinition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax219:InvalidCartridgeTypeException"></xs:element> + <xs:element minOccurs="0" name="appAlias" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="validateDeploymentPolicy"> + <xs:element name="CloudControllerServiceApplicationDefinitionException"> <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="ax224:Partition"></xs:element> + <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax219:ApplicationDefinitionException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="validateDeploymentPolicyResponse"> + <xs:element name="unDeployApplicationDefinition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></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="unDeployCompositeApplicationDefinition"> + <xs:element name="CloudControllerServiceInvalidMemberException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="appAlias" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax219:InvalidMemberException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="undeployCartridgeDefinition"> + <xs:element name="terminateInstance"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeType" 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="CloudControllerServiceInvalidServiceGroupException"> + <xs:element name="CloudControllerServiceInvalidClusterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax219:InvalidServiceGroupException"></xs:element> + <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax219:InvalidClusterException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployServiceGroup"> + <xs:element name="terminateAllInstances"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax222: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="undeployServiceGroup"> + <xs:element name="CloudControllerServiceUnregisteredCartridgeException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="UnregisteredCartridgeException" nillable="true" type="ax219:UnregisteredCartridgeException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupSubGroups"> + <xs:element name="startInstance"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="memberContext" nillable="true" type="ax221:MemberContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupSubGroupsResponse"> + <xs:element name="startInstanceResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax221:MemberContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupCartridges"> + <xs:element name="registerService"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="registrant" nillable="true" type="ax221:Registrant"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupCartridgesResponse"> + <xs:element name="registerServiceResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupDependencies"> + <xs:element name="getServiceGroupSubGroups"> <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="getServiceGroupDependenciesResponse"> + <xs:element name="getServiceGroupSubGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax222:Dependencies"></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="getServiceGroupDependencies"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="memberContext" nillable="true" type="ax222: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="getServiceGroupDependenciesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax222:MemberContext"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax221:Dependencies"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidMemberException"> + <xs:element name="getServiceGroupCartridges"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax219:InvalidMemberException"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstance"> + <xs:element name="getServiceGroupCartridgesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></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="CloudControllerServiceInvalidClusterException"> + <xs:element name="getServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax219:InvalidClusterException"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateAllInstances"> + <xs:element name="getServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -375,128 +369,75 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="validatePartition"> + <xs:element name="getClusterContext"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="validatePartitionResponse"> + <xs:element name="getClusterContextResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax221:ClusterContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroup"> + <xs:element name="getCartridgeInfo"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" 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="getServiceGroupResponse"> + <xs:element name="getCartridgeInfoResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax222:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax221:CartridgeInfo"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceUnregisteredClusterException"> + <xs:element name="deployServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax219:UnregisteredClusterException"></xs:element> + <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax221:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="unregisterService"> + <xs:element name="deployCompositeApplicationDefinition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="compositeApplicationDefinition" nillable="true" type="ax221:CompositeApplicationDefinition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="registerService"> + <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="registrant" nillable="true" type="ax222:Registrant"></xs:element> + <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax219:InvalidCartridgeDefinitionException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="registerServiceResponse"> + <xs:element name="deployCartridgeDefinition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax221:CartridgeConfig"></xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="deployApplicationDefinition"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax226:ApplicationContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> </xs:schema> - <xs:schema xmlns:ax225="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> - <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="partitionMax" type="xs:int"></xs:element> - <xs:element minOccurs="0" name="partitionMin" type="xs:int"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax222:Properties"></xs:element> - <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:schema> - <xs:schema 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:ax224="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:complexType name="CartridgeConfig"> - <xs:sequence> - <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax222:IaasConfig"></xs:element> - <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax222:LoadbalancerConfig"></xs:element> - <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="persistence" nillable="true" type="ax222:Persistence"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax222:PortMapping"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax222:Properties"></xs:element> - <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="IaasConfig"> - <xs:sequence> - <xs:element minOccurs="0" name="className" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="credential" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="identity" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="maxInstanceLimit" type="xs:int"></xs:element> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax222:NetworkInterfaces"></xs:element> - <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax222:Properties"></xs:element> - <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="NetworkInterfaces"> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax222:NetworkInterface"></xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="NetworkInterface"> - <xs:sequence> - <xs:element minOccurs="0" name="fixedIp" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="portUuid" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> <xs:complexType name="Properties"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax222:Property"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax221:Property"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="Property"> @@ -505,16 +446,40 @@ <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="LoadbalancerConfig"> + <xs:complexType name="MemberContext"> <xs:sequence> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax222:Properties"></xs:element> - <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element> + <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="ax220: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="ax221:Properties"></xs:element> + <xs:element minOccurs="0" name="publicIpAddress" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> + <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="ax221:Persistence"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax221: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:sequence> <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax222:Volume"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax221:Volume"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="Volume"> @@ -529,11 +494,24 @@ <xs:element minOccurs="0" name="volumeId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="PortMapping"> + <xs:complexType name="Dependencies"> <xs:sequence> - <xs:element minOccurs="0" name="port" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="protocol" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="proxyPort" 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="startupOrder" nillable="true" type="ax221:StartupOrder"></xs:element> + </xs:sequence> + </xs:complexType> + <xs:complexType name="StartupOrder"> + <xs:sequence> + <xs:element minOccurs="0" name="after" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="start" 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="ax221: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="ClusterContext"> @@ -545,15 +523,55 @@ <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></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="ax222:Volume"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax221:Volume"></xs:element> + </xs:sequence> + </xs:complexType> + <xs:complexType name="CartridgeInfo"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax221:AppType"></xs:element> + <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="displayName" 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="lbConfig" nillable="true" type="ax221:LoadbalancerConfig"></xs:element> + <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="persistence" nillable="true" type="ax221:Persistence"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax221:PortMapping"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax221:Property"></xs:element> + <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> + <xs:complexType name="AppType"> + <xs:sequence> + <xs:element minOccurs="0" name="appSpecificMapping" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> + <xs:complexType name="LoadbalancerConfig"> + <xs:sequence> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"></xs:element> + <xs:element minOccurs="0" name="type" 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> + <xs:element minOccurs="0" name="protocol" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="proxyPort" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="CompositeApplicationDefinition"> <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 maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="ax222:ConfigCartridge"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="components" nillable="true" type="ax222:ConfigGroup"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="ax221:ConfigCartridge"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="components" nillable="true" type="ax221:ConfigGroup"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="ConfigCartridge"> @@ -564,14 +582,14 @@ <xs:complexType name="ConfigGroup"> <xs:sequence> <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax222:ConfigDependencies"></xs:element> + <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax221:ConfigDependencies"></xs:element> <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribables" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="ConfigDependencies"> <xs:sequence> <xs:element minOccurs="0" name="kill_behavior" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="startup_order" nillable="true" type="ax222:ConfigDependencyPair"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="startup_order" nillable="true" type="ax221:ConfigDependencyPair"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="ConfigDependencyPair"> @@ -580,9 +598,8 @@ <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="CartridgeInfo"> + <xs:complexType name="CartridgeConfig"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax222:AppType"></xs:element> <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"></xs:element> @@ -590,71 +607,55 @@ <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="displayName" 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="lbConfig" nillable="true" type="ax222:LoadbalancerConfig"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax221:IaasConfig"></xs:element> + <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax221:LoadbalancerConfig"></xs:element> <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="persistence" nillable="true" type="ax222:Persistence"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax222:PortMapping"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax222:Property"></xs:element> + <xs:element minOccurs="0" name="persistence" nillable="true" type="ax221:Persistence"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax221:PortMapping"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"></xs:element> <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="AppType"> - <xs:sequence> - <xs:element minOccurs="0" name="appSpecificMapping" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="ServiceGroup"> + <xs:complexType name="IaasConfig"> <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="ax222:Dependencies"></xs:element> + <xs:element minOccurs="0" name="className" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="credential" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="identity" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="maxInstanceLimit" type="xs:int"></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="Dependencies"> - <xs:sequence> - <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrder" nillable="true" type="ax222:StartupOrder"></xs:element> + <xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax221:NetworkInterfaces"></xs:element> + <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"></xs:element> + <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="StartupOrder"> + <xs:complexType name="NetworkInterfaces"> <xs:sequence> - <xs:element minOccurs="0" name="after" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="start" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax221:NetworkInterface"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="MemberContext"> + <xs:complexType name="NetworkInterface"> <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="ax224: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="ax222:Properties"></xs:element> - <xs:element minOccurs="0" name="publicIpAddress" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="fixedIp" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="portUuid" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="Registrant"> + </xs:schema> + <xs:schema xmlns:ax222="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> - <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="ax222:Persistence"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax222:Properties"></xs:element> - <xs:element minOccurs="0" name="tenantRange" 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="partitionMax" type="xs:int"></xs:element> + <xs:element minOccurs="0" name="partitionMin" type="xs:int"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"></xs:element> + <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:schema> @@ -734,15 +735,15 @@ <wsdl:message name="CloudControllerServiceInvalidIaasProviderException"> <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidIaasProviderException"></wsdl:part> </wsdl:message> - <wsdl:message name="undeployServiceGroupRequest"> - <wsdl:part name="parameters" element="ns:undeployServiceGroup"></wsdl:part> - </wsdl:message> <wsdl:message name="getCartridgeInfoRequest"> <wsdl:part name="parameters" element="ns:getCartridgeInfo"></wsdl:part> </wsdl:message> <wsdl:message name="getCartridgeInfoResponse"> <wsdl:part name="parameters" element="ns:getCartridgeInfoResponse"></wsdl:part> </wsdl:message> + <wsdl:message name="undeployServiceGroupRequest"> + <wsdl:part name="parameters" element="ns:undeployServiceGroup"></wsdl:part> + </wsdl:message> <wsdl:message name="deployApplicationDefinitionRequest"> <wsdl:part name="parameters" element="ns:deployApplicationDefinition"></wsdl:part> </wsdl:message> @@ -842,15 +843,15 @@ <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeDefinitionException" name="CloudControllerServiceInvalidCartridgeDefinitionException" wsaw:Action="urn:deployCartridgeDefinitionCloudControllerServiceInvalidCartridgeDefinitionException"></wsdl:fault> <wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:deployCartridgeDefinitionCloudControllerServiceInvalidIaasProviderException"></wsdl:fault> </wsdl:operation> - <wsdl:operation name="undeployServiceGroup"> - <wsdl:input message="ns:undeployServiceGroupRequest" wsaw:Action="urn:undeployServiceGroup"></wsdl:input> - <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:undeployServiceGroupCloudControllerServiceInvalidServiceGroupException"></wsdl:fault> - </wsdl:operation> <wsdl:operation name="getCartridgeInfo"> <wsdl:input message="ns:getCartridgeInfoRequest" wsaw:Action="urn:getCartridgeInfo"></wsdl:input> <wsdl:output message="ns:getCartridgeInfoResponse" wsaw:Action="urn:getCartridgeInfoResponse"></wsdl:output> <wsdl:fault message="ns:CloudControllerServiceUnregisteredCartridgeException" name="CloudControllerServiceUnregisteredCartridgeException" wsaw:Action="urn:getCartridgeInfoCloudControllerServiceUnregisteredCartridgeException"></wsdl:fault> </wsdl:operation> + <wsdl:operation name="undeployServiceGroup"> + <wsdl:input message="ns:undeployServiceGroupRequest" wsaw:Action="urn:undeployServiceGroup"></wsdl:input> + <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:undeployServiceGroupCloudControllerServiceInvalidServiceGroupException"></wsdl:fault> + </wsdl:operation> <wsdl:operation name="deployApplicationDefinition"> <wsdl:input message="ns:deployApplicationDefinitionRequest" wsaw:Action="urn:deployApplicationDefinition"></wsdl:input> <wsdl:fault message="ns:CloudControllerServiceApplicationDefinitionException" name="CloudControllerServiceApplicationDefinitionException" wsaw:Action="urn:deployApplicationDefinitionCloudControllerServiceApplicationDefinitionException"></wsdl:fault> @@ -1018,6 +1019,15 @@ <soap:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap:fault> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="undeployServiceGroup"> + <soap:operation soapAction="urn:undeployServiceGroup" style="document"></soap:operation> + <wsdl:input> + <soap:body use="literal"></soap:body> + </wsdl:input> + <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException"> + <soap:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"></soap:fault> + </wsdl:fault> + </wsdl:operation> <wsdl:operation name="getCartridgeInfo"> <soap:operation soapAction="urn:getCartridgeInfo" style="document"></soap:operation> <wsdl:input> @@ -1030,15 +1040,6 @@ <soap:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"></soap:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="undeployServiceGroup"> - <soap:operation soapAction="urn:undeployServiceGroup" style="document"></soap:operation> - <wsdl:input> - <soap:body use="literal"></soap:body> - </wsdl:input> - <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException"> - <soap:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"></soap:fault> - </wsdl:fault> - </wsdl:operation> <wsdl:operation name="deployApplicationDefinition"> <soap:operation soapAction="urn:deployApplicationDefinition" style="document"></soap:operation> <wsdl:input> @@ -1264,6 +1265,15 @@ <soap12:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap12:fault> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="undeployServiceGroup"> + <soap12:operation soapAction="urn:undeployServiceGroup" style="document"></soap12:operation> + <wsdl:input> + <soap12:body use="literal"></soap12:body> + </wsdl:input> + <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException"> + <soap12:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"></soap12:fault> + </wsdl:fault> + </wsdl:operation> <wsdl:operation name="getCartridgeInfo"> <soap12:operation soapAction="urn:getCartridgeInfo" style="document"></soap12:operation> <wsdl:input> @@ -1276,15 +1286,6 @@ <soap12:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"></soap12:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="undeployServiceGroup"> - <soap12:operation soapAction="urn:undeployServiceGroup" style="document"></soap12:operation> - <wsdl:input> - <soap12:body use="literal"></soap12:body> - </wsdl:input> - <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException"> - <soap12:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"></soap12:fault> - </wsdl:fault> - </wsdl:operation> <wsdl:operation name="deployApplicationDefinition"> <soap12:operation soapAction="urn:deployApplicationDefinition" style="document"></soap12:operation> <wsdl:input> @@ -1471,6 +1472,12 @@ <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:input> </wsdl:operation> + <wsdl:operation name="undeployServiceGroup"> + <http:operation location="undeployServiceGroup"></http:operation> + <wsdl:input> + <mime:content type="text/xml" part="parameters"></mime:content> + </wsdl:input> + </wsdl:operation> <wsdl:operation name="getCartridgeInfo"> <http:operation location="getCartridgeInfo"></http:operation> <wsdl:input> @@ -1480,12 +1487,6 @@ <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:output> </wsdl:operation> - <wsdl:operation name="undeployServiceGroup"> - <http:operation location="undeployServiceGroup"></http:operation> - <wsdl:input> - <mime:content type="text/xml" part="parameters"></mime:content> - </wsdl:input> - </wsdl:operation> <wsdl:operation name="deployApplicationDefinition"> <http:operation location="deployApplicationDefinition"></http:operation> <wsdl:input> @@ -1558,22 +1559,22 @@ </wsdl:binding> <wsdl:service name="CloudControllerService"> <wsdl:port name="CloudControllerServiceHttpSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> - <soap:address location="http://172.16.2.207:9763/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/";></soap:address> + <soap:address location="http://192.168.122.1:9763/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/";></soap:address> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> - <soap:address location="https://172.16.2.207:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/";></soap:address> + <soap:address location="https://192.168.122.1:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/";></soap:address> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> - <soap12:address location="http://172.16.2.207:9763/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/";></soap12:address> + <soap12:address location="http://192.168.122.1:9763/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/";></soap12:address> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> - <soap12:address location="https://172.16.2.207:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/";></soap12:address> + <soap12:address location="https://192.168.122.1:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/";></soap12:address> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpEndpoint" binding="ns:CloudControllerServiceHttpBinding"> - <http:address location="http://172.16.2.207:9763/services/CloudControllerService.CloudControllerServiceHttpEndpoint/";></http:address> + <http:address location="http://192.168.122.1:9763/services/CloudControllerService.CloudControllerServiceHttpEndpoint/";></http:address> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsEndpoint" binding="ns:CloudControllerServiceHttpBinding"> - <http:address location="https://172.16.2.207:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/";></http:address> + <http:address location="https://192.168.122.1:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/";></http:address> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file
