Repository: stratos Updated Branches: refs/heads/tenant-isolation e2ec31234 -> dddaf6003
Update the application policy missing references with uuid Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dddaf600 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dddaf600 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dddaf600 Branch: refs/heads/tenant-isolation Commit: dddaf60030e8ec646b3e79fcc5db48d7b5212cec Parents: e2ec312 Author: Gayan Gunarathne <[email protected]> Authored: Fri Jul 10 00:51:19 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Fri Jul 10 00:51:19 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/pojo/policy/PolicyManager.java | 2 +- .../autoscaler/services/AutoscalerService.java | 13 +- .../services/impl/AutoscalerServiceImpl.java | 15 +- .../common/client/AutoscalerServiceClient.java | 8 +- .../rest/endpoint/api/StratosApiV41Utils.java | 5 +- .../src/main/resources/AutoscalerService.wsdl | 438 +++++++++++-------- 6 files changed, 280 insertions(+), 201 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/dddaf600/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 a5070b8..cc809d8 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 @@ -442,7 +442,7 @@ public class PolicyManager { public ApplicationPolicy getApplicationPolicyById(String id) { ApplicationPolicy applicationPolicy = null; for (ApplicationPolicy applicationPolicy1 : getApplicationPolicies()) { - if (applicationPolicy1.getId().equals(id)) { + if (applicationPolicy1.getUuid().equals(id)) { applicationPolicy = applicationPolicy1; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/dddaf600/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 eee9cc7..125084e 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 @@ -174,13 +174,24 @@ public interface AutoscalerService { InvalidApplicationPolicyException, InvalidPolicyException, ApplicationPolicyAlreadyExistsException; /** - * Get application policy by application id + * Get application policy by application uuid * * @param applicationPolicyId the application policy id * @return {@link ApplicationPolicy} used by the given application */ public ApplicationPolicy getApplicationPolicy(String applicationPolicyId); + /** + * + * Get application policy by application id and tenant id + * + * @param applicationPolicyId + * @param tenantId + * @return + */ + + public ApplicationPolicy getApplicationPolicyByTenant(String applicationPolicyId, int tenantId); + /** * Remove application policy * http://git-wip-us.apache.org/repos/asf/stratos/blob/dddaf600/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 b52117a..29e12d7 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 @@ -944,10 +944,21 @@ public class AutoscalerServiceImpl implements AutoscalerService { } @Override - public ApplicationPolicy getApplicationPolicy(String applicationPolicyId) { - return PolicyManager.getInstance().getApplicationPolicy(applicationPolicyId); + public ApplicationPolicy getApplicationPolicy(String applicationPolicyUuid) { + return PolicyManager.getInstance().getApplicationPolicy(applicationPolicyUuid); } + @Override + public ApplicationPolicy getApplicationPolicyByTenant(String applicationPolicyId,int tenantId) { + ApplicationPolicy[] applicationPolicies=getApplicationPolicies(); + for(ApplicationPolicy applicationPolicy:applicationPolicies){ + if(applicationPolicy.getId().equals(applicationPolicyId)&&applicationPolicy.getTenantId()==tenantId){ + return applicationPolicy; + } + } + return null; + } + @Override public boolean removeApplicationPolicy(String applicationPolicyId) throws InvalidPolicyException, UnremovablePolicyException { http://git-wip-us.apache.org/repos/asf/stratos/blob/dddaf600/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 4922cea..01c779b 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 @@ -136,10 +136,14 @@ public class AutoscalerServiceClient { stub.addApplicationPolicy(applicationPolicy); } - public ApplicationPolicy getApplicationPolicy(String applicationPolicyId) throws RemoteException { - return stub.getApplicationPolicy(applicationPolicyId); + public ApplicationPolicy getApplicationPolicy(String applicationPolicyUuid) throws RemoteException { + return stub.getApplicationPolicy(applicationPolicyUuid); } + public ApplicationPolicy getApplicationPolicyByTenant(String applicationPolicyId,int tenantId) throws RemoteException { + return stub.getApplicationPolicyByTenant(applicationPolicyId,tenantId); + } + public ApplicationPolicy[] getApplicationPolicies() throws RemoteException { return stub.getApplicationPolicies(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/dddaf600/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 7c7ad42..72ac6b0 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 @@ -1821,8 +1821,9 @@ public class StratosApiV41Utils { log.error(message); throw new RestAPIException(message); } - - autoscalerServiceClient.deployApplication(application.getApplicationUuid(), applicationPolicyId); + String applicationPolicyUuid=AutoscalerServiceClient.getInstance().getApplicationPolicyByTenant( + applicationPolicyId,application.getTenantId()).getUuid(); + autoscalerServiceClient.deployApplication(application.getApplicationUuid(), applicationPolicyUuid); if (log.isInfoEnabled()) { log.info(String.format("Application deployed successfully: [application-id] %s", applicationId)); } http://git-wip-us.apache.org/repos/asf/stratos/blob/dddaf600/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 1b9c55d..bb76de7 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: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: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:ns="http://impl.services.autoscaler.stratos.apache.org"; xmlns:ax25="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax26="http://partition.common.stratos.apache.org/xsd"; xmlns:ax217="http://policy.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:ax22="http://common.stratos.apache.org/xsd"; xmlns:ax215="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax221="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax213="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax223="http://rmi.java/xsd"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax211="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; 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"/> @@ -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="ax216: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> @@ -149,8 +149,8 @@ <xs:complexType name="ServiceGroup"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax214:Dependencies"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax214:ServiceGroup"/> + <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax221:Dependencies"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax221:ServiceGroup"/> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="tenantId" type="xs:int"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> @@ -164,15 +164,15 @@ </xs:sequence> </xs:complexType> </xs:schema> - <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: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:ax29="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax216="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax218="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax220="http://common.stratos.apache.org/xsd"; xmlns:ax212="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax222="http://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://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://application.exception.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://common.stratos.apache.org/xsd"/> + <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://rmi.java/xsd"/> <xs:element name="getApplications"> <xs:complexType> @@ -186,297 +186,297 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceApplicationDefinitionException"> + <xs:element name="getApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax25:ApplicationDefinitionException"/> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException"> + <xs:element name="getApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax27:CartridgeGroupNotFoundException"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceCartridgeNotFoundException"> + <xs:element name="getDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax27:CartridgeNotFoundException"/> + <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addApplication"> + <xs:element name="getDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax29:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addApplicationResponse"> + <xs:element name="getApplicationPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="applicationPolicyUuid" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicy"> + <xs:element name="getApplicationPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicyResponse"> + <xs:element name="getAutoscalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:DeploymentPolicy"/> + <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplication"> + <xs:element name="getAutoscalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationResponse"> + <xs:element name="getAutoscalingPolicyForTenant"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> + <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="tenantId" type="xs:int"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroup"> + <xs:element name="getAutoscalingPolicyForTenantResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupResponse"> + <xs:element name="AutoscalerServiceApplicationDefinitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax214:ServiceGroup"/> + <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax214:ApplicationDefinitionException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoscalingPolicy"> + <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax216:CartridgeGroupNotFoundException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoscalingPolicyResponse"> + <xs:element name="AutoscalerServiceCartridgeNotFoundException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax217:AutoscalePolicy"/> + <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax216:CartridgeNotFoundException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidArgumentException"> + <xs:element name="addApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax27:InvalidArgumentException"/> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateClusterMonitor"> + <xs:element name="addApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateClusterMonitorResponse"> + <xs:element name="updateApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoScalingPolicies"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getAutoScalingPoliciesResponse"> + <xs:element name="updateApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax217:AutoscalePolicy"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException"> + <xs:element name="getApplicationByTenant"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax27:AutoScalingPolicyAlreadyExistException"/> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="tenantId" type="xs:int"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addAutoScalingPolicy"> + <xs:element name="getApplicationByTenantResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax217:AutoscalePolicy"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addAutoScalingPolicyResponse"> + <xs:element name="existApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidPolicyException"> + <xs:element name="existApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax219:InvalidPolicyException"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateAutoScalingPolicy"> + <xs:element name="deployApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax217:AutoscalePolicy"/> + <xs:element minOccurs="0" name="applicationUuid" 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="updateAutoScalingPolicyResponse"> + <xs:element name="deployApplicationResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceUnremovablePolicyException"> + <xs:element name="getAutoScalingPolicies"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax219:UnremovablePolicyException"/> - </xs:sequence> + <xs:sequence/> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServicePolicyDoesNotExistException"> + <xs:element name="getAutoScalingPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax219:PolicyDoesNotExistException"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeAutoScalingPolicy"> + <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax216:AutoScalingPolicyAlreadyExistException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeAutoScalingPolicyResponse"> + <xs:element name="addAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoscalingPolicyForTenant"> + <xs:element name="addAutoScalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="tenantId" type="xs:int"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoscalingPolicyForTenantResponse"> + <xs:element name="AutoscalerServiceInvalidPolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax217:AutoscalePolicy"/> + <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax217:InvalidPolicyException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateApplication"> + <xs:element name="updateAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateApplicationResponse"> + <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="getApplicationByTenant"> + <xs:element name="AutoscalerServiceUnremovablePolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="tenantId" type="xs:int"/> + <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax217:UnremovablePolicyException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationByTenantResponse"> + <xs:element name="AutoscalerServicePolicyDoesNotExistException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> + <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax217:PolicyDoesNotExistException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="existApplication"> + <xs:element name="removeAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="autoscalePolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="existApplicationResponse"> + <xs:element name="removeAutoScalingPolicyResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployApplication"> + <xs:element name="undeployApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationUuid" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="force" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployApplicationResponse"> + <xs:element name="undeployApplicationResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="undeployApplication"> + <xs:element name="deleteApplication"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="force" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="undeployApplicationResponse"> + <xs:element name="deleteApplicationResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deleteApplication"> + <xs:element name="AutoscalerServiceInvalidArgumentException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax216:InvalidArgumentException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deleteApplicationResponse"> + <xs:element name="updateClusterMonitor"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateClusterMonitorResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> @@ -486,14 +486,14 @@ <xs:element name="AutoscalerServiceInvalidServiceGroupException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax25:InvalidServiceGroupException"/> + <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax214:InvalidServiceGroupException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="addServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax214:ServiceGroup"/> + <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax221:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -507,7 +507,7 @@ <xs:element name="updateServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeGroup" nillable="true" type="ax214:ServiceGroup"/> + <xs:element minOccurs="0" name="cartridgeGroup" nillable="true" type="ax221:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -532,6 +532,20 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="getServiceGroup"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getServiceGroupResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="getServiceGroupByTenant"> <xs:complexType> <xs:sequence> @@ -543,7 +557,7 @@ <xs:element name="getServiceGroupByTenantResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax214:ServiceGroup"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -565,7 +579,7 @@ <xs:element name="AutoscalerServiceAutoScalerException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax27:AutoScalerException"/> + <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax216:AutoScalerException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -577,7 +591,7 @@ <xs:element name="getServiceGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax214:ServiceGroup"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -626,21 +640,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="ax25:InvalidApplicationPolicyException"/> + <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax214: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="ax217:ApplicationPolicyAlreadyExistsException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -658,6 +672,21 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="getApplicationPolicyByTenant"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="tenantId" type="xs:int"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationPolicyByTenantResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ApplicationPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="removeApplicationPolicy"> <xs:complexType> <xs:sequence> @@ -675,7 +704,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="ax217:ApplicatioinPolicyNotExistsException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -708,14 +737,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="ax217: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="ax217:DeploymentPolicyAlreadyExistsException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -736,14 +765,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="ax217:DeploymentPolicyNotExistsException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceCloudControllerConnectionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax27:CloudControllerConnectionException"/> + <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax216:CloudControllerConnectionException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -802,28 +831,14 @@ </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="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:ax28="http://partition.common.stratos.apache.org/xsd"; xmlns:ax210="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="ax212:NetworkPartitionRef"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax28:NetworkPartitionRef"/> <xs:element minOccurs="0" name="tenantId" type="xs:int"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> @@ -841,13 +856,13 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax211="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd";> + <xs:schema xmlns:ax27="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="ax210:PartitionRef"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionRefs" nillable="true" type="ax26:PartitionRef"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> @@ -857,7 +872,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="ax22:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> </xs:sequence> </xs:complexType> </xs:schema> @@ -891,7 +906,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:ax219="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> @@ -900,14 +915,14 @@ </xs:complexType> <xs:complexType name="UnremovablePolicyException"> <xs:complexContent> - <xs:extension base="ax27:AutoScalerException"> + <xs:extension base="ax219:AutoScalerException"> <xs:sequence/> </xs:extension> </xs:complexContent> </xs:complexType> <xs:complexType name="PolicyDoesNotExistException"> <xs:complexContent> - <xs:extension base="ax27:AutoScalerException"> + <xs:extension base="ax219:AutoScalerException"> <xs:sequence/> </xs:extension> </xs:complexContent> @@ -948,11 +963,6 @@ <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> @@ -963,6 +973,11 @@ </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> @@ -1118,24 +1133,30 @@ <wsdl:message name="existApplicationResponse"> <wsdl:part name="parameters" element="ns:existApplicationResponse"/> </wsdl:message> - <wsdl:message name="deleteApplicationRequest"> - <wsdl:part name="parameters" element="ns:deleteApplication"/> - </wsdl:message> - <wsdl:message name="deleteApplicationResponse"> - <wsdl:part name="parameters" element="ns:deleteApplicationResponse"/> - </wsdl:message> <wsdl:message name="getServiceGroupRequest"> <wsdl:part name="parameters" element="ns:getServiceGroup"/> </wsdl:message> <wsdl:message name="getServiceGroupResponse"> <wsdl:part name="parameters" element="ns:getServiceGroupResponse"/> </wsdl:message> + <wsdl:message name="deleteApplicationRequest"> + <wsdl:part name="parameters" element="ns:deleteApplication"/> + </wsdl:message> + <wsdl:message name="deleteApplicationResponse"> + <wsdl:part name="parameters" element="ns:deleteApplicationResponse"/> + </wsdl:message> <wsdl:message name="undeployServiceGroupRequest"> <wsdl:part name="parameters" element="ns:undeployServiceGroup"/> </wsdl:message> <wsdl:message name="undeployServiceGroupResponse"> <wsdl:part name="parameters" element="ns:undeployServiceGroupResponse"/> </wsdl:message> + <wsdl:message name="getApplicationPolicyByTenantRequest"> + <wsdl:part name="parameters" element="ns:getApplicationPolicyByTenant"/> + </wsdl:message> + <wsdl:message name="getApplicationPolicyByTenantResponse"> + <wsdl:part name="parameters" element="ns:getApplicationPolicyByTenantResponse"/> + </wsdl:message> <wsdl:message name="getDeploymentPolicyForTenantRequest"> <wsdl:part name="parameters" element="ns:getDeploymentPolicyForTenant"/> </wsdl:message> @@ -1232,18 +1253,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"/> @@ -1338,19 +1359,23 @@ <wsdl:input message="ns:existApplicationRequest" wsaw:Action="urn:existApplication"/> <wsdl:output message="ns:existApplicationResponse" wsaw:Action="urn:existApplicationResponse"/> </wsdl:operation> - <wsdl:operation name="deleteApplication"> - <wsdl:input message="ns:deleteApplicationRequest" wsaw:Action="urn:deleteApplication"/> - <wsdl:output message="ns:deleteApplicationResponse" wsaw:Action="urn:deleteApplicationResponse"/> - </wsdl:operation> <wsdl:operation name="getServiceGroup"> <wsdl:input message="ns:getServiceGroupRequest" wsaw:Action="urn:getServiceGroup"/> <wsdl:output message="ns:getServiceGroupResponse" wsaw:Action="urn:getServiceGroupResponse"/> </wsdl:operation> + <wsdl:operation name="deleteApplication"> + <wsdl:input message="ns:deleteApplicationRequest" wsaw:Action="urn:deleteApplication"/> + <wsdl:output message="ns:deleteApplicationResponse" wsaw:Action="urn:deleteApplicationResponse"/> + </wsdl:operation> <wsdl:operation name="undeployServiceGroup"> <wsdl:input message="ns:undeployServiceGroupRequest" wsaw:Action="urn:undeployServiceGroup"/> <wsdl:output message="ns:undeployServiceGroupResponse" wsaw:Action="urn:undeployServiceGroupResponse"/> <wsdl:fault message="ns:AutoscalerServiceAutoScalerException" name="AutoscalerServiceAutoScalerException" wsaw:Action="urn:undeployServiceGroupAutoscalerServiceAutoScalerException"/> </wsdl:operation> + <wsdl:operation name="getApplicationPolicyByTenant"> + <wsdl:input message="ns:getApplicationPolicyByTenantRequest" wsaw:Action="urn:getApplicationPolicyByTenant"/> + <wsdl:output message="ns:getApplicationPolicyByTenantResponse" wsaw:Action="urn:getApplicationPolicyByTenantResponse"/> + </wsdl:operation> <wsdl:operation name="getDeploymentPolicyForTenant"> <wsdl:input message="ns:getDeploymentPolicyForTenantRequest" wsaw:Action="urn:getDeploymentPolicyForTenant"/> <wsdl:output message="ns:getDeploymentPolicyForTenantResponse" wsaw:Action="urn:getDeploymentPolicyForTenantResponse"/> @@ -1418,10 +1443,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"/> @@ -1429,6 +1450,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"/> @@ -1654,8 +1679,8 @@ <soap:body use="literal"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getServiceGroup"> - <soap:operation soapAction="urn:getServiceGroup" style="document"/> + <wsdl:operation name="deleteApplication"> + <soap:operation soapAction="urn:deleteApplication" style="document"/> <wsdl:input> <soap:body use="literal"/> </wsdl:input> @@ -1663,8 +1688,8 @@ <soap:body use="literal"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="deleteApplication"> - <soap:operation soapAction="urn:deleteApplication" style="document"/> + <wsdl:operation name="getServiceGroup"> + <soap:operation soapAction="urn:getServiceGroup" style="document"/> <wsdl:input> <soap:body use="literal"/> </wsdl:input> @@ -1684,6 +1709,15 @@ <soap:fault use="literal" name="AutoscalerServiceAutoScalerException"/> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getApplicationPolicyByTenant"> + <soap:operation soapAction="urn:getApplicationPolicyByTenant" style="document"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="getAutoscalingPolicyForTenant"> <soap:operation soapAction="urn:getAutoscalingPolicyForTenant" style="document"/> <wsdl:input> @@ -1846,6 +1880,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> @@ -1864,15 +1907,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"/> @@ -2098,8 +2132,8 @@ <soap12:body use="literal"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getServiceGroup"> - <soap12:operation soapAction="urn:getServiceGroup" style="document"/> + <wsdl:operation name="deleteApplication"> + <soap12:operation soapAction="urn:deleteApplication" style="document"/> <wsdl:input> <soap12:body use="literal"/> </wsdl:input> @@ -2107,8 +2141,8 @@ <soap12:body use="literal"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="deleteApplication"> - <soap12:operation soapAction="urn:deleteApplication" style="document"/> + <wsdl:operation name="getServiceGroup"> + <soap12:operation soapAction="urn:getServiceGroup" style="document"/> <wsdl:input> <soap12:body use="literal"/> </wsdl:input> @@ -2128,6 +2162,15 @@ <soap12:fault use="literal" name="AutoscalerServiceAutoScalerException"/> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getApplicationPolicyByTenant"> + <soap12:operation soapAction="urn:getApplicationPolicyByTenant" style="document"/> + <wsdl:input> + <soap12:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal"/> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="getAutoscalingPolicyForTenant"> <soap12:operation soapAction="urn:getAutoscalingPolicyForTenant" style="document"/> <wsdl:input> @@ -2290,6 +2333,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> @@ -2308,15 +2360,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"/> @@ -2491,8 +2534,8 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getServiceGroup"> - <http:operation location="getServiceGroup"/> + <wsdl:operation name="deleteApplication"> + <http:operation location="deleteApplication"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input> @@ -2500,8 +2543,8 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="deleteApplication"> - <http:operation location="deleteApplication"/> + <wsdl:operation name="getServiceGroup"> + <http:operation location="getServiceGroup"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input> @@ -2518,6 +2561,15 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> + <wsdl:operation name="getApplicationPolicyByTenant"> + <http:operation location="getApplicationPolicyByTenant"/> + <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="getAutoscalingPolicyForTenant"> <http:operation location="getAutoscalingPolicyForTenant"/> <wsdl:input> @@ -2635,8 +2687,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> @@ -2644,8 +2696,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>
