remove network partition modified to use UUID
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d23ca480 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d23ca480 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d23ca480 Branch: refs/heads/tenant-isolation Commit: d23ca480a4b64373cf6ea214ff0caabf628632fb Parents: 12512f3 Author: Dinithi <[email protected]> Authored: Tue Jul 7 18:46:30 2015 +0530 Committer: Dinithi <[email protected]> Committed: Tue Jul 7 18:46:30 2015 +0530 ---------------------------------------------------------------------- .../services/CloudControllerService.java | 3 +- .../impl/CloudControllerServiceImpl.java | 22 +- .../client/CloudControllerServiceClient.java | 4 +- .../rest/endpoint/api/StratosApiV41.java | 3 +- .../rest/endpoint/api/StratosApiV41Utils.java | 4 +- .../src/main/resources/AutoscalerService.wsdl | 518 +++++----- .../main/resources/CloudControllerService.wsdl | 999 ++++++++++--------- 7 files changed, 773 insertions(+), 780 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d23ca480/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java index 169c665..4ee2811 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java @@ -364,7 +364,8 @@ public interface CloudControllerService { * @param networkPartitionId * @throws NetworkPartitionNotExistsException */ - public boolean removeNetworkPartition(String networkPartitionId) throws NetworkPartitionNotExistsException; + public boolean removeNetworkPartition(String networkPartitionId, + int tenantId) throws NetworkPartitionNotExistsException; /** * Update network partition http://git-wip-us.apache.org/repos/asf/stratos/blob/d23ca480/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index c8579e3..212d1ef 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -35,7 +35,6 @@ import org.apache.stratos.cloud.controller.messaging.topology.TopologyManager; import org.apache.stratos.cloud.controller.services.CloudControllerService; import org.apache.stratos.cloud.controller.util.CloudControllerUtil; import org.apache.stratos.common.Property; -import org.apache.stratos.common.client.CloudControllerServiceClient; import org.apache.stratos.common.domain.LoadBalancingIPType; import org.apache.stratos.common.threading.StratosThreadPool; import org.apache.stratos.messaging.domain.topology.*; @@ -1524,24 +1523,15 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public boolean removeNetworkPartition(String networkPartitionId) throws NetworkPartitionNotExistsException { + public boolean removeNetworkPartition(String networkPartitionId, + int tenantId) throws NetworkPartitionNotExistsException { try { - org.apache.stratos.cloud.controller.stub.domain.NetworkPartition[] networkPartitions = - CloudControllerServiceClient.getInstance().getNetworkPartitions(); - org.apache.stratos.cloud.controller.stub.domain.NetworkPartition networkPartitionForTenant = null; - if (networkPartitions != null) { - for (org.apache.stratos.cloud.controller.stub.domain.NetworkPartition networkPartition : - networkPartitions) { - if (networkPartition.getId().equals(networkPartitionId) && networkPartition.getTenantId() == this - .tenantId) { - networkPartitionForTenant = networkPartition; - } - } - } + NetworkPartition networkPartition = cloudControllerContext.getNetworkPartitionForTenant + (networkPartitionId, tenantId); - if (networkPartitionForTenant != null) { - String networkPartitionUuid = networkPartitionForTenant.getUuid(); + if (networkPartition != null) { + String networkPartitionUuid = networkPartition.getUuid(); if (log.isInfoEnabled()) { log.info(String.format("Removing network partition: [network-partition-uuid] %s " + http://git-wip-us.apache.org/repos/asf/stratos/blob/d23ca480/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java index 8944564..d7e282b 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java @@ -199,9 +199,9 @@ public class CloudControllerServiceClient { stub.addNetworkPartition(networkPartition); } - public void removeNetworkPartition(String networkPartitionId) throws RemoteException, + public void removeNetworkPartition(String networkPartitionId, int tenantId) throws RemoteException, CloudControllerServiceNetworkPartitionNotExistsExceptionException { - stub.removeNetworkPartition(networkPartitionId); + stub.removeNetworkPartition(networkPartitionId, tenantId); } public void updateNetworkPartition(NetworkPartition networkPartition) throws RemoteException, http://git-wip-us.apache.org/repos/asf/stratos/blob/d23ca480/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index 7cd3ff8..9e6dd2e 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -734,7 +734,8 @@ public class StratosApiV41 extends AbstractApi { @PathParam("networkPartitionId") String networkPartitionId) throws RestAPIException { try { - StratosApiV41Utils.removeNetworkPartition(networkPartitionId); + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + StratosApiV41Utils.removeNetworkPartition(networkPartitionId, carbonContext.getTenantId()); } catch (CloudControllerServiceNetworkPartitionNotExistsExceptionException e) { return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "Network partition is not found")).build(); http://git-wip-us.apache.org/repos/asf/stratos/blob/d23ca480/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 8d8b802..72213ea 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -2786,7 +2786,7 @@ public class StratosApiV41Utils { * * @param networkPartitionId networkPartitionId */ - public static void removeNetworkPartition(String networkPartitionId) throws RestAPIException, + public static void removeNetworkPartition(String networkPartitionId, int tenantId) throws RestAPIException, CloudControllerServiceNetworkPartitionNotExistsExceptionException { try { @@ -2862,7 +2862,7 @@ public class StratosApiV41Utils { } CloudControllerServiceClient serviceClient = CloudControllerServiceClient.getInstance(); - serviceClient.removeNetworkPartition(networkPartitionId); + serviceClient.removeNetworkPartition(networkPartitionId, tenantId); } catch (AutoscalerServiceAutoScalerExceptionException e) { String message = e.getMessage(); log.error(message); http://git-wip-us.apache.org/repos/asf/stratos/blob/d23ca480/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 a927a44..9b7fde8 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,10 +1,10 @@ -<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax29="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ns="http://impl.services.autoscaler.stratos.apache.org"; xmlns:ax27="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax23="http://common.stratos.apache.org/xsd"; xmlns:ax21="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax22="http://partition.common.stratos.apache.org/xsd"; xmlns:ax219="http://io.java/xsd"; xmlns:ax218="http://rmi.java/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax215="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax222="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax213="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax211="http://application.exception.au toscaler.stratos.apache.org/xsd" 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://impl.services.autoscaler.stratos.apache.org";> +<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax29="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ns="http://impl.services.autoscaler.stratos.apache.org"; xmlns:ax25="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax26="http://common.stratos.apache.org/xsd"; xmlns:ax23="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax21="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax219="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://partition.common.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax213="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax222="http://rmi.java/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax223="http://io.java/xsd"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax211="http://autoscale.policy.pojo.au toscaler.stratos.apache.org/xsd" 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://impl.services.autoscaler.stratos.apache.org";> <wsdl:types> - <xs:schema xmlns:ax220="http://io.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd";> + <xs:schema xmlns:ax224="http://io.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd";> <xs:import namespace="http://io.java/xsd"/> <xs:complexType name="RemoteException"> <xs:complexContent> - <xs:extension base="ax219:IOException"> + <xs:extension base="ax223:IOException"> <xs:sequence> <xs:element minOccurs="0" name="cause" nillable="true" type="xs:anyType"/> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> @@ -21,7 +21,7 @@ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="instanceRoundingFactor" type="xs:float"/> <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> - <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax27:LoadThresholds"/> + <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax211:LoadThresholds"/> <xs:element minOccurs="0" name="tenantId" type="xs:int"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> @@ -34,17 +34,17 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax216="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax27="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="ax215:ComponentContext"/> + <xs:element minOccurs="0" name="components" nillable="true" type="ax25:ComponentContext"/> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> <xs:element minOccurs="0" name="status" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="tenantAdminUsername" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"/> @@ -53,10 +53,10 @@ </xs:complexType> <xs:complexType name="ComponentContext"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax215:ApplicationClusterContext"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax215:CartridgeContext"/> - <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax215:DependencyContext"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax215:GroupContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax25:ApplicationClusterContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax25:CartridgeContext"/> + <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax25:DependencyContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax25:GroupContext"/> </xs:sequence> </xs:complexType> <xs:complexType name="ApplicationClusterContext"> @@ -67,8 +67,8 @@ <xs:element maxOccurs="unbounded" minOccurs="0" name="dependencyClusterIds" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax215:PersistenceContext"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> + <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax25:PersistenceContext"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"/> </xs:sequence> @@ -76,7 +76,7 @@ <xs:complexType name="PersistenceContext"> <xs:sequence> <xs:element minOccurs="0" name="persistenceRequired" type="xs:boolean"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax215:VolumeContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax25:VolumeContext"/> </xs:sequence> </xs:complexType> <xs:complexType name="VolumeContext"> @@ -95,21 +95,21 @@ <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="ax215:SubscribableInfoContext"/> + <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax25:SubscribableInfoContext"/> <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> <xs:complexType name="SubscribableInfoContext"> <xs:sequence> <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax215:ArtifactRepositoryContext"/> + <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax25:ArtifactRepositoryContext"/> <xs:element minOccurs="0" name="autoscalingPolicy" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="dependencyAliases" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="maxMembers" type="xs:int"/> <xs:element minOccurs="0" name="minMembers" type="xs:int"/> - <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax215:PersistenceContext"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> + <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax25:PersistenceContext"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> </xs:sequence> </xs:complexType> <xs:complexType name="ArtifactRepositoryContext"> @@ -131,9 +131,9 @@ <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="ax215:CartridgeContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax25:CartridgeContext"/> <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax215:GroupContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax25:GroupContext"/> <xs:element minOccurs="0" name="groupMaxInstances" type="xs:int"/> <xs:element minOccurs="0" name="groupMinInstances" type="xs:int"/> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> @@ -157,104 +157,102 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax28="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax26="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax221="http://rmi.java/xsd"; xmlns:ax212="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax223="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax210="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax226="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> - <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/> - <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/> - <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/> + <xs:schema xmlns:ax28="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax22="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax218="http://common.stratos.apache.org/xsd"; xmlns:ax220="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax212="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax210="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax225="http://rmi.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/> - <xs:import namespace="http://rmi.java/xsd"/> - <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://common.stratos.apache.org/xsd"/> - <xs:element name="getDeploymentPolicy"> + <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://rmi.java/xsd"/> + <xs:element name="AutoscalerServiceApplicationDefinitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax21:ApplicationDefinitionException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicyResponse"> + <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:DeploymentPolicy"/> + <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax23:CartridgeGroupNotFoundException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoscalingPolicy"> + <xs:element name="AutoscalerServiceCartridgeNotFoundException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax23:CartridgeNotFoundException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoscalingPolicyResponse"> + <xs:element name="addApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax27:AutoscalePolicy"/> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax28:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroup"> + <xs:element name="addApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupResponse"> + <xs:element name="getApplications"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/> - </xs:sequence> + <xs:sequence/> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceApplicationDefinitionException"> + <xs:element name="getApplicationsResponse"> <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="ax28:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException"> + <xs:element name="getServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax214:CartridgeGroupNotFoundException"/> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceCartridgeNotFoundException"> + <xs:element name="getServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax214:CartridgeNotFoundException"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addApplication"> + <xs:element name="getAutoscalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax217:ApplicationContext"/> + <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addApplicationResponse"> + <xs:element name="getAutoscalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateApplication"> + <xs:element name="getDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax217:ApplicationContext"/> + <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateApplicationResponse"> + <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="ax217:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -268,179 +266,154 @@ <xs:element name="getApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax217:ApplicationContext"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="existApplication"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax28:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="existApplicationResponse"> + <xs:element name="AutoscalerServiceInvalidArgumentException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax23:InvalidArgumentException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplications"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getApplicationsResponse"> + <xs:element name="updateClusterMonitor"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax217:ApplicationContext"/> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployApplication"> + <xs:element name="updateClusterMonitorResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployApplicationResponse"> + <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax23:AutoScalingPolicyAlreadyExistException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceRemoteException"> + <xs:element name="addAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax218:RemoteException"/> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidApplicationPolicyException"> + <xs:element name="addAutoScalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax212:InvalidApplicationPolicyException"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceApplicationPolicyAlreadyExistsException"> + <xs:element name="AutoscalerServiceInvalidPolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="ApplicationPolicyAlreadyExistsException" nillable="true" type="ax222:ApplicationPolicyAlreadyExistsException"/> + <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax219:InvalidPolicyException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addApplicationPolicy"> + <xs:element name="updateAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax26:ApplicationPolicy"/> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addApplicationPolicyResponse"> + <xs:element name="updateAutoScalingPolicyResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationPolicy"> + <xs:element name="AutoscalerServiceUnremovablePolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax219:UnremovablePolicyException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationPolicyResponse"> + <xs:element name="AutoscalerServicePolicyDoesNotExistException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:ApplicationPolicy"/> + <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax219:PolicyDoesNotExistException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationPolicies"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getApplicationPoliciesResponse"> + <xs:element name="removeAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:ApplicationPolicy"/> + <xs:element minOccurs="0" name="autoscalePolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException"> + <xs:element name="removeAutoScalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax222:ApplicatioinPolicyNotExistsException"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateApplicationPolicy"> + <xs:element name="getAutoScalingPolicies"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax26:ApplicationPolicy"/> - </xs:sequence> + <xs:sequence/> </xs:complexType> </xs:element> - <xs:element name="updateApplicationPolicyResponse"> + <xs:element name="getAutoScalingPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidPolicyException"> + <xs:element name="updateApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax222:InvalidPolicyException"/> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax28:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceUnremovablePolicyException"> + <xs:element name="updateApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax222:UnremovablePolicyException"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeApplicationPolicy"> + <xs:element name="existApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeApplicationPolicyResponse"> + <xs:element name="existApplicationResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceAutoScalerException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax214:AutoScalerException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getApplicationNetworkPartitions"> + <xs:element name="deployApplication"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationNetworkPartitionsResponse"> + <xs:element name="deployApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> @@ -473,22 +446,10 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroups"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getServiceGroupsResponse"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="AutoscalerServiceInvalidServiceGroupException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax212:InvalidServiceGroupException"/> + <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax21:InvalidServiceGroupException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -534,169 +495,182 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidArgumentException"> + <xs:element name="findClusterId"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax214:InvalidArgumentException"/> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateClusterMonitor"> + <xs:element name="findClusterIdResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> + <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateClusterMonitorResponse"> + <xs:element name="AutoscalerServiceAutoScalerException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax23:AutoScalerException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="findClusterId"> + <xs:element name="getServiceGroups"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getServiceGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="findClusterIdResponse"> + <xs:element name="serviceGroupExist"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException"> + <xs:element name="serviceGroupExistResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax222:InvalidDeploymentPolicyException"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException"> + <xs:element name="undeployServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax222:DeploymentPolicyNotExistsException"/> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceCloudControllerConnectionException"> + <xs:element name="undeployServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax214:CloudControllerConnectionException"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateDeploymentPolicy"> + <xs:element name="getApplicationNetworkPartitions"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax26:DeploymentPolicy"/> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateDeploymentPolicyResponse"> + <xs:element name="getApplicationNetworkPartitionsResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicies"> + <xs:element name="AutoscalerServiceRemoteException"> <xs:complexType> - <xs:sequence/> + <xs:sequence> + <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax222:RemoteException"/> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPoliciesResponse"> + <xs:element name="AutoscalerServiceInvalidApplicationPolicyException"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:DeploymentPolicy"/> + <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax21:InvalidApplicationPolicyException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoScalingPolicies"> + <xs:element name="AutoscalerServiceApplicationPolicyAlreadyExistsException"> <xs:complexType> - <xs:sequence/> + <xs:sequence> + <xs:element minOccurs="0" name="ApplicationPolicyAlreadyExistsException" nillable="true" type="ax219:ApplicationPolicyAlreadyExistsException"/> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoScalingPoliciesResponse"> + <xs:element name="addApplicationPolicy"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:AutoscalePolicy"/> + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax217:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException"> + <xs:element name="addApplicationPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax214:AutoScalingPolicyAlreadyExistException"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addAutoScalingPolicy"> + <xs:element name="removeApplicationPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax27:AutoscalePolicy"/> + <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addAutoScalingPolicyResponse"> + <xs:element name="removeApplicationPolicyResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateAutoScalingPolicy"> + <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax27:AutoscalePolicy"/> + <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax219:ApplicatioinPolicyNotExistsException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateAutoScalingPolicyResponse"> + <xs:element name="updateApplicationPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax217:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServicePolicyDoesNotExistException"> + <xs:element name="updateApplicationPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax222:PolicyDoesNotExistException"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeAutoScalingPolicy"> + <xs:element name="getApplicationPolicies"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicyId" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax217:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeAutoScalingPolicyResponse"> + <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax219:InvalidDeploymentPolicyException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax222:DeploymentPolicyAlreadyExistsException"/> + <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax219:DeploymentPolicyAlreadyExistsException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="addDeployementPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax26:DeploymentPolicy"/> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax217:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -707,56 +681,82 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeDeployementPolicy"> + <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax219:DeploymentPolicyNotExistsException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeDeployementPolicyResponse"> + <xs:element name="AutoscalerServiceCloudControllerConnectionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax23:CloudControllerConnectionException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="serviceGroupExist"> + <xs:element name="updateDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax217:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="serviceGroupExistResponse"> + <xs:element name="updateDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="undeployServiceGroup"> + <xs:element name="removeDeployementPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="undeployServiceGroupResponse"> + <xs:element name="removeDeployementPolicyResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="getDeploymentPolicies"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getDeploymentPoliciesResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax217:DeploymentPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax217:ApplicationPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> </xs:schema> - <xs:schema xmlns:ax25="http://partition.common.stratos.apache.org/xsd"; xmlns:ax224="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax216="http://partition.common.stratos.apache.org/xsd"; xmlns:ax226="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> <xs:import namespace="http://partition.common.stratos.apache.org/xsd"/> <xs:import namespace="http://common.stratos.apache.org/xsd"/> <xs:complexType name="DeploymentPolicy"> <xs:sequence> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax25:NetworkPartitionRef"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax216:NetworkPartitionRef"/> <xs:element minOccurs="0" name="tenantId" type="xs:int"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> @@ -767,19 +767,19 @@ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionGroups" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitions" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"/> <xs:element minOccurs="0" name="tenantId" type="xs:int"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax24="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd";> + <xs:schema xmlns:ax215="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd";> <xs:import namespace="http://common.stratos.apache.org/xsd"/> <xs:complexType name="NetworkPartitionRef"> <xs:sequence> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionRefs" nillable="true" type="ax22:PartitionRef"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionRefs" nillable="true" type="ax214:PartitionRef"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> @@ -789,7 +789,7 @@ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="partitionMax" type="xs:int"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"/> </xs:sequence> </xs:complexType> </xs:schema> @@ -799,12 +799,12 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidApplicationPolicyException"> + <xs:complexType name="InvalidServiceGroupException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidServiceGroupException"> + <xs:complexType name="InvalidApplicationPolicyException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> @@ -813,7 +813,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="ax23:Property"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax26:Property"/> </xs:sequence> </xs:complexType> <xs:complexType name="Property"> @@ -823,16 +823,8 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax225="http://exception.autoscaler.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.exception.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax221="http://exception.autoscaler.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.exception.autoscaler.stratos.apache.org/xsd";> <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/> - <xs:complexType name="ApplicationPolicyAlreadyExistsException"> - <xs:sequence/> - </xs:complexType> - <xs:complexType name="ApplicatioinPolicyNotExistsException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> <xs:complexType name="InvalidPolicyException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> @@ -840,29 +832,37 @@ </xs:complexType> <xs:complexType name="UnremovablePolicyException"> <xs:complexContent> - <xs:extension base="ax213:AutoScalerException"> + <xs:extension base="ax23:AutoScalerException"> <xs:sequence/> </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="InvalidDeploymentPolicyException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="DeploymentPolicyNotExistsException"> - <xs:sequence/> - </xs:complexType> <xs:complexType name="PolicyDoesNotExistException"> <xs:complexContent> - <xs:extension base="ax213:AutoScalerException"> + <xs:extension base="ax23:AutoScalerException"> <xs:sequence/> </xs:extension> </xs:complexContent> </xs:complexType> + <xs:complexType name="ApplicationPolicyAlreadyExistsException"> + <xs:sequence/> + </xs:complexType> + <xs:complexType name="ApplicatioinPolicyNotExistsException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="InvalidDeploymentPolicyException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> <xs:complexType name="DeploymentPolicyAlreadyExistsException"> <xs:sequence/> </xs:complexType> + <xs:complexType name="DeploymentPolicyNotExistsException"> + <xs:sequence/> + </xs:complexType> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://io.java/xsd";> <xs:complexType name="IOException"> @@ -880,6 +880,14 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> + <xs:complexType name="InvalidArgumentException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="AutoScalingPolicyAlreadyExistException"> + <xs:sequence/> + </xs:complexType> <xs:complexType name="AutoScalerException"> <xs:complexContent> <xs:extension base="xs:RuntimeException"> @@ -887,19 +895,17 @@ </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="InvalidArgumentException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> <xs:complexType name="CloudControllerConnectionException"> <xs:sequence/> </xs:complexType> - <xs:complexType name="AutoScalingPolicyAlreadyExistException"> - <xs:sequence/> - </xs:complexType> </xs:schema> </wsdl:types> + <wsdl:message name="getAutoScalingPoliciesRequest"> + <wsdl:part name="parameters" element="ns:getAutoScalingPolicies"/> + </wsdl:message> + <wsdl:message name="getAutoScalingPoliciesResponse"> + <wsdl:part name="parameters" element="ns:getAutoScalingPoliciesResponse"/> + </wsdl:message> <wsdl:message name="removeAutoScalingPolicyRequest"> <wsdl:part name="parameters" element="ns:removeAutoScalingPolicy"/> </wsdl:message> @@ -912,12 +918,6 @@ <wsdl:message name="AutoscalerServicePolicyDoesNotExistException"> <wsdl:part name="parameters" element="ns:AutoscalerServicePolicyDoesNotExistException"/> </wsdl:message> - <wsdl:message name="getAutoScalingPoliciesRequest"> - <wsdl:part name="parameters" element="ns:getAutoScalingPolicies"/> - </wsdl:message> - <wsdl:message name="getAutoScalingPoliciesResponse"> - <wsdl:part name="parameters" element="ns:getAutoScalingPoliciesResponse"/> - </wsdl:message> <wsdl:message name="getDeploymentPoliciesRequest"> <wsdl:part name="parameters" element="ns:getDeploymentPolicies"/> </wsdl:message> @@ -1153,16 +1153,16 @@ <wsdl:part name="parameters" element="ns:updateApplicationResponse"/> </wsdl:message> <wsdl:portType name="AutoscalerServicePortType"> + <wsdl:operation name="getAutoScalingPolicies"> + <wsdl:input message="ns:getAutoScalingPoliciesRequest" wsaw:Action="urn:getAutoScalingPolicies"/> + <wsdl:output message="ns:getAutoScalingPoliciesResponse" wsaw:Action="urn:getAutoScalingPoliciesResponse"/> + </wsdl:operation> <wsdl:operation name="removeAutoScalingPolicy"> <wsdl:input message="ns:removeAutoScalingPolicyRequest" wsaw:Action="urn:removeAutoScalingPolicy"/> <wsdl:output message="ns:removeAutoScalingPolicyResponse" wsaw:Action="urn:removeAutoScalingPolicyResponse"/> <wsdl:fault message="ns:AutoscalerServiceUnremovablePolicyException" name="AutoscalerServiceUnremovablePolicyException" wsaw:Action="urn:removeAutoScalingPolicyAutoscalerServiceUnremovablePolicyException"/> <wsdl:fault message="ns:AutoscalerServicePolicyDoesNotExistException" name="AutoscalerServicePolicyDoesNotExistException" wsaw:Action="urn:removeAutoScalingPolicyAutoscalerServicePolicyDoesNotExistException"/> </wsdl:operation> - <wsdl:operation name="getAutoScalingPolicies"> - <wsdl:input message="ns:getAutoScalingPoliciesRequest" wsaw:Action="urn:getAutoScalingPolicies"/> - <wsdl:output message="ns:getAutoScalingPoliciesResponse" wsaw:Action="urn:getAutoScalingPoliciesResponse"/> - </wsdl:operation> <wsdl:operation name="getDeploymentPolicies"> <wsdl:input message="ns:getDeploymentPoliciesRequest" wsaw:Action="urn:getDeploymentPolicies"/> <wsdl:output message="ns:getDeploymentPoliciesResponse" wsaw:Action="urn:getDeploymentPoliciesResponse"/> @@ -1324,15 +1324,6 @@ </wsdl:portType> <wsdl:binding name="AutoscalerServiceSoap11Binding" type="ns:AutoscalerServicePortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"/> - <wsdl:operation name="getAutoScalingPolicies"> - <soap:operation soapAction="urn:getAutoScalingPolicies" style="document"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> <wsdl:operation name="removeAutoScalingPolicy"> <soap:operation soapAction="urn:removeAutoScalingPolicy" style="document"/> <wsdl:input> @@ -1348,6 +1339,15 @@ <soap:fault use="literal" name="AutoscalerServiceUnremovablePolicyException"/> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getAutoScalingPolicies"> + <soap:operation soapAction="urn:getAutoScalingPolicies" style="document"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="addApplicationPolicy"> <soap:operation soapAction="urn:addApplicationPolicy" style="document"/> <wsdl:input> @@ -1732,15 +1732,6 @@ </wsdl:binding> <wsdl:binding name="AutoscalerServiceSoap12Binding" type="ns:AutoscalerServicePortType"> <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"/> - <wsdl:operation name="getAutoScalingPolicies"> - <soap12:operation soapAction="urn:getAutoScalingPolicies" style="document"/> - <wsdl:input> - <soap12:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap12:body use="literal"/> - </wsdl:output> - </wsdl:operation> <wsdl:operation name="removeAutoScalingPolicy"> <soap12:operation soapAction="urn:removeAutoScalingPolicy" style="document"/> <wsdl:input> @@ -1756,6 +1747,15 @@ <soap12:fault use="literal" name="AutoscalerServiceUnremovablePolicyException"/> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getAutoScalingPolicies"> + <soap12:operation soapAction="urn:getAutoScalingPolicies" style="document"/> + <wsdl:input> + <soap12:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal"/> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="addApplicationPolicy"> <soap12:operation soapAction="urn:addApplicationPolicy" style="document"/> <wsdl:input> @@ -2140,8 +2140,8 @@ </wsdl:binding> <wsdl:binding name="AutoscalerServiceHttpBinding" type="ns:AutoscalerServicePortType"> <http:binding verb="POST"/> - <wsdl:operation name="getAutoScalingPolicies"> - <http:operation location="getAutoScalingPolicies"/> + <wsdl:operation name="removeAutoScalingPolicy"> + <http:operation location="removeAutoScalingPolicy"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input> @@ -2149,8 +2149,8 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="removeAutoScalingPolicy"> - <http:operation location="removeAutoScalingPolicy"/> + <wsdl:operation name="getAutoScalingPolicies"> + <http:operation location="getAutoScalingPolicies"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input>
