Fixing issues when removing cartridges
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8750f8e0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8750f8e0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8750f8e0 Branch: refs/heads/tenant-isolation Commit: 8750f8e023f6e91918fef9b935d2c173b046acec Parents: fb769af Author: Dinithi <[email protected]> Authored: Thu Jul 16 15:12:31 2015 +0530 Committer: Dinithi <[email protected]> Committed: Thu Jul 16 15:12:31 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/services/AutoscalerService.java | 9 + .../services/impl/AutoscalerServiceImpl.java | 15 + .../context/CloudControllerContext.java | 6 +- .../messaging/topology/TopologyBuilder.java | 2 +- .../services/CloudControllerService.java | 7 + .../impl/CloudControllerServiceImpl.java | 20 + .../common/client/AutoscalerServiceClient.java | 4 + .../client/CloudControllerServiceClient.java | 4 + .../rest/endpoint/api/StratosApiV41Utils.java | 48 +- .../src/main/resources/AutoscalerService.wsdl | 237 +++--- .../main/resources/CloudControllerService.wsdl | 779 ++++++++++--------- 11 files changed, 641 insertions(+), 490 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/8750f8e0/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 839d116..f297287 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 @@ -335,4 +335,13 @@ public interface AutoscalerService { * @return array of {@link DeploymentPolicy} */ public ApplicationContext[] getApplicationsByTenant(int tenantId); + + /** + * Get deployment policy definition + * + * @param tenantId tenant id + * @return Deployment policy + */ + public DeploymentPolicy[] getDeploymentPoliciesByTenant(int tenantId); + } http://git-wip-us.apache.org/repos/asf/stratos/blob/8750f8e0/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 e843b04..b9a4195 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 @@ -1458,4 +1458,19 @@ public class AutoscalerServiceImpl implements AutoscalerService { } } + @Override + public DeploymentPolicy[] getDeploymentPoliciesByTenant(int tenantId) { + DeploymentPolicy[] allDeploymentPolicies = getDeploymentPolicies(); + List<DeploymentPolicy> deploymentPolicies = new ArrayList<DeploymentPolicy>(); + + if (allDeploymentPolicies != null) { + for (DeploymentPolicy deploymentPolicy : allDeploymentPolicies) { + if (deploymentPolicy.getTenantId() == tenantId) { + deploymentPolicies.add(deploymentPolicy); + } + } + } + return deploymentPolicies.toArray(new DeploymentPolicy[deploymentPolicies.size()]); + } + } http://git-wip-us.apache.org/repos/asf/stratos/blob/8750f8e0/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 6fb95b9..b5f69cb 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 @@ -313,13 +313,13 @@ public class CloudControllerContext implements Serializable { } public void removeCartridge(Cartridge cartridge) { - if (cartridgeTypeToCartridgeMap.containsKey(cartridge.getType())) { - cartridgeTypeToCartridgeMap.remove(cartridge.getType()); + if (cartridgeTypeToCartridgeMap.containsKey(cartridge.getUuid())) { + cartridgeTypeToCartridgeMap.remove(cartridge.getUuid()); } } public void updateCartridge(Cartridge cartridge) { - cartridgeTypeToCartridgeMap.put(cartridge.getType(), cartridge); + cartridgeTypeToCartridgeMap.put(cartridge.getUuid(), cartridge); } public ServiceGroup getServiceGroup(String name) { http://git-wip-us.apache.org/repos/asf/stratos/blob/8750f8e0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java index e74342c..a8d8827 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java @@ -609,7 +609,7 @@ public class TopologyBuilder { // Set member ports try { - Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(service.getServiceName()); + Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(service.getServiceUuid()); if (cartridge == null) { throw new RuntimeException(String.format("Cartridge not found: [cartridge-type] %s", service.getServiceName())); http://git-wip-us.apache.org/repos/asf/stratos/blob/8750f8e0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java index c341093..1474ae5 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java @@ -431,4 +431,11 @@ public interface CloudControllerService { */ public String[] getIaasProviders(); + /** + * Get cartridges for tenant + * + * @param cartridgeType Type of the cartridge + * @param tenantId tenant id + */ + public Cartridge[] getCartridgesByTenant(int tenantId); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/8750f8e0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index b3d98a5..d4c7b13 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -793,6 +793,26 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override + public Cartridge[] getCartridgesByTenant(int tenantId) { + + Collection<Cartridge> allCartridges = CloudControllerContext.getInstance().getCartridges(); + List<Cartridge> cartridges = new ArrayList<Cartridge>(); + if (allCartridges == null || allCartridges.size() == 0) { + log.info("No registered Cartridge found."); + return null; + } + for (Cartridge cartridge : allCartridges) { + if (log.isDebugEnabled()) { + log.debug(cartridge); + } + if (cartridge.getTenantId() == tenantId) { + cartridges.add(cartridge); + } + } + return cartridges.toArray(new Cartridge[cartridges.size()]); + } + + @Override public boolean unregisterService(String clusterId) throws UnregisteredClusterException { final String clusterId_ = clusterId; http://git-wip-us.apache.org/repos/asf/stratos/blob/8750f8e0/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 4069ee9..4406898 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 @@ -204,6 +204,10 @@ public class AutoscalerServiceClient { return stub.getDeploymentPolicyByTenant(deploymentPolicyId, tenantId); } + public DeploymentPolicy[] getDeploymentPoliciesByTenant(int tenantId) throws RemoteException { + return stub.getDeploymentPoliciesByTenant(tenantId); + } + public ServiceGroup[] getServiceGroups() throws RemoteException, AutoscalerServiceAutoScalerExceptionException { return stub.getServiceGroups(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/8750f8e0/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java index df73dee..a41db85 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java @@ -116,6 +116,10 @@ public class CloudControllerServiceClient { return stub.getCartridges(); } + public Cartridge[] getCartridgesByTenant(int tenantId) throws RemoteException { + return stub.getCartridgesByTenant(tenantId); + } + public Cartridge getCartridge(String cartridgeType) throws RemoteException, CloudControllerServiceCartridgeNotFoundExceptionException { return stub.getCartridge(cartridgeType); http://git-wip-us.apache.org/repos/asf/stratos/blob/8750f8e0/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 9777a50..1d51bcf 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 @@ -433,23 +433,27 @@ public class StratosApiV41Utils { try { Pattern searchPattern = getSearchStringPattern(cartridgeSearchString); - String[] availableCartridges = CloudControllerServiceClient.getInstance().getRegisteredCartridges(); + //String[] availableCartridges = CloudControllerServiceClient.getInstance().getRegisteredCartridges(); + Cartridge[] availableCartridges = CloudControllerServiceClient.getInstance().getCartridgesByTenant + (tenantId); if (availableCartridges != null) { - for (String cartridgeType : availableCartridges) { + for (Cartridge cartridgeDefinition : availableCartridges) { Cartridge cartridgeInfo = null; try { - cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeByTenant(cartridgeType,tenantId); + //cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeByTenant + // (cartridgeType,tenantId); + cartridgeInfo = cartridgeDefinition; } catch (Exception e) { if (log.isWarnEnabled()) { - log.warn("Error when calling getCartridgeInfo for " + cartridgeType + ", Error: " + log.warn("Error when calling getCartridgeInfo for " + cartridgeDefinition.getType() + ", Error: " + e.getMessage()); } } if (cartridgeInfo == null) { // This cannot happen. But continue if (log.isDebugEnabled()) { - log.debug("Cartridge Info not found: " + cartridgeType); + log.debug("Cartridge Info not found: " + cartridgeDefinition.getType()); } continue; } @@ -469,8 +473,6 @@ public class StratosApiV41Utils { CartridgeBean cartridge = ObjectConverter.convertCartridgeToCartridgeDefinitionBean(cartridgeInfo); cartridges.add(cartridge); } - - } } else { if (log.isDebugEnabled()) { @@ -3012,18 +3014,20 @@ public class StratosApiV41Utils { DeploymentPolicyBean deploymentPolicyBean; try { - org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy[] deploymentPolicies - = AutoscalerServiceClient.getInstance().getDeploymentPolicies(); - - DeploymentPolicy deploymentPolicy = null; PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy + = AutoscalerServiceClient.getInstance().getDeploymentPolicyForTenant(deploymentPolicyId, + carbonContext.getTenantId()); + + /*DeploymentPolicy deploymentPolicy = null; + for (DeploymentPolicy deploymentPolicy1 : deploymentPolicies) { if (carbonContext.getTenantId() == deploymentPolicy1.getTenantId()) { if (deploymentPolicy1.getId().equals(deploymentPolicyId)) { deploymentPolicy = deploymentPolicy1; } } - } + }*/ if (deploymentPolicy == null) { return null; } @@ -3044,24 +3048,10 @@ public class StratosApiV41Utils { */ public static DeploymentPolicyBean[] getDeploymentPolicies() throws RestAPIException { try { + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy[] deploymentPolicies - = AutoscalerServiceClient.getInstance().getDeploymentPolicies(); - - DeploymentPolicy[] deploymentPoliciesForTenantArray = new DeploymentPolicy[0]; - if (deploymentPolicies != null) { - PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - List<DeploymentPolicy> deploymentPoliciesForTenant = new ArrayList<DeploymentPolicy>(); - for (DeploymentPolicy deploymentPolicy : deploymentPolicies) { - if (carbonContext.getTenantId() == deploymentPolicy.getTenantId()) { - deploymentPoliciesForTenant.add(deploymentPolicy); - } - } - if (deploymentPoliciesForTenant.size() != 0) { - deploymentPoliciesForTenantArray = deploymentPoliciesForTenant.toArray(new - DeploymentPolicy[deploymentPoliciesForTenant.size()]); - } - } - return ObjectConverter.convertASStubDeploymentPoliciesToDeploymentPolicies(deploymentPoliciesForTenantArray); + = AutoscalerServiceClient.getInstance().getDeploymentPoliciesByTenant(carbonContext.getTenantId()); + return ObjectConverter.convertASStubDeploymentPoliciesToDeploymentPolicies(deploymentPolicies); } catch (RemoteException e) { String message = "Could not get deployment policies"; log.error(message); http://git-wip-us.apache.org/repos/asf/stratos/blob/8750f8e0/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 cfecdfa..2e9f2e8 100644 --- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl +++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax29="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ns="http://impl.services.autoscaler.stratos.apache.org"; xmlns:ax25="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax26="http://common.stratos.apache.org/xsd"; xmlns:ax23="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax21="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax216="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax220="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax212="http://partition.common.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://deployment.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";> +<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax29="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ns="http://impl.services.autoscaler.stratos.apache.org"; xmlns:ax25="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax26="http://common.stratos.apache.org/xsd"; xmlns:ax23="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax21="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax216="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax219="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax222="http://rmi.java/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax210="http://partition.common.stratos.apache.org/xsd"; xmlns:ax223="http://io.java/xsd"; xmlns:http="http:/ /schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> <wsdl:types> - <xs:schema xmlns:ax225="http://io.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd";> + <xs:schema xmlns:ax224="http://io.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd";> <xs:import namespace="http://io.java/xsd"/> <xs:complexType name="RemoteException"> <xs:complexContent> - <xs:extension base="ax224:IOException"> + <xs:extension base="ax223:IOException"> <xs:sequence> <xs:element minOccurs="0" name="cause" nillable="true" type="xs:anyType"/> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> @@ -152,8 +152,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="ax214:Dependencies"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax214: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"/> @@ -167,12 +167,12 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax28="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax22="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax218="http://common.stratos.apache.org/xsd"; xmlns:ax215="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax221="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax210="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:schema xmlns:ax28="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax22="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax218="http://common.stratos.apache.org/xsd"; xmlns:ax215="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax220="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax213="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax225="http://rmi.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/> - <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://common.stratos.apache.org/xsd"/> <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/> @@ -224,45 +224,45 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroup"> + <xs:element name="getDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupResponse"> + <xs:element name="getDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax29:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicy"> + <xs:element name="getApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicyId" 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="getDeploymentPolicyResponse"> + <xs:element name="getApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax28:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplication"> + <xs:element name="getServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationResponse"> + <xs:element name="getServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax28:ApplicationContext"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax214:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -302,20 +302,6 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationPolicy"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="applicationPolicyUuid" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getApplicationPolicyResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax215:ApplicationPolicy"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="getAutoScalingPolicies"> <xs:complexType> <xs:sequence/> @@ -352,7 +338,7 @@ <xs:element name="AutoscalerServiceInvalidPolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax220:InvalidPolicyException"/> + <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax219:InvalidPolicyException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -373,14 +359,14 @@ <xs:element name="AutoscalerServiceUnremovablePolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax220:UnremovablePolicyException"/> + <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax219:UnremovablePolicyException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServicePolicyDoesNotExistException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax220:PolicyDoesNotExistException"/> + <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax219:PolicyDoesNotExistException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -525,7 +511,7 @@ <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="ax214:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -539,7 +525,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="ax214:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -575,7 +561,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="ax214:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -590,7 +576,7 @@ <xs:element name="getDeploymentPolicyByTenantResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax29:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -624,7 +610,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="ax214:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -638,7 +624,7 @@ <xs:element name="getServiceGroupsByTenantResponse"> <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="ax214:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -687,7 +673,7 @@ <xs:element name="AutoscalerServiceRemoteException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax223:RemoteException"/> + <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax222:RemoteException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -701,14 +687,14 @@ <xs:element name="AutoscalerServiceApplicationPolicyAlreadyExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="ApplicationPolicyAlreadyExistsException" nillable="true" type="ax220:ApplicationPolicyAlreadyExistsException"/> + <xs:element minOccurs="0" name="ApplicationPolicyAlreadyExistsException" nillable="true" type="ax219: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="ax29:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -730,7 +716,7 @@ <xs:element name="getApplicationPolicyByTenantResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax215:ApplicationPolicy"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -751,14 +737,14 @@ <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax220:ApplicatioinPolicyNotExistsException"/> + <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax219: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="ax29:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -777,28 +763,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="ax29:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax220:InvalidDeploymentPolicyException"/> + <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax219:InvalidDeploymentPolicyException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax220:DeploymentPolicyAlreadyExistsException"/> + <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax219:DeploymentPolicyAlreadyExistsException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="addDeployementPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax215:DeploymentPolicy"/> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax29:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -812,7 +798,7 @@ <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax220:DeploymentPolicyNotExistsException"/> + <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax219:DeploymentPolicyNotExistsException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -826,7 +812,7 @@ <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="ax29:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -862,7 +848,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="ax29:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -874,18 +860,46 @@ <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="ax29:DeploymentPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getDeploymentPoliciesByTenant"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="tenantId" type="xs:int"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getDeploymentPoliciesByTenantResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:DeploymentPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationPolicyUuid" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> </xs:schema> - <xs:schema xmlns:ax219="http://common.stratos.apache.org/xsd"; xmlns:ax214="http://partition.common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> + <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: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="ax214:NetworkPartitionRef"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax212:NetworkPartitionRef"/> <xs:element minOccurs="0" name="tenantId" type="xs:int"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> @@ -903,13 +917,13 @@ </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:ax211="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="ax210:PartitionRef"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> @@ -953,7 +967,7 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax222="http://exception.autoscaler.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.exception.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax221="http://exception.autoscaler.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.exception.autoscaler.stratos.apache.org/xsd";> <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/> <xs:complexType name="InvalidPolicyException"> <xs:sequence> @@ -1276,6 +1290,12 @@ <wsdl:message name="getApplicationsResponse"> <wsdl:part name="parameters" element="ns:getApplicationsResponse"/> </wsdl:message> + <wsdl:message name="getDeploymentPoliciesByTenantRequest"> + <wsdl:part name="parameters" element="ns:getDeploymentPoliciesByTenant"/> + </wsdl:message> + <wsdl:message name="getDeploymentPoliciesByTenantResponse"> + <wsdl:part name="parameters" element="ns:getDeploymentPoliciesByTenantResponse"/> + </wsdl:message> <wsdl:message name="addApplicationRequest"> <wsdl:part name="parameters" element="ns:addApplication"/> </wsdl:message> @@ -1318,18 +1338,18 @@ <wsdl:message name="removeServiceGroupResponse"> <wsdl:part name="parameters" element="ns:removeServiceGroupResponse"/> </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: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:portType name="AutoscalerServicePortType"> <wsdl:operation name="getServiceGroupByTenant"> <wsdl:input message="ns:getServiceGroupByTenantRequest" wsaw:Action="urn:getServiceGroupByTenant"/> @@ -1490,6 +1510,10 @@ <wsdl:input message="ns:getApplicationsRequest" wsaw:Action="urn:getApplications"/> <wsdl:output message="ns:getApplicationsResponse" wsaw:Action="urn:getApplicationsResponse"/> </wsdl:operation> + <wsdl:operation name="getDeploymentPoliciesByTenant"> + <wsdl:input message="ns:getDeploymentPoliciesByTenantRequest" wsaw:Action="urn:getDeploymentPoliciesByTenant"/> + <wsdl:output message="ns:getDeploymentPoliciesByTenantResponse" wsaw:Action="urn:getDeploymentPoliciesByTenantResponse"/> + </wsdl:operation> <wsdl:operation name="addApplication"> <wsdl:input message="ns:addApplicationRequest" wsaw:Action="urn:addApplication"/> <wsdl:output message="ns:addApplicationResponse" wsaw:Action="urn:addApplicationResponse"/> @@ -1520,6 +1544,10 @@ <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"/> @@ -1527,10 +1555,6 @@ <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"/> @@ -1927,6 +1951,15 @@ <soap:fault use="literal" name="AutoscalerServiceCartridgeGroupNotFoundException"/> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getDeploymentPoliciesByTenant"> + <soap:operation soapAction="urn:getDeploymentPoliciesByTenant" style="document"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="updateClusterMonitor"> <soap:operation soapAction="urn:updateClusterMonitor" style="document"/> <wsdl:input> @@ -1984,15 +2017,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:operation name="updateApplication"> <soap:operation soapAction="urn:updateApplication" style="document"/> <wsdl:input> @@ -2011,6 +2035,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:binding> <wsdl:binding name="AutoscalerServiceSoap12Binding" type="ns:AutoscalerServicePortType"> <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"/> @@ -2407,6 +2440,15 @@ <soap12:fault use="literal" name="AutoscalerServiceCartridgeGroupNotFoundException"/> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getDeploymentPoliciesByTenant"> + <soap12:operation soapAction="urn:getDeploymentPoliciesByTenant" style="document"/> + <wsdl:input> + <soap12:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal"/> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="updateClusterMonitor"> <soap12:operation soapAction="urn:updateClusterMonitor" style="document"/> <wsdl:input> @@ -2464,15 +2506,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:operation name="updateApplication"> <soap12:operation soapAction="urn:updateApplication" style="document"/> <wsdl:input> @@ -2491,6 +2524,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:binding> <wsdl:binding name="AutoscalerServiceHttpBinding" type="ns:AutoscalerServicePortType"> <http:binding verb="POST"/> @@ -2809,6 +2851,15 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> + <wsdl:operation name="getDeploymentPoliciesByTenant"> + <http:operation location="getDeploymentPoliciesByTenant"/> + <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="updateClusterMonitor"> <http:operation location="updateClusterMonitor"/> <wsdl:input> @@ -2845,8 +2896,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> @@ -2854,8 +2905,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>
