Modifying Application creation to use UUID
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e1ee84bf Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e1ee84bf Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e1ee84bf Branch: refs/heads/tenant-isolation Commit: e1ee84bfe99625b039c6676257b1b6e4fd3d3cbe Parents: e2cd82b Author: Dinithi <[email protected]> Authored: Thu Jul 9 17:55:15 2015 +0530 Committer: Dinithi <[email protected]> Committed: Thu Jul 9 17:55:15 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 7 +- .../services/impl/AutoscalerServiceImpl.java | 23 +- .../context/CloudControllerContext.java | 4 +- .../domain/application/Applications.java | 4 +- .../rest/endpoint/api/StratosApiV41Utils.java | 6 +- .../util/converter/ObjectConverter.java | 1 + .../src/main/resources/AutoscalerService.wsdl | 408 +++++++++---------- 7 files changed, 228 insertions(+), 225 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e1ee84bf/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index bbd0c1c..90c46d5 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -360,13 +360,14 @@ public class DefaultApplicationParser implements ApplicationParser { List<String> dependencyClusterIDs = new ArrayList<String>(); List<String> exportMetadataKeys = new ArrayList<String>(); List<String> importMetadataKeys = new ArrayList<String>(); - String cartridgeType = cartridgeContext.getUuid(); + String cartridgeType = cartridgeContext.getType(); SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext(); String subscriptionAlias = subscribableInfoContext.getAlias(); Cartridge cartridge = getCartridgeByTenant(cartridgeType, tenantId); if (cartridge == null) { - throw new CartridgeNotFoundException("Cartridge not found " + cartridgeType); + throw new CartridgeNotFoundException(String.format("Cartridge not found [cartridge-uuid] %s " + + "[cartridge-type] %s", cartridgeContext.getUuid(), cartridgeType)); } // Add metadata keys defined in cartridges as export metadata keys @@ -493,7 +494,7 @@ public class DefaultApplicationParser implements ApplicationParser { throws ApplicationDefinitionException { for (CartridgeContext cartridgeContext : cartridgeContextList) { - String cartridgeType = cartridgeContext.getUuid(); + String cartridgeType = cartridgeContext.getType(); SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext(); String subscriptionAlias = subscribableInfoContext.getAlias(); http://git-wip-us.apache.org/repos/asf/stratos/blob/e1ee84bf/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 ac94b64..b52117a 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 @@ -315,22 +315,23 @@ public class AutoscalerServiceImpl implements AutoscalerService { } @Override - public boolean deployApplication(String applicationId, String applicationPolicyId) + public boolean deployApplication(String applicationUuid, String applicationPolicyId) throws ApplicationDefinitionException { try { - Application application = ApplicationHolder.getApplications().getApplication(applicationId); + Application application = ApplicationHolder.getApplications().getApplication(applicationUuid); if (application == null) { - throw new RuntimeException("Application not found: " + applicationId); + throw new RuntimeException(String.format("Application not found [application-uuid] : %s ", + applicationUuid)); } ApplicationContext applicationContext = RegistryManager.getInstance(). - getApplicationContext(applicationId); + getApplicationContext(applicationUuid); if (applicationContext == null) { - throw new RuntimeException("Application context not found: " + applicationId); + throw new RuntimeException("Application context not found: " + applicationUuid); } // validating application policy against the application - AutoscalerUtil.validateApplicationPolicyAgainstApplication(applicationId, applicationPolicyId); + AutoscalerUtil.validateApplicationPolicyAgainstApplication(applicationUuid, applicationPolicyId); // Create application clusters in cloud controller and send application created event ApplicationBuilder.handleApplicationDeployment(application, @@ -339,7 +340,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { // Setting application policy id in application object try { ApplicationHolder.acquireWriteLock(); - application = ApplicationHolder.getApplications().getApplication(applicationId); + application = ApplicationHolder.getApplications().getApplication(applicationUuid); application.setApplicationPolicyId(applicationPolicyId); ApplicationHolder.persistApplication(application); } finally { @@ -348,7 +349,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { // adding network partition algorithm context to registry NetworkPartitionAlgorithmContext algorithmContext = - new NetworkPartitionAlgorithmContext(applicationId, applicationPolicyId, 0); + new NetworkPartitionAlgorithmContext(applicationUuid, applicationPolicyId, 0); AutoscalerContext.getInstance().addNetworkPartitionAlgorithmContext(algorithmContext); if (!applicationContext.isMultiTenant()) { @@ -359,17 +360,17 @@ public class AutoscalerServiceImpl implements AutoscalerService { applicationContext.setStatus(ApplicationContext.STATUS_DEPLOYED); AutoscalerContext.getInstance().updateApplicationContext(applicationContext); - log.info("Waiting for application clusters to be created: [application-id] " + applicationId); + log.info("Waiting for application clusters to be created: [application-uuid] " + applicationUuid); return true; } catch (Exception e) { ApplicationContext applicationContext = RegistryManager.getInstance(). - getApplicationContext(applicationId); + getApplicationContext(applicationUuid); if (applicationContext != null) { // Revert application status applicationContext.setStatus(ApplicationContext.STATUS_CREATED); AutoscalerContext.getInstance().updateApplicationContext(applicationContext); } - String message = "Application deployment failed: [application-id]" + applicationId; + String message = "Application deployment failed: [application-uuid]" + applicationUuid; log.error(message, e); throw new RuntimeException(message, e); } http://git-wip-us.apache.org/repos/asf/stratos/blob/e1ee84bf/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java index 61996cd..5a6a9c2 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java @@ -242,8 +242,8 @@ public class CloudControllerContext implements Serializable { return serviceGroupNameToServiceGroupMap.values(); } - public Cartridge getCartridge(String cartridgeType) { - return cartridgeTypeToCartridgeMap.get(cartridgeType); + public Cartridge getCartridge(String cartridgeUuid) { + return cartridgeTypeToCartridgeMap.get(cartridgeUuid); } private Lock acquireWriteLock(String object) { http://git-wip-us.apache.org/repos/asf/stratos/blob/e1ee84bf/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java index 82ef5e2..aa0db86 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java @@ -43,8 +43,8 @@ public class Applications implements Serializable { this.applicationMap.put(application.getUniqueIdentifier(), application); } - public Application getApplication(String appId) { - return this.getApplications().get(appId); + public Application getApplication(String applicationUuid) { + return this.getApplications().get(applicationUuid); } public boolean isInitialized() { http://git-wip-us.apache.org/repos/asf/stratos/blob/e1ee84bf/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 76afe3a..57853d9 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 @@ -1756,7 +1756,7 @@ public class StratosApiV41Utils { /** * Deploy application with an application policy. * - * @param applicationId Application ID + * @param applicationId Application Id * @param applicationPolicyId Application policy Id * @throws RestAPIException */ @@ -1796,7 +1796,7 @@ public class StratosApiV41Utils { } // This is a redundant state since there is only CREATED,DEPLOYED state. - // But this will be usefull when more status are added. + // But this will be useful when more status are added. if (!application.getStatus().equalsIgnoreCase(APPLICATION_STATUS_CREATED)) { String message = String.format( "Application is not in CREATED state: [application-id] %s [current status] %s ", @@ -1816,7 +1816,7 @@ public class StratosApiV41Utils { throw new RestAPIException(message); } - autoscalerServiceClient.deployApplication(applicationId, applicationPolicyId); + autoscalerServiceClient.deployApplication(application.getApplicationUuid(), applicationPolicyId); if (log.isInfoEnabled()) { log.info(String.format("Application deployed successfully: [application-id] %s", applicationId)); } http://git-wip-us.apache.org/repos/asf/stratos/blob/e1ee84bf/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index 9169108..99dd60b 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -1631,6 +1631,7 @@ public class ObjectConverter { */ public static CartridgeBean convertCartridgeToCartridgeDefinitionBean(Cartridge cartridgeInfo) { CartridgeBean cartridge = new CartridgeBean(); + cartridge.setUuid(cartridgeInfo.getUuid()); cartridge.setType(cartridgeInfo.getType()); cartridge.setProvider(cartridgeInfo.getProvider()); cartridge.setCategory(cartridgeInfo.getCategory()); http://git-wip-us.apache.org/repos/asf/stratos/blob/e1ee84bf/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 0fa2d7a..101558e 100644 --- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl +++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax29="http://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:ns1="http://org.apache.axis2/xsd"; xmlns:ax212="http://partition.common.stratos.apache.org/xsd"; xmlns:ax222="http://rmi.java/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax223="http://io.java/xsd"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax211="http://deployment.policy.pojo.au toscaler.stratos.apache.org/xsd" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> +<?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:ax28="http://partition.common.stratos.apache.org/xsd"; xmlns:ax25="http://deployment.policy.pojo.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:ax218="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax220="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax215="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax222="http://rmi.java/xsd"; xmlns:ax213="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax223="http://io.java/xsd"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax211="http://autoscale.policy.pojo.a utoscaler.stratos.apache.org/xsd" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> <wsdl:types> <xs:schema xmlns:ax224="http://io.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd";> <xs:import namespace="http://io.java/xsd"/> @@ -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> @@ -148,8 +148,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="ax29:Dependencies"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax29:ServiceGroup"/> + <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax220:Dependencies"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax220: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"/> @@ -163,88 +163,41 @@ </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://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax220="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax210="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax225="http://rmi.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> + <xs:schema xmlns:ax27="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax216="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax219="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax221="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax212="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax225="http://rmi.java/xsd"; xmlns:ax226="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> <xs:import namespace="http://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.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/> - <xs:import namespace="http://common.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://application.exception.autoscaler.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> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getApplicationsResponse"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="AutoscalerServiceApplicationDefinitionException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax25:ApplicationDefinitionException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax27:CartridgeGroupNotFoundException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="AutoscalerServiceCartridgeNotFoundException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax27:CartridgeNotFoundException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="addApplication"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="addApplicationResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getServiceGroup"> + <xs:import namespace="http://common.stratos.apache.org/xsd"/> + <xs:element name="getApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupResponse"> + <xs:element name="getApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplication"> + <xs:element name="getApplicationPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationResponse"> + <xs:element name="getApplicationPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax27:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -258,7 +211,7 @@ <xs:element name="getDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -272,43 +225,21 @@ <xs:element name="getAutoscalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax217:AutoscalePolicy"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="AutoscalerServiceInvalidArgumentException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax27:InvalidArgumentException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="updateClusterMonitor"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - <xs:element 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"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax27:AutoScalingPolicyAlreadyExistException"/> + <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax214:AutoScalingPolicyAlreadyExistException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="addAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax217:AutoscalePolicy"/> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -322,14 +253,14 @@ <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="ax216:InvalidPolicyException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="updateAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax217:AutoscalePolicy"/> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -343,14 +274,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="ax216: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="ax216:PolicyDoesNotExistException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -379,7 +310,7 @@ <xs:element name="getAutoscalingPolicyForTenantResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax217:AutoscalePolicy"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -391,7 +322,28 @@ <xs:element name="getAutoScalingPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax217:AutoscalePolicy"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceApplicationDefinitionException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax219:ApplicationDefinitionException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax214:CartridgeGroupNotFoundException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceCartridgeNotFoundException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax214:CartridgeNotFoundException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -441,7 +393,7 @@ <xs:element name="deployApplication"> <xs:complexType> <xs:sequence> - <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="applicationPolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> @@ -485,14 +437,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="ax219:InvalidServiceGroupException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="addServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax29:ServiceGroup"/> + <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax220:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -506,7 +458,7 @@ <xs:element name="updateServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeGroup" nillable="true" type="ax29:ServiceGroup"/> + <xs:element minOccurs="0" name="cartridgeGroup" nillable="true" type="ax220:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -542,7 +494,7 @@ <xs:element name="getServiceGroupByTenantResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax220:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -564,7 +516,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="ax214:AutoScalerException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -576,7 +528,7 @@ <xs:element name="getServiceGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax220:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -632,21 +584,21 @@ <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="ax219: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="ax216:ApplicationPolicyAlreadyExistsException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="addApplicationPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax215:ApplicationPolicy"/> + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax27:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -674,14 +626,14 @@ <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="ax216:ApplicatioinPolicyNotExistsException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="updateApplicationPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax215:ApplicationPolicy"/> + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax27:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -700,28 +652,28 @@ <xs:element name="getApplicationPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax215:ApplicationPolicy"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> <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="ax216: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="ax216:DeploymentPolicyAlreadyExistsException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="addDeployementPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax215:DeploymentPolicy"/> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax27:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -735,21 +687,21 @@ <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="ax216: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="ax214:CloudControllerConnectionException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="updateDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax215:DeploymentPolicy"/> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax27:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -785,7 +737,7 @@ <xs:element name="getDeploymentPolicyForTenantResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -797,56 +749,104 @@ <xs:element name="getDeploymentPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationPolicy"> + <xs:element name="AutoscalerServiceInvalidArgumentException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax214:InvalidArgumentException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationPolicyResponse"> + <xs:element name="updateClusterMonitor"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax215:ApplicationPolicy"/> + <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"/> + </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="ax220:ServiceGroup"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addApplication"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addApplicationResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getApplications"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationsResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> </xs:schema> - <xs:schema xmlns:ax214="http://partition.common.stratos.apache.org/xsd"; xmlns:ax226="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> - <xs:import namespace="http://partition.common.stratos.apache.org/xsd"/> + <xs:schema xmlns:ax26="http://common.stratos.apache.org/xsd"; xmlns:ax210="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://common.stratos.apache.org/xsd"/> - <xs:complexType name="DeploymentPolicy"> + <xs:import namespace="http://partition.common.stratos.apache.org/xsd"/> + <xs:complexType name="ApplicationPolicy"> <xs:sequence> + <xs:element minOccurs="0" name="algorithm" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax214:NetworkPartitionRef"/> + <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="tenantId" type="xs:int"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="ApplicationPolicy"> + <xs:complexType name="DeploymentPolicy"> <xs:sequence> - <xs:element minOccurs="0" name="algorithm" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionGroups" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitions" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionsUuid" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/> + <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> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax213="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd";> + <xs:schema xmlns:ax29="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="ax212:PartitionRef"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionRefs" nillable="true" type="ax28:PartitionRef"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> @@ -856,7 +856,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="ax29:Properties"/> </xs:sequence> </xs:complexType> </xs:schema> @@ -890,7 +890,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:ax217="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> @@ -899,14 +899,14 @@ </xs:complexType> <xs:complexType name="UnremovablePolicyException"> <xs:complexContent> - <xs:extension base="ax27:AutoScalerException"> + <xs:extension base="ax217:AutoScalerException"> <xs:sequence/> </xs:extension> </xs:complexContent> </xs:complexType> <xs:complexType name="PolicyDoesNotExistException"> <xs:complexContent> - <xs:extension base="ax27:AutoScalerException"> + <xs:extension base="ax217:AutoScalerException"> <xs:sequence/> </xs:extension> </xs:complexContent> @@ -937,6 +937,16 @@ </xs:complexType> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.autoscaler.stratos.apache.org/xsd";> + <xs:complexType name="AutoScalingPolicyAlreadyExistException"> + <xs:sequence/> + </xs:complexType> + <xs:complexType name="AutoScalerException"> + <xs:complexContent> + <xs:extension base="xs:RuntimeException"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> <xs:complexType name="CartridgeGroupNotFoundException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> @@ -947,24 +957,14 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> + <xs:complexType name="CloudControllerConnectionException"> + <xs:sequence/> + </xs:complexType> <xs:complexType name="InvalidArgumentException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="AutoScalingPolicyAlreadyExistException"> - <xs:sequence/> - </xs:complexType> - <xs:complexType name="AutoScalerException"> - <xs:complexContent> - <xs:extension base="xs:RuntimeException"> - <xs:sequence/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:complexType name="CloudControllerConnectionException"> - <xs:sequence/> - </xs:complexType> </xs:schema> </wsdl:types> <wsdl:message name="getServiceGroupByTenantRequest"> @@ -1117,18 +1117,18 @@ <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> @@ -1231,18 +1231,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"/> @@ -1337,14 +1337,14 @@ <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"/> @@ -1417,10 +1417,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"/> @@ -1428,6 +1424,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"/> @@ -1653,8 +1653,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> @@ -1662,8 +1662,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> @@ -1845,6 +1845,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> @@ -1863,15 +1872,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"/> @@ -2097,8 +2097,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> @@ -2106,8 +2106,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> @@ -2289,6 +2289,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> @@ -2307,15 +2316,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"/> @@ -2490,8 +2490,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> @@ -2499,8 +2499,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> @@ -2634,8 +2634,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> @@ -2643,8 +2643,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>
