Repository: stratos Updated Branches: refs/heads/docker-grouping-merge 31c69b39d -> 38ea793fc
fixing to use correct properties from stratos-common Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/307cf78f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/307cf78f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/307cf78f Branch: refs/heads/docker-grouping-merge Commit: 307cf78f6f6d9f85a9a13cea20e6473a6d723c3d Parents: 31c69b3 Author: reka <[email protected]> Authored: Wed Nov 5 09:53:26 2014 +0530 Committer: reka <[email protected]> Committed: Wed Nov 5 11:23:22 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/api/AutoScalerServiceImpl.java | 5 +- .../applications/parser/ApplicationParser.java | 2 +- .../parser/DefaultApplicationParser.java | 20 +- .../interfaces/AutoScalerServiceInterface.java | 4 +- .../monitor/cluster/AbstractClusterMonitor.java | 2 +- .../KubernetesServiceClusterMonitor.java | 4 +- .../monitor/cluster/VMClusterMonitor.java | 2 +- .../manager/client/AutoscalerServiceClient.java | 17 +- .../pom.xml | 2 +- .../src/main/resources/AutoScalerService.wsdl | 247 +++++++------------ 10 files changed, 128 insertions(+), 177 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/307cf78f/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 90aac2d..796c5bb 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 @@ -41,8 +41,8 @@ import org.apache.stratos.autoscaler.policy.PolicyManager; import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; import org.apache.stratos.autoscaler.registry.RegistryManager; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.Properties; +import org.apache.stratos.common.Property; import org.apache.stratos.common.kubernetes.KubernetesGroup; import org.apache.stratos.common.kubernetes.KubernetesHost; import org.apache.stratos.common.kubernetes.KubernetesMaster; @@ -349,6 +349,7 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface { return null; } + public boolean checkClusterLBExistenceAgainstPolicy(String clusterId, String deploymentPolicyId) { for (PartitionGroup partitionGroup : PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getPartitionGroups()) { http://git-wip-us.apache.org/repos/asf/stratos/blob/307cf78f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ApplicationParser.java index 3bf8bb1..a429076 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ApplicationParser.java @@ -22,7 +22,7 @@ package org.apache.stratos.autoscaler.applications.parser; import org.apache.stratos.autoscaler.applications.pojo.ApplicationClusterContext; import org.apache.stratos.autoscaler.exception.ApplicationDefinitionException; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.Properties; import org.apache.stratos.messaging.domain.applications.Application; import java.util.Map; http://git-wip-us.apache.org/repos/asf/stratos/blob/307cf78f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index 7c73d58..f173001 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -33,12 +33,12 @@ import org.apache.stratos.autoscaler.exception.CartridgeInformationException; import org.apache.stratos.autoscaler.pojo.ServiceGroup; import org.apache.stratos.autoscaler.registry.RegistryManager; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.Property; import org.apache.stratos.messaging.domain.applications.Application; import org.apache.stratos.messaging.domain.applications.ClusterDataHolder; import org.apache.stratos.messaging.domain.applications.DependencyOrder; import org.apache.stratos.messaging.domain.applications.Group; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.Properties; import java.util.*; import javax.crypto.Cipher; @@ -300,18 +300,18 @@ public class DefaultApplicationParser implements ApplicationParser { } String alias; - Properties properties = new Properties(); for (SubscribableInfoContext value : subscribableInfoCtxts.values()) { alias = value.getAlias(); String username = value.getRepoUsername(); String password = value.getRepoPassword(); String repoUrl = value.getRepoUrl(); + List<Property> properties = new ArrayList<Property>(); if (StringUtils.isNotEmpty(username)) { Property property = new Property(); property.setName("REPO_USERNAME"); property.setValue(username); - properties.addProperties(property); + properties.add(property); } if (StringUtils.isNotEmpty(password)) { @@ -319,17 +319,23 @@ public class DefaultApplicationParser implements ApplicationParser { Property property = new Property(); property.setName("REPO_PASSWORD"); property.setValue(encryptedPassword); - properties.addProperties(property); + properties.add(property); } if (StringUtils.isNotEmpty(repoUrl)) { Property property = new Property(); property.setName("REPO_URL"); property.setValue(repoUrl); - properties.addProperties(property); + properties.add(property); } - this.addProperties(alias, properties); + Property[] probArr = new Property[properties.size()]; + + Properties prob = new Properties(); + prob.setProperties(properties.toArray(probArr)); + + + this.addProperties(alias, prob ); } http://git-wip-us.apache.org/repos/asf/stratos/blob/307cf78f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java index 204cc79..226c4af 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java @@ -32,7 +32,7 @@ import org.apache.stratos.autoscaler.partition.PartitionGroup; import org.apache.stratos.autoscaler.pojo.ServiceGroup; import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.Properties; import org.apache.stratos.common.kubernetes.KubernetesGroup; import org.apache.stratos.common.kubernetes.KubernetesHost; import org.apache.stratos.common.kubernetes.KubernetesMaster; @@ -195,7 +195,7 @@ public interface AutoScalerServiceInterface { * @param properties updated properties. */ void updateClusterMonitor(String clusterId, Properties properties) throws InvalidArgumentException; - + /** * deploys an Application Definition * http://git-wip-us.apache.org/repos/asf/stratos/blob/307cf78f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java index 55748e1..f401ad8 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java @@ -31,7 +31,7 @@ import org.apache.stratos.autoscaler.monitor.events.MonitorScalingEvent; import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent; import org.apache.stratos.autoscaler.monitor.events.MonitorTerminateAllEvent; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.Properties; import org.apache.stratos.messaging.domain.topology.ClusterStatus; import org.apache.stratos.messaging.event.health.stat.AverageLoadAverageEvent; import org.apache.stratos.messaging.event.health.stat.AverageMemoryConsumptionEvent; http://git-wip-us.apache.org/repos/asf/stratos/blob/307cf78f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java index 1f17daa..d6dc3a3 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java @@ -29,8 +29,8 @@ import org.apache.stratos.autoscaler.exception.InvalidArgumentException; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.stratos.autoscaler.util.AutoScalerConstants; import org.apache.stratos.autoscaler.util.ConfUtil; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; +import org.apache.stratos.common.Properties; +import org.apache.stratos.common.Property; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.messaging.domain.topology.ClusterStatus; http://git-wip-us.apache.org/repos/asf/stratos/blob/307cf78f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java index d6dc27c..3d6ef75 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java @@ -34,7 +34,7 @@ import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.stratos.autoscaler.status.checker.StatusChecker; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.Properties; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.Member; import org.apache.stratos.messaging.domain.topology.Service; http://git-wip-us.apache.org/repos/asf/stratos/blob/307cf78f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java index 3fbddf7..0062767 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java @@ -22,19 +22,18 @@ package org.apache.stratos.manager.client; import org.apache.axis2.AxisFault; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.transport.http.HTTPConstants; -import org.apache.commons.lang.NotImplementedException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.autoscaler.applications.pojo.xsd.ApplicationContext; +import org.apache.stratos.autoscaler.pojo.xsd.ServiceGroup; import org.apache.stratos.autoscaler.stub.*; import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy; import org.apache.stratos.autoscaler.stub.kubernetes.KubernetesGroup; import org.apache.stratos.autoscaler.stub.kubernetes.KubernetesHost; import org.apache.stratos.autoscaler.stub.kubernetes.KubernetesMaster; import org.apache.stratos.autoscaler.stub.policy.model.AutoscalePolicy; -import org.apache.stratos.autoscaler.applications.pojo.xsd.ApplicationContext; -import org.apache.stratos.autoscaler.pojo.xsd.ServiceGroup; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; -import org.apache.stratos.cloud.controller.stub.pojo.Properties; +import org.apache.stratos.common.Properties; import org.apache.stratos.manager.internal.DataHolder; import org.apache.stratos.manager.utils.CartridgeConstants; @@ -231,12 +230,12 @@ public class AutoscalerServiceClient { stub.deployServiceGroup(serviceGroup); } - public void deployApplication (ApplicationContext applicationContext) throws + public void deployApplication(ApplicationContext applicationContext) throws AutoScalerServiceApplicationDefinitionExceptionException, RemoteException { stub.deployApplicationDefinition(applicationContext); } - public void undeployApplication (String applicationId, int tenantId, String tenantDomain) throws + public void undeployApplication(String applicationId, int tenantId, String tenantDomain) throws AutoScalerServiceApplicationDefinitionExceptionException, RemoteException { stub.unDeployApplicationDefinition(applicationId, tenantId, tenantDomain); } @@ -298,8 +297,8 @@ public class AutoscalerServiceClient { AutoScalerServiceNonExistingKubernetesHostExceptionException { return stub.updateKubernetesHost(kubernetesHost); } - - public void updateClusterMonitor(String clusterId, Properties properties) throws RemoteException, AutoScalerServiceInvalidArgumentExceptionException { + + /*public void updateClusterMonitor(String clusterId, Properties properties) throws RemoteException, AutoScalerServiceInvalidArgumentExceptionException { stub.updateClusterMonitor(clusterId, properties); - } + }*/ } http://git-wip-us.apache.org/repos/asf/stratos/blob/307cf78f/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml index 90c967b..d102d90 100644 --- a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml +++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml @@ -50,7 +50,7 @@ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> <arg line="-uri src/main/resources/AutoScalerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.autoscaler.stub - -ns2p http://policy.deployment.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.deployment.policy,http://model.policy.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.policy.model,http://exception.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.exception,http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.deployment.partition,http://pojo.stub.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.pojo,http://partition.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.partition,http://kubernetes.common.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.kubernetes,http://api.autoscaler.stratos.apache.org=org.apache.stratos.autoscaler.stub.api,http://common.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.pojo"/> + -ns2p http://policy.deployment.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.deployment.policy,http://model.policy.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.policy.model,http://exception.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.exception,http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.deployment.partition,http://pojo.stub.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.stub.pojo,http://partition.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.partition,http://kubernetes.common.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.kubernetes,http://api.autoscaler.stratos.apache.org=org.apache.stratos.autoscaler.stub.api,http://common.stratos.apache.org/xsd=org.apache.stratos.autoscaler.stub.common.pojo"/> <classpath refid="maven.dependency.classpath"/> <classpath refid="maven.compile.classpath"/> <classpath refid="maven.runtime.classpath"/> http://git-wip-us.apache.org/repos/asf/stratos/blob/307cf78f/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 bce9910..ca27be8 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,29 +1,29 @@ -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax27="http://pojo.stub.controller.cloud.stratos.apache.org/xsd"; xmlns:ns="http://api.autoscaler.stratos.apache.org"; xmlns:ax25="http://policy.deployment.autoscaler.stratos.apache.org/xsd"; xmlns:ax26="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"; xmlns:ax23="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://common.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax216="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax222="http://kubernetes.common.stratos.apache.org/xsd"; xmlns:ax210="http://partition.autoscaler.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax225="http://model.policy.autoscaler.stratos.apache.org/xsd"; xmlns:soap="http://s chemas.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: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:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax218="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax212="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax221="http://kubernetes.common.stratos.apache.org/xsd"; xmlns:ax222="http://common.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax225="http://model.policy.autoscaler.stratos.apache.org/xsd"; xmlns:soap="http://s chemas.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> <wsdl:types> - <xs:schema xmlns:ax29="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"; xmlns:ax212="http://partition.autoscaler.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:import namespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://partition.autoscaler.stratos.apache.org/xsd";></xs:import> <xs:complexType name="DeploymentPolicy"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax29:Partition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax27:Partition"></xs:element> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionGroups" nillable="true" type="ax212:PartitionGroup"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionGroups" nillable="true" type="ax28:PartitionGroup"></xs:element> <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax218="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:import> + <xs:schema xmlns:ax215="http://pojo.stub.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";> + <xs:import namespace="http://pojo.stub.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:complexType name="ApplicationContext"> <xs:sequence> <xs:element minOccurs="0" name="alias" 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="components" nillable="true" type="ax216:ComponentContext"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax217:Properties"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax216:SubscribableInfoContext"></xs:element> + <xs:element minOccurs="0" name="components" nillable="true" type="ax214:ComponentContext"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax214:SubscribableInfoContext"></xs:element> <xs:element minOccurs="0" name="teantAdminUsername" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> @@ -31,9 +31,9 @@ </xs:complexType> <xs:complexType name="ComponentContext"> <xs:sequence> - <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax216:DependencyContext"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax216:GroupContext"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax216:SubscribableContext"></xs:element> + <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax214:DependencyContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax214:GroupContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax214:SubscribableContext"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="DependencyContext"> @@ -47,9 +47,9 @@ <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="autoscalingPolicy" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax216:GroupContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax214:GroupContext"></xs:element> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax216:SubscribableContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax214:SubscribableContext"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="SubscribableContext"> @@ -75,7 +75,7 @@ <xs:complexType name="ServiceGroup"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax23:Dependencies"></xs:element> + <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax218:Dependencies"></xs:element> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> <xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"></xs:element> </xs:sequence> @@ -124,17 +124,17 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax211="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:import namespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:complexType name="PartitionGroup"> <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="ax26:Partition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax29:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax28="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:import namespace="http://pojo.stub.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:complexType name="Partition"> <xs:sequence> @@ -148,13 +148,26 @@ <xs:element minOccurs="0" name="partitionMaxSpecified" type="xs:boolean"></xs:element> <xs:element minOccurs="0" name="partitionMin" type="xs:int"></xs:element> <xs:element minOccurs="0" name="partitionMinSpecified" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"></xs:element> <xs:element minOccurs="0" name="propertiesSpecified" type="xs:boolean"></xs:element> <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="providerSpecified" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:schema> + <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="ax222:Property"></xs:element> + </xs:sequence> + </xs:complexType> + <xs:complexType name="Property"> + <xs:sequence> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> + </xs:schema> <xs:schema xmlns:ax223="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://kubernetes.common.stratos.apache.org/xsd";> <xs:import namespace="http://common.stratos.apache.org/xsd";></xs:import> <xs:complexType name="KubernetesHost"> @@ -162,12 +175,12 @@ <xs:element minOccurs="0" name="hostId" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="hostIpAddress" 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="properties" nillable="true" type="ax217:Properties"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax222:Properties"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="KubernetesMaster"> <xs:complexContent> - <xs:extension base="ax222:KubernetesHost"> + <xs:extension base="ax221:KubernetesHost"> <xs:sequence> <xs:element minOccurs="0" name="endpoint" nillable="true" type="xs:string"></xs:element> </xs:sequence> @@ -178,10 +191,10 @@ <xs:sequence> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="kubernetesHosts" nillable="true" type="ax222:KubernetesHost"></xs:element> - <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax222:KubernetesMaster"></xs:element> - <xs:element minOccurs="0" name="portRange" nillable="true" type="ax222:PortRange"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax217:Properties"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="kubernetesHosts" nillable="true" type="ax221:KubernetesHost"></xs:element> + <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax221:KubernetesMaster"></xs:element> + <xs:element minOccurs="0" name="portRange" nillable="true" type="ax221:PortRange"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax222:Properties"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="PortRange"> @@ -191,91 +204,77 @@ </xs:sequence> </xs:complexType> </xs:schema> - <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="ax217:Property"></xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="Property"> - <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:schema> - <xs:schema xmlns:ax215="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax220="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"; xmlns:ax221="http://partition.autoscaler.stratos.apache.org/xsd"; xmlns:ax213="http://policy.deployment.autoscaler.stratos.apache.org/xsd"; xmlns:ax224="http://kubernetes.common.stratos.apache.org/xsd"; xmlns:ax226="http://model.policy.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax219="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax227="http://pojo.stub.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.autoscaler.stratos.apache.org";> - <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd";></xs:import> + <xs:schema xmlns:ax220="http://partition.autoscaler.stratos.apache.org/xsd"; xmlns:ax213="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax211="http://policy.deployment.autoscaler.stratos.apache.org/xsd"; xmlns:ax224="http://kubernetes.common.stratos.apache.org/xsd"; xmlns:ax226="http://model.policy.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd"; xmlns:ax216="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax219="http://pojo.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:import> <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd";></xs:import> + <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://partition.autoscaler.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://kubernetes.common.stratos.apache.org/xsd";></xs:import> <xs:import namespace="http://model.policy.autoscaler.stratos.apache.org/xsd";></xs:import> - <xs:import namespace="http://pojo.stub.controller.cloud.stratos.apache.org/xsd";></xs:import> - <xs:element name="getServiceGroup"> + <xs:element name="getDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupResponse"> + <xs:element name="getDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax23:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicy"> + <xs:element name="AutoScalerServiceApplicationDefinitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax212:ApplicationDefinitionException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicyResponse"> + <xs:element name="unDeployApplicationDefinition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"></xs:element> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> + <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoScalerServiceApplicationDefinitionException"> + <xs:element name="deployApplicationDefinition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax214:ApplicationDefinitionException"></xs:element> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax216:ApplicationContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployApplicationDefinition"> + <xs:element name="getPartition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax216:ApplicationContext"></xs:element> + <xs:element minOccurs="0" name="partitionId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="unDeployApplicationDefinition"> + <xs:element name="getPartitionResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> - <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax24:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getPartition"> + <xs:element name="getServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="partitionId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getPartitionResponse"> + <xs:element name="getServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:Partition"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax219:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -289,28 +288,28 @@ <xs:element name="getPartitionGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:PartitionGroup"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax28:PartitionGroup"></xs:element> </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> + <xs:element minOccurs="0" name="InvalidKubernetesMasterException" nillable="true" type="ax212:InvalidKubernetesMasterException"></xs:element> </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> + <xs:element minOccurs="0" name="NonExistingKubernetesMasterException" nillable="true" type="ax212:NonExistingKubernetesMasterException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="updateKubernetesMaster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax222:KubernetesMaster"></xs:element> + <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax221:KubernetesMaster"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -324,21 +323,21 @@ <xs:element name="AutoScalerServiceInvalidKubernetesHostException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidKubernetesHostException" nillable="true" type="ax214:InvalidKubernetesHostException"></xs:element> + <xs:element minOccurs="0" name="InvalidKubernetesHostException" nillable="true" type="ax212:InvalidKubernetesHostException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoScalerServiceNonExistingKubernetesHostException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="NonExistingKubernetesHostException" nillable="true" type="ax214:NonExistingKubernetesHostException"></xs:element> + <xs:element minOccurs="0" name="NonExistingKubernetesHostException" nillable="true" type="ax212:NonExistingKubernetesHostException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="updateKubernetesHost"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax222:KubernetesHost"></xs:element> + <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax221:KubernetesHost"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -352,7 +351,7 @@ <xs:element name="AutoScalerServiceNonExistingKubernetesGroupException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="NonExistingKubernetesGroupException" nillable="true" type="ax214:NonExistingKubernetesGroupException"></xs:element> + <xs:element minOccurs="0" name="NonExistingKubernetesGroupException" nillable="true" type="ax212:NonExistingKubernetesGroupException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -366,21 +365,21 @@ <xs:element name="getKubernetesGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax222:KubernetesGroup"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax221:KubernetesGroup"></xs:element> </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:element> + <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax212:InvalidPolicyException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="updateDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax25:DeploymentPolicy"></xs:element> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax23:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -402,7 +401,7 @@ <xs:element name="getPartitionsOfGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:Partition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -416,7 +415,7 @@ <xs:element name="getPartitionsOfDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:Partition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -428,7 +427,7 @@ <xs:element name="getAllAvailablePartitionsResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:Partition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -440,7 +439,7 @@ <xs:element name="getAllDeploymentPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -466,21 +465,21 @@ <xs:element name="getValidDeploymentPoliciesforCartridgeResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoScalerServiceInvalidPartitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax214:InvalidPartitionException"></xs:element> + <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax212:InvalidPartitionException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="addPartition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="partition" nillable="true" type="ax26:Partition"></xs:element> + <xs:element minOccurs="0" name="partition" nillable="true" type="ax24:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -494,7 +493,7 @@ <xs:element name="addDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax25:DeploymentPolicy"></xs:element> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax23:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -555,7 +554,7 @@ <xs:element name="getAllKubernetesGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax222:KubernetesGroup"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:KubernetesGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -569,7 +568,7 @@ <xs:element name="getMasterForKubernetesGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax222:KubernetesMaster"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax221:KubernetesMaster"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -583,21 +582,21 @@ <xs:element name="getHostsForKubernetesGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax222:KubernetesHost"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:KubernetesHost"></xs:element> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoScalerServiceInvalidKubernetesGroupException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidKubernetesGroupException" nillable="true" type="ax214:InvalidKubernetesGroupException"></xs:element> + <xs:element minOccurs="0" name="InvalidKubernetesGroupException" nillable="true" type="ax212:InvalidKubernetesGroupException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="addKubernetesGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesGroup" nillable="true" type="ax222:KubernetesGroup"></xs:element> + <xs:element minOccurs="0" name="kubernetesGroup" nillable="true" type="ax221:KubernetesGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -612,7 +611,7 @@ <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax222:KubernetesHost"></xs:element> + <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax221:KubernetesHost"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -654,7 +653,7 @@ <xs:element name="AutoScalerServiceNonExistingLBException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="NonExistingLBException" nillable="true" type="ax214:NonExistingLBException"></xs:element> + <xs:element minOccurs="0" name="NonExistingLBException" nillable="true" type="ax212:NonExistingLBException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -739,32 +738,17 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoScalerServiceInvalidArgumentException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax214:InvalidArgumentException"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="updateClusterMonitor"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="AutoScalerServiceInvalidServiceGroupException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax214:InvalidServiceGroupException"></xs:element> + <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax212:InvalidServiceGroupException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="deployServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax23:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax219:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -785,7 +769,7 @@ <xs:element name="AutoScalerServiceAutoScalerException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax214:AutoScalerException"></xs:element> + <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax212:AutoScalerException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -800,7 +784,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="ax27:Property"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax25:Property"></xs:element> <xs:element minOccurs="0" name="propertiesSpecified" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> @@ -864,11 +848,6 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidArgumentException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> <xs:complexType name="InvalidServiceGroupException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> @@ -1078,12 +1057,6 @@ <wsdl:message name="addDeploymentPolicyResponse"> <wsdl:part name="parameters" element="ns:addDeploymentPolicyResponse"></wsdl:part> </wsdl:message> - <wsdl:message name="updateClusterMonitorRequest"> - <wsdl:part name="parameters" element="ns:updateClusterMonitor"></wsdl:part> - </wsdl:message> - <wsdl:message name="AutoScalerServiceInvalidArgumentException"> - <wsdl:part name="parameters" element="ns:AutoScalerServiceInvalidArgumentException"></wsdl:part> - </wsdl:message> <wsdl:message name="getAllKubernetesGroupsRequest"> <wsdl:part name="parameters" element="ns:getAllKubernetesGroups"></wsdl:part> </wsdl:message> @@ -1262,10 +1235,6 @@ <wsdl:output message="ns:addDeploymentPolicyResponse" wsaw:Action="urn:addDeploymentPolicyResponse"></wsdl:output> <wsdl:fault message="ns:AutoScalerServiceInvalidPolicyException" name="AutoScalerServiceInvalidPolicyException" wsaw:Action="urn:addDeploymentPolicyAutoScalerServiceInvalidPolicyException"></wsdl:fault> </wsdl:operation> - <wsdl:operation name="updateClusterMonitor"> - <wsdl:input message="ns:updateClusterMonitorRequest" wsaw:Action="urn:updateClusterMonitor"></wsdl:input> - <wsdl:fault message="ns:AutoScalerServiceInvalidArgumentException" name="AutoScalerServiceInvalidArgumentException" wsaw:Action="urn:updateClusterMonitorAutoScalerServiceInvalidArgumentException"></wsdl:fault> - </wsdl:operation> <wsdl:operation name="getAllKubernetesGroups"> <wsdl:input message="ns:getAllKubernetesGroupsRequest" wsaw:Action="urn:getAllKubernetesGroups"></wsdl:input> <wsdl:output message="ns:getAllKubernetesGroupsResponse" wsaw:Action="urn:getAllKubernetesGroupsResponse"></wsdl:output> @@ -1605,15 +1574,6 @@ <soap:fault use="literal" name="AutoScalerServiceInvalidPolicyException"></soap:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="updateClusterMonitor"> - <soap:operation soapAction="urn:updateClusterMonitor" style="document"></soap:operation> - <wsdl:input> - <soap:body use="literal"></soap:body> - </wsdl:input> - <wsdl:fault name="AutoScalerServiceInvalidArgumentException"> - <soap:fault use="literal" name="AutoScalerServiceInvalidArgumentException"></soap:fault> - </wsdl:fault> - </wsdl:operation> <wsdl:operation name="getAllKubernetesGroups"> <soap:operation soapAction="urn:getAllKubernetesGroups" style="document"></soap:operation> <wsdl:input> @@ -2001,15 +1961,6 @@ <soap12:fault use="literal" name="AutoScalerServiceInvalidPolicyException"></soap12:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="updateClusterMonitor"> - <soap12:operation soapAction="urn:updateClusterMonitor" style="document"></soap12:operation> - <wsdl:input> - <soap12:body use="literal"></soap12:body> - </wsdl:input> - <wsdl:fault name="AutoScalerServiceInvalidArgumentException"> - <soap12:fault use="literal" name="AutoScalerServiceInvalidArgumentException"></soap12:fault> - </wsdl:fault> - </wsdl:operation> <wsdl:operation name="getAllKubernetesGroups"> <soap12:operation soapAction="urn:getAllKubernetesGroups" style="document"></soap12:operation> <wsdl:input> @@ -2349,12 +2300,6 @@ <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:output> </wsdl:operation> - <wsdl:operation name="updateClusterMonitor"> - <http:operation location="updateClusterMonitor"></http:operation> - <wsdl:input> - <mime:content type="text/xml" part="parameters"></mime:content> - </wsdl:input> - </wsdl:operation> <wsdl:operation name="getAllKubernetesGroups"> <http:operation location="getAllKubernetesGroups"></http:operation> <wsdl:input> @@ -2424,22 +2369,22 @@ </wsdl:binding> <wsdl:service name="AutoScalerService"> <wsdl:port name="AutoScalerServiceHttpSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding"> - <soap:address location="http://192.168.1.2:9763/services/AutoScalerService.AutoScalerServiceHttpSoap11Endpoint/";></soap:address> + <soap:address location="http://10.100.1.142:9763/services/AutoScalerService.AutoScalerServiceHttpSoap11Endpoint/";></soap:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpsSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding"> - <soap:address location="https://192.168.1.2:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap11Endpoint/";></soap:address> + <soap:address location="https://10.100.1.142:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap11Endpoint/";></soap:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpsSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding"> - <soap12:address location="https://192.168.1.2:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap12Endpoint/";></soap12:address> + <soap12:address location="https://10.100.1.142:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap12Endpoint/";></soap12:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding"> - <soap12:address location="http://192.168.1.2:9763/services/AutoScalerService.AutoScalerServiceHttpSoap12Endpoint/";></soap12:address> + <soap12:address location="http://10.100.1.142:9763/services/AutoScalerService.AutoScalerServiceHttpSoap12Endpoint/";></soap12:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpEndpoint" binding="ns:AutoScalerServiceHttpBinding"> - <http:address location="http://192.168.1.2:9763/services/AutoScalerService.AutoScalerServiceHttpEndpoint/";></http:address> + <http:address location="http://10.100.1.142:9763/services/AutoScalerService.AutoScalerServiceHttpEndpoint/";></http:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpsEndpoint" binding="ns:AutoScalerServiceHttpBinding"> - <http:address location="https://192.168.1.2:9443/services/AutoScalerService.AutoScalerServiceHttpsEndpoint/";></http:address> + <http:address location="https://10.100.1.142:9443/services/AutoScalerService.AutoScalerServiceHttpsEndpoint/";></http:address> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file
