Merge the PR #385
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7bc874b1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7bc874b1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7bc874b1 Branch: refs/heads/tenant-isolation Commit: 7bc874b1dcf9c8b64a56b1b8201c80f5291d8730 Parents: 8ac13e1 12512f3 Author: Gayan Gunarathne <[email protected]> Authored: Tue Jul 7 14:30:22 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Tue Jul 7 14:30:22 2015 +0530 ---------------------------------------------------------------------- .../services/impl/AutoscalerServiceImpl.java | 10 +- .../context/CloudControllerContext.java | 12 +- .../impl/CloudControllerServiceImpl.java | 63 +- .../NetworkPartitionReferenceBean.java | 9 + .../rest/endpoint/api/StratosApiV41.java | 8 + .../rest/endpoint/api/StratosApiV41Utils.java | 36 +- .../util/converter/ObjectConverter.java | 2 + .../src/main/resources/AutoscalerService.wsdl | 84 +-- .../main/resources/CloudControllerService.wsdl | 705 ++++++++++--------- 9 files changed, 505 insertions(+), 424 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7bc874b1/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7bc874b1/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7bc874b1/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7bc874b1/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7bc874b1/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl ---------------------------------------------------------------------- diff --cc service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl index 33ef303,6a60bcb..8896a8d --- 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,346 -1,263 +1,253 @@@ - <?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ns="http://impl.services.controller.cloud.stratos.apache.org"; xmlns:ax27="http://domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax23="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax24="http://common.stratos.apache.org/xsd"; xmlns:ax21="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax212="http://topology.domain.messaging.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax210="http://domain.common.stratos.apache.org/xsd"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://impl.services.controller.cloud.stratos.apache.org";> -<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax29="http://topology.domain.messaging.stratos.apache.org/xsd"; xmlns:ns="http://impl.services.controller.cloud.stratos.apache.org"; xmlns:ax27="http://domain.common.stratos.apache.org/xsd"; xmlns:ax23="http://domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax24="http://common.stratos.apache.org/xsd"; xmlns:ax21="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax211="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"; xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://impl.services.controller.cloud.stratos.apache.org";> ++<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax29="http://topology.domain.messaging.stratos.apache.org/xsd"; xmlns:ns="http://impl.services.controller.cloud.stratos.apache.org"; xmlns:ax27="http://domain.common.stratos.apache.org/xsd"; xmlns:ax25="http://common.stratos.apache.org/xsd"; xmlns:ax23="http://domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax21="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax211="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"; xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://impl.services.controller.cloud.stratos.apache.org";> <wsdl:types> - <xs:schema xmlns:ax29="http://domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax213="http://topology.domain.messaging.stratos.apache.org/xsd"; xmlns:ax26="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax22="http://exception.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org";> - <xs:schema xmlns:ax213="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax210="http://topology.domain.messaging.stratos.apache.org/xsd"; xmlns:ax26="http://domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax22="http://exception.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org";> ++ <xs:schema xmlns:ax213="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax210="http://topology.domain.messaging.stratos.apache.org/xsd"; xmlns:ax24="http://domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax22="http://exception.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org";> <xs:import namespace="http://exception.controller.cloud.stratos.apache.org/xsd"/> - <xs:import namespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"/> <xs:import namespace="http://domain.controller.cloud.stratos.apache.org/xsd"/> <xs:import namespace="http://topology.domain.messaging.stratos.apache.org/xsd"/> - <xs:element name="CloudControllerServiceNonExistingKubernetesClusterException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="NonExistingKubernetesClusterException" nillable="true" type="ax21:NonExistingKubernetesClusterException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getKubernetesCluster"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getKubernetesClusterResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:KubernetesCluster"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="CloudControllerServiceInvalidPartitionException"> + <xs:import namespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"/> - <xs:element name="CloudControllerServiceInvalidPartitionException"> ++ <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> <xs:complexType> <xs:sequence> -- <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax21:InvalidPartitionException"/> ++ <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax21:InvalidCartridgeTypeException"/> </xs:sequence> </xs:complexType> </xs:element> -- <xs:element name="validatePartition"> ++ <xs:element name="removeCartridge"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="partition" nillable="true" type="ax29:Partition"/> - <xs:element minOccurs="0" name="partition" nillable="true" type="ax26:Partition"/> ++ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> -- <xs:element name="validatePartitionResponse"> ++ <xs:element name="removeCartridgeResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getCartridges"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getCartridgesResponse"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> -- <xs:element name="CloudControllerServiceCartridgeNotFoundException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax21:CartridgeNotFoundException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="CloudControllerServiceInvalidIaasProviderException"> ++ <xs:element name="CloudControllerServiceInvalidServiceGroupException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax21:InvalidIaasProviderException"/> - <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax21:CartridgeNotFoundException"/> ++ <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax21:InvalidServiceGroupException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceCloudControllerException"> - <xs:element name="CloudControllerServiceInvalidIaasProviderException"> ++ <xs:element name="addServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax21:CloudControllerException"/> - <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax21:InvalidIaasProviderException"/> ++ <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax23:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstance"> - <xs:element name="CloudControllerServiceCloudControllerException"> ++ <xs:element name="addServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax29:InstanceContext"/> - <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax21:CloudControllerException"/> ++ <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstanceResponse"> - <xs:element name="startInstances"> ++ <xs:element name="removeServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:MemberContext"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="instanceContexts" nillable="true" type="ax26:InstanceContext"/> ++ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidMemberException"> - <xs:element name="startInstancesResponse"> ++ <xs:element name="removeServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> ++ <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> - <xs:element name="updateClusterStatus"> ++ <xs:element name="getServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax21:InvalidCartridgeTypeException"/> - <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="status" nillable="true" type="ax29:ClusterStatus"/> ++ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstance"> - <xs:element name="updateClusterStatusResponse"> ++ <xs:element name="getServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++ <xs:element minOccurs="0" name="return" nillable="true" type="ax23:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstanceResponse"> - <xs:element name="CloudControllerServiceUnregisteredClusterException"> ++ <xs:element name="getServiceGroupSubGroups"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> - <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax21:UnregisteredClusterException"/> ++ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getIaasProviders"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getIaasProvidersResponse"> - <xs:element name="unregisterService"> ++ <xs:element name="getServiceGroupSubGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getCartridge"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getCartridgeResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:Cartridge"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getClusterContext"> - <xs:element name="unregisterServiceResponse"> ++ <xs:element name="getServiceGroupCartridges"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getClusterContextResponse"> - <xs:element name="registerService"> ++ <xs:element name="getServiceGroupCartridgesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ClusterContext"/> - <xs:element minOccurs="0" name="registrant" nillable="true" type="ax26:Registrant"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException"> - <xs:element name="registerServiceResponse"> ++ <xs:element name="getServiceGroupDependencies"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax21:InvalidCartridgeDefinitionException"/> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceCartridgeAlreadyExistsException"> - <xs:element name="getIaasProviders"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getIaasProvidersResponse"> ++ <xs:element name="getServiceGroupDependenciesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CartridgeAlreadyExistsException" nillable="true" type="ax21:CartridgeAlreadyExistsException"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="return" nillable="true" type="ax23:Dependencies"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addCartridge"> - <xs:element name="getNetworkPartitions"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getNetworkPartitionsResponse"> ++ <xs:element name="CloudControllerServiceCartridgeNotFoundException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax29:Cartridge"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:NetworkPartition"/> ++ <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax21:CartridgeNotFoundException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addCartridgeResponse"> - <xs:element name="getCartridges"> ++ <xs:element name="CloudControllerServiceInvalidIaasProviderException"> <xs:complexType> - <xs:sequence/> + <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++ <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax21:InvalidIaasProviderException"/> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceCartridgeDefinitionNotExistsException"> - <xs:element name="getCartridgesResponse"> ++ <xs:element name="CloudControllerServiceCloudControllerException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CartridgeDefinitionNotExistsException" nillable="true" type="ax21:CartridgeDefinitionNotExistsException"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax21:CloudControllerException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateCartridge"> - <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException"> ++ <xs:element name="startInstances"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridge" nillable="true" type="ax29:Cartridge"/> - <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax21:InvalidCartridgeDefinitionException"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="instanceContexts" nillable="true" type="ax23:InstanceContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateCartridgeResponse"> - <xs:element name="CloudControllerServiceCartridgeAlreadyExistsException"> ++ <xs:element name="startInstancesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> - <xs:element minOccurs="0" name="CartridgeAlreadyExistsException" nillable="true" type="ax21:CartridgeAlreadyExistsException"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:MemberContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeCartridge"> - <xs:element name="addCartridge"> ++ <xs:element name="terminateInstanceForcefully"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax26:Cartridge"/> ++ <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeCartridgeResponse"> - <xs:element name="addCartridgeResponse"> ++ <xs:element name="terminateInstanceForcefullyResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidServiceGroupException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax21:InvalidServiceGroupException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="addServiceGroup"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax29:ServiceGroup"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="addServiceGroupResponse"> - <xs:element name="CloudControllerServiceCartridgeDefinitionNotExistsException"> ++ <xs:element name="CloudControllerServiceInvalidPartitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> - <xs:element minOccurs="0" name="CartridgeDefinitionNotExistsException" nillable="true" type="ax21:CartridgeDefinitionNotExistsException"/> ++ <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax21:InvalidPartitionException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeServiceGroup"> - <xs:element name="updateCartridge"> ++ <xs:element name="validatePartition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="cartridge" nillable="true" type="ax26:Cartridge"/> ++ <xs:element minOccurs="0" name="partition" nillable="true" type="ax23:Partition"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeServiceGroupResponse"> - <xs:element name="updateCartridgeResponse"> ++ <xs:element name="validatePartitionResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroup"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getServiceGroupResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getServiceGroupSubGroups"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getServiceGroupSubGroupsResponse"> - <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> ++ <xs:element name="startInstance"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax21:InvalidCartridgeTypeException"/> ++ <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax23:InstanceContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupCartridges"> - <xs:element name="removeCartridge"> ++ <xs:element name="startInstanceResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="return" nillable="true" type="ax23:MemberContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupCartridgesResponse"> - <xs:element name="removeCartridgeResponse"> ++ <xs:element name="CloudControllerServiceInvalidMemberException"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++ <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupDependencies"> - <xs:element name="CloudControllerServiceInvalidServiceGroupException"> ++ <xs:element name="terminateInstance"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax21:InvalidServiceGroupException"/> ++ <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupDependenciesResponse"> - <xs:element name="getServiceGroupSubGroups"> ++ <xs:element name="terminateInstanceResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:Dependencies"/> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstances"> - <xs:element name="getServiceGroupSubGroupsResponse"> ++ <xs:element name="getCartridge"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="instanceContexts" nillable="true" type="ax29:InstanceContext"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="tenantId" type="xs:int"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstancesResponse"> - <xs:element name="getServiceGroupCartridges"> ++ <xs:element name="getCartridgeResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:MemberContext"/> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="return" nillable="true" type="ax23:Cartridge"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstanceForcefully"> - <xs:element name="getServiceGroupCartridgesResponse"> ++ <xs:element name="getClusterContext"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstanceForcefullyResponse"> - <xs:element name="getServiceGroupDependencies"> ++ <xs:element name="getClusterContextResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="return" nillable="true" type="ax23:ClusterContext"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -365,10 -282,10 +272,10 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getCartridge"> + <xs:element name="registerService"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="registrant" nillable="true" type="ax29:Registrant"/> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="registrant" nillable="true" type="ax23:Registrant"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -415,13 -331,10 +322,13 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidKubernetesHostException"> + <xs:element name="updateClusterStatus"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidKubernetesHostException" nillable="true" type="ax21:InvalidKubernetesHostException"/> + <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="status" nillable="true" type="ax212:ClusterStatus"/> ++ <xs:element minOccurs="0" name="status" nillable="true" type="ax29:ClusterStatus"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -439,11 -353,10 +346,11 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addKubernetesHostResponse"> + <xs:element name="createApplicationClusters"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="appId" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="appClustersContexts" nillable="true" type="ax29:ApplicationClusterContext"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="appClustersContexts" nillable="true" type="ax23:ApplicationClusterContext"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -480,15 -388,31 +387,22 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getKubernetesCluster"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getKubernetesClusterResponse"> + <xs:element name="getKubernetesClusters"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax213:KubernetesCluster"/> - </xs:sequence> + <xs:sequence/> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceNonExistingKubernetesHostException"> + <xs:element name="getKubernetesClustersResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:KubernetesCluster"/> - <xs:element minOccurs="0" name="NonExistingKubernetesHostException" nillable="true" type="ax21:NonExistingKubernetesHostException"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax213:KubernetesCluster"/> + </xs:sequence> + </xs:complexType> + </xs:element> - <xs:element name="updateKubernetesHost"> ++ <xs:element name="CloudControllerServiceNonExistingKubernetesClusterException"> + <xs:complexType> + <xs:sequence> - <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax213:KubernetesHost"/> ++ <xs:element minOccurs="0" name="NonExistingKubernetesClusterException" nillable="true" type="ax21:NonExistingKubernetesClusterException"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -499,10 -423,10 +413,10 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceNetworkPartitionAlreadyExistsException"> + <xs:element name="getMasterForKubernetesClusterResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:KubernetesMaster"/> - <xs:element minOccurs="0" name="NetworkPartitionAlreadyExistsException" nillable="true" type="ax21:NetworkPartitionAlreadyExistsException"/> ++ <xs:element minOccurs="0" name="return" nillable="true" type="ax213:KubernetesMaster"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -513,10 -437,10 +427,10 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addNetworkPartition"> + <xs:element name="getHostsForKubernetesClusterResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:KubernetesHost"/> - <xs:element minOccurs="0" name="networkPartition" nillable="true" type="ax26:NetworkPartition"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax213:KubernetesHost"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -534,10 -458,10 +448,10 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeNetworkPartition"> + <xs:element name="addKubernetesCluster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax26:KubernetesCluster"/> - <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax213:KubernetesCluster"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -548,10 -472,10 +462,10 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateNetworkPartition"> + <xs:element name="updateKubernetesCluster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax26:KubernetesCluster"/> - <xs:element minOccurs="0" name="networkPartition" nillable="true" type="ax26:NetworkPartition"/> ++ <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax213:KubernetesCluster"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -569,11 -493,10 +483,11 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getNetworkPartitionResponse"> + <xs:element name="addKubernetesHost"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:NetworkPartition"/> + <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax26:KubernetesHost"/> ++ <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax213:KubernetesHost"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -633,10 -559,10 +547,10 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeKubernetesCluster"> + <xs:element name="updateKubernetesMaster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax26:KubernetesMaster"/> - <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax213:KubernetesMaster"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -647,10 -573,10 +561,10 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeKubernetesHost"> + <xs:element name="updateKubernetesHost"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax26:KubernetesHost"/> - <xs:element minOccurs="0" name="kubernetesHostId" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax213:KubernetesHost"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -675,10 -601,10 +589,10 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getMasterForKubernetesCluster"> + <xs:element name="addNetworkPartition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="networkPartition" nillable="true" type="ax29:NetworkPartition"/> - <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="networkPartition" nillable="true" type="ax23:NetworkPartition"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -710,10 -630,10 +624,10 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addServiceGroup"> + <xs:element name="updateNetworkPartition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="networkPartition" nillable="true" type="ax29:NetworkPartition"/> - <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax26:ServiceGroup"/> ++ <xs:element minOccurs="0" name="networkPartition" nillable="true" type="ax23:NetworkPartition"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -724,15 -644,17 +638,15 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeServiceGroup"> + <xs:element name="getNetworkPartitions"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> - </xs:sequence> + <xs:sequence/> </xs:complexType> </xs:element> - <xs:element name="removeServiceGroupResponse"> + <xs:element name="getNetworkPartitionsResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:NetworkPartition"/> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:NetworkPartition"/> </xs:sequence> </xs:complexType> </xs:element> @@@ -743,13 -665,91 +657,100 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="createApplicationClusters"> + <xs:element name="getNetworkPartitionResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:NetworkPartition"/> - <xs:element minOccurs="0" name="appId" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="appClustersContexts" nillable="true" type="ax26:ApplicationClusterContext"/> ++ <xs:element minOccurs="0" name="return" nillable="true" type="ax23:NetworkPartition"/> + </xs:sequence> + </xs:complexType> + </xs:element> - <xs:element name="createApplicationClustersResponse"> ++ <xs:element name="getKubernetesCluster"> + <xs:complexType> + <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++ <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> - <xs:element name="terminateInstanceForcefully"> ++ <xs:element name="getKubernetesClusterResponse"> + <xs:complexType> + <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="return" nillable="true" type="ax213:KubernetesCluster"/> + </xs:sequence> + </xs:complexType> + </xs:element> - <xs:element name="terminateInstanceForcefullyResponse"> ++ <xs:element name="getIaasProviders"> + <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> - </xs:sequence> ++ <xs:sequence/> + </xs:complexType> + </xs:element> - <xs:element name="startInstance"> ++ <xs:element name="getIaasProvidersResponse"> + <xs:complexType> + <xs:sequence> - <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax26:InstanceContext"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> - <xs:element name="startInstanceResponse"> ++ <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException"> + <xs:complexType> + <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> ++ <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax21:InvalidCartridgeDefinitionException"/> + </xs:sequence> + </xs:complexType> + </xs:element> - <xs:element name="CloudControllerServiceInvalidMemberException"> ++ <xs:element name="CloudControllerServiceCartridgeAlreadyExistsException"> + <xs:complexType> + <xs:sequence> - <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/> ++ <xs:element minOccurs="0" name="CartridgeAlreadyExistsException" nillable="true" type="ax21:CartridgeAlreadyExistsException"/> + </xs:sequence> + </xs:complexType> + </xs:element> - <xs:element name="terminateInstance"> ++ <xs:element name="addCartridge"> + <xs:complexType> + <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax23:Cartridge"/> + </xs:sequence> + </xs:complexType> + </xs:element> - <xs:element name="terminateInstanceResponse"> ++ <xs:element name="addCartridgeResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> - <xs:element name="CloudControllerServiceInvalidClusterException"> ++ <xs:element name="CloudControllerServiceCartridgeDefinitionNotExistsException"> + <xs:complexType> + <xs:sequence> - <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax21:InvalidClusterException"/> ++ <xs:element minOccurs="0" name="CartridgeDefinitionNotExistsException" nillable="true" type="ax21:CartridgeDefinitionNotExistsException"/> + </xs:sequence> + </xs:complexType> + </xs:element> - <xs:element name="terminateInstances"> ++ <xs:element name="updateCartridge"> + <xs:complexType> + <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="cartridge" nillable="true" type="ax23:Cartridge"/> + </xs:sequence> + </xs:complexType> + </xs:element> - <xs:element name="terminateInstancesResponse"> ++ <xs:element name="updateCartridgeResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> ++ <xs:element name="getCartridges"> ++ <xs:complexType> ++ <xs:sequence/> ++ </xs:complexType> ++ </xs:element> ++ <xs:element name="getCartridgesResponse"> ++ <xs:complexType> ++ <xs:sequence> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://topology.domain.messaging.stratos.apache.org/xsd";> <xs:complexType abstract="true" name="ClusterStatus"> @@@ -765,7 -765,7 +766,7 @@@ <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://common.stratos.apache.org/xsd";> <xs:complexType name="Properties"> <xs:sequence> -- <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax24:Property"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax25:Property"/> </xs:sequence> </xs:complexType> <xs:complexType name="Property"> @@@ -776,12 -776,7 +777,12 @@@ </xs:complexType> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.controller.cloud.stratos.apache.org/xsd";> - <xs:complexType name="NonExistingKubernetesClusterException"> - <xs:complexType name="InvalidPartitionException"> ++ <xs:complexType name="InvalidCartridgeTypeException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> - <xs:complexType name="InvalidPartitionException"> ++ <xs:complexType name="InvalidServiceGroupException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> @@@ -818,15 -791,19 +797,19 @@@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="CartridgeAlreadyExistsException"> - <xs:sequence/> + <xs:complexType name="CloudControllerException"> + <xs:complexContent> + <xs:extension base="xs:RuntimeException"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> </xs:complexType> - <xs:complexType name="CartridgeDefinitionNotExistsException"> - <xs:complexType name="UnregisteredClusterException"> ++ <xs:complexType name="InvalidPartitionException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidServiceGroupException"> - <xs:complexType name="InvalidCartridgeDefinitionException"> ++ <xs:complexType name="InvalidMemberException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> @@@ -851,7 -831,12 +834,12 @@@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidKubernetesHostException"> ++ <xs:complexType name="NonExistingKubernetesClusterException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> - <xs:complexType name="NonExistingKubernetesClusterException"> + <xs:complexType name="InvalidKubernetesClusterException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> @@@ -891,26 -879,23 +879,24 @@@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="ApplicationClusterRegistrationException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> - </xs:sequence> + <xs:complexType name="NetworkPartitionNotExistsException"> + <xs:sequence/> </xs:complexType> - </xs:schema> - <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.common.stratos.apache.org/xsd";> - <xs:complexType name="NameValuePair"> - <xs:complexType name="InvalidMemberException"> ++ <xs:complexType name="InvalidCartridgeDefinitionException"> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="LoadBalancingIPType"> - <xs:complexContent> - <xs:extension base="xs:Enum"> - <xs:sequence/> - </xs:extension> - </xs:complexContent> - <xs:complexType name="InvalidClusterException"> ++ <xs:complexType name="CartridgeAlreadyExistsException"> ++ <xs:sequence/> ++ </xs:complexType> ++ <xs:complexType name="CartridgeDefinitionNotExistsException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> + </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax25="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd";> + <xs:schema xmlns:ax212="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd";> <xs:import namespace="http://common.stratos.apache.org/xsd"/> <xs:complexType name="KubernetesCluster"> <xs:sequence> @@@ -945,18 -930,33 +931,36 @@@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax28="http://common.stratos.apache.org/xsd"; xmlns:ax211="http://domain.common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.controller.cloud.stratos.apache.org/xsd";> + <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.common.stratos.apache.org/xsd";> + <xs:complexType name="NameValuePair"> + <xs:sequence> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="LoadBalancingIPType"> + <xs:complexContent> + <xs:extension base="xs:Enum"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:schema> - <xs:schema xmlns:ax28="http://domain.common.stratos.apache.org/xsd"; xmlns:ax25="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.controller.cloud.stratos.apache.org/xsd";> ++ <xs:schema xmlns:ax28="http://domain.common.stratos.apache.org/xsd"; xmlns:ax26="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.controller.cloud.stratos.apache.org/xsd";> <xs:import namespace="http://common.stratos.apache.org/xsd"/> <xs:import namespace="http://domain.common.stratos.apache.org/xsd"/> -- <xs:complexType name="Partition"> ++ <xs:complexType name="ServiceGroup"> + <xs:sequence> - <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> - <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="partitionMax" type="xs:int"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax28:Properties"/> - <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax23:Dependencies"/> ++ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"/> ++ </xs:sequence> ++ </xs:complexType> ++ <xs:complexType name="Dependencies"> + <xs:sequence> - <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> - <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="partitionMax" type="xs:int"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> - <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrders" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> <xs:complexType name="InstanceContext"> @@@ -967,12 -967,12 +971,23 @@@ <xs:element minOccurs="0" name="initTime" type="xs:long"/> <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"/> - <xs:element minOccurs="0" name="partition" nillable="true" type="ax27:Partition"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax28:Properties"/> + <xs:element minOccurs="0" name="partition" nillable="true" type="ax23:Partition"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax27:Volume"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> + </xs:sequence> + </xs:complexType> ++ <xs:complexType name="Partition"> ++ <xs:sequence> ++ <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> ++ <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> ++ <xs:element minOccurs="0" name="partitionMax" type="xs:int"/> ++ <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> ++ <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> <xs:complexType name="Volume"> <xs:sequence> <xs:element minOccurs="0" name="device" nillable="true" type="xs:string"/> @@@ -1026,9 -1026,40 +1041,9 @@@ <xs:element minOccurs="0" name="ram" type="xs:int"/> </xs:sequence> </xs:complexType> - <xs:complexType name="Registrant"> - <xs:sequence> - <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> - <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="Persistence"> - <xs:sequence> - <xs:element minOccurs="0" name="persistenceRequired" type="xs:boolean"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="NetworkPartition"> - <xs:sequence> - <xs:element minOccurs="0" name="activeByDefault" type="xs:boolean"/> - <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax23:Partition"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> - <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="tenantId" type="xs:int"/> - <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> <xs:complexType name="Cartridge"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypeMappings" nillable="true" type="ax27:AppType"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypeMappings" nillable="true" type="ax23:AppType"/> <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="category" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"/> @@@ -1041,14 -1072,12 +1056,14 @@@ <xs:element minOccurs="0" name="loadBalancingIPType" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="metadataKeys" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/> - <xs:element minOccurs="0" name="persistence" nillable="true" type="ax27:Persistence"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax27:PortMapping"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax28:Properties"/> + <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax23:PortMapping"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="tenantId" type="xs:int"/> <xs:element minOccurs="0" name="tenantPartitions" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> @@@ -1097,12 -1126,6 +1112,12 @@@ <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> + <xs:complexType name="Persistence"> + <xs:sequence> + <xs:element minOccurs="0" name="persistenceRequired" type="xs:boolean"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax27:Volume"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> + </xs:sequence> + </xs:complexType> <xs:complexType name="PortMapping"> <xs:sequence> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> @@@ -1121,39 -1158,12 +1136,25 @@@ <xs:element minOccurs="0" name="kubernetesServices" nillable="true" type="xs:anyType"/> <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"/> <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax28:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"/> <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax27:Volume"/> - </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 minOccurs="0" name="dependencies" nillable="true" type="ax27:Dependencies"/> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="Dependencies"> - <xs:sequence> - <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrders" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> </xs:sequence> </xs:complexType> + <xs:complexType name="Registrant"> + <xs:sequence> + <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="persistence" nillable="true" type="ax27:Persistence"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax28:Properties"/> ++ <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/> ++ <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> <xs:complexType name="ApplicationClusterContext"> <xs:sequence> <xs:element minOccurs="0" name="autoscalePolicyName" nillable="true" type="xs:string"/> @@@ -1167,21 -1177,9 +1168,21 @@@ <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax27:Volume"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> </xs:sequence> </xs:complexType> + <xs:complexType name="NetworkPartition"> + <xs:sequence> + <xs:element minOccurs="0" name="activeByDefault" type="xs:boolean"/> + <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax27:Partition"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax28:Properties"/> ++ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax23:Partition"/> ++ <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="tenantId" type="xs:int"/> + <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> </xs:schema> </wsdl:types> <wsdl:message name="getCartridgesRequest">
