Renaming ChildPolicy.id to ChildPolicy.alias to be consistent with alias in application definition
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7ca9f940 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7ca9f940 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7ca9f940 Branch: refs/heads/master Commit: 7ca9f9406722563c6ba18481378d0ac04366ea3e Parents: 8ea5eb6 Author: Imesh Gunaratne <[email protected]> Authored: Thu Dec 18 18:10:05 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Dec 18 18:34:50 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/api/AutoScalerServiceImpl.java | 2 +- .../context/cluster/VMClusterContext.java | 26 +-- .../pojo/policy/deployment/ChildPolicy.java | 13 +- .../policy/deployment/DeploymentPolicy.java | 2 +- .../policy/deployment/ChildPolicy.java | 10 +- .../src/main/resources/AutoScalerService.wsdl | 160 +++++++++---------- 6 files changed, 99 insertions(+), 114 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7ca9f940/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java index f5ac2e8..8e900c2 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java @@ -81,7 +81,7 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { ApplicationHolder.acquireReadLock(); for (ChildPolicy childPolicy : deploymentPolicy.getChildPolicies()) { - String alias = childPolicy.getId(); + String alias = childPolicy.getAlias(); List<Partition> partitionList = new ArrayList<Partition>(); for (ChildLevelNetworkPartition networkPartition : childPolicy.getChildLevelNetworkPartitions()) { Partition[] partitions = deploymentPolicy.getApplicationLevelNetworkPartition( http://git-wip-us.apache.org/repos/asf/stratos/blob/7ca9f940/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java index ba90d8f..b371901 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java @@ -181,7 +181,7 @@ public class VMClusterContext extends AbstractClusterContext { } if (log.isDebugEnabled()) { - log.debug("Deployment policy name: " + childPolicy.getId()); + log.debug("Child policy alias: " + childPolicy.getAlias()); } ChildLevelPartition[] childLevelPartitions = childPolicy. @@ -189,9 +189,8 @@ public class VMClusterContext extends AbstractClusterContext { clusterLevelNetworkPartitionContext.getId()). getChildLevelPartitions(); if (childLevelPartitions == null) { - String msg = - "Partitions are null in deployment policy: [policy-name]: " + - childPolicy.getId(); + String msg = "Partitions are null in child policy: [alias]: " + + childPolicy.getAlias(); log.error(msg); throw new PolicyValidationException(msg); } @@ -218,7 +217,7 @@ public class VMClusterContext extends AbstractClusterContext { throws PolicyValidationException, PartitionValidationException { if (clusterLevelNetworkPartitionContext == null) { String msg = - "Network Partition is null in deployment policy: [policy-name]: " + + "Network Partition is null in deployment policy: [application-id]: " + deploymentPolicy.getApplicationId(); log.error(msg); throw new PolicyValidationException(msg); @@ -231,7 +230,7 @@ public class VMClusterContext extends AbstractClusterContext { String msg = "[Partition] " + clusterInstance.getPartitionId() + " for [networkPartition] " + clusterInstance.getNetworkPartitionId() + "is null " + - "in deployment policy: [policy-name]: " + deploymentPolicy.getApplicationId(); + "in deployment policy: [application-id]: " + deploymentPolicy.getApplicationId(); log.error(msg); throw new PolicyValidationException(msg); } @@ -349,19 +348,4 @@ public class VMClusterContext extends AbstractClusterContext { return partition1; } - - //FIXME********** - /*private org.apache.stratos.cloud.controller.stub.pojo.Properties convertMemberPropsToMemberContextProps( - java.util.Properties properties) { - org.apache.stratos.cloud.controller.stub.pojo.Properties props = new org.apache.stratos.cloud.controller.stub.pojo.Properties(); - for (Map.Entry<Object, Object> e : properties.entrySet()) { - Property property = new Property(); - property.setName((String) e.getKey()); - property.setValue((String) e.getValue()); - props.addProperties(property); - } - return props; - }*/ - - } http://git-wip-us.apache.org/repos/asf/stratos/blob/7ca9f940/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/ChildPolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/ChildPolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/ChildPolicy.java index 7a08ce9..9a65bab 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/ChildPolicy.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/ChildPolicy.java @@ -23,19 +23,20 @@ import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.Ch import java.io.Serializable; /** - * This will keep the Children's policy in an application + * This will keep the children's policy in an application */ public class ChildPolicy implements Serializable { - private String id; + + private String alias; private ChildLevelNetworkPartition[] childLevelNetworkPartitions; - public String getId() { - return id; + public String getAlias() { + return alias; } - public void setId(String id) { - this.id = id; + public void setAlias(String id) { + this.alias = id; } public ChildLevelNetworkPartition[] getChildLevelNetworkPartitions() { http://git-wip-us.apache.org/repos/asf/stratos/blob/7ca9f940/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java index fb2f233..b2c9e52 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java @@ -210,7 +210,7 @@ public class DeploymentPolicy implements Serializable{ public ChildPolicy getChildPolicy(String id) { for(ChildPolicy childPolicy : childPolicies) { - if (childPolicy.getId().equals(id)) { + if (childPolicy.getAlias().equals(id)) { return childPolicy; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/7ca9f940/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ChildPolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ChildPolicy.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ChildPolicy.java index 4e47843..14fe144 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ChildPolicy.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/policy/deployment/ChildPolicy.java @@ -26,15 +26,15 @@ import java.util.List; @XmlRootElement public class ChildPolicy { - private String childId; + private String alias; private List<ChildLevelNetworkPartition> networkPartition; - public String getChildId() { - return childId; + public String getAlias() { + return alias; } - public void setChildId(String childId) { - this.childId = childId; + public void setAlias(String alias) { + this.alias = alias; } public List<ChildLevelNetworkPartition> getNetworkPartition() { http://git-wip-us.apache.org/repos/asf/stratos/blob/7ca9f940/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl ---------------------------------------------------------------------- diff --git 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 index a2fb7fe..cbbfa52 100644 --- 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,4 +1,4 @@ -<?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://common.stratos.apache.org/xsd"; xmlns:ax25="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax26="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax23="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax21="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax214="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax220="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax212="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax222="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/a ddressing/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/"; targetNamespace="http://api.autoscaler.stratos.apache.org";> +<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax29="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ns="http://api.autoscaler.stratos.apache.org"; xmlns:ax27="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax23="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://common.stratos.apache.org/xsd"; xmlns:ax217="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax21="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax220="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax215="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax212="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax222="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/a ddressing/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/"; targetNamespace="http://api.autoscaler.stratos.apache.org";> <wsdl:types> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd";> <xs:complexType name="AutoscalePolicy"> @@ -38,16 +38,16 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax215="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax210="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";> <xs:import namespace="http://common.stratos.apache.org/xsd"/> <xs:complexType name="ApplicationContext"> <xs:sequence> <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="components" nillable="true" type="ax214:ComponentContext"/> + <xs:element minOccurs="0" name="components" nillable="true" type="ax29:ComponentContext"/> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax24:Properties"/> <xs:element minOccurs="0" name="status" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="teantAdminUsername" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"/> @@ -56,16 +56,16 @@ </xs:complexType> <xs:complexType name="ComponentContext"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax214:CartridgeContext"/> - <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax214:DependencyContext"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax214:GroupContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax29:CartridgeContext"/> + <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax29:DependencyContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax29:GroupContext"/> </xs:sequence> </xs:complexType> <xs:complexType name="CartridgeContext"> <xs:sequence> <xs:element minOccurs="0" name="cartridgeMax" type="xs:int"/> <xs:element minOccurs="0" name="cartridgeMin" type="xs:int"/> - <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax214:SubscribableInfoContext"/> + <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax29:SubscribableInfoContext"/> <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> @@ -78,7 +78,7 @@ <xs:element minOccurs="0" name="maxMembers" type="xs:int"/> <xs:element minOccurs="0" name="minMembers" type="xs:int"/> <xs:element minOccurs="0" name="privateRepo" type="xs:boolean"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax24:Properties"/> <xs:element minOccurs="0" name="repoPassword" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="repoUrl" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="repoUsername" nillable="true" type="xs:string"/> @@ -94,8 +94,8 @@ <xs:complexType name="GroupContext"> <xs:sequence> <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax214:CartridgeContext"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax214:GroupContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax29:CartridgeContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax29:GroupContext"/> <xs:element minOccurs="0" name="groupMaxInstances" type="xs:int"/> <xs:element minOccurs="0" name="groupMinInstances" type="xs:int"/> <xs:element minOccurs="0" name="groupScalingEnabled" type="xs:boolean"/> @@ -121,15 +121,15 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax29="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax213="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> <xs:import namespace="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/> <xs:complexType name="DeploymentPolicy"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax29:Partition"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax23:Partition"/> <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationLevelNetworkPartitions" nillable="true" type="ax29:ApplicationLevelNetworkPartition"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelNetworkPartitions" nillable="true" type="ax29:ChildLevelNetworkPartition"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="childPolicies" nillable="true" type="ax25:ChildPolicy"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationLevelNetworkPartitions" nillable="true" type="ax23:ApplicationLevelNetworkPartition"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelNetworkPartitions" nillable="true" type="ax23:ChildLevelNetworkPartition"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="childPolicies" nillable="true" type="ax212:ChildPolicy"/> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> <xs:element minOccurs="0" name="tenantId" type="xs:int"/> @@ -137,8 +137,8 @@ </xs:complexType> <xs:complexType name="ChildPolicy"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelNetworkPartitions" nillable="true" type="ax29:ChildLevelNetworkPartition"/> - <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelNetworkPartitions" nillable="true" type="ax23:ChildLevelNetworkPartition"/> </xs:sequence> </xs:complexType> </xs:schema> @@ -149,27 +149,27 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax28="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax25="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> <xs:import namespace="http://common.stratos.apache.org/xsd"/> - <xs:complexType name="Partition"> + <xs:complexType name="ApplicationLevelNetworkPartition"> <xs:sequence> - <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="activeByDefault" type="xs:boolean"/> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> - <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax23:Partition"/> </xs:sequence> </xs:complexType> - <xs:complexType name="ApplicationLevelNetworkPartition"> + <xs:complexType name="Partition"> <xs:sequence> - <xs:element minOccurs="0" name="activeByDefault" type="xs:boolean"/> + <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax26:Partition"/> + <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> <xs:complexType name="ChildLevelNetworkPartition"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelPartitions" nillable="true" type="ax26:ChildLevelPartition"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelPartitions" nillable="true" type="ax23:ChildLevelPartition"/> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="min" type="xs:int"/> <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"/> @@ -193,7 +193,7 @@ <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://common.stratos.apache.org/xsd";> <xs:complexType name="Properties"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax27:Property"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax24:Property"/> </xs:sequence> </xs:complexType> <xs:complexType name="Property"> @@ -203,158 +203,158 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax24="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax216="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax22="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax219="http://common.stratos.apache.org/xsd"; xmlns:ax218="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax221="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax213="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax223="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax210="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax211="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.autoscaler.stratos.apache.org";> + <xs:schema xmlns:ax28="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax26="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax216="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax22="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax219="http://common.stratos.apache.org/xsd"; xmlns:ax218="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax221="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax223="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax211="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.autoscaler.stratos.apache.org";> <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/> - <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/> - <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://common.stratos.apache.org/xsd"/> <xs:import namespace="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/> - <xs:element name="getAutoScalingPolicies"> + <xs:element name="getAutoscalingPolicy"> <xs:complexType> - <xs:sequence/> + <xs:sequence> + <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoScalingPoliciesResponse"> + <xs:element name="getAutoscalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax21:AutoscalePolicy"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax21:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoScalerServiceInvalidPolicyException"> + <xs:element name="getNetworkPartitions"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax23:InvalidPolicyException"/> + <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addAutoScalingPolicy"> + <xs:element name="getNetworkPartitionsResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax21:AutoscalePolicy"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:ApplicationLevelNetworkPartition"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addAutoScalingPolicyResponse"> + <xs:element name="AutoScalerServiceApplicationDefinitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax27:ApplicationDefinitionException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateAutoScalingPolicy"> + <xs:element name="addApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax21:AutoscalePolicy"/> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax29:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateAutoScalingPolicyResponse"> + <xs:element name="getApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicy"> + <xs:element name="getApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicyResponse"> + <xs:element name="getApplications"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"/> - </xs:sequence> + <xs:sequence/> </xs:complexType> </xs:element> - <xs:element name="getAutoscalingPolicy"> + <xs:element name="getApplicationsResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoscalingPolicyResponse"> + <xs:element name="deployApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax21:AutoscalePolicy"/> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="policy" nillable="true" type="ax214:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getNetworkPartitions"> + <xs:element name="deployApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getNetworkPartitionsResponse"> + <xs:element name="getAutoScalingPolicies"> <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:ApplicationLevelNetworkPartition"/> - </xs:sequence> + <xs:sequence/> </xs:complexType> </xs:element> - <xs:element name="AutoScalerServiceApplicationDefinitionException"> + <xs:element name="getAutoScalingPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax212:ApplicationDefinitionException"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax21:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addApplication"> + <xs:element name="AutoScalerServiceInvalidPolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax216:ApplicationContext"/> + <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax216:InvalidPolicyException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplication"> + <xs:element name="addAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax21:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationResponse"> + <xs:element name="addAutoScalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax216:ApplicationContext"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplications"> + <xs:element name="updateAutoScalingPolicy"> <xs:complexType> - <xs:sequence/> + <xs:sequence> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax21:AutoscalePolicy"/> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationsResponse"> + <xs:element name="updateAutoScalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax216:ApplicationContext"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployApplication"> + <xs:element name="getDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="policy" nillable="true" type="ax25:DeploymentPolicy"/> + <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployApplicationResponse"> + <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="ax214:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -383,7 +383,7 @@ <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax24:Properties"/> </xs:sequence> </xs:complexType> </xs:element>
