You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2014/09/26 11:48:26 UTC
[50/50] [abbrv] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Fixed merge conflits
Conflicts:
components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
tools/stratos-installer/setup.sh
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f010309c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f010309c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f010309c
Branch: refs/heads/master
Commit: f010309c7e9e6399b66d7c1ec099011411080d83
Parents: 5e2eed6 6ba4fae
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Fri Sep 26 09:07:03 2014 +0000
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Fri Sep 26 09:07:03 2014 +0000
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 2 -
.../common/constants/StratosConstants.java | 9 +-
.../bean/util/converter/PojoConverter.java | 19 +-
.../rest/endpoint/services/ServiceUtils.java | 2 -
.../src/main/resources/AutoScalerService.wsdl | 384 +++++++++----------
.../main/resources/CloudControllerService.wsdl | 292 +++++++-------
6 files changed, 346 insertions(+), 362 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f010309c/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f010309c/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
index 8b940b2,73b9b24..1e36c15
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
@@@ -140,19 -140,7 +140,20 @@@ public class StratosConstants
public static final String EMAIL_CONFIG= "email";
public static final String MULTITENANCY_CONFIG_FOLDER = "multitenancy";
+ // Cloud controller - payload
+ public static final String MEMBER_ID= "MEMBER_ID";
+ public static final String LB_CLUSTER_ID= "LB_CLUSTER_ID";
+ public static final String NETWORK_PARTITION_ID= "NETWORK_PARTITION_ID";
-
-
-
++
+ // Kubernetes related constants
+ public static final String KUBERNETES_CLUSTER_ID = "KUBERNETES_CLUSTER_ID";
+ public static final String KUBERNETES_DEPLOYER_TYPE = "kubernetes";
+ public static final String KUBERNETES_MASTER_IP = "KUBERNETES_MASTER_IP";
+ public static final String KUBERNETES_MIN_REPLICAS = "KUBERNETES_REPLICAS_MIN";
+ public static final String KUBERNETES_PORT_RANGE = "KUBERNETES_PORT_RANGE";
+ public static final String ALLOCATED_SERVICE_HOST_PORT = "ALLOCATED_SERVICE_HOST_PORT";
-
++
+ // Policy and definition related constants
+ public static final int PUBLIC_DEFINITION = 0;
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f010309c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
index 5477fff,f717972..82b1bbc
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
@@@ -632,14 -582,7 +625,8 @@@ public class PojoConverter
}
partitionGroupsBeans = new PartitionGroup[partitionGroups.length];
- for (int i = 0; i < partitionGroups.length; i++) {
- /*PartitionGroup partitionGroup = new PartitionGroup();
- partitionGroup.id = partitionGroups[i].getId();
- partitionGroup.partitionAlgo = partitionGroups[i].getPartitionAlgo();
-
- if(partitionGroups[i].getPartitions() != null && partitionGroups[i].getPartitions().length > 0){
- partitionGroup.partition = getPartitionList(partitionGroups[i].getPartitions());
- }*/
++
+ for (int i = 0 ; i < partitionGroups.length ; i ++) {
partitionGroupsBeans[i] = populatePartitionGroupPojo(partitionGroups[i]);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f010309c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
index 08e3334,d1ea6b9..ef1157b
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
@@@ -73,14 -64,10 +73,12 @@@ import org.apache.stratos.rest.endpoint
import org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDomainBean;
import org.apache.stratos.rest.endpoint.bean.util.converter.PojoConverter;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
-
+import org.wso2.carbon.context.CarbonContext;
+import org.wso2.carbon.user.api.UserRealm;
+import org.wso2.carbon.user.api.UserStoreException;
+import org.wso2.carbon.user.api.UserStoreManager;
-
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
--
import java.rmi.RemoteException;
import java.util.*;
import java.util.regex.Pattern;
http://git-wip-us.apache.org/repos/asf/stratos/blob/f010309c/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
----------------------------------------------------------------------
diff --cc service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
index 718ac98,82e287b..b2a93a8
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
@@@ -1,7 -1,8 +1,7 @@@
- <?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://api.autoscaler.stratos.apache.org" xmlns:ax27="http://partition.autoscaler.stratos.apache.org/xsd" xmlns:ax25="http://policy.deployment.autoscaler.stratos.apache.org/xsd" xmlns:ax21="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd" xmlns:ax216="http://kubernetes.common.stratos.apache.org/xsd" xmlns:ax22="http://pojo.stub.controller.cloud.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax214="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax212="http://model.policy.autoscaler.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNa
mespace="http://api.autoscaler.stratos.apache.org">
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://api.autoscaler.stratos.apache.org" xmlns:ax28="http://partition.autoscaler.stratos.apache.org/xsd" xmlns:ax25="http://pojo.stub.controller.cloud.stratos.apache.org/xsd" xmlns:ax23="http://policy.deployment.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd" xmlns:ax216="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax214="http://model.policy.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://api.autoscaler.stratos.apache.org">
- <wsdl:documentation>AutoScalerService</wsdl:documentation>
++<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax29="http://partition.autoscaler.stratos.apache.org/xsd" xmlns:ns="http://api.autoscaler.stratos.apache.org" xmlns:ax27="http://policy.deployment.autoscaler.stratos.apache.org/xsd" xmlns:ax23="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd" xmlns:ax24="http://pojo.stub.controller.cloud.stratos.apache.org/xsd" xmlns:ax21="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax215="http://kubernetes.common.stratos.apache.org/xsd" xmlns:ax213="http://model.policy.autoscaler.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNam
espace="http://api.autoscaler.stratos.apache.org">
<wsdl:types>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.autoscaler.stratos.apache.org/xsd">
- <xs:complexType name="NonExistingLBException">
+ <xs:complexType name="InvalidPartitionException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
@@@ -50,7 -21,7 +50,7 @@@
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.stub.controller.cloud.stratos.apache.org/xsd">
<xs:complexType name="Properties">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax22:Property"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax25:Property"/>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax24:Property"/>
<xs:element minOccurs="0" name="propertiesSpecified" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
@@@ -63,218 -34,53 +63,140 @@@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax217="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax215="http://model.policy.autoscaler.stratos.apache.org/xsd" xmlns:ax212="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd" xmlns:ax213="http://partition.autoscaler.stratos.apache.org/xsd" xmlns:ax211="http://policy.deployment.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.autoscaler.stratos.apache.org">
- <xs:import namespace="http://policy.deployment.autoscaler.stratos.apache.org/xsd"/>
+ <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://kubernetes.common.stratos.apache.org/xsd">
+ <xs:complexType name="KubernetesGroup">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="kubernetesHosts" nillable="true" type="ax216:KubernetesHost"/>
- <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax216:KubernetesMaster"/>
- <xs:element minOccurs="0" name="portRange" nillable="true" type="ax216:PortRange"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax216:Properties"/>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="kubernetesHosts" nillable="true" type="ax215:KubernetesHost"/>
++ <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax215:KubernetesMaster"/>
++ <xs:element minOccurs="0" name="portRange" nillable="true" type="ax215:PortRange"/>
++ <xs:element minOccurs="0" name="properties" nillable="true" type="ax215:Properties"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="KubernetesHost">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="hostId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="hostIpAddress" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="hostname" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax216:Properties"/>
++ <xs:element minOccurs="0" name="properties" nillable="true" type="ax215:Properties"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Properties">
+ <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax216:Property"/>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax215:Property"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Property">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="KubernetesMaster">
+ <xs:complexContent>
- <xs:extension base="ax216:KubernetesHost">
++ <xs:extension base="ax215:KubernetesHost">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="endpoint" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="PortRange">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="lower" type="xs:int"/>
+ <xs:element minOccurs="0" name="upper" type="xs:int"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
- <xs:schema xmlns:ax24="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd" xmlns:ax217="http://kubernetes.common.stratos.apache.org/xsd" xmlns:ax215="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax213="http://model.policy.autoscaler.stratos.apache.org/xsd" xmlns:ax210="http://policy.deployment.autoscaler.stratos.apache.org/xsd" xmlns:ax211="http://partition.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.autoscaler.stratos.apache.org">
++ <xs:schema xmlns:ax26="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd" xmlns:ax217="http://partition.autoscaler.stratos.apache.org/xsd" xmlns:ax216="http://kubernetes.common.stratos.apache.org/xsd" xmlns:ax22="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax214="http://model.policy.autoscaler.stratos.apache.org/xsd" xmlns:ax212="http://policy.deployment.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.autoscaler.stratos.apache.org">
++ <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"/>
- <xs:import namespace="http://partition.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://policy.deployment.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://partition.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://model.policy.autoscaler.stratos.apache.org/xsd"/>
-- <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/>
- <xs:element name="getValidDeploymentPoliciesforCartridge">
+ <xs:import namespace="http://kubernetes.common.stratos.apache.org/xsd"/>
- <xs:element name="getPartition">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="partitionId" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getPartitionResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax24:Partition"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getDeploymentPolicy">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getDeploymentPolicyResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getPartitionGroups">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getPartitionGroupsResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:PartitionGroup"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getAllAvailablePartitions">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getAllAvailablePartitionsResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getAllDeploymentPolicies">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getAllDeploymentPoliciesResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getAllAutoScalingPolicy">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getAllAutoScalingPolicyResponse">
++ <xs:import namespace="http://partition.autoscaler.stratos.apache.org/xsd"/>
++ <xs:element name="AutoScalerServiceInvalidPartitionException">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"/>
- <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
++ <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax21:InvalidPartitionException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getValidDeploymentPoliciesforCartridge">
- <xs:element name="getValidDeploymentPoliciesforCartridgeResponse">
++ <xs:element name="addPartition">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"/>
++ <xs:element minOccurs="0" name="partition" nillable="true" type="ax26:Partition"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getValidDeploymentPoliciesforCartridgeResponse">
- <xs:element name="getServiceLBClusterId">
++ <xs:element name="addPartitionResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"/>
- <xs:element minOccurs="0" name="serviceType" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/>
++ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoScalerServiceInvalidPartitionException">
- <xs:element name="getServiceLBClusterIdResponse">
++ <xs:element name="AutoScalerServiceInvalidPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax214:InvalidPartitionException"/>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
++ <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax21:InvalidPolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addPartition">
- <xs:element name="getPartitionsOfGroup">
++ <xs:element name="addDeploymentPolicy">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="partition" nillable="true" type="ax24:Partition"/>
++ <xs:element minOccurs="0" name="depPolicy" nillable="true" type="ax27:DeploymentPolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="addPartitionResponse">
++ <xs:element name="addDeploymentPolicyResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="AutoScalerServiceInvalidPolicyException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax214:InvalidPolicyException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="addDeploymentPolicy">
++ <xs:element name="addAutoScalingPolicy">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="depPolicy" nillable="true" type="ax25:DeploymentPolicy"/>
++ <xs:element minOccurs="0" name="aspolicy" nillable="true" type="ax214:AutoscalePolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="addDeploymentPolicyResponse">
++ <xs:element name="addAutoScalingPolicyResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="addAutoScalingPolicy">
++ <xs:element name="getDeploymentPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="aspolicy" nillable="true" type="ax212:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addAutoScalingPolicyResponse">
- <xs:element name="getPartitionsOfGroupResponse">
++ <xs:element name="getDeploymentPolicyResponse">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
++ <xs:element minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getAutoscalingPolicy">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getAutoscalingPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"/>
++ <xs:element minOccurs="0" name="return" nillable="true" type="ax214:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -288,26 -94,21 +210,26 @@@
<xs:element name="getPartitionsOfDeploymentPolicyResponse">
<xs:complexType>
<xs:sequence>
-- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"/>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:Partition"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getPartitionGroups">
+ <xs:element name="getAllKubernetesGroups">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getAllKubernetesGroupsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax217:KubernetesGroup"/>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax216:KubernetesGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getPartitionGroupsResponse">
+ <xs:element name="AutoScalerServiceNonExistingKubernetesGroupException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="NonExistingKubernetesGroupException" nillable="true" type="ax214:NonExistingKubernetesGroupException"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax28:PartitionGroup"/>
++ <xs:element minOccurs="0" name="NonExistingKubernetesGroupException" nillable="true" type="ax21:NonExistingKubernetesGroupException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -318,10 -119,10 +240,10 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getPartitionResponse">
+ <xs:element name="getKubernetesGroupResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax217:KubernetesGroup"/>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax24:Partition"/>
++ <xs:element minOccurs="0" name="return" nillable="true" type="ax216:KubernetesGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -332,10 -133,10 +254,10 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicyResponse">
+ <xs:element name="getMasterForKubernetesGroupResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax217:KubernetesMaster"/>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"/>
++ <xs:element minOccurs="0" name="return" nillable="true" type="ax216:KubernetesMaster"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -346,53 -147,48 +268,53 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDefaultLBClusterIdResponse">
+ <xs:element name="getHostsForKubernetesGroupResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax217:KubernetesHost"/>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax216:KubernetesHost"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoscalingPolicy">
+ <xs:element name="AutoScalerServiceInvalidKubernetesGroupException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidKubernetesGroupException" nillable="true" type="ax214:InvalidKubernetesGroupException"/>
- <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/>
++ <xs:element minOccurs="0" name="InvalidKubernetesGroupException" nillable="true" type="ax21:InvalidKubernetesGroupException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoscalingPolicyResponse">
+ <xs:element name="addKubernetesGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="kubernetesGroup" nillable="true" type="ax217:KubernetesGroup"/>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax214:AutoscalePolicy"/>
++ <xs:element minOccurs="0" name="kubernetesGroup" nillable="true" type="ax216:KubernetesGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAllDeploymentPolicies">
+ <xs:element name="addKubernetesGroupResponse">
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAllDeploymentPoliciesResponse">
+ <xs:element name="AutoScalerServiceInvalidKubernetesHostException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidKubernetesHostException" nillable="true" type="ax214:InvalidKubernetesHostException"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"/>
++ <xs:element minOccurs="0" name="InvalidKubernetesHostException" nillable="true" type="ax21:InvalidKubernetesHostException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAllAvailablePartitions">
+ <xs:element name="addKubernetesHost">
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax217:KubernetesHost"/>
++ <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax216:KubernetesHost"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAllAvailablePartitionsResponse">
+ <xs:element name="addKubernetesHostResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -410,88 -204,25 +332,88 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="checkServiceLBExistenceAgainstPolicy">
+ <xs:element name="AutoScalerServiceNonExistingKubernetesHostException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="NonExistingKubernetesHostException" nillable="true" type="ax214:NonExistingKubernetesHostException"/>
- <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
++ <xs:element minOccurs="0" name="NonExistingKubernetesHostException" nillable="true" type="ax21:NonExistingKubernetesHostException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="checkServiceLBExistenceAgainstPolicyResponse">
+ <xs:element name="removeKubernetesHost">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="hostId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeKubernetesHostResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AutoScalerServiceInvalidKubernetesMasterException">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="InvalidKubernetesMasterException" nillable="true" type="ax214:InvalidKubernetesMasterException"/>
++ <xs:element minOccurs="0" name="InvalidKubernetesMasterException" nillable="true" type="ax21:InvalidKubernetesMasterException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AutoScalerServiceNonExistingKubernetesMasterException">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="NonExistingKubernetesMasterException" nillable="true" type="ax214:NonExistingKubernetesMasterException"/>
++ <xs:element minOccurs="0" name="NonExistingKubernetesMasterException" nillable="true" type="ax21:NonExistingKubernetesMasterException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateKubernetesMaster">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax217:KubernetesMaster"/>
++ <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax216:KubernetesMaster"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateKubernetesMasterResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="updateKubernetesHost">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax217:KubernetesHost"/>
++ <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax216:KubernetesHost"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateKubernetesHostResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getPartitionsOfGroup">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getPartitionsOfGroupResponse">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"/>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:Partition"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="AutoScalerServiceNonExistingLBException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="NonExistingLBException" nillable="true" type="ax214:NonExistingLBException"/>
- <xs:element minOccurs="0" name="NonExistingLBException" nillable="true" type="ax217:NonExistingLBException"/>
++ <xs:element minOccurs="0" name="NonExistingLBException" nillable="true" type="ax21:NonExistingLBException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -576,14 -263,70 +498,92 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoScalerServiceInvalidPartitionException">
++ <xs:element name="getPartition">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax217:InvalidPartitionException"/>
++ <xs:element minOccurs="0" name="partitionId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="addPartition">
++ <xs:element name="getPartitionResponse">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="partition" nillable="true" type="ax24:Partition"/>
++ <xs:element minOccurs="0" name="return" nillable="true" type="ax26:Partition"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="addPartitionResponse">
++ <xs:element name="getPartitionGroups">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
++ <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="AutoScalerServiceInvalidPolicyException">
++ <xs:element name="getPartitionGroupsResponse">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax217:InvalidPolicyException"/>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:PartitionGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="addDeploymentPolicy">
++ <xs:element name="getAllAvailablePartitions">
++ <xs:complexType>
++ <xs:sequence/>
++ </xs:complexType>
++ </xs:element>
++ <xs:element name="getAllAvailablePartitionsResponse">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="depPolicy" nillable="true" type="ax23:DeploymentPolicy"/>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:Partition"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="addDeploymentPolicyResponse">
++ <xs:element name="getAllDeploymentPolicies">
++ <xs:complexType>
++ <xs:sequence/>
++ </xs:complexType>
++ </xs:element>
++ <xs:element name="getAllDeploymentPoliciesResponse">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="addAutoScalingPolicy">
++ <xs:element name="getAllAutoScalingPolicy">
++ <xs:complexType>
++ <xs:sequence/>
++ </xs:complexType>
++ </xs:element>
++ <xs:element name="getAllAutoScalingPolicyResponse">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="aspolicy" nillable="true" type="ax214:AutoscalePolicy"/>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax214:AutoscalePolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="addAutoScalingPolicyResponse">
++ <xs:element name="getValidDeploymentPoliciesforCartridge">
+ <xs:complexType>
+ <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
++ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
++ </xs:sequence>
++ </xs:complexType>
++ </xs:element>
++ <xs:element name="getValidDeploymentPoliciesforCartridgeResponse">
++ <xs:complexType>
++ <xs:sequence>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:schema>
- <xs:schema xmlns:ax28="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.autoscaler.stratos.apache.org/xsd">
- <xs:schema xmlns:ax29="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.autoscaler.stratos.apache.org/xsd">
++ <xs:schema xmlns:ax210="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.autoscaler.stratos.apache.org/xsd">
<xs:import namespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"/>
<xs:complexType name="PartitionGroup">
<xs:sequence>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax28:Partition"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax29:Partition"/>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax210:Partition"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
@@@ -594,15 -337,15 +594,15 @@@
<xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
- <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax212:LoadThresholds"/>
- <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax214:LoadThresholds"/>
++ <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax213:LoadThresholds"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="LoadThresholds">
<xs:sequence>
- <xs:element minOccurs="0" name="loadAverage" nillable="true" type="ax212:LoadAverageThresholds"/>
- <xs:element minOccurs="0" name="memoryConsumption" nillable="true" type="ax212:MemoryConsumptionThresholds"/>
- <xs:element minOccurs="0" name="requestsInFlight" nillable="true" type="ax212:RequestsInFlightThresholds"/>
- <xs:element minOccurs="0" name="loadAverage" nillable="true" type="ax214:LoadAverageThresholds"/>
- <xs:element minOccurs="0" name="memoryConsumption" nillable="true" type="ax214:MemoryConsumptionThresholds"/>
- <xs:element minOccurs="0" name="requestsInFlight" nillable="true" type="ax214:RequestsInFlightThresholds"/>
++ <xs:element minOccurs="0" name="loadAverage" nillable="true" type="ax213:LoadAverageThresholds"/>
++ <xs:element minOccurs="0" name="memoryConsumption" nillable="true" type="ax213:MemoryConsumptionThresholds"/>
++ <xs:element minOccurs="0" name="requestsInFlight" nillable="true" type="ax213:RequestsInFlightThresholds"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="LoadAverageThresholds">
@@@ -624,12 -367,12 +624,12 @@@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax29="http://partition.autoscaler.stratos.apache.org/xsd" xmlns:ax26="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.deployment.autoscaler.stratos.apache.org/xsd">
- <xs:schema xmlns:ax27="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd" xmlns:ax210="http://partition.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.deployment.autoscaler.stratos.apache.org/xsd">
++ <xs:schema xmlns:ax28="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd" xmlns:ax211="http://partition.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.deployment.autoscaler.stratos.apache.org/xsd">
<xs:import namespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"/>
<xs:import namespace="http://partition.autoscaler.stratos.apache.org/xsd"/>
<xs:complexType name="DeploymentPolicy">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax26:Partition"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax27:Partition"/>
++ <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax28:Partition"/>
<xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
@@@ -638,7 -381,7 +638,7 @@@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax23="http://pojo.stub.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd">
- <xs:schema xmlns:ax26="http://pojo.stub.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd">
++ <xs:schema xmlns:ax25="http://pojo.stub.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd">
<xs:import namespace="http://pojo.stub.controller.cloud.stratos.apache.org/xsd"/>
<xs:complexType name="Partition">
<xs:sequence>
@@@ -741,6 -448,6 +735,12 @@@
<wsdl:message name="getAllDeploymentPoliciesResponse">
<wsdl:part name="parameters" element="ns:getAllDeploymentPoliciesResponse"/>
</wsdl:message>
++ <wsdl:message name="removeKubernetesGroupRequest">
++ <wsdl:part name="parameters" element="ns:removeKubernetesGroup"/>
++ </wsdl:message>
++ <wsdl:message name="removeKubernetesGroupResponse">
++ <wsdl:part name="parameters" element="ns:removeKubernetesGroupResponse"/>
++ </wsdl:message>
<wsdl:message name="getValidDeploymentPoliciesforCartridgeRequest">
<wsdl:part name="parameters" element="ns:getValidDeploymentPoliciesforCartridge"/>
</wsdl:message>
@@@ -780,27 -478,12 +780,27 @@@
<wsdl:message name="checkDefaultLBExistenceAgainstPolicyResponse">
<wsdl:part name="parameters" element="ns:checkDefaultLBExistenceAgainstPolicyResponse"/>
</wsdl:message>
+ <wsdl:message name="removeKubernetesHostRequest">
+ <wsdl:part name="parameters" element="ns:removeKubernetesHost"/>
+ </wsdl:message>
+ <wsdl:message name="removeKubernetesHostResponse">
+ <wsdl:part name="parameters" element="ns:removeKubernetesHostResponse"/>
+ </wsdl:message>
+ <wsdl:message name="AutoScalerServiceNonExistingKubernetesHostException">
+ <wsdl:part name="parameters" element="ns:AutoScalerServiceNonExistingKubernetesHostException"/>
+ </wsdl:message>
- <wsdl:message name="getKubernetesGroupRequest">
- <wsdl:part name="parameters" element="ns:getKubernetesGroup"/>
- </wsdl:message>
- <wsdl:message name="getKubernetesGroupResponse">
- <wsdl:part name="parameters" element="ns:getKubernetesGroupResponse"/>
- </wsdl:message>
<wsdl:message name="getPartitionRequest">
<wsdl:part name="parameters" element="ns:getPartition"/>
</wsdl:message>
<wsdl:message name="getPartitionResponse">
<wsdl:part name="parameters" element="ns:getPartitionResponse"/>
</wsdl:message>
++ <wsdl:message name="getKubernetesGroupRequest">
++ <wsdl:part name="parameters" element="ns:getKubernetesGroup"/>
++ </wsdl:message>
++ <wsdl:message name="getKubernetesGroupResponse">
++ <wsdl:part name="parameters" element="ns:getKubernetesGroupResponse"/>
++ </wsdl:message>
<wsdl:message name="addPartitionRequest">
<wsdl:part name="parameters" element="ns:addPartition"/>
</wsdl:message>
@@@ -900,15 -549,10 +900,15 @@@
<wsdl:output message="ns:addAutoScalingPolicyResponse" wsaw:Action="urn:addAutoScalingPolicyResponse"/>
<wsdl:fault message="ns:AutoScalerServiceInvalidPolicyException" name="AutoScalerServiceInvalidPolicyException" wsaw:Action="urn:addAutoScalingPolicyAutoScalerServiceInvalidPolicyException"/>
</wsdl:operation>
+ <wsdl:operation name="getAllDeploymentPolicies">
+ <wsdl:input message="ns:getAllDeploymentPoliciesRequest" wsaw:Action="urn:getAllDeploymentPolicies"/>
+ <wsdl:output message="ns:getAllDeploymentPoliciesResponse" wsaw:Action="urn:getAllDeploymentPoliciesResponse"/>
+ </wsdl:operation>
+ <wsdl:operation name="removeKubernetesGroup">
+ <wsdl:input message="ns:removeKubernetesGroupRequest" wsaw:Action="urn:removeKubernetesGroup"/>
+ <wsdl:output message="ns:removeKubernetesGroupResponse" wsaw:Action="urn:removeKubernetesGroupResponse"/>
+ <wsdl:fault message="ns:AutoScalerServiceNonExistingKubernetesGroupException" name="AutoScalerServiceNonExistingKubernetesGroupException" wsaw:Action="urn:removeKubernetesGroupAutoScalerServiceNonExistingKubernetesGroupException"/>
+ </wsdl:operation>
- <wsdl:operation name="getAllDeploymentPolicies">
- <wsdl:input message="ns:getAllDeploymentPoliciesRequest" wsaw:Action="urn:getAllDeploymentPolicies"/>
- <wsdl:output message="ns:getAllDeploymentPoliciesResponse" wsaw:Action="urn:getAllDeploymentPoliciesResponse"/>
- </wsdl:operation>
<wsdl:operation name="getValidDeploymentPoliciesforCartridge">
<wsdl:input message="ns:getValidDeploymentPoliciesforCartridgeRequest" wsaw:Action="urn:getValidDeploymentPoliciesforCartridge"/>
<wsdl:output message="ns:getValidDeploymentPoliciesforCartridgeResponse" wsaw:Action="urn:getValidDeploymentPoliciesforCartridgeResponse"/>
@@@ -935,20 -573,10 +935,20 @@@
<wsdl:input message="ns:checkDefaultLBExistenceAgainstPolicyRequest" wsaw:Action="urn:checkDefaultLBExistenceAgainstPolicy"/>
<wsdl:output message="ns:checkDefaultLBExistenceAgainstPolicyResponse" wsaw:Action="urn:checkDefaultLBExistenceAgainstPolicyResponse"/>
</wsdl:operation>
+ <wsdl:operation name="removeKubernetesHost">
+ <wsdl:input message="ns:removeKubernetesHostRequest" wsaw:Action="urn:removeKubernetesHost"/>
+ <wsdl:output message="ns:removeKubernetesHostResponse" wsaw:Action="urn:removeKubernetesHostResponse"/>
+ <wsdl:fault message="ns:AutoScalerServiceNonExistingKubernetesHostException" name="AutoScalerServiceNonExistingKubernetesHostException" wsaw:Action="urn:removeKubernetesHostAutoScalerServiceNonExistingKubernetesHostException"/>
+ </wsdl:operation>
+ <wsdl:operation name="getPartition">
+ <wsdl:input message="ns:getPartitionRequest" wsaw:Action="urn:getPartition"/>
+ <wsdl:output message="ns:getPartitionResponse" wsaw:Action="urn:getPartitionResponse"/>
+ </wsdl:operation>
+ <wsdl:operation name="getKubernetesGroup">
+ <wsdl:input message="ns:getKubernetesGroupRequest" wsaw:Action="urn:getKubernetesGroup"/>
+ <wsdl:output message="ns:getKubernetesGroupResponse" wsaw:Action="urn:getKubernetesGroupResponse"/>
+ <wsdl:fault message="ns:AutoScalerServiceNonExistingKubernetesGroupException" name="AutoScalerServiceNonExistingKubernetesGroupException" wsaw:Action="urn:getKubernetesGroupAutoScalerServiceNonExistingKubernetesGroupException"/>
+ </wsdl:operation>
- <wsdl:operation name="getPartition">
- <wsdl:input message="ns:getPartitionRequest" wsaw:Action="urn:getPartition"/>
- <wsdl:output message="ns:getPartitionResponse" wsaw:Action="urn:getPartitionResponse"/>
- </wsdl:operation>
<wsdl:operation name="addPartition">
<wsdl:input message="ns:addPartitionRequest" wsaw:Action="urn:addPartition"/>
<wsdl:output message="ns:addPartitionResponse" wsaw:Action="urn:addPartitionResponse"/>
@@@ -1077,29 -663,8 +1077,32 @@@
<soap:fault use="literal" name="AutoScalerServiceInvalidPolicyException"/>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="getMasterForKubernetesGroup">
+ <soap:operation soapAction="urn:getMasterForKubernetesGroup" style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AutoScalerServiceNonExistingKubernetesGroupException">
+ <soap:fault use="literal" name="AutoScalerServiceNonExistingKubernetesGroupException"/>
+ </wsdl:fault>
+ </wsdl:operation>
- <wsdl:operation name="getAllDeploymentPolicies">
- <soap:operation soapAction="urn:getAllDeploymentPolicies" style="document"/>
++ <wsdl:operation name="removeKubernetesGroup">
++ <soap:operation soapAction="urn:removeKubernetesGroup" style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
++ <wsdl:fault name="AutoScalerServiceNonExistingKubernetesGroupException">
++ <soap:fault use="literal" name="AutoScalerServiceNonExistingKubernetesGroupException"/>
++ </wsdl:fault>
+ </wsdl:operation>
- <wsdl:operation name="removeKubernetesGroup">
- <soap:operation soapAction="urn:removeKubernetesGroup" style="document"/>
+ <wsdl:operation name="getAllDeploymentPolicies">
+ <soap:operation soapAction="urn:getAllDeploymentPolicies" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
@@@ -1170,29 -717,8 +1170,32 @@@
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="removeKubernetesHost">
+ <soap:operation soapAction="urn:removeKubernetesHost" style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AutoScalerServiceNonExistingKubernetesHostException">
+ <soap:fault use="literal" name="AutoScalerServiceNonExistingKubernetesHostException"/>
+ </wsdl:fault>
+ </wsdl:operation>
- <wsdl:operation name="getPartition">
- <soap:operation soapAction="urn:getPartition" style="document"/>
++ <wsdl:operation name="getKubernetesGroup">
++ <soap:operation soapAction="urn:getKubernetesGroup" style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
++ <wsdl:fault name="AutoScalerServiceNonExistingKubernetesGroupException">
++ <soap:fault use="literal" name="AutoScalerServiceNonExistingKubernetesGroupException"/>
++ </wsdl:fault>
+ </wsdl:operation>
- <wsdl:operation name="getKubernetesGroup">
- <soap:operation soapAction="urn:getKubernetesGroup" style="document"/>
+ <wsdl:operation name="getPartition">
+ <soap:operation soapAction="urn:getPartition" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
@@@ -1386,29 -846,8 +1386,32 @@@
<soap12:fault use="literal" name="AutoScalerServiceInvalidPolicyException"/>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="getMasterForKubernetesGroup">
+ <soap12:operation soapAction="urn:getMasterForKubernetesGroup" style="document"/>
+ <wsdl:input>
+ <soap12:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AutoScalerServiceNonExistingKubernetesGroupException">
+ <soap12:fault use="literal" name="AutoScalerServiceNonExistingKubernetesGroupException"/>
+ </wsdl:fault>
+ </wsdl:operation>
- <wsdl:operation name="getAllDeploymentPolicies">
- <soap12:operation soapAction="urn:getAllDeploymentPolicies" style="document"/>
++ <wsdl:operation name="removeKubernetesGroup">
++ <soap12:operation soapAction="urn:removeKubernetesGroup" style="document"/>
+ <wsdl:input>
+ <soap12:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal"/>
+ </wsdl:output>
++ <wsdl:fault name="AutoScalerServiceNonExistingKubernetesGroupException">
++ <soap12:fault use="literal" name="AutoScalerServiceNonExistingKubernetesGroupException"/>
++ </wsdl:fault>
+ </wsdl:operation>
- <wsdl:operation name="removeKubernetesGroup">
- <soap12:operation soapAction="urn:removeKubernetesGroup" style="document"/>
+ <wsdl:operation name="getAllDeploymentPolicies">
+ <soap12:operation soapAction="urn:getAllDeploymentPolicies" style="document"/>
<wsdl:input>
<soap12:body use="literal"/>
</wsdl:input>
@@@ -1479,29 -900,8 +1479,32 @@@
<soap12:body use="literal"/>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="removeKubernetesHost">
+ <soap12:operation soapAction="urn:removeKubernetesHost" style="document"/>
+ <wsdl:input>
+ <soap12:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AutoScalerServiceNonExistingKubernetesHostException">
+ <soap12:fault use="literal" name="AutoScalerServiceNonExistingKubernetesHostException"/>
+ </wsdl:fault>
+ </wsdl:operation>
- <wsdl:operation name="getPartition">
- <soap12:operation soapAction="urn:getPartition" style="document"/>
++ <wsdl:operation name="getKubernetesGroup">
++ <soap12:operation soapAction="urn:getKubernetesGroup" style="document"/>
+ <wsdl:input>
+ <soap12:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal"/>
+ </wsdl:output>
++ <wsdl:fault name="AutoScalerServiceNonExistingKubernetesGroupException">
++ <soap12:fault use="literal" name="AutoScalerServiceNonExistingKubernetesGroupException"/>
++ </wsdl:fault>
+ </wsdl:operation>
- <wsdl:operation name="getKubernetesGroup">
- <soap12:operation soapAction="urn:getKubernetesGroup" style="document"/>
+ <wsdl:operation name="getPartition">
+ <soap12:operation soapAction="urn:getPartition" style="document"/>
<wsdl:input>
<soap12:body use="literal"/>
</wsdl:input>
@@@ -1683,26 -1026,8 +1683,26 @@@
<mime:content type="text/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="getMasterForKubernetesGroup">
+ <http:operation location="getMasterForKubernetesGroup"/>
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:input>
+ <wsdl:output>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:output>
+ </wsdl:operation>
- <wsdl:operation name="getAllDeploymentPolicies">
- <http:operation location="getAllDeploymentPolicies"/>
++ <wsdl:operation name="removeKubernetesGroup">
++ <http:operation location="removeKubernetesGroup"/>
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:input>
+ <wsdl:output>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:output>
+ </wsdl:operation>
- <wsdl:operation name="removeKubernetesGroup">
- <http:operation location="removeKubernetesGroup"/>
+ <wsdl:operation name="getAllDeploymentPolicies">
+ <http:operation location="getAllDeploymentPolicies"/>
<wsdl:input>
<mime:content type="text/xml" part="parameters"/>
</wsdl:input>
@@@ -1764,26 -1080,8 +1764,26 @@@
<mime:content type="text/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="removeKubernetesHost">
+ <http:operation location="removeKubernetesHost"/>
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:input>
+ <wsdl:output>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:output>
+ </wsdl:operation>
- <wsdl:operation name="getPartition">
- <http:operation location="getPartition"/>
++ <wsdl:operation name="getKubernetesGroup">
++ <http:operation location="getKubernetesGroup"/>
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:input>
+ <wsdl:output>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:output>
+ </wsdl:operation>
- <wsdl:operation name="getKubernetesGroup">
- <http:operation location="getKubernetesGroup"/>
+ <wsdl:operation name="getPartition">
+ <http:operation location="getPartition"/>
<wsdl:input>
<mime:content type="text/xml" part="parameters"/>
</wsdl:input>