Autoscaling policy modified
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/606f663b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/606f663b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/606f663b Branch: refs/heads/tenant-isolation Commit: 606f663be0c0e2fa3c99c456f419512effa70630 Parents: a4f76a4 Author: Dinithi <[email protected]> Authored: Thu Jul 16 18:57:11 2015 +0530 Committer: Dinithi <[email protected]> Committed: Thu Jul 16 18:57:11 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/pojo/policy/PolicyManager.java | 20 +- .../autoscaler/services/AutoscalerService.java | 13 +- .../services/impl/AutoscalerServiceImpl.java | 18 +- .../common/client/AutoscalerServiceClient.java | 4 + .../rest/endpoint/api/StratosApiV41Utils.java | 51 +--- .../src/main/resources/AutoscalerService.wsdl | 271 +++++++++++-------- 6 files changed, 220 insertions(+), 157 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/606f663b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java index a0a567b..45faf41 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java @@ -83,7 +83,8 @@ public class PolicyManager { // Add the policy to information model and persist. public boolean addAutoscalePolicy(AutoscalePolicy policy) throws AutoScalingPolicyAlreadyExistException { if (log.isInfoEnabled()) { - log.info(String.format("Adding autoscaling policy: [id] %s", policy.getUuid())); + log.info(String.format("Adding autoscaling policy: [autoscaling policy-uuid] %s [autoscaling policy-id] " + + "%s", policy.getUuid(), policy.getId())); } if (StringUtils.isEmpty(policy.getUuid())) { throw new AutoScalerException("Autoscaling policy id cannot be empty"); @@ -91,7 +92,9 @@ public class PolicyManager { this.addASPolicyToInformationModel(policy); RegistryManager.getInstance().persistAutoscalerPolicy(policy); if (log.isInfoEnabled()) { - log.info(String.format("Autoscaling policy is added successfully: [id] %s", policy.getUuid())); + log.info(String.format("Autoscaling policy: [autoscaling-policy-uuid] %s [autoscaling-policy-id] %s added" + + " successfully", + policy.getUuid(), policy.getId())); } return true; } @@ -103,19 +106,20 @@ public class PolicyManager { this.updateASPolicyInInformationModel(policy); RegistryManager.getInstance().persistAutoscalerPolicy(policy); if (log.isInfoEnabled()) { - log.info(String.format("Autoscaling policy is updated successfully: [id] %s", policy.getUuid())); + log.info(String.format("Autoscaling policy updated successfully: [autoscaling policy-uuid] %s " + + "[autoscaling policy-id] %s", policy.getUuid(), policy.getId())); } return true; } - public boolean removeAutoscalePolicy(String policyID) { - if (StringUtils.isEmpty(policyID)) { + public boolean removeAutoscalePolicy(String policyId) { + if (StringUtils.isEmpty(policyId)) { throw new AutoScalerException("Autoscaling policy id cannot be empty"); } - this.removeASPolicyInInformationModel(policyID); - RegistryManager.getInstance().removeAutoscalerPolicy(policyID); + this.removeASPolicyInInformationModel(policyId); + RegistryManager.getInstance().removeAutoscalerPolicy(policyId); if (log.isInfoEnabled()) { - log.info(String.format("Autoscaling policy is removed successfully: [id] %s", policyID)); + log.info(String.format("Autoscaling policy removed successfully: [autoscaling-policy-id] %s", policyId)); } return true; } http://git-wip-us.apache.org/repos/asf/stratos/blob/606f663b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java index f297287..2350c57 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java @@ -337,11 +337,22 @@ public interface AutoscalerService { public ApplicationContext[] getApplicationsByTenant(int tenantId); /** - * Get deployment policy definition + * Get deployment policy definition by tenant * * @param tenantId tenant id * @return Deployment policy */ public DeploymentPolicy[] getDeploymentPoliciesByTenant(int tenantId); + /** + * Get autoscaling policy definition by tenant + * + * @param tenantId tenant id + * @return Autoscaling policy + */ + public AutoscalePolicy[] getAutoScalingPoliciesByTenant(int tenantId); + + + + } http://git-wip-us.apache.org/repos/asf/stratos/blob/606f663b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java index b1b1a47..91a12ac 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java @@ -88,13 +88,29 @@ public class AutoscalerServiceImpl implements AutoscalerService { } @Override + public AutoscalePolicy[] getAutoScalingPoliciesByTenant(int tenantId) { + AutoscalePolicy[] allAutoscalePolicies = getAutoScalingPolicies(); + List<AutoscalePolicy> autoscalePolicies = new ArrayList<AutoscalePolicy>(); + + if(allAutoscalePolicies!=null){ + for(AutoscalePolicy autoscalePolicy: allAutoscalePolicies){ + if(autoscalePolicy.getTenantId()==tenantId){ + autoscalePolicies.add(autoscalePolicy); + } + } + } + return autoscalePolicies.toArray(new AutoscalePolicy[autoscalePolicies.size()]); + } + + @Override public boolean addAutoScalingPolicy(AutoscalePolicy autoscalePolicy) throws AutoScalingPolicyAlreadyExistException { String autoscalePolicyId = autoscalePolicy.getId(); if (PolicyManager.getInstance().getAutoscalePolicyById(autoscalePolicyId) != null && PolicyManager .getInstance().getAutoscalePolicyById(autoscalePolicyId).getTenantId() == autoscalePolicy.getTenantId ()) { - String message = "Autoscaling policy already exists: [autoscaling-policy-id] " + autoscalePolicyId; + String message = String.format("Autoscaling policy already exists: [autoscaling-policy-uuid] %s " + + "[autoscaling-policy-id] %s", autoscalePolicy.getUuid(), autoscalePolicyId); log.error(message); throw new AutoScalingPolicyAlreadyExistException(message); } http://git-wip-us.apache.org/repos/asf/stratos/blob/606f663b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java index 4406898..1e6c0c8 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java @@ -272,4 +272,8 @@ public class AutoscalerServiceClient { return stub.getDeploymentPolicies(); } + public AutoscalePolicy[] getAutoScalingPoliciesByTenant(int tenantId) throws RemoteException { + return stub.getAutoScalingPoliciesByTenant(tenantId); + } + } http://git-wip-us.apache.org/repos/asf/stratos/blob/606f663b/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 d8cf30c..7e3564d 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 @@ -946,34 +946,16 @@ public class StratosApiV41Utils { * @throws RestAPIException */ public static AutoscalePolicyBean[] getAutoScalePolicies() throws RestAPIException { - - org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy[] autoscalePolicies = null; - AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); - AutoscalePolicy[] autoscalingPoliciesForTenantArray = new AutoscalePolicy[0]; - - if (autoscalerServiceClient != null) { - try { - autoscalePolicies = autoscalerServiceClient.getAutoScalePolicies(); - if (autoscalePolicies != null) { - PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - List<AutoscalePolicy> autoscalingPoliciesForTenant = new ArrayList<AutoscalePolicy>(); - for (AutoscalePolicy autoscalePolicy : autoscalePolicies) { - if (carbonContext.getTenantId() == autoscalePolicy.getTenantId()) { - autoscalingPoliciesForTenant.add(autoscalePolicy); - } - } - if (autoscalingPoliciesForTenant.size() != 0) { - autoscalingPoliciesForTenantArray = autoscalingPoliciesForTenant.toArray(new - AutoscalePolicy[autoscalingPoliciesForTenant.size()]); - } - } - } catch (RemoteException e) { - String errorMsg = "Error while getting available autoscaling policies. Cause : " + e.getMessage(); - log.error(errorMsg, e); - throw new RestAPIException(errorMsg, e); - } + try { + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + AutoscalePolicy[] autoscalePolicies + = AutoscalerServiceClient.getInstance().getAutoScalingPoliciesByTenant(carbonContext.getTenantId()); + return ObjectConverter.convertStubAutoscalePoliciesToAutoscalePolicies(autoscalePolicies); + } catch (RemoteException e) { + String message = "Could not get autoscaling policies"; + log.error(message); + throw new RestAPIException(message, e); } - return ObjectConverter.convertStubAutoscalePoliciesToAutoscalePolicies(autoscalingPoliciesForTenantArray); } /** @@ -987,17 +969,10 @@ public class StratosApiV41Utils { AutoscalePolicyBean autoscalePolicyBean; try { - AutoscalePolicy[] autoscalePolicies = AutoscalerServiceClient.getInstance().getAutoScalePolicies(); - - AutoscalePolicy autoscalePolicy = null; PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - for (AutoscalePolicy autoscalePolicy1 : autoscalePolicies) { - if (carbonContext.getTenantId() == autoscalePolicy1.getTenantId()) { - if (autoscalePolicy1.getId().equals(autoscalePolicyId)) { - autoscalePolicy = autoscalePolicy1; - } - } - } + AutoscalePolicy autoscalePolicy = AutoscalerServiceClient.getInstance().getAutoScalePolicyForTenant + (autoscalePolicyId, carbonContext.getTenantId()); + if (autoscalePolicy == null) { return null; } @@ -1009,6 +984,8 @@ public class StratosApiV41Utils { throw new RestAPIException(errorMsg, e); } return autoscalePolicyBean; + + } // Util methods for repo actions http://git-wip-us.apache.org/repos/asf/stratos/blob/606f663b/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 2e9f2e8..4a8cee9 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://deployment.policy.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:ax216="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax219="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax222="http://rmi.java/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax210="http://partition.common.stratos.apache.org/xsd"; xmlns:ax223="http://io.java/xsd"; xmlns:http="http:/ /schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://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://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ns="http://impl.services.autoscaler.stratos.apache.org"; xmlns:ax27="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax25="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax21="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax216="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax22="http://common.stratos.apache.org/xsd"; xmlns:ax214="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax220="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax210="http://partition.common.stratos.apache.org/xsd"; xmlns:ax223="http://rmi.java/xsd"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax224="http://io.java/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:ax224="http://io.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd";> + <xs:schema xmlns:ax225="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="ax223:IOException"> + <xs:extension base="ax224: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"/> @@ -34,18 +34,18 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax27="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax23="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="applicationUuid" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="components" nillable="true" type="ax25:ComponentContext"/> + <xs:element minOccurs="0" name="components" nillable="true" type="ax21: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="ax27:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23: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"/> @@ -54,10 +54,10 @@ </xs:complexType> <xs:complexType name="ComponentContext"> <xs:sequence> - <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:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax21:ApplicationClusterContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax21:CartridgeContext"/> + <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax21:DependencyContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax21:GroupContext"/> </xs:sequence> </xs:complexType> <xs:complexType name="ApplicationClusterContext"> @@ -69,8 +69,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="ax25:PersistenceContext"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> + <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax21:PersistenceContext"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23: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> @@ -78,7 +78,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="ax25:VolumeContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax21:VolumeContext"/> </xs:sequence> </xs:complexType> <xs:complexType name="VolumeContext"> @@ -97,7 +97,7 @@ <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="ax25:SubscribableInfoContext"/> + <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax21:SubscribableInfoContext"/> <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> @@ -105,7 +105,7 @@ <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="ax25:ArtifactRepositoryContext"/> + <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax21:ArtifactRepositoryContext"/> <xs:element minOccurs="0" name="autoscalingPolicy" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="autoscalingPolicyUuid" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="dependencyAliases" nillable="true" type="xs:string"/> @@ -113,8 +113,8 @@ <xs:element minOccurs="0" name="deploymentPolicyUuid" 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="ax25:PersistenceContext"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> + <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax21:PersistenceContext"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> </xs:sequence> </xs:complexType> <xs:complexType name="ArtifactRepositoryContext"> @@ -136,10 +136,10 @@ <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="ax25:CartridgeContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax21:CartridgeContext"/> <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="deploymentPolicyUuid" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax25:GroupContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax21: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"/> @@ -167,60 +167,60 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax28="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://autoscale.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:ax215="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax220="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax213="http://deployment.policy.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:schema xmlns:ax28="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax26="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax218="http://common.stratos.apache.org/xsd"; xmlns:ax215="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax221="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax213="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax226="http://rmi.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> + <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/> <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://deployment.policy.pojo.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://common.stratos.apache.org/xsd"/> <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://rmi.java/xsd"/> - <xs:element name="AutoscalerServiceApplicationDefinitionException"> + <xs:element name="getApplications"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax21:ApplicationDefinitionException"/> - </xs:sequence> + <xs:sequence/> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException"> + <xs:element name="getApplicationsResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax23:CartridgeGroupNotFoundException"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceCartridgeNotFoundException"> + <xs:element name="AutoscalerServiceApplicationDefinitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax23:CartridgeNotFoundException"/> + <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax25:ApplicationDefinitionException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addApplication"> + <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax28:ApplicationContext"/> + <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax27:CartridgeGroupNotFoundException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addApplicationResponse"> + <xs:element name="AutoscalerServiceCartridgeNotFoundException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax27:CartridgeNotFoundException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplications"> + <xs:element name="addApplication"> <xs:complexType> - <xs:sequence/> + <xs:sequence> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationsResponse"> + <xs:element name="addApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax28:ApplicationContext"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> @@ -248,7 +248,7 @@ <xs:element name="getApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax28:ApplicationContext"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> @@ -283,7 +283,7 @@ <xs:element name="AutoscalerServiceInvalidArgumentException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax23:InvalidArgumentException"/> + <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax27:InvalidArgumentException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -291,7 +291,7 @@ <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/> </xs:sequence> </xs:complexType> </xs:element> @@ -302,6 +302,20 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="getApplicationPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationPolicyUuid" 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="ax29:ApplicationPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="getAutoScalingPolicies"> <xs:complexType> <xs:sequence/> @@ -314,10 +328,24 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="getAutoScalingPoliciesByTenant"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="tenantId" type="xs:int"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getAutoScalingPoliciesByTenantResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax217:AutoscalePolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax23:AutoScalingPolicyAlreadyExistException"/> + <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax27:AutoScalingPolicyAlreadyExistException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -338,7 +366,7 @@ <xs:element name="AutoscalerServiceInvalidPolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax219:InvalidPolicyException"/> + <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax220:InvalidPolicyException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -359,14 +387,14 @@ <xs:element name="AutoscalerServiceUnremovablePolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax219:UnremovablePolicyException"/> + <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax220:UnremovablePolicyException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServicePolicyDoesNotExistException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax219:PolicyDoesNotExistException"/> + <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax220:PolicyDoesNotExistException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -402,7 +430,7 @@ <xs:element name="updateApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax28:ApplicationContext"/> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> @@ -424,7 +452,7 @@ <xs:element name="getApplicationByTenantResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax28:ApplicationContext"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> @@ -453,7 +481,7 @@ <xs:element name="getApplicationsByTenantResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax28:ApplicationContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> @@ -504,7 +532,7 @@ <xs:element name="AutoscalerServiceInvalidServiceGroupException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax21:InvalidServiceGroupException"/> + <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax25:InvalidServiceGroupException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -598,7 +626,7 @@ <xs:element name="AutoscalerServiceAutoScalerException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax23:AutoScalerException"/> + <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax27:AutoScalerException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -673,21 +701,21 @@ <xs:element name="AutoscalerServiceRemoteException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax222:RemoteException"/> + <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax223:RemoteException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceInvalidApplicationPolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax21:InvalidApplicationPolicyException"/> + <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax25:InvalidApplicationPolicyException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceApplicationPolicyAlreadyExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="ApplicationPolicyAlreadyExistsException" nillable="true" type="ax219:ApplicationPolicyAlreadyExistsException"/> + <xs:element minOccurs="0" name="ApplicationPolicyAlreadyExistsException" nillable="true" type="ax220:ApplicationPolicyAlreadyExistsException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -737,7 +765,7 @@ <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax219:ApplicatioinPolicyNotExistsException"/> + <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax220:ApplicatioinPolicyNotExistsException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -770,14 +798,14 @@ <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax219:InvalidDeploymentPolicyException"/> + <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax220:InvalidDeploymentPolicyException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax219:DeploymentPolicyAlreadyExistsException"/> + <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax220:DeploymentPolicyAlreadyExistsException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -798,14 +826,14 @@ <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax219:DeploymentPolicyNotExistsException"/> + <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax220:DeploymentPolicyNotExistsException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceCloudControllerConnectionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax23:CloudControllerConnectionException"/> + <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax27:CloudControllerConnectionException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -878,22 +906,8 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationPolicy"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="applicationPolicyUuid" 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="ax29:ApplicationPolicy"/> - </xs:sequence> - </xs:complexType> - </xs:element> </xs:schema> - <xs:schema xmlns:ax212="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:schema xmlns:ax219="http://common.stratos.apache.org/xsd"; xmlns:ax212="http://partition.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"> @@ -911,7 +925,7 @@ <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 maxOccurs="unbounded" minOccurs="0" name="networkPartitionsUuid" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/> <xs:element minOccurs="0" name="tenantId" type="xs:int"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> @@ -933,7 +947,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="ax26:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/> </xs:sequence> </xs:complexType> </xs:schema> @@ -957,7 +971,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="ax26:Property"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax22:Property"/> </xs:sequence> </xs:complexType> <xs:complexType name="Property"> @@ -967,7 +981,7 @@ </xs:sequence> </xs:complexType> </xs:schema> - <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:schema xmlns:ax222="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="InvalidPolicyException"> <xs:sequence> @@ -976,14 +990,14 @@ </xs:complexType> <xs:complexType name="UnremovablePolicyException"> <xs:complexContent> - <xs:extension base="ax23:AutoScalerException"> + <xs:extension base="ax27:AutoScalerException"> <xs:sequence/> </xs:extension> </xs:complexContent> </xs:complexType> <xs:complexType name="PolicyDoesNotExistException"> <xs:complexContent> - <xs:extension base="ax23:AutoScalerException"> + <xs:extension base="ax27:AutoScalerException"> <xs:sequence/> </xs:extension> </xs:complexContent> @@ -1110,6 +1124,12 @@ <wsdl:message name="AutoscalerServiceAutoScalerException"> <wsdl:part name="parameters" element="ns:AutoscalerServiceAutoScalerException"/> </wsdl:message> + <wsdl:message name="getAutoScalingPoliciesByTenantRequest"> + <wsdl:part name="parameters" element="ns:getAutoScalingPoliciesByTenant"/> + </wsdl:message> + <wsdl:message name="getAutoScalingPoliciesByTenantResponse"> + <wsdl:part name="parameters" element="ns:getAutoScalingPoliciesByTenantResponse"/> + </wsdl:message> <wsdl:message name="getApplicationRequest"> <wsdl:part name="parameters" element="ns:getApplication"/> </wsdl:message> @@ -1338,18 +1358,18 @@ <wsdl:message name="removeServiceGroupResponse"> <wsdl:part name="parameters" element="ns:removeServiceGroupResponse"/> </wsdl:message> - <wsdl:message name="getApplicationPolicyRequest"> - <wsdl:part name="parameters" element="ns:getApplicationPolicy"/> - </wsdl:message> - <wsdl:message name="getApplicationPolicyResponse"> - <wsdl:part name="parameters" element="ns:getApplicationPolicyResponse"/> - </wsdl:message> <wsdl:message name="updateApplicationRequest"> <wsdl:part name="parameters" element="ns:updateApplication"/> </wsdl:message> <wsdl:message name="updateApplicationResponse"> <wsdl:part name="parameters" element="ns:updateApplicationResponse"/> </wsdl:message> + <wsdl:message name="getApplicationPolicyRequest"> + <wsdl:part name="parameters" element="ns:getApplicationPolicy"/> + </wsdl:message> + <wsdl:message name="getApplicationPolicyResponse"> + <wsdl:part name="parameters" element="ns:getApplicationPolicyResponse"/> + </wsdl:message> <wsdl:portType name="AutoscalerServicePortType"> <wsdl:operation name="getServiceGroupByTenant"> <wsdl:input message="ns:getServiceGroupByTenantRequest" wsaw:Action="urn:getServiceGroupByTenant"/> @@ -1389,6 +1409,10 @@ <wsdl:output message="ns:getServiceGroupsResponse" wsaw:Action="urn:getServiceGroupsResponse"/> <wsdl:fault message="ns:AutoscalerServiceAutoScalerException" name="AutoscalerServiceAutoScalerException" wsaw:Action="urn:getServiceGroupsAutoscalerServiceAutoScalerException"/> </wsdl:operation> + <wsdl:operation name="getAutoScalingPoliciesByTenant"> + <wsdl:input message="ns:getAutoScalingPoliciesByTenantRequest" wsaw:Action="urn:getAutoScalingPoliciesByTenant"/> + <wsdl:output message="ns:getAutoScalingPoliciesByTenantResponse" wsaw:Action="urn:getAutoScalingPoliciesByTenantResponse"/> + </wsdl:operation> <wsdl:operation name="getApplication"> <wsdl:input message="ns:getApplicationRequest" wsaw:Action="urn:getApplication"/> <wsdl:output message="ns:getApplicationResponse" wsaw:Action="urn:getApplicationResponse"/> @@ -1544,10 +1568,6 @@ <wsdl:output message="ns:removeServiceGroupResponse" wsaw:Action="urn:removeServiceGroupResponse"/> <wsdl:fault message="ns:AutoscalerServiceCartridgeGroupNotFoundException" name="AutoscalerServiceCartridgeGroupNotFoundException" wsaw:Action="urn:removeServiceGroupAutoscalerServiceCartridgeGroupNotFoundException"/> </wsdl:operation> - <wsdl:operation name="getApplicationPolicy"> - <wsdl:input message="ns:getApplicationPolicyRequest" wsaw:Action="urn:getApplicationPolicy"/> - <wsdl:output message="ns:getApplicationPolicyResponse" wsaw:Action="urn:getApplicationPolicyResponse"/> - </wsdl:operation> <wsdl:operation name="updateApplication"> <wsdl:input message="ns:updateApplicationRequest" wsaw:Action="urn:updateApplication"/> <wsdl:output message="ns:updateApplicationResponse" wsaw:Action="urn:updateApplicationResponse"/> @@ -1555,6 +1575,10 @@ <wsdl:fault message="ns:AutoscalerServiceCartridgeGroupNotFoundException" name="AutoscalerServiceCartridgeGroupNotFoundException" wsaw:Action="urn:updateApplicationAutoscalerServiceCartridgeGroupNotFoundException"/> <wsdl:fault message="ns:AutoscalerServiceCartridgeNotFoundException" name="AutoscalerServiceCartridgeNotFoundException" wsaw:Action="urn:updateApplicationAutoscalerServiceCartridgeNotFoundException"/> </wsdl:operation> + <wsdl:operation name="getApplicationPolicy"> + <wsdl:input message="ns:getApplicationPolicyRequest" wsaw:Action="urn:getApplicationPolicy"/> + <wsdl:output message="ns:getApplicationPolicyResponse" wsaw:Action="urn:getApplicationPolicyResponse"/> + </wsdl:operation> </wsdl:portType> <wsdl:binding name="AutoscalerServiceSoap11Binding" type="ns:AutoscalerServicePortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"/> @@ -1648,6 +1672,15 @@ <soap:fault use="literal" name="AutoscalerServiceAutoScalerException"/> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getAutoScalingPoliciesByTenant"> + <soap:operation soapAction="urn:getAutoScalingPoliciesByTenant" style="document"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="getApplication"> <soap:operation soapAction="urn:getApplication" style="document"/> <wsdl:input> @@ -2017,6 +2050,15 @@ <soap:fault use="literal" name="AutoscalerServiceCartridgeGroupNotFoundException"/> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getApplicationPolicy"> + <soap:operation soapAction="urn:getApplicationPolicy" style="document"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="updateApplication"> <soap:operation soapAction="urn:updateApplication" style="document"/> <wsdl:input> @@ -2035,15 +2077,6 @@ <soap:fault use="literal" name="AutoscalerServiceCartridgeGroupNotFoundException"/> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getApplicationPolicy"> - <soap:operation soapAction="urn:getApplicationPolicy" style="document"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> </wsdl:binding> <wsdl:binding name="AutoscalerServiceSoap12Binding" type="ns:AutoscalerServicePortType"> <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"/> @@ -2137,6 +2170,15 @@ <soap12:fault use="literal" name="AutoscalerServiceAutoScalerException"/> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getAutoScalingPoliciesByTenant"> + <soap12:operation soapAction="urn:getAutoScalingPoliciesByTenant" style="document"/> + <wsdl:input> + <soap12:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal"/> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="getApplication"> <soap12:operation soapAction="urn:getApplication" style="document"/> <wsdl:input> @@ -2506,6 +2548,15 @@ <soap12:fault use="literal" name="AutoscalerServiceCartridgeGroupNotFoundException"/> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getApplicationPolicy"> + <soap12:operation soapAction="urn:getApplicationPolicy" style="document"/> + <wsdl:input> + <soap12:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal"/> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="updateApplication"> <soap12:operation soapAction="urn:updateApplication" style="document"/> <wsdl:input> @@ -2524,15 +2575,6 @@ <soap12:fault use="literal" name="AutoscalerServiceCartridgeGroupNotFoundException"/> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getApplicationPolicy"> - <soap12:operation soapAction="urn:getApplicationPolicy" style="document"/> - <wsdl:input> - <soap12:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap12:body use="literal"/> - </wsdl:output> - </wsdl:operation> </wsdl:binding> <wsdl:binding name="AutoscalerServiceHttpBinding" type="ns:AutoscalerServicePortType"> <http:binding verb="POST"/> @@ -2608,6 +2650,15 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> + <wsdl:operation name="getAutoScalingPoliciesByTenant"> + <http:operation location="getAutoScalingPoliciesByTenant"/> + <wsdl:input> + <mime:content type="text/xml" part="parameters"/> + </wsdl:input> + <wsdl:output> + <mime:content type="text/xml" part="parameters"/> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="getApplication"> <http:operation location="getApplication"/> <wsdl:input> @@ -2896,8 +2947,8 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="updateApplication"> - <http:operation location="updateApplication"/> + <wsdl:operation name="getApplicationPolicy"> + <http:operation location="getApplicationPolicy"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input> @@ -2905,8 +2956,8 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getApplicationPolicy"> - <http:operation location="getApplicationPolicy"/> + <wsdl:operation name="updateApplication"> + <http:operation location="updateApplication"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input>
