You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/03/01 19:35:33 UTC
[12/50] [abbrv] stratos git commit: fixing conflicts
fixing conflicts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7cc23ffc
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7cc23ffc
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7cc23ffc
Branch: refs/heads/docker-grouping-merge
Commit: 7cc23ffc866625a3605df41eec67272cc639d1c6
Parents: b724ac2 a2d11ad
Author: R-Rajkumar <rr...@gmail.com>
Authored: Fri Feb 27 20:11:33 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Fri Feb 27 20:11:33 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/cli/StratosApplication.java | 1 +
.../main/resources/CloudControllerService.wsdl | 412 +++++++++----------
2 files changed, 207 insertions(+), 206 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7cc23ffc/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
index ca696a8,7d9c9be..532f043
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
@@@ -231,11 -231,6 +231,12 @@@ public class StratosApplication extend
command = new ListPartialSearchTenantsCommand();
commands.put(command.getName(),command);
+ command = new DescribeApplicationSignupCommand();
+ commands.put(command.getName(),command);
+
+ command = new DeleteApplicationSignupCommand();
+ commands.put(command.getName(),command);
++
command = new AddDeploymentPolicyCommand();
commands.put(command.getName(), command);
http://git-wip-us.apache.org/repos/asf/stratos/blob/7cc23ffc/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
----------------------------------------------------------------------
diff --cc service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
index 2f95914,12949c2..499d49c
--- 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
@@@ -231,10 -211,87 +231,87 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateKubernetesMaster">
++ <xs:element name="CloudControllerServiceInvalidServiceGroupException">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax228:KubernetesMaster"></xs:element>
++ <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax222:InvalidServiceGroupException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="updateKubernetesMasterResponse">
++ <xs:element name="getServiceGroupSubGroups">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
++ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="CloudControllerServiceNonExistingKubernetesHostException">
++ <xs:element name="getServiceGroupSubGroupsResponse">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="NonExistingKubernetesHostException" nillable="true" type="ax222:NonExistingKubernetesHostException"></xs:element>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="updateKubernetesHost">
++ <xs:element name="getServiceGroupCartridges">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax228:KubernetesHost"></xs:element>
++ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="updateKubernetesHostResponse">
++ <xs:element name="getServiceGroupCartridgesResponse">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="CloudControllerServiceInvalidKubernetesClusterException">
++ <xs:element name="getServiceGroupDependencies">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="InvalidKubernetesClusterException" nillable="true" type="ax222:InvalidKubernetesClusterException"></xs:element>
++ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="addKubernetesCluster">
++ <xs:element name="getServiceGroupDependenciesResponse">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax228:KubernetesCluster"></xs:element>
++ <xs:element minOccurs="0" name="return" nillable="true" type="ax224:Dependencies"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="addKubernetesClusterResponse">
++ <xs:element name="CloudControllerServiceInvalidIaasProviderException">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
++ <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax222:InvalidIaasProviderException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="getKubernetesCluster">
++ <xs:element name="CloudControllerServiceCloudControllerException">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
++ <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax222:CloudControllerException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="getKubernetesClusterResponse">
++ <xs:element name="startInstances">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax228:KubernetesCluster"></xs:element>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="instanceContexts" nillable="true" type="ax224:InstanceContext"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="removeKubernetesCluster">
++ <xs:element name="startInstancesResponse">
+ <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="ax224:MemberContext"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="removeKubernetesClusterResponse">
+ <xs:element name="getDeploymentPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -264,17 -323,10 +341,10 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceInvalidIaasProviderException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax222:InvalidIaasProviderException"></xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getServiceGroupSubGroupsResponse">
+ <xs:element name="CloudControllerServiceCartridgeDefinitionNotExistsException">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="CartridgeDefinitionNotExistsException" nillable="true" type="ax222:CartridgeDefinitionNotExistsException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -520,17 -576,10 +590,10 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceCloudControllerException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax222:CloudControllerException"></xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="removeDeployementPolicy">
+ <xs:element name="terminateInstance">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -618,10 -604,24 +618,10 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="unregisterService">
+ <xs:element name="startInstanceResponse">
<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="ax224:MemberContext"></xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="CloudControllerServiceInvalidMemberException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax222:InvalidMemberException"></xs:element>
- </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:element>
++ <xs:element minOccurs="0" name="return" nillable="true" type="ax224:MemberContext"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -728,16 -740,22 +728,16 @@@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="NonExistingKubernetesMasterException">
- <xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
- </xs:sequence>
+ <xs:complexType name="DeploymentPolicyAlreadyExistsException">
+ <xs:sequence></xs:sequence>
</xs:complexType>
- <xs:complexType name="NonExistingKubernetesHostException">
- <xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
- </xs:sequence>
+ <xs:complexType name="InvalidDeploymentPolicyException">
+ <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 name="DeploymentPolicyNotExistsException">
+ <xs:sequence></xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidCartridgeDefinitionException">
+ <xs:complexType name="InvalidServiceGroupException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
@@@ -747,7 -765,19 +747,19 @@@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="CloudControllerException">
+ <xs:complexContent>
+ <xs:extension base="xs:RuntimeException">
+ <xs:sequence></xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
- <xs:complexType name="InvalidClusterException">
++ <xs:complexType name="InvalidCartridgeDefinitionException">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
- <xs:complexType name="InvalidPartitionException">
+ <xs:complexType name="CartridgeDefinitionNotExistsException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
@@@ -791,23 -808,6 +803,11 @@@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="CloudControllerException">
- <xs:complexContent>
- <xs:extension base="xs:RuntimeException">
- <xs:sequence></xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="InvalidServiceGroupException">
- <xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
- </xs:sequence>
- </xs:complexType>
+ <xs:complexType name="UnregisteredClusterException">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.common.stratos.apache.org/xsd">
<xs:complexType name="NameValuePair">
@@@ -931,57 -993,66 +931,114 @@@
<xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></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="ax225: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="ax224: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>
+ <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="dependencyClusterIds" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax225:Properties"></xs:element>
+ <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="DeploymentPolicy">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionsRef" nillable="true" type="ax224:NetworkPartitionRef"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="NetworkPartitionRef">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax224:PartitionRef"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="PartitionRef">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="max" type="xs:int"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Dependencies">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrders" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="InstanceContext">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="clusterInstanceId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="initTime" type="xs:long"></xs:element>
+ <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"></xs:element>
+ <xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
++ <xs:element minOccurs="0" name="properties" nillable="true" type="ax225:Properties"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="MemberContext">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="allocatedIPs" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="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="clusterInstanceId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="defaultPrivateIP" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="defaultPublicIP" nillable="true" type="xs:string"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="dynamicPayload" nillable="true" type="ax232:NameValuePair"></xs:element>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="dynamicPayload" nillable="true" type="ax233:NameValuePair"></xs:element>
+ <xs:element minOccurs="0" name="initTime" type="xs:long"></xs:element>
+ <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="instanceMetadata" nillable="true" type="ax224:InstanceMetadata"></xs:element>
+ <xs:element minOccurs="0" name="kubernetesPodId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="kubernetesPodName" nillable="true" type="xs:string"></xs:element>
++ <xs:element minOccurs="0" name="kubernetesPodLabel" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"></xs:element>
+ <xs:element minOccurs="0" name="obsoleteInitTime" type="xs:long"></xs:element>
+ <xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="privateIPs" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
++ <xs:element minOccurs="0" name="properties" nillable="true" type="ax225:Properties"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="publicIPs" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="InstanceMetadata">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="hostname" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="hypervisor" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="loginPort" type="xs:int"></xs:element>
+ <xs:element minOccurs="0" name="operatingSystem64bit" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="operatingSystemArchitecture" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="operatingSystemName" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="operatingSystemVersion" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="ram" type="xs:int"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
- <xs:complexType name="CartridgeInfo">
+ <xs:complexType name="CartridgeConfig">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax224: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 minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"></xs:element>
@@@ -1007,110 -1075,42 +1064,53 @@@
<xs:element minOccurs="0" name="version" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="AppType">
+ <xs:complexType name="IaasConfig">
<xs:sequence>
- <xs:element minOccurs="0" name="appSpecificMapping" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="className" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="credential" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="identity" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax224:NetworkInterfaces"></xs:element>
+ <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"></xs:element>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax225:Properties"></xs:element>
+ <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ClusterContext">
+ <xs:complexType name="NetworkInterfaces">
<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="ax226: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="ax224:Volume"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax224:NetworkInterface"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="NetworkInterface">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="fixedIp" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="floatingNetworks" nillable="true" type="ax224:FloatingNetworks"></xs:element>
+ <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="portUuid" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="FloatingNetworks">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="floatingNetworks" nillable="true" type="ax224:FloatingNetwork"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="FloatingNetwork">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="floatingIP" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ApplicationClusterContext">
+ <xs:complexType name="NetworkPartition">
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalePolicyName" 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="dependencyClusterIds" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
- <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"></xs:element>
+ <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 minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax224:Partition"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InstanceContext">
- <xs:sequence>
- <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="clusterInstanceId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="initTime" type="xs:long"></xs:element>
- <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"></xs:element>
- <xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax225:Properties"></xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="MemberContext">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="allocatedIPs" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="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="clusterInstanceId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="defaultPrivateIP" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="defaultPublicIP" nillable="true" type="xs:string"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="dynamicPayload" nillable="true" type="ax233:NameValuePair"></xs:element>
- <xs:element minOccurs="0" name="initTime" type="xs:long"></xs:element>
- <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="instanceMetadata" nillable="true" type="ax224:InstanceMetadata"></xs:element>
- <xs:element minOccurs="0" name="kubernetesPodId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="kubernetesPodLabel" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"></xs:element>
- <xs:element minOccurs="0" name="obsoleteInitTime" type="xs:long"></xs:element>
- <xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="privateIPs" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax225:Properties"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="publicIPs" nillable="true" type="xs:string"></xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="InstanceMetadata">
- <xs:sequence>
- <xs:element minOccurs="0" name="hostname" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="hypervisor" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="loginPort" type="xs:int"></xs:element>
- <xs:element minOccurs="0" name="operatingSystem64bit" type="xs:boolean"></xs:element>
- <xs:element minOccurs="0" name="operatingSystemArchitecture" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="operatingSystemName" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="operatingSystemVersion" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="ram" type="xs:int"></xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="Dependencies">
- <xs:sequence>
- <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrders" nillable="true" type="xs:string"></xs:element>
- </xs:sequence>
- </xs:complexType>
<xs:complexType name="ServiceGroup">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"></xs:element>
@@@ -1335,24 -1335,24 +1335,24 @@@
<wsdl:message name="getMasterForKubernetesClusterResponse">
<wsdl:part name="parameters" element="ns:getMasterForKubernetesClusterResponse"></wsdl:part>
</wsdl:message>
-- <wsdl:message name="startInstancesRequest">
-- <wsdl:part name="parameters" element="ns:startInstances"></wsdl:part>
-- </wsdl:message>
-- <wsdl:message name="startInstancesResponse">
-- <wsdl:part name="parameters" element="ns:startInstancesResponse"></wsdl:part>
-- </wsdl:message>
-- <wsdl:message name="CloudControllerServiceInvalidIaasProviderException">
-- <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidIaasProviderException"></wsdl:part>
-- </wsdl:message>
<wsdl:message name="updateCartridgeRequest">
<wsdl:part name="parameters" element="ns:updateCartridge"></wsdl:part>
</wsdl:message>
<wsdl:message name="CloudControllerServiceInvalidCartridgeDefinitionException">
<wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidCartridgeDefinitionException"></wsdl:part>
</wsdl:message>
++ <wsdl:message name="CloudControllerServiceInvalidIaasProviderException">
++ <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidIaasProviderException"></wsdl:part>
++ </wsdl:message>
<wsdl:message name="CloudControllerServiceCartridgeDefinitionNotExistsException">
<wsdl:part name="parameters" element="ns:CloudControllerServiceCartridgeDefinitionNotExistsException"></wsdl:part>
</wsdl:message>
++ <wsdl:message name="startInstancesRequest">
++ <wsdl:part name="parameters" element="ns:startInstances"></wsdl:part>
++ </wsdl:message>
++ <wsdl:message name="startInstancesResponse">
++ <wsdl:part name="parameters" element="ns:startInstancesResponse"></wsdl:part>
++ </wsdl:message>
<wsdl:message name="startInstanceRequest">
<wsdl:part name="parameters" element="ns:startInstance"></wsdl:part>
</wsdl:message>
@@@ -1556,6 -1556,6 +1556,12 @@@
<wsdl:output message="ns:getMasterForKubernetesClusterResponse" wsaw:Action="urn:getMasterForKubernetesClusterResponse"></wsdl:output>
<wsdl:fault message="ns:CloudControllerServiceNonExistingKubernetesClusterException" name="CloudControllerServiceNonExistingKubernetesClusterException" wsaw:Action="urn:getMasterForKubernetesClusterCloudControllerServiceNonExistingKubernetesClusterException"></wsdl:fault>
</wsdl:operation>
++ <wsdl:operation name="updateCartridge">
++ <wsdl:input message="ns:updateCartridgeRequest" wsaw:Action="urn:updateCartridge"></wsdl:input>
++ <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeDefinitionException" name="CloudControllerServiceInvalidCartridgeDefinitionException" wsaw:Action="urn:updateCartridgeCloudControllerServiceInvalidCartridgeDefinitionException"></wsdl:fault>
++ <wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:updateCartridgeCloudControllerServiceInvalidIaasProviderException"></wsdl:fault>
++ <wsdl:fault message="ns:CloudControllerServiceCartridgeDefinitionNotExistsException" name="CloudControllerServiceCartridgeDefinitionNotExistsException" wsaw:Action="urn:updateCartridgeCloudControllerServiceCartridgeDefinitionNotExistsException"></wsdl:fault>
++ </wsdl:operation>
<wsdl:operation name="startInstances">
<wsdl:input message="ns:startInstancesRequest" wsaw:Action="urn:startInstances"></wsdl:input>
<wsdl:output message="ns:startInstancesResponse" wsaw:Action="urn:startInstancesResponse"></wsdl:output>
@@@ -1563,12 -1563,12 +1569,6 @@@
<wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:startInstancesCloudControllerServiceInvalidIaasProviderException"></wsdl:fault>
<wsdl:fault message="ns:CloudControllerServiceCloudControllerException" name="CloudControllerServiceCloudControllerException" wsaw:Action="urn:startInstancesCloudControllerServiceCloudControllerException"></wsdl:fault>
</wsdl:operation>
-- <wsdl:operation name="updateCartridge">
-- <wsdl:input message="ns:updateCartridgeRequest" wsaw:Action="urn:updateCartridge"></wsdl:input>
-- <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeDefinitionException" name="CloudControllerServiceInvalidCartridgeDefinitionException" wsaw:Action="urn:updateCartridgeCloudControllerServiceInvalidCartridgeDefinitionException"></wsdl:fault>
-- <wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:updateCartridgeCloudControllerServiceInvalidIaasProviderException"></wsdl:fault>
-- <wsdl:fault message="ns:CloudControllerServiceCartridgeDefinitionNotExistsException" name="CloudControllerServiceCartridgeDefinitionNotExistsException" wsaw:Action="urn:updateCartridgeCloudControllerServiceCartridgeDefinitionNotExistsException"></wsdl:fault>
-- </wsdl:operation>
<wsdl:operation name="startInstance">
<wsdl:input message="ns:startInstanceRequest" wsaw:Action="urn:startInstance"></wsdl:input>
<wsdl:output message="ns:startInstanceResponse" wsaw:Action="urn:startInstanceResponse"></wsdl:output>
@@@ -1957,21 -1957,21 +1957,6 @@@
<soap:fault use="literal" name="CloudControllerServiceNonExistingKubernetesClusterException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
-- <wsdl:operation name="updateCartridge">
-- <soap:operation soapAction="urn:updateCartridge" style="document"></soap:operation>
-- <wsdl:input>
-- <soap:body use="literal"></soap:body>
-- </wsdl:input>
-- <wsdl:fault name="CloudControllerServiceCartridgeDefinitionNotExistsException">
-- <soap:fault use="literal" name="CloudControllerServiceCartridgeDefinitionNotExistsException"></soap:fault>
-- </wsdl:fault>
-- <wsdl:fault name="CloudControllerServiceInvalidCartridgeDefinitionException">
-- <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeDefinitionException"></soap:fault>
-- </wsdl:fault>
-- <wsdl:fault name="CloudControllerServiceInvalidIaasProviderException">
-- <soap:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap:fault>
-- </wsdl:fault>
-- </wsdl:operation>
<wsdl:operation name="startInstances">
<soap:operation soapAction="urn:startInstances" style="document"></soap:operation>
<wsdl:input>
@@@ -1990,6 -1990,6 +1975,21 @@@
<soap:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
++ <wsdl:operation name="updateCartridge">
++ <soap:operation soapAction="urn:updateCartridge" style="document"></soap:operation>
++ <wsdl:input>
++ <soap:body use="literal"></soap:body>
++ </wsdl:input>
++ <wsdl:fault name="CloudControllerServiceCartridgeDefinitionNotExistsException">
++ <soap:fault use="literal" name="CloudControllerServiceCartridgeDefinitionNotExistsException"></soap:fault>
++ </wsdl:fault>
++ <wsdl:fault name="CloudControllerServiceInvalidCartridgeDefinitionException">
++ <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeDefinitionException"></soap:fault>
++ </wsdl:fault>
++ <wsdl:fault name="CloudControllerServiceInvalidIaasProviderException">
++ <soap:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap:fault>
++ </wsdl:fault>
++ </wsdl:operation>
<wsdl:operation name="startInstance">
<soap:operation soapAction="urn:startInstance" style="document"></soap:operation>
<wsdl:input>
@@@ -2452,21 -2452,21 +2452,6 @@@
<soap12:fault use="literal" name="CloudControllerServiceNonExistingKubernetesClusterException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
-- <wsdl:operation name="updateCartridge">
-- <soap12:operation soapAction="urn:updateCartridge" style="document"></soap12:operation>
-- <wsdl:input>
-- <soap12:body use="literal"></soap12:body>
-- </wsdl:input>
-- <wsdl:fault name="CloudControllerServiceCartridgeDefinitionNotExistsException">
-- <soap12:fault use="literal" name="CloudControllerServiceCartridgeDefinitionNotExistsException"></soap12:fault>
-- </wsdl:fault>
-- <wsdl:fault name="CloudControllerServiceInvalidCartridgeDefinitionException">
-- <soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeDefinitionException"></soap12:fault>
-- </wsdl:fault>
-- <wsdl:fault name="CloudControllerServiceInvalidIaasProviderException">
-- <soap12:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap12:fault>
-- </wsdl:fault>
-- </wsdl:operation>
<wsdl:operation name="startInstances">
<soap12:operation soapAction="urn:startInstances" style="document"></soap12:operation>
<wsdl:input>
@@@ -2485,6 -2485,6 +2470,21 @@@
<soap12:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
++ <wsdl:operation name="updateCartridge">
++ <soap12:operation soapAction="urn:updateCartridge" style="document"></soap12:operation>
++ <wsdl:input>
++ <soap12:body use="literal"></soap12:body>
++ </wsdl:input>
++ <wsdl:fault name="CloudControllerServiceCartridgeDefinitionNotExistsException">
++ <soap12:fault use="literal" name="CloudControllerServiceCartridgeDefinitionNotExistsException"></soap12:fault>
++ </wsdl:fault>
++ <wsdl:fault name="CloudControllerServiceInvalidCartridgeDefinitionException">
++ <soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeDefinitionException"></soap12:fault>
++ </wsdl:fault>
++ <wsdl:fault name="CloudControllerServiceInvalidIaasProviderException">
++ <soap12:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap12:fault>
++ </wsdl:fault>
++ </wsdl:operation>
<wsdl:operation name="startInstance">
<soap12:operation soapAction="urn:startInstance" style="document"></soap12:operation>
<wsdl:input>
@@@ -2848,12 -2848,12 +2848,6 @@@
<mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
-- <wsdl:operation name="updateCartridge">
-- <http:operation location="updateCartridge"></http:operation>
-- <wsdl:input>
-- <mime:content type="text/xml" part="parameters"></mime:content>
-- </wsdl:input>
-- </wsdl:operation>
<wsdl:operation name="startInstances">
<http:operation location="startInstances"></http:operation>
<wsdl:input>
@@@ -2863,6 -2863,6 +2857,12 @@@
<mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
++ <wsdl:operation name="updateCartridge">
++ <http:operation location="updateCartridge"></http:operation>
++ <wsdl:input>
++ <mime:content type="text/xml" part="parameters"></mime:content>
++ </wsdl:input>
++ </wsdl:operation>
<wsdl:operation name="startInstance">
<http:operation location="startInstance"></http:operation>
<wsdl:input>