Repository: stratos Updated Branches: refs/heads/master 548013a6d -> a0a437abc
moving provider from partition to network partition Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a0a437ab Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a0a437ab Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a0a437ab Branch: refs/heads/master Commit: a0a437abc26e926bb51c173855621a86c908e40a Parents: 548013a Author: R-Rajkumar <[email protected]> Authored: Fri Mar 6 22:19:19 2015 +0530 Committer: R-Rajkumar <[email protected]> Committed: Fri Mar 6 22:19:19 2015 +0530 ---------------------------------------------------------------------- .../controller/domain/NetworkPartition.java | 9 + .../impl/CloudControllerServiceImpl.java | 4 + .../beans/partition/NetworkPartitionBean.java | 9 + .../common/beans/partition/PartitionBean.java | 9 - .../util/converter/ObjectConverter.java | 4 +- .../mock/network-partition-1.json | 2 +- .../mock/network-partition-2.json | 3 +- .../mock/network-partition-3.json | 2 +- .../main/resources/CloudControllerService.wsdl | 451 ++++++++++--------- 9 files changed, 252 insertions(+), 241 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a0a437ab/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java index f70d161..9a8f67b 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java @@ -30,6 +30,7 @@ public class NetworkPartition implements Serializable { private static final long serialVersionUID = -8043298009352097370L; private String id; + private String provider; private boolean activeByDefault; private Partition[] partitions; @@ -81,4 +82,12 @@ public class NetworkPartition implements Serializable { } return null; } + + public String getProvider() { + return provider; + } + + public void setProvider(String provider) { + this.provider = provider; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/a0a437ab/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index 958eb44..31eca08 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -1491,6 +1491,8 @@ public class CloudControllerServiceImpl implements CloudControllerService { log.info(String.format("Validating partition: [network-partition-id] %s [partition-id] %s", networkPartition.getId(), partition.getId())); } + // Overwrites partition provider with network partition provider + partition.setProvider(networkPartition.getProvider()); validatePartition(partition); if(log.isInfoEnabled()) { log.info(String.format("Partition validated successfully: [network-partition-id] %s " + @@ -1568,6 +1570,8 @@ public class CloudControllerServiceImpl implements CloudControllerService { log.info(String.format("Validating partition: [network-partition-id] %s [partition-id] %s", networkPartition.getId(), partition.getId())); } + // Overwrites partition provider with network partition provider + partition.setProvider(networkPartition.getProvider()); validatePartition(partition); if(log.isInfoEnabled()) { log.info(String.format("Partition validated successfully: [network-partition-id] %s " + http://git-wip-us.apache.org/repos/asf/stratos/blob/a0a437ab/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java index dcdea43..95a22fa 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java @@ -26,6 +26,7 @@ import java.util.List; public class NetworkPartitionBean { private String id; + private String provider; private List<PartitionBean> partitions; public String getId() { @@ -43,4 +44,12 @@ public class NetworkPartitionBean { public void setPartitions(List<PartitionBean> partitions) { this.partitions = partitions; } + + public String getProvider() { + return provider; + } + + public void setProvider(String provider) { + this.provider = provider; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/a0a437ab/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java index c9648c8..a94cdfc 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java @@ -30,7 +30,6 @@ public class PartitionBean { private String id; private String description; private boolean isPublic; - private String provider; private String kubernetesClusterId; private List<PropertyBean> property; @@ -42,14 +41,6 @@ public class PartitionBean { this.id = id; } - public String getProvider() { - return provider; - } - - public void setProvider(String provider) { - this.provider = provider; - } - public boolean getIsPublic() { return isPublic(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/a0a437ab/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 1910c2e..5378b77 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 @@ -427,7 +427,6 @@ public class ObjectConverter { partition.setId(partitionBean.getId()); partition.setDescription(partitionBean.getDescription()); partition.setIsPublic(partitionBean.isPublic()); - partition.setProvider(partitionBean.getProvider()); if (partitionBean.getProperty() != null && !partitionBean.getProperty().isEmpty()) { @@ -514,7 +513,6 @@ public class ObjectConverter { partition.setId(stubPartition.getId()); partition.setPublic(stubPartition.getIsPublic()); partition.setDescription(stubPartition.getDescription()); - partition.setProvider(stubPartition.getProvider()); partition.setKubernetesClusterId(stubPartition.getKubernetesClusterId()); if(stubPartition.getProperties() != null) { List<org.apache.stratos.common.beans.cartridge.PropertyBean> propertyBeanList = new ArrayList<org.apache.stratos.common.beans.cartridge.PropertyBean>(); @@ -544,6 +542,7 @@ public class ObjectConverter { org.apache.stratos.cloud.controller.stub.domain.NetworkPartition networkPartition = new org.apache.stratos.cloud.controller.stub.domain.NetworkPartition(); networkPartition.setId(networkPartitionBean.getId()); + networkPartition.setProvider(networkPartitionBean.getProvider()); if (networkPartitionBean.getPartitions() != null && !networkPartitionBean.getPartitions().isEmpty()) { networkPartition.setPartitions(convertPartitionToCCPartitionPojos(networkPartitionBean.getPartitions())); } @@ -780,7 +779,6 @@ public class ObjectConverter { partitionBeans.setId(partition.getId()); partitionBeans.setDescription(partition.getDescription()); partitionBeans.setPublic(partition.getIsPublic()); - partitionBeans.setProvider(partition.getProvider()); /*partitionBeans.partitionMin = partition.getPartitionMin(); partitionBeans.partitionMax = partition.getPartitionMax();*/ //properties http://git-wip-us.apache.org/repos/asf/stratos/blob/a0a437ab/samples/network-partitions/mock/network-partition-1.json ---------------------------------------------------------------------- diff --git a/samples/network-partitions/mock/network-partition-1.json b/samples/network-partitions/mock/network-partition-1.json index 2a5b7ec..547d188 100644 --- a/samples/network-partitions/mock/network-partition-1.json +++ b/samples/network-partitions/mock/network-partition-1.json @@ -1,9 +1,9 @@ { "id": "network-partition-1", + "provider": "mock", "partitions": [ { "id": "partition-1", - "provider": "mock", "property": [ { "name": "region", http://git-wip-us.apache.org/repos/asf/stratos/blob/a0a437ab/samples/network-partitions/mock/network-partition-2.json ---------------------------------------------------------------------- diff --git a/samples/network-partitions/mock/network-partition-2.json b/samples/network-partitions/mock/network-partition-2.json index 2f9743f..23236e2 100644 --- a/samples/network-partitions/mock/network-partition-2.json +++ b/samples/network-partitions/mock/network-partition-2.json @@ -1,9 +1,9 @@ { "id": "network-partition-2", + "provider": "mock", "partitions": [ { "id": "network-partition-2-partition-1", - "provider": "mock", "property": [ { "name": "region", @@ -13,7 +13,6 @@ }, { "id": "network-partition-2-partition-2", - "provider": "mock", "property": [ { "name": "region", http://git-wip-us.apache.org/repos/asf/stratos/blob/a0a437ab/samples/network-partitions/mock/network-partition-3.json ---------------------------------------------------------------------- diff --git a/samples/network-partitions/mock/network-partition-3.json b/samples/network-partitions/mock/network-partition-3.json index 264fd0a..1bb7f2a 100644 --- a/samples/network-partitions/mock/network-partition-3.json +++ b/samples/network-partitions/mock/network-partition-3.json @@ -1,9 +1,9 @@ { "id": "network-partition-3", + "provider": "mock", "partitions": [ { "id": "partition-1", - "provider": "mock", "property": [ { "name": "region", http://git-wip-us.apache.org/repos/asf/stratos/blob/a0a437ab/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 15964dc..2dbfc26 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 @@ -90,6 +90,34 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="CloudControllerServiceInvalidClusterException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax225:InvalidClusterException"></xs:element> + </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:element> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getCartridgeInfo"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getCartridgeInfoResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax228:CartridgeInfo"></xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="CloudControllerServiceInvalidPartitionException"> <xs:complexType> <xs:sequence> @@ -97,6 +125,28 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax225:InvalidCartridgeTypeException"></xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="validateDeploymentPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax228:Partition"></xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="validateDeploymentPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="validatePartition"> <xs:complexType> <xs:sequence> @@ -272,18 +322,6 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicies"> - <xs:complexType> - <xs:sequence></xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getDeploymentPoliciesResponse"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax228:DeploymentPolicy"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException"> <xs:complexType> <xs:sequence> @@ -291,20 +329,6 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceCartridgeAlreadyExistsException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="CartridgeAlreadyExistsException" nillable="true" type="ax225:CartridgeAlreadyExistsException"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="addCartridge"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax228:CartridgeConfig"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="CloudControllerServiceCartridgeDefinitionNotExistsException"> <xs:complexType> <xs:sequence> @@ -331,13 +355,6 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax225:InvalidCartridgeTypeException"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="removeCartridge"> <xs:complexType> <xs:sequence> @@ -477,137 +494,120 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidKubernetesClusterException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidKubernetesClusterException" nillable="true" type="ax225:InvalidKubernetesClusterException"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="addKubernetesCluster"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax237:KubernetesCluster"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="addKubernetesClusterResponse"> + <xs:element name="getDeploymentPolicies"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> - </xs:sequence> + <xs:sequence></xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getKubernetesCluster"> + <xs:element name="getDeploymentPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax228:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getKubernetesClusterResponse"> + <xs:element name="CloudControllerServiceCartridgeAlreadyExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax237:KubernetesCluster"></xs:element> + <xs:element minOccurs="0" name="CartridgeAlreadyExistsException" nillable="true" type="ax225:CartridgeAlreadyExistsException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeKubernetesCluster"> + <xs:element name="addCartridge"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax228:CartridgeConfig"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeKubernetesClusterResponse"> + <xs:element name="CloudControllerServiceInvalidKubernetesClusterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="InvalidKubernetesClusterException" nillable="true" type="ax225:InvalidKubernetesClusterException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeKubernetesHost"> + <xs:element name="addKubernetesCluster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesHostId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax237:KubernetesCluster"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeKubernetesHostResponse"> + <xs:element name="addKubernetesClusterResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidClusterException"> + <xs:element name="getKubernetesCluster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax225:InvalidClusterException"></xs:element> + <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstances"> + <xs:element name="getKubernetesClusterResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax237:KubernetesCluster"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getCartridgeInfo"> + <xs:element name="removeKubernetesCluster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getCartridgeInfoResponse"> + <xs:element name="removeKubernetesClusterResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax228:CartridgeInfo"></xs:element> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="validateDeploymentPolicy"> + <xs:element name="removeKubernetesHost"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax228:Partition"></xs:element> + <xs:element minOccurs="0" name="kubernetesHostId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="validateDeploymentPolicyResponse"> + <xs:element name="removeKubernetesHostResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidMemberException"> + <xs:element name="addServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax225:InvalidMemberException"></xs:element> + <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax228:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstance"> + <xs:element name="removeServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstance"> + <xs:element name="getServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax228:InstanceContext"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstanceResponse"> + <xs:element name="getServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax228:MemberContext"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax228:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -625,31 +625,31 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addServiceGroup"> + <xs:element name="startInstance"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax228:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax228:InstanceContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeServiceGroup"> + <xs:element name="startInstanceResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax228:MemberContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroup"> + <xs:element name="CloudControllerServiceInvalidMemberException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax225:InvalidMemberException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupResponse"> + <xs:element name="terminateInstance"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax228:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -715,11 +715,21 @@ </xs:extension> </xs:complexContent> </xs:complexType> + <xs:complexType name="InvalidClusterException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> <xs:complexType name="InvalidPartitionException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> + <xs:complexType name="InvalidCartridgeTypeException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> <xs:complexType name="ApplicationClusterRegistrationException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> @@ -749,19 +759,11 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="CartridgeAlreadyExistsException"> - <xs:sequence></xs:sequence> - </xs:complexType> <xs:complexType name="CartridgeDefinitionNotExistsException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidCartridgeTypeException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> <xs:complexType name="NetworkPartitionAlreadyExistsException"> <xs:sequence></xs:sequence> </xs:complexType> @@ -788,12 +790,15 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> + <xs:complexType name="CartridgeAlreadyExistsException"> + <xs:sequence></xs:sequence> + </xs:complexType> <xs:complexType name="InvalidKubernetesClusterException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidClusterException"> + <xs:complexType name="UnregisteredClusterException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> @@ -803,11 +808,6 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="UnregisteredClusterException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> </xs:schema> <xs:schema xmlns:ax236="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:import> @@ -932,19 +932,37 @@ <xs:element minOccurs="0" name="ram" type="xs:int"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="ClusterContext"> + <xs:complexType name="CartridgeInfo"> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax227:AppType"></xs:element> + <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="category" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="kubernetesServices" nillable="true" type="xs:anyType"></xs:element> - <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element> - <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"></xs:element> - <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="loadBalancingIPType" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="metadataKeys" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="persistence" nillable="true" type="ax227:Persistence"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax227:PortMapping"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax230:Property"></xs:element> + <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="tenantPartitions" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> + <xs:complexType name="AppType"> + <xs:sequence> + <xs:element minOccurs="0" name="appSpecificMapping" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> + <xs:complexType name="Persistence"> + <xs:sequence> + <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"></xs:element> <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax227:Volume"></xs:element> </xs:sequence> </xs:complexType> @@ -960,6 +978,31 @@ <xs:element minOccurs="0" name="volumeId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> + <xs:complexType name="PortMapping"> + <xs:sequence> + <xs:element minOccurs="0" name="kubernetesServicePort" type="xs:int"></xs:element> + <xs:element minOccurs="0" name="kubernetesServicePortMapping" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="port" type="xs:int"></xs:element> + <xs:element minOccurs="0" name="protocol" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="proxyPort" type="xs:int"></xs:element> + </xs:sequence> + </xs:complexType> + <xs:complexType name="ClusterContext"> + <xs:sequence> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="kubernetesServices" nillable="true" type="xs:anyType"></xs:element> + <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element> + <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"></xs:element> + <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax227:Volume"></xs:element> + </xs:sequence> + </xs:complexType> <xs:complexType name="ApplicationClusterContext"> <xs:sequence> <xs:element minOccurs="0" name="autoscalePolicyName" nillable="true" type="xs:string"></xs:element> @@ -1056,54 +1099,12 @@ <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="Persistence"> - <xs:sequence> - <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax227:Volume"></xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="PortMapping"> - <xs:sequence> - <xs:element minOccurs="0" name="kubernetesServicePort" type="xs:int"></xs:element> - <xs:element minOccurs="0" name="kubernetesServicePortMapping" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="port" type="xs:int"></xs:element> - <xs:element minOccurs="0" name="protocol" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="proxyPort" type="xs:int"></xs:element> - </xs:sequence> - </xs:complexType> <xs:complexType name="NetworkPartition"> <xs:sequence> <xs:element minOccurs="0" name="activeByDefault" type="xs:boolean"></xs:element> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax227:Partition"></xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="CartridgeInfo"> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax227:AppType"></xs:element> - <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="category" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="loadBalancingIPType" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="metadataKeys" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="persistence" nillable="true" type="ax227:Persistence"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax227:PortMapping"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax230:Property"></xs:element> <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="tenantPartitions" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="AppType"> - <xs:sequence> - <xs:element minOccurs="0" name="appSpecificMapping" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="ServiceGroup"> @@ -1354,18 +1355,18 @@ <wsdl:message name="startInstanceResponse"> <wsdl:part name="parameters" element="ns:startInstanceResponse"></wsdl:part> </wsdl:message> - <wsdl:message name="terminateInstancesRequest"> - <wsdl:part name="parameters" element="ns:terminateInstances"></wsdl:part> - </wsdl:message> - <wsdl:message name="CloudControllerServiceInvalidClusterException"> - <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidClusterException"></wsdl:part> - </wsdl:message> <wsdl:message name="getNetworkPartitionRequest"> <wsdl:part name="parameters" element="ns:getNetworkPartition"></wsdl:part> </wsdl:message> <wsdl:message name="getNetworkPartitionResponse"> <wsdl:part name="parameters" element="ns:getNetworkPartitionResponse"></wsdl:part> </wsdl:message> + <wsdl:message name="terminateInstancesRequest"> + <wsdl:part name="parameters" element="ns:terminateInstances"></wsdl:part> + </wsdl:message> + <wsdl:message name="CloudControllerServiceInvalidClusterException"> + <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidClusterException"></wsdl:part> + </wsdl:message> <wsdl:message name="updateClusterStatusRequest"> <wsdl:part name="parameters" element="ns:updateClusterStatus"></wsdl:part> </wsdl:message> @@ -1399,18 +1400,18 @@ <wsdl:message name="removeCartridgeRequest"> <wsdl:part name="parameters" element="ns:removeCartridge"></wsdl:part> </wsdl:message> - <wsdl:message name="getNetworkPartitionsRequest"> - <wsdl:part name="parameters" element="ns:getNetworkPartitions"></wsdl:part> - </wsdl:message> - <wsdl:message name="getNetworkPartitionsResponse"> - <wsdl:part name="parameters" element="ns:getNetworkPartitionsResponse"></wsdl:part> - </wsdl:message> <wsdl:message name="addCartridgeRequest"> <wsdl:part name="parameters" element="ns:addCartridge"></wsdl:part> </wsdl:message> <wsdl:message name="CloudControllerServiceCartridgeAlreadyExistsException"> <wsdl:part name="parameters" element="ns:CloudControllerServiceCartridgeAlreadyExistsException"></wsdl:part> </wsdl:message> + <wsdl:message name="getNetworkPartitionsRequest"> + <wsdl:part name="parameters" element="ns:getNetworkPartitions"></wsdl:part> + </wsdl:message> + <wsdl:message name="getNetworkPartitionsResponse"> + <wsdl:part name="parameters" element="ns:getNetworkPartitionsResponse"></wsdl:part> + </wsdl:message> <wsdl:portType name="CloudControllerServicePortType"> <wsdl:operation name="getDeploymentPolicies"> <wsdl:input message="ns:getDeploymentPoliciesRequest" wsaw:Action="urn:getDeploymentPolicies"></wsdl:input> @@ -1571,14 +1572,14 @@ <wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:startInstanceCloudControllerServiceInvalidIaasProviderException"></wsdl:fault> <wsdl:fault message="ns:CloudControllerServiceCloudControllerException" name="CloudControllerServiceCloudControllerException" wsaw:Action="urn:startInstanceCloudControllerServiceCloudControllerException"></wsdl:fault> </wsdl:operation> - <wsdl:operation name="terminateInstances"> - <wsdl:input message="ns:terminateInstancesRequest" wsaw:Action="urn:terminateInstances"></wsdl:input> - <wsdl:fault message="ns:CloudControllerServiceInvalidClusterException" name="CloudControllerServiceInvalidClusterException" wsaw:Action="urn:terminateInstancesCloudControllerServiceInvalidClusterException"></wsdl:fault> - </wsdl:operation> <wsdl:operation name="getNetworkPartition"> <wsdl:input message="ns:getNetworkPartitionRequest" wsaw:Action="urn:getNetworkPartition"></wsdl:input> <wsdl:output message="ns:getNetworkPartitionResponse" wsaw:Action="urn:getNetworkPartitionResponse"></wsdl:output> </wsdl:operation> + <wsdl:operation name="terminateInstances"> + <wsdl:input message="ns:terminateInstancesRequest" wsaw:Action="urn:terminateInstances"></wsdl:input> + <wsdl:fault message="ns:CloudControllerServiceInvalidClusterException" name="CloudControllerServiceInvalidClusterException" wsaw:Action="urn:terminateInstancesCloudControllerServiceInvalidClusterException"></wsdl:fault> + </wsdl:operation> <wsdl:operation name="updateClusterStatus"> <wsdl:input message="ns:updateClusterStatusRequest" wsaw:Action="urn:updateClusterStatus"></wsdl:input> </wsdl:operation> @@ -1609,16 +1610,16 @@ <wsdl:input message="ns:removeCartridgeRequest" wsaw:Action="urn:removeCartridge"></wsdl:input> <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeTypeException" name="CloudControllerServiceInvalidCartridgeTypeException" wsaw:Action="urn:removeCartridgeCloudControllerServiceInvalidCartridgeTypeException"></wsdl:fault> </wsdl:operation> - <wsdl:operation name="getNetworkPartitions"> - <wsdl:input message="ns:getNetworkPartitionsRequest" wsaw:Action="urn:getNetworkPartitions"></wsdl:input> - <wsdl:output message="ns:getNetworkPartitionsResponse" wsaw:Action="urn:getNetworkPartitionsResponse"></wsdl:output> - </wsdl:operation> <wsdl:operation name="addCartridge"> <wsdl:input message="ns:addCartridgeRequest" wsaw:Action="urn:addCartridge"></wsdl:input> <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeDefinitionException" name="CloudControllerServiceInvalidCartridgeDefinitionException" wsaw:Action="urn:addCartridgeCloudControllerServiceInvalidCartridgeDefinitionException"></wsdl:fault> <wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:addCartridgeCloudControllerServiceInvalidIaasProviderException"></wsdl:fault> <wsdl:fault message="ns:CloudControllerServiceCartridgeAlreadyExistsException" name="CloudControllerServiceCartridgeAlreadyExistsException" wsaw:Action="urn:addCartridgeCloudControllerServiceCartridgeAlreadyExistsException"></wsdl:fault> </wsdl:operation> + <wsdl:operation name="getNetworkPartitions"> + <wsdl:input message="ns:getNetworkPartitionsRequest" wsaw:Action="urn:getNetworkPartitions"></wsdl:input> + <wsdl:output message="ns:getNetworkPartitionsResponse" wsaw:Action="urn:getNetworkPartitionsResponse"></wsdl:output> + </wsdl:operation> </wsdl:portType> <wsdl:binding name="CloudControllerServiceSoap11Binding" type="ns:CloudControllerServicePortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"></soap:binding> @@ -2003,15 +2004,6 @@ <soap:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getNetworkPartition"> - <soap:operation soapAction="urn:getNetworkPartition" style="document"></soap:operation> - <wsdl:input> - <soap:body use="literal"></soap:body> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"></soap:body> - </wsdl:output> - </wsdl:operation> <wsdl:operation name="terminateInstances"> <soap:operation soapAction="urn:terminateInstances" style="document"></soap:operation> <wsdl:input> @@ -2021,6 +2013,15 @@ <soap:fault use="literal" name="CloudControllerServiceInvalidClusterException"></soap:fault> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getNetworkPartition"> + <soap:operation soapAction="urn:getNetworkPartition" style="document"></soap:operation> + <wsdl:input> + <soap:body use="literal"></soap:body> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"></soap:body> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="getClusterContext"> <soap:operation soapAction="urn:getClusterContext" style="document"></soap:operation> <wsdl:input> @@ -2090,6 +2091,15 @@ <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap:fault> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getNetworkPartitions"> + <soap:operation soapAction="urn:getNetworkPartitions" style="document"></soap:operation> + <wsdl:input> + <soap:body use="literal"></soap:body> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"></soap:body> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="addCartridge"> <soap:operation soapAction="urn:addCartridge" style="document"></soap:operation> <wsdl:input> @@ -2105,15 +2115,6 @@ <soap:fault use="literal" name="CloudControllerServiceCartridgeAlreadyExistsException"></soap:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getNetworkPartitions"> - <soap:operation soapAction="urn:getNetworkPartitions" style="document"></soap:operation> - <wsdl:input> - <soap:body use="literal"></soap:body> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"></soap:body> - </wsdl:output> - </wsdl:operation> </wsdl:binding> <wsdl:binding name="CloudControllerServiceSoap12Binding" type="ns:CloudControllerServicePortType"> <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"></soap12:binding> @@ -2498,15 +2499,6 @@ <soap12:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap12:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getNetworkPartition"> - <soap12:operation soapAction="urn:getNetworkPartition" style="document"></soap12:operation> - <wsdl:input> - <soap12:body use="literal"></soap12:body> - </wsdl:input> - <wsdl:output> - <soap12:body use="literal"></soap12:body> - </wsdl:output> - </wsdl:operation> <wsdl:operation name="terminateInstances"> <soap12:operation soapAction="urn:terminateInstances" style="document"></soap12:operation> <wsdl:input> @@ -2516,6 +2508,15 @@ <soap12:fault use="literal" name="CloudControllerServiceInvalidClusterException"></soap12:fault> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getNetworkPartition"> + <soap12:operation soapAction="urn:getNetworkPartition" style="document"></soap12:operation> + <wsdl:input> + <soap12:body use="literal"></soap12:body> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal"></soap12:body> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="getClusterContext"> <soap12:operation soapAction="urn:getClusterContext" style="document"></soap12:operation> <wsdl:input> @@ -2585,6 +2586,15 @@ <soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap12:fault> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getNetworkPartitions"> + <soap12:operation soapAction="urn:getNetworkPartitions" style="document"></soap12:operation> + <wsdl:input> + <soap12:body use="literal"></soap12:body> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal"></soap12:body> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="addCartridge"> <soap12:operation soapAction="urn:addCartridge" style="document"></soap12:operation> <wsdl:input> @@ -2600,15 +2610,6 @@ <soap12:fault use="literal" name="CloudControllerServiceCartridgeAlreadyExistsException"></soap12:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getNetworkPartitions"> - <soap12:operation soapAction="urn:getNetworkPartitions" style="document"></soap12:operation> - <wsdl:input> - <soap12:body use="literal"></soap12:body> - </wsdl:input> - <wsdl:output> - <soap12:body use="literal"></soap12:body> - </wsdl:output> - </wsdl:operation> </wsdl:binding> <wsdl:binding name="CloudControllerServiceHttpBinding" type="ns:CloudControllerServicePortType"> <http:binding verb="POST"></http:binding> @@ -2867,6 +2868,12 @@ <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:output> </wsdl:operation> + <wsdl:operation name="terminateInstances"> + <http:operation location="terminateInstances"></http:operation> + <wsdl:input> + <mime:content type="text/xml" part="parameters"></mime:content> + </wsdl:input> + </wsdl:operation> <wsdl:operation name="getNetworkPartition"> <http:operation location="getNetworkPartition"></http:operation> <wsdl:input> @@ -2876,12 +2883,6 @@ <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:output> </wsdl:operation> - <wsdl:operation name="terminateInstances"> - <http:operation location="terminateInstances"></http:operation> - <wsdl:input> - <mime:content type="text/xml" part="parameters"></mime:content> - </wsdl:input> - </wsdl:operation> <wsdl:operation name="getClusterContext"> <http:operation location="getClusterContext"></http:operation> <wsdl:input> @@ -2933,12 +2934,6 @@ <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:input> </wsdl:operation> - <wsdl:operation name="addCartridge"> - <http:operation location="addCartridge"></http:operation> - <wsdl:input> - <mime:content type="text/xml" part="parameters"></mime:content> - </wsdl:input> - </wsdl:operation> <wsdl:operation name="getNetworkPartitions"> <http:operation location="getNetworkPartitions"></http:operation> <wsdl:input> @@ -2948,6 +2943,12 @@ <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:output> </wsdl:operation> + <wsdl:operation name="addCartridge"> + <http:operation location="addCartridge"></http:operation> + <wsdl:input> + <mime:content type="text/xml" part="parameters"></mime:content> + </wsdl:input> + </wsdl:operation> </wsdl:binding> <wsdl:service name="CloudControllerService"> <wsdl:port name="CloudControllerServiceHttpSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding">
