Repository: stratos Updated Branches: refs/heads/tenant-isolation af8b38d23 -> 0bc4e8b31
Update the cartridge adding flow with UUID Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0bc4e8b3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0bc4e8b3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0bc4e8b3 Branch: refs/heads/tenant-isolation Commit: 0bc4e8b31bc20555cfc6d3de5df1b2dc2bb94a4f Parents: af8b38d Author: Gayan Gunarathne <[email protected]> Authored: Wed Jul 8 11:03:40 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Wed Jul 8 11:03:40 2015 +0530 ---------------------------------------------------------------------- .../rest/endpoint/api/StratosApiV41Utils.java | 6 +- .../util/converter/ObjectConverter.java | 2 +- .../main/resources/CloudControllerService.wsdl | 574 +++++++++---------- 3 files changed, 291 insertions(+), 291 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0bc4e8b3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 2b1c7b9..a168174 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -151,11 +151,11 @@ public class StratosApiV41Utils { cartridgeBean.getType())); } } catch (CloudControllerServiceCartridgeAlreadyExistsExceptionException e) { - String msg = "Could not add cartridge"; + String msg = "Could not add cartridge as it is already exits"; log.error(msg, e); throw new RestAPIException(msg); } catch (CloudControllerServiceInvalidCartridgeDefinitionExceptionException e) { - String msg = "Could not add cartridge"; + String msg = "Could not add cartridge as invalid cartridge definition"; log.error(msg, e); throw new RestAPIException(msg); } catch (RemoteException e) { @@ -163,7 +163,7 @@ public class StratosApiV41Utils { log.error(msg, e); throw new RestAPIException(msg); } catch (CloudControllerServiceInvalidIaasProviderExceptionException e) { - String msg = "Could not add cartridge"; + String msg = "Could not add cartridge as invalid iaas provider"; log.error(msg, e); throw new RestAPIException(msg); } http://git-wip-us.apache.org/repos/asf/stratos/blob/0bc4e8b3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index 77b4c24..eb2ce8b 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -73,7 +73,7 @@ public class ObjectConverter { } Cartridge cartridge = new Cartridge(); - + cartridge.setUuid(cartridgeBean.getUuid()); cartridge.setType(cartridgeBean.getType()); cartridge.setHostName(cartridgeBean.getHost()); cartridge.setProvider(cartridgeBean.getProvider()); http://git-wip-us.apache.org/repos/asf/stratos/blob/0bc4e8b3/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 c7b2e30..a6a8818 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,96 +1,85 @@ -<?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://kubernetes.domain.controller.cloud.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:ax212="http://domain.common.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax210="http://topology.domain.messaging.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:ns="http://impl.services.controller.cloud.stratos.apache.org" xmlns:ax27="http://kubernetes.domain.controller.cloud.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: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"> <wsdl:types> - <xs:schema xmlns:ax29="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd" xmlns:ax26="http://domain.controller.cloud.stratos.apache.org/xsd" xmlns:ax211="http://topology.domain.messaging.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:ax29="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd" xmlns:ax213="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:import namespace="http://exception.controller.cloud.stratos.apache.org/xsd"/> <xs:import namespace="http://domain.controller.cloud.stratos.apache.org/xsd"/> <xs:import namespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"/> <xs:import namespace="http://topology.domain.messaging.stratos.apache.org/xsd"/> - <xs:element name="getIaasProviders"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getIaasProvidersResponse"> - <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="CloudControllerServiceInvalidCartridgeDefinitionException"> + <xs:element name="CloudControllerServiceInvalidPartitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax21:InvalidCartridgeDefinitionException"/> + <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax21:InvalidPartitionException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidIaasProviderException"> + <xs:element name="validatePartition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax21:InvalidIaasProviderException"/> + <xs:element minOccurs="0" name="partition" nillable="true" type="ax26:Partition"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceCartridgeAlreadyExistsException"> + <xs:element name="validatePartitionResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CartridgeAlreadyExistsException" nillable="true" type="ax21:CartridgeAlreadyExistsException"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addCartridge"> + <xs:element name="CloudControllerServiceInvalidMemberException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax26:Cartridge"/> + <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addCartridgeResponse"> + <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax21:InvalidCartridgeTypeException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceCartridgeDefinitionNotExistsException"> + <xs:element name="CloudControllerServiceCloudControllerException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CartridgeDefinitionNotExistsException" nillable="true" type="ax21:CartridgeDefinitionNotExistsException"/> + <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax21:CloudControllerException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateCartridge"> + <xs:element name="terminateInstance"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridge" 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="updateCartridgeResponse"> + <xs:element name="terminateInstanceResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> + <xs:element name="CloudControllerServiceCartridgeNotFoundException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax21:InvalidCartridgeTypeException"/> + <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax21:CartridgeNotFoundException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeCartridge"> + <xs:element name="getCartridge"> <xs:complexType> <xs:sequence> <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="removeCartridgeResponse"> + <xs:element name="getCartridgeResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax26:Cartridge"/> </xs:sequence> </xs:complexType> </xs:element> @@ -115,130 +104,110 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstanceForcefully"> + <xs:element name="CloudControllerServiceInvalidIaasProviderException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax21:InvalidIaasProviderException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstanceForcefullyResponse"> + <xs:element name="startInstance"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax26:InstanceContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidClusterException"> + <xs:element name="startInstanceResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax21:InvalidClusterException"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstances"> + <xs:element name="getIaasProviders"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - </xs:sequence> + <xs:sequence/> </xs:complexType> </xs:element> - <xs:element name="terminateInstancesResponse"> + <xs:element name="getIaasProvidersResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceCartridgeNotFoundException"> + <xs:element name="getClusterContext"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax21:CartridgeNotFoundException"/> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="registerService"> + <xs:element name="getClusterContextResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="registrant" nillable="true" type="ax26:Registrant"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax26:ClusterContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="registerServiceResponse"> + <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax21:InvalidCartridgeDefinitionException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceUnregisteredClusterException"> + <xs:element name="CloudControllerServiceCartridgeAlreadyExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax21:UnregisteredClusterException"/> + <xs:element minOccurs="0" name="CartridgeAlreadyExistsException" nillable="true" type="ax21:CartridgeAlreadyExistsException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="unregisterService"> + <xs:element name="addCartridge"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax26:Cartridge"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="unregisterServiceResponse"> + <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="CloudControllerServiceInvalidPartitionException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax21:InvalidPartitionException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="validateDeploymentPolicyNetworkPartition"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="validateDeploymentPolicyNetworkPartitionResponse"> + <xs:element name="CloudControllerServiceCartridgeDefinitionNotExistsException"> <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:sequence> </xs:complexType> </xs:element> - <xs:element name="updateClusterStatus"> + <xs:element name="updateCartridge"> <xs:complexType> <xs:sequence> - <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="ax210:ClusterStatus"/> + <xs:element minOccurs="0" name="cartridge" nillable="true" type="ax26:Cartridge"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateClusterStatusResponse"> + <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="validatePartition"> + <xs:element name="removeCartridge"> <xs:complexType> <xs:sequence> - <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"/> @@ -336,24 +305,119 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceCloudControllerException"> + <xs:element name="startInstances"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax21:CloudControllerException"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="instanceContexts" nillable="true" type="ax26:InstanceContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstances"> + <xs:element name="startInstancesResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="instanceContexts" nillable="true" type="ax26:InstanceContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstancesResponse"> + <xs:element name="terminateInstanceForcefully"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> + <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <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="CloudControllerServiceInvalidClusterException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax21:InvalidClusterException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="terminateInstances"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="terminateInstancesResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="registerService"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="registrant" nillable="true" type="ax26:Registrant"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="registerServiceResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="CloudControllerServiceUnregisteredClusterException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax21:UnregisteredClusterException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="unregisterService"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="unregisterServiceResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="validateDeploymentPolicyNetworkPartition"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="validateDeploymentPolicyNetworkPartitionResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateClusterStatus"> + <xs:complexType> + <xs:sequence> + <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:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateClusterStatusResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> @@ -676,27 +740,6 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidMemberException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="terminateInstance"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="terminateInstanceResponse"> - <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/> @@ -709,49 +752,6 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstance"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax26:InstanceContext"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="startInstanceResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> - </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:element minOccurs="0" name="tenantId" type="xs:int"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getCartridgeResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:Cartridge"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getClusterContext"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getClusterContextResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:ClusterContext"/> - </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"> @@ -778,66 +778,71 @@ </xs:complexType> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.controller.cloud.stratos.apache.org/xsd"> - <xs:complexType name="InvalidCartridgeDefinitionException"> + <xs:complexType name="InvalidPartitionException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="InvalidMemberException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidIaasProviderException"> + <xs:complexType name="InvalidCartridgeTypeException"> <xs:sequence> <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="CartridgeNotFoundException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidCartridgeTypeException"> + <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="InvalidIaasProviderException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidClusterException"> + <xs:complexType name="InvalidCartridgeDefinitionException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="CartridgeNotFoundException"> + <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:complexType name="UnregisteredClusterException"> + <xs:complexType name="InvalidServiceGroupException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidPartitionException"> + <xs:complexType name="InvalidClusterException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidServiceGroupException"> + <xs:complexType name="UnregisteredClusterException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="CloudControllerException"> - <xs:complexContent> - <xs:extension base="xs:RuntimeException"> - <xs:sequence/> - </xs:extension> - </xs:complexContent> - </xs:complexType> <xs:complexType name="ApplicationClusterRegistrationException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> @@ -891,11 +896,6 @@ <xs:complexType name="NetworkPartitionNotExistsException"> <xs:sequence/> </xs:complexType> - <xs:complexType name="InvalidMemberException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.common.stratos.apache.org/xsd"> <xs:complexType name="NameValuePair"> @@ -947,9 +947,20 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax213="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:ax25="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:import namespace="http://common.stratos.apache.org/xsd"/> <xs:import namespace="http://domain.common.stratos.apache.org/xsd"/> + <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="Cartridge"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypeMappings" nillable="true" type="ax23:AppType"/> @@ -1047,44 +1058,6 @@ <xs:element minOccurs="0" name="proxyPort" 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="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="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="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="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"> <xs:sequence> <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> @@ -1108,14 +1081,14 @@ <xs:element minOccurs="0" name="clusterInstanceId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="defaultPrivateIP" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="defaultPublicIP" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="dynamicPayload" nillable="true" type="ax212:NameValuePair"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="dynamicPayload" nillable="true" type="ax210:NameValuePair"/> <xs:element minOccurs="0" name="initTime" type="xs:long"/> <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="instanceMetadata" nillable="true" type="ax23:InstanceMetadata"/> <xs:element minOccurs="0" name="kubernetesPodId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="kubernetesPodLabel" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="loadBalancingIPType" nillable="true" type="ax212:LoadBalancingIPType"/> + <xs:element minOccurs="0" name="loadBalancingIPType" nillable="true" type="ax210:LoadBalancingIPType"/> <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"/> @@ -1140,6 +1113,49 @@ <xs:element minOccurs="0" name="ram" type="xs:int"/> </xs:sequence> </xs:complexType> + <xs:complexType name="ClusterContext"> + <xs:sequence> + <xs:element minOccurs="0" name="applicationId" 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="hostName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> + <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="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="ax23: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="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="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="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="ApplicationClusterContext"> <xs:sequence> <xs:element minOccurs="0" name="autoscalePolicyName" nillable="true" type="xs:string"/> @@ -1168,22 +1184,6 @@ <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="ClusterContext"> - <xs:sequence> - <xs:element minOccurs="0" name="applicationId" 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="hostName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> - <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="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="ax23:Volume"/> - </xs:sequence> - </xs:complexType> </xs:schema> </wsdl:types> <wsdl:message name="getCartridgesRequest"> @@ -1261,18 +1261,18 @@ <wsdl:message name="CloudControllerServiceKubernetesClusterAlreadyExistsException"> <wsdl:part name="parameters" element="ns:CloudControllerServiceKubernetesClusterAlreadyExistsException"/> </wsdl:message> - <wsdl:message name="addServiceGroupRequest"> - <wsdl:part name="parameters" element="ns:addServiceGroup"/> - </wsdl:message> - <wsdl:message name="addServiceGroupResponse"> - <wsdl:part name="parameters" element="ns:addServiceGroupResponse"/> - </wsdl:message> <wsdl:message name="registerServiceRequest"> <wsdl:part name="parameters" element="ns:registerService"/> </wsdl:message> <wsdl:message name="registerServiceResponse"> <wsdl:part name="parameters" element="ns:registerServiceResponse"/> </wsdl:message> + <wsdl:message name="addServiceGroupRequest"> + <wsdl:part name="parameters" element="ns:addServiceGroup"/> + </wsdl:message> + <wsdl:message name="addServiceGroupResponse"> + <wsdl:part name="parameters" element="ns:addServiceGroupResponse"/> + </wsdl:message> <wsdl:message name="terminateInstanceRequest"> <wsdl:part name="parameters" element="ns:terminateInstance"/> </wsdl:message> @@ -1441,18 +1441,18 @@ <wsdl:message name="CloudControllerServiceInvalidClusterException"> <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidClusterException"/> </wsdl:message> - <wsdl:message name="getClusterContextRequest"> - <wsdl:part name="parameters" element="ns:getClusterContext"/> - </wsdl:message> - <wsdl:message name="getClusterContextResponse"> - <wsdl:part name="parameters" element="ns:getClusterContextResponse"/> - </wsdl:message> <wsdl:message name="updateClusterStatusRequest"> <wsdl:part name="parameters" element="ns:updateClusterStatus"/> </wsdl:message> <wsdl:message name="updateClusterStatusResponse"> <wsdl:part name="parameters" element="ns:updateClusterStatusResponse"/> </wsdl:message> + <wsdl:message name="getClusterContextRequest"> + <wsdl:part name="parameters" element="ns:getClusterContext"/> + </wsdl:message> + <wsdl:message name="getClusterContextResponse"> + <wsdl:part name="parameters" element="ns:getClusterContextResponse"/> + </wsdl:message> <wsdl:message name="updateKubernetesHostRequest"> <wsdl:part name="parameters" element="ns:updateKubernetesHost"/> </wsdl:message> @@ -1546,16 +1546,16 @@ <wsdl:fault message="ns:CloudControllerServiceInvalidKubernetesClusterException" name="CloudControllerServiceInvalidKubernetesClusterException" wsaw:Action="urn:addKubernetesClusterCloudControllerServiceInvalidKubernetesClusterException"/> <wsdl:fault message="ns:CloudControllerServiceKubernetesClusterAlreadyExistsException" name="CloudControllerServiceKubernetesClusterAlreadyExistsException" wsaw:Action="urn:addKubernetesClusterCloudControllerServiceKubernetesClusterAlreadyExistsException"/> </wsdl:operation> - <wsdl:operation name="addServiceGroup"> - <wsdl:input message="ns:addServiceGroupRequest" wsaw:Action="urn:addServiceGroup"/> - <wsdl:output message="ns:addServiceGroupResponse" wsaw:Action="urn:addServiceGroupResponse"/> - <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:addServiceGroupCloudControllerServiceInvalidServiceGroupException"/> - </wsdl:operation> <wsdl:operation name="registerService"> <wsdl:input message="ns:registerServiceRequest" wsaw:Action="urn:registerService"/> <wsdl:output message="ns:registerServiceResponse" wsaw:Action="urn:registerServiceResponse"/> <wsdl:fault message="ns:CloudControllerServiceCartridgeNotFoundException" name="CloudControllerServiceCartridgeNotFoundException" wsaw:Action="urn:registerServiceCloudControllerServiceCartridgeNotFoundException"/> </wsdl:operation> + <wsdl:operation name="addServiceGroup"> + <wsdl:input message="ns:addServiceGroupRequest" wsaw:Action="urn:addServiceGroup"/> + <wsdl:output message="ns:addServiceGroupResponse" wsaw:Action="urn:addServiceGroupResponse"/> + <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:addServiceGroupCloudControllerServiceInvalidServiceGroupException"/> + </wsdl:operation> <wsdl:operation name="terminateInstance"> <wsdl:input message="ns:terminateInstanceRequest" wsaw:Action="urn:terminateInstance"/> <wsdl:output message="ns:terminateInstanceResponse" wsaw:Action="urn:terminateInstanceResponse"/> @@ -1672,14 +1672,14 @@ <wsdl:output message="ns:terminateInstancesResponse" wsaw:Action="urn:terminateInstancesResponse"/> <wsdl:fault message="ns:CloudControllerServiceInvalidClusterException" name="CloudControllerServiceInvalidClusterException" wsaw:Action="urn:terminateInstancesCloudControllerServiceInvalidClusterException"/> </wsdl:operation> - <wsdl:operation name="getClusterContext"> - <wsdl:input message="ns:getClusterContextRequest" wsaw:Action="urn:getClusterContext"/> - <wsdl:output message="ns:getClusterContextResponse" wsaw:Action="urn:getClusterContextResponse"/> - </wsdl:operation> <wsdl:operation name="updateClusterStatus"> <wsdl:input message="ns:updateClusterStatusRequest" wsaw:Action="urn:updateClusterStatus"/> <wsdl:output message="ns:updateClusterStatusResponse" wsaw:Action="urn:updateClusterStatusResponse"/> </wsdl:operation> + <wsdl:operation name="getClusterContext"> + <wsdl:input message="ns:getClusterContextRequest" wsaw:Action="urn:getClusterContext"/> + <wsdl:output message="ns:getClusterContextResponse" wsaw:Action="urn:getClusterContextResponse"/> + </wsdl:operation> <wsdl:operation name="updateKubernetesHost"> <wsdl:input message="ns:updateKubernetesHostRequest" wsaw:Action="urn:updateKubernetesHost"/> <wsdl:output message="ns:updateKubernetesHostResponse" wsaw:Action="urn:updateKubernetesHostResponse"/> @@ -1820,28 +1820,28 @@ <soap:fault use="literal" name="CloudControllerServiceKubernetesClusterAlreadyExistsException"/> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="registerService"> - <soap:operation soapAction="urn:registerService" style="document"/> + <wsdl:operation name="addServiceGroup"> + <soap:operation soapAction="urn:addServiceGroup" style="document"/> <wsdl:input> <soap:body use="literal"/> </wsdl:input> <wsdl:output> <soap:body use="literal"/> </wsdl:output> - <wsdl:fault name="CloudControllerServiceCartridgeNotFoundException"> - <soap:fault use="literal" name="CloudControllerServiceCartridgeNotFoundException"/> + <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException"> + <soap:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"/> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="addServiceGroup"> - <soap:operation soapAction="urn:addServiceGroup" style="document"/> + <wsdl:operation name="registerService"> + <soap:operation soapAction="urn:registerService" style="document"/> <wsdl:input> <soap:body use="literal"/> </wsdl:input> <wsdl:output> <soap:body use="literal"/> </wsdl:output> - <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException"> - <soap:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"/> + <wsdl:fault name="CloudControllerServiceCartridgeNotFoundException"> + <soap:fault use="literal" name="CloudControllerServiceCartridgeNotFoundException"/> </wsdl:fault> </wsdl:operation> <wsdl:operation name="terminateInstance"> @@ -2126,8 +2126,8 @@ <soap:body use="literal"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="updateClusterStatus"> - <soap:operation soapAction="urn:updateClusterStatus" style="document"/> + <wsdl:operation name="getClusterContext"> + <soap:operation soapAction="urn:getClusterContext" style="document"/> <wsdl:input> <soap:body use="literal"/> </wsdl:input> @@ -2135,8 +2135,8 @@ <soap:body use="literal"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getClusterContext"> - <soap:operation soapAction="urn:getClusterContext" style="document"/> + <wsdl:operation name="updateClusterStatus"> + <soap:operation soapAction="urn:updateClusterStatus" style="document"/> <wsdl:input> <soap:body use="literal"/> </wsdl:input> @@ -2339,28 +2339,28 @@ <soap12:fault use="literal" name="CloudControllerServiceKubernetesClusterAlreadyExistsException"/> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="registerService"> - <soap12:operation soapAction="urn:registerService" style="document"/> + <wsdl:operation name="addServiceGroup"> + <soap12:operation soapAction="urn:addServiceGroup" style="document"/> <wsdl:input> <soap12:body use="literal"/> </wsdl:input> <wsdl:output> <soap12:body use="literal"/> </wsdl:output> - <wsdl:fault name="CloudControllerServiceCartridgeNotFoundException"> - <soap12:fault use="literal" name="CloudControllerServiceCartridgeNotFoundException"/> + <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException"> + <soap12:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"/> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="addServiceGroup"> - <soap12:operation soapAction="urn:addServiceGroup" style="document"/> + <wsdl:operation name="registerService"> + <soap12:operation soapAction="urn:registerService" style="document"/> <wsdl:input> <soap12:body use="literal"/> </wsdl:input> <wsdl:output> <soap12:body use="literal"/> </wsdl:output> - <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException"> - <soap12:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"/> + <wsdl:fault name="CloudControllerServiceCartridgeNotFoundException"> + <soap12:fault use="literal" name="CloudControllerServiceCartridgeNotFoundException"/> </wsdl:fault> </wsdl:operation> <wsdl:operation name="terminateInstance"> @@ -2645,8 +2645,8 @@ <soap12:body use="literal"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="updateClusterStatus"> - <soap12:operation soapAction="urn:updateClusterStatus" style="document"/> + <wsdl:operation name="getClusterContext"> + <soap12:operation soapAction="urn:getClusterContext" style="document"/> <wsdl:input> <soap12:body use="literal"/> </wsdl:input> @@ -2654,8 +2654,8 @@ <soap12:body use="literal"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getClusterContext"> - <soap12:operation soapAction="urn:getClusterContext" style="document"/> + <wsdl:operation name="updateClusterStatus"> + <soap12:operation soapAction="urn:updateClusterStatus" style="document"/> <wsdl:input> <soap12:body use="literal"/> </wsdl:input> @@ -2831,8 +2831,8 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="registerService"> - <http:operation location="registerService"/> + <wsdl:operation name="addServiceGroup"> + <http:operation location="addServiceGroup"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input> @@ -2840,8 +2840,8 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="addServiceGroup"> - <http:operation location="addServiceGroup"/> + <wsdl:operation name="registerService"> + <http:operation location="registerService"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input> @@ -3047,8 +3047,8 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="updateClusterStatus"> - <http:operation location="updateClusterStatus"/> + <wsdl:operation name="getClusterContext"> + <http:operation location="getClusterContext"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input> @@ -3056,8 +3056,8 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getClusterContext"> - <http:operation location="getClusterContext"/> + <wsdl:operation name="updateClusterStatus"> + <http:operation location="updateClusterStatus"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input>
