Repository: stratos Updated Branches: refs/heads/tenant-isolation 8ac13e17b -> 9b446c015
Modify NetworkPartitionReference to work with UUID Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ed9c193f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ed9c193f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ed9c193f Branch: refs/heads/tenant-isolation Commit: ed9c193f91eed5fef626d5e11a50da224b35b8d1 Parents: 0293c84 Author: Dinithi <[email protected]> Authored: Tue Jul 7 14:14:39 2015 +0530 Committer: Dinithi <[email protected]> Committed: Tue Jul 7 14:14:39 2015 +0530 ---------------------------------------------------------------------- .../services/impl/AutoscalerServiceImpl.java | 10 +- .../context/CloudControllerContext.java | 12 +- .../impl/CloudControllerServiceImpl.java | 63 +++-- .../NetworkPartitionReferenceBean.java | 9 + .../rest/endpoint/api/StratosApiV41.java | 8 + .../rest/endpoint/api/StratosApiV41Utils.java | 36 ++- .../util/converter/ObjectConverter.java | 2 + .../src/main/resources/AutoscalerService.wsdl | 84 +++--- .../main/resources/CloudControllerService.wsdl | 270 +++++++++---------- 9 files changed, 287 insertions(+), 207 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ed9c193f/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 eeede04..e43ecc0 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 @@ -1115,6 +1115,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { // validate each network partition references for (NetworkPartitionRef networkPartitionRef : deploymentPolicy.getNetworkPartitionRefs()) { // network partition id can't be null or empty + //String networkPartitionUuid = networkPartitionRef.getUuid(); String networkPartitionId = networkPartitionRef.getId(); if (StringUtils.isBlank(networkPartitionId)) { String msg = String.format("Network partition id is blank: [deployment-policy-uuid] %s " + @@ -1128,12 +1129,12 @@ public class AutoscalerServiceImpl implements AutoscalerService { NetworkPartition networkPartitionForTenant = null; if (networkPartitions != null) { for (NetworkPartition networkPartition : networkPartitions) { - if (deploymentPolicy.getTenantId() == networkPartition.getTenantId()) { + if (deploymentPolicy.getTenantId() == networkPartition.getTenantId() && networkPartition.getId() + .equals(networkPartitionRef.getId())) { networkPartitionForTenant = networkPartition; } } } - if (networkPartitionForTenant == null) { String msg = String.format("Network partition is not found: [deployment-policy-uuid] %s " + "[deployment-policy-id] %s [network-partition-id] %s", deploymentPolicyUuid, @@ -1184,8 +1185,9 @@ public class AutoscalerServiceImpl implements AutoscalerService { // a network partition reference should contain at least one partition reference PartitionRef[] partitions = networkPartitionRef.getPartitionRefs(); if (null == partitions || partitions.length == 0) { - String msg = String.format("Network partition does not have any partition references: " - + "[deployment-policy-id] %s [network-partition-id] %s", deploymentPolicyId, networkPartitionId); + String msg = String.format("Network partition does not have any partition references: " + + "[deployment-policy-id] %s [network-partition-id] %s", deploymentPolicyId, + networkPartitionId); log.error(msg); throw new InvalidDeploymentPolicyException(msg); } http://git-wip-us.apache.org/repos/asf/stratos/blob/ed9c193f/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 b223167..26639d6 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 @@ -148,7 +148,7 @@ public class CloudControllerContext implements Serializable { /** * Map of network partitions - * Key - network partition id + * Key - network partition uuid * Value network partition */ private Map<String, NetworkPartition> networkPartitionIDToNetworkPartitionMap; @@ -302,6 +302,16 @@ public class CloudControllerContext implements Serializable { networkPartitionIDToNetworkPartitionMap.remove(networkPartitionID); } + public NetworkPartition getNetworkPartitionForTenant(String networkPartitionId, int tenantId) { + NetworkPartition networkPartitionForTenant = null; + for (NetworkPartition networkPartition : getNetworkPartitions()) { + if (networkPartition.getTenantId() == tenantId && networkPartition.getId().equals(networkPartitionId)) { + networkPartitionForTenant = networkPartition; + } + } + return networkPartitionForTenant; + } + public void removeCartridge(Cartridge cartridge) { if (cartridgeTypeToCartridgeMap.containsKey(cartridge.getType())) { cartridgeTypeToCartridgeMap.remove(cartridge.getType()); http://git-wip-us.apache.org/repos/asf/stratos/blob/ed9c193f/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 0e754c8..c8579e3 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -35,6 +35,7 @@ import org.apache.stratos.cloud.controller.messaging.topology.TopologyManager; import org.apache.stratos.cloud.controller.services.CloudControllerService; import org.apache.stratos.cloud.controller.util.CloudControllerUtil; import org.apache.stratos.common.Property; +import org.apache.stratos.common.client.CloudControllerServiceClient; import org.apache.stratos.common.domain.LoadBalancingIPType; import org.apache.stratos.common.threading.StratosThreadPool; import org.apache.stratos.messaging.domain.topology.*; @@ -1470,8 +1471,9 @@ public class CloudControllerServiceImpl implements CloudControllerService { } String networkPartitionId = networkPartition.getId(); - if (cloudControllerContext.getNetworkPartition(networkPartitionId) != null && cloudControllerContext - .getNetworkPartition(networkPartitionId).getTenantId() == networkPartition.getTenantId()) { + + if (cloudControllerContext.getNetworkPartitionForTenant(networkPartitionId, + networkPartition.getTenantId()) != null) { String message = "Network partition already exists: [network-partition-id] " + networkPartitionId; log.error(message); throw new NetworkPartitionAlreadyExistsException(message); @@ -1525,28 +1527,51 @@ public class CloudControllerServiceImpl implements CloudControllerService { public boolean removeNetworkPartition(String networkPartitionId) throws NetworkPartitionNotExistsException { try { - String networkPartitionUuid = cloudControllerContext.getNetworkPartition(networkPartitionId).getUuid(); - - if (log.isInfoEnabled()) { - log.info(String.format("Removing network partition: [network-partition-uuid] %s " + - "[network-partition-id] %s", networkPartitionUuid, networkPartitionId)); + org.apache.stratos.cloud.controller.stub.domain.NetworkPartition[] networkPartitions = + CloudControllerServiceClient.getInstance().getNetworkPartitions(); + org.apache.stratos.cloud.controller.stub.domain.NetworkPartition networkPartitionForTenant = null; + if (networkPartitions != null) { + for (org.apache.stratos.cloud.controller.stub.domain.NetworkPartition networkPartition : + networkPartitions) { + if (networkPartition.getId().equals(networkPartitionId) && networkPartition.getTenantId() == this + .tenantId) { + networkPartitionForTenant = networkPartition; + } + } } - handleNullObject(networkPartitionId, "Network Partition Id is null"); - if (cloudControllerContext.getNetworkPartition(networkPartitionId) == null) { - String message = String.format("Network partition not found: [network-partition-uuid] %s " + - "[network-partition-id] %s", networkPartitionUuid, networkPartitionId); + if (networkPartitionForTenant != null) { + String networkPartitionUuid = networkPartitionForTenant.getUuid(); + + if (log.isInfoEnabled()) { + log.info(String.format("Removing network partition: [network-partition-uuid] %s " + + "[network-partition-id] %s", networkPartitionUuid, networkPartitionId)); + } + handleNullObject(networkPartitionId, "Network Partition Id is null"); + + if (networkPartitionUuid == null) { + String message = String.format("Network partition not found:[network-partition-id] %s", networkPartitionId); + log.error(message); + throw new NetworkPartitionNotExistsException(message); + } + // removing from CC-Context + CloudControllerContext.getInstance().removeNetworkPartition(networkPartitionUuid); + // persisting CC-Context + CloudControllerContext.getInstance().persist(); + if (log.isInfoEnabled()) { + log.info(String.format("Network partition removed successfully: [network-partition-uuid] %s " + + "[network-partition-id] %s", networkPartitionUuid, networkPartitionId)); + } + } else { + String message = String.format("Network partition not found: [network-partition-id] %s", + networkPartitionId); log.error(message); throw new NetworkPartitionNotExistsException(message); } - // removing from CC-Context - CloudControllerContext.getInstance().removeNetworkPartition(networkPartitionId); - // persisting CC-Context - CloudControllerContext.getInstance().persist(); - if (log.isInfoEnabled()) { - log.info(String.format("Network partition removed successfully: [network-partition-uuid] %s " + - "[network-partition-id] %s", networkPartitionUuid, networkPartitionId)); - } + + + + } catch (Exception e) { String message = e.getMessage(); log.error(message); http://git-wip-us.apache.org/repos/asf/stratos/blob/ed9c193f/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java index 4aa587d..a5712f4 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java @@ -27,6 +27,7 @@ public class NetworkPartitionReferenceBean { private String id; private String uuid; + private int tenantId; private String provider; private List<PartitionReferenceBean> partitions; private String partitionAlgo; @@ -47,6 +48,14 @@ public class NetworkPartitionReferenceBean { this.uuid = uuid; } + public int getTenantId() { + return tenantId; + } + + public void setTenantId(int tenantId) { + this.tenantId = tenantId; + } + public List<PartitionReferenceBean> getPartitions() { return partitions; } http://git-wip-us.apache.org/repos/asf/stratos/blob/ed9c193f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index e07abaa..046934f 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -38,6 +38,7 @@ import org.apache.stratos.common.beans.kubernetes.KubernetesClusterBean; import org.apache.stratos.common.beans.kubernetes.KubernetesHostBean; import org.apache.stratos.common.beans.kubernetes.KubernetesMasterBean; import org.apache.stratos.common.beans.partition.NetworkPartitionBean; +import org.apache.stratos.common.beans.partition.NetworkPartitionReferenceBean; import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean; import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean; import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean; @@ -138,6 +139,13 @@ public class StratosApiV41 extends AbstractApi { PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); deploymentPolicyDefinitionBean.setTenantId(carbonContext.getTenantId()); + + List<NetworkPartitionReferenceBean> networkPartitionReferenceBeans = deploymentPolicyDefinitionBean + .getNetworkPartitions(); + for (NetworkPartitionReferenceBean networkPartitionReferenceBeans1 : networkPartitionReferenceBeans) {\ + networkPartitionReferenceBeans1.setTenantId(deploymentPolicyDefinitionBean.getTenantId()); + } + try { StratosApiV41Utils.addDeploymentPolicy(deploymentPolicyDefinitionBean); } catch (AutoscalerServiceInvalidDeploymentPolicyExceptionException e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/ed9c193f/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 fbcad1c..8d8b802 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 @@ -48,6 +48,7 @@ import org.apache.stratos.common.beans.kubernetes.KubernetesClusterBean; import org.apache.stratos.common.beans.kubernetes.KubernetesHostBean; import org.apache.stratos.common.beans.kubernetes.KubernetesMasterBean; import org.apache.stratos.common.beans.partition.NetworkPartitionBean; +import org.apache.stratos.common.beans.partition.NetworkPartitionReferenceBean; import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean; import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean; import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean; @@ -2737,8 +2738,8 @@ public class StratosApiV41Utils { CloudControllerServiceInvalidNetworkPartitionExceptionException { try { CloudControllerServiceClient serviceClient = CloudControllerServiceClient.getInstance(); - serviceClient.addNetworkPartition( - ObjectConverter.convertNetworkPartitionToCCStubNetworkPartition(networkPartitionBean)); + serviceClient.addNetworkPartition(ObjectConverter.convertNetworkPartitionToCCStubNetworkPartition + (networkPartitionBean)); } catch (RemoteException e) { String message = e.getMessage(); log.error(message); @@ -2812,16 +2813,28 @@ public class StratosApiV41Utils { } } + String networkPartitionUuid = null; + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + for (NetworkPartitionBean networkPartitionBean : getNetworkPartitions()) { + if (networkPartitionBean.getTenantId() == carbonContext.getTenantId() && + networkPartitionBean.getId().equals(networkPartitionId)) { + networkPartitionUuid = networkPartitionBean.getUuid(); + } + } + + DeploymentPolicy[] deploymentPolicies = autoscalerServiceClient.getDeploymentPolicies(); if (deploymentPolicies != null) { for (DeploymentPolicy deploymentPolicy : deploymentPolicies) { for (org.apache.stratos.autoscaler.stub.partition.NetworkPartitionRef networkPartitionRef : deploymentPolicy.getNetworkPartitionRefs()) { - if (networkPartitionRef.getId().equals(networkPartitionId)) { - String message = String.format("Cannot remove the network partition %s, since" + - " it is used in deployment policy %s", networkPartitionId, - deploymentPolicy.getId()); + if (networkPartitionRef.getUuid().equals(networkPartitionUuid)) { + String message = String.format("Cannot remove the network partition: " + + "[network-partition-uuid] %s [network-partition-id] %s since" + + " it is used in deployment policy: [deployment-policy-uuid] %s " + + "[deployment-policy-id] %s", networkPartitionUuid, networkPartitionId, + deploymentPolicy.getUuid(), deploymentPolicy.getId()); log.error(message); throw new RestAPIException(message); } @@ -2927,6 +2940,17 @@ public class StratosApiV41Utils { deploymentPolicyDefinitionBean.getId())); } + NetworkPartitionBean[] networkPartitions = getNetworkPartitions(); + for (NetworkPartitionReferenceBean networkPartitionReferenceBean : deploymentPolicyDefinitionBean + .getNetworkPartitions()) { + for (NetworkPartitionBean networkPartitionBean : networkPartitions) { + if (networkPartitionBean.getTenantId() == deploymentPolicyDefinitionBean.getTenantId() && + networkPartitionBean.getId().equals(networkPartitionReferenceBean.getId())) { + networkPartitionReferenceBean.setUuid(networkPartitionBean.getUuid()); + } + } + } + org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy = ObjectConverter .convertDeploymentPolicyBeanToASDeploymentPolicy(deploymentPolicyDefinitionBean); AutoscalerServiceClient.getInstance().addDeploymentPolicy(deploymentPolicy); http://git-wip-us.apache.org/repos/asf/stratos/blob/ed9c193f/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 9c00e21..a981e3d 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 @@ -609,6 +609,7 @@ public class ObjectConverter { for (NetworkPartitionRef networkPartitionRef : networkPartitions) { NetworkPartitionReferenceBean networkPartitionReferenceBean = new NetworkPartitionReferenceBean(); networkPartitionReferenceBean.setId(networkPartitionRef.getId()); + networkPartitionReferenceBean.setUuid(networkPartitionRef.getUuid()); networkPartitionReferenceBean.setPartitionAlgo(networkPartitionRef.getPartitionAlgo()); networkPartitionReferenceBean.setPartitions( convertASStubPartitionsToPartitions(networkPartitionRef.getPartitionRefs())); @@ -2072,6 +2073,7 @@ public class ObjectConverter { for (NetworkPartitionRef networkPartition : networkPartitions) { NetworkPartitionReferenceBean networkPartitionReferenceBean = new NetworkPartitionReferenceBean(); networkPartitionReferenceBean.setId(networkPartition.getId()); + networkPartitionReferenceBean.setUuid(networkPartition.getUuid()); networkPartitionReferenceBean.setPartitionAlgo(networkPartition.getPartitionAlgo()); networkPartitionReferenceBean.setPartitions( convertASStubPartitionRefsToPartitionReferences(networkPartition.getPartitionRefs())); http://git-wip-us.apache.org/repos/asf/stratos/blob/ed9c193f/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 78aeb74..a927a44 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://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ns="http://impl.services.autoscaler.stratos.apache.org"; xmlns:ax25="http://common.stratos.apache.org/xsd"; xmlns:ax23="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://partition.common.stratos.apache.org/xsd"; xmlns:ax21="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax219="http://io.java/xsd"; xmlns:ax218="http://rmi.java/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax215="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax222="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax213="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax211="http://application.exception.au toscaler.stratos.apache.org/xsd" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> +<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax29="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ns="http://impl.services.autoscaler.stratos.apache.org"; xmlns:ax27="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax23="http://common.stratos.apache.org/xsd"; xmlns:ax21="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax22="http://partition.common.stratos.apache.org/xsd"; xmlns:ax219="http://io.java/xsd"; xmlns:ax218="http://rmi.java/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax215="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax222="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax213="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax211="http://application.exception.au toscaler.stratos.apache.org/xsd" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> <wsdl:types> <xs:schema xmlns:ax220="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="ax29:LoadThresholds"/> + <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax27:LoadThresholds"/> <xs:element minOccurs="0" name="tenantId" type="xs:int"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> @@ -44,7 +44,7 @@ <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> <xs:element minOccurs="0" name="status" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="tenantAdminUsername" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"/> @@ -68,7 +68,7 @@ <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax215:PersistenceContext"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"/> </xs:sequence> @@ -109,7 +109,7 @@ <xs:element minOccurs="0" name="maxMembers" type="xs:int"/> <xs:element minOccurs="0" name="minMembers" type="xs:int"/> <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax215:PersistenceContext"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> </xs:sequence> </xs:complexType> <xs:complexType name="ArtifactRepositoryContext"> @@ -144,8 +144,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="ax21:Dependencies"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax21:ServiceGroup"/> + <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="name" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> @@ -157,55 +157,55 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax28="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax22="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax221="http://rmi.java/xsd"; xmlns:ax212="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax223="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax210="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax226="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> - <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/> + <xs:schema xmlns:ax28="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax26="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax221="http://rmi.java/xsd"; xmlns:ax212="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax223="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax210="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax226="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://rmi.java/xsd"/> <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://common.stratos.apache.org/xsd"/> - <xs:element name="getServiceGroup"> + <xs:element name="getDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupResponse"> + <xs:element name="getDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax21:ServiceGroup"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax26:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicy"> + <xs:element name="getAutoscalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicyResponse"> + <xs:element name="getAutoscalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax28:DeploymentPolicy"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax27:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoscalingPolicy"> + <xs:element name="getServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoscalingPolicyResponse"> + <xs:element name="getServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:AutoscalePolicy"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -337,7 +337,7 @@ <xs:element name="addApplicationPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax28:ApplicationPolicy"/> + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax26:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -358,7 +358,7 @@ <xs:element name="getApplicationPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax28:ApplicationPolicy"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax26:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -370,7 +370,7 @@ <xs:element name="getApplicationPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax28:ApplicationPolicy"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -384,7 +384,7 @@ <xs:element name="updateApplicationPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax28:ApplicationPolicy"/> + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax26:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -481,7 +481,7 @@ <xs:element name="getServiceGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax21:ServiceGroup"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -495,7 +495,7 @@ <xs:element name="addServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax21:ServiceGroup"/> + <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax29:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -509,7 +509,7 @@ <xs:element name="updateServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeGroup" nillable="true" type="ax21:ServiceGroup"/> + <xs:element minOccurs="0" name="cartridgeGroup" nillable="true" type="ax29:ServiceGroup"/> </xs:sequence> </xs:complexType> </xs:element> @@ -545,7 +545,7 @@ <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> </xs:sequence> </xs:complexType> </xs:element> @@ -595,7 +595,7 @@ <xs:element name="updateDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax28:DeploymentPolicy"/> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax26:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -614,7 +614,7 @@ <xs:element name="getDeploymentPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax28:DeploymentPolicy"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -626,7 +626,7 @@ <xs:element name="getAutoScalingPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:AutoscalePolicy"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -640,7 +640,7 @@ <xs:element name="addAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax29:AutoscalePolicy"/> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax27:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -654,7 +654,7 @@ <xs:element name="updateAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax29:AutoscalePolicy"/> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax27:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -696,7 +696,7 @@ <xs:element name="addDeployementPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax28:DeploymentPolicy"/> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax26:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -750,13 +750,13 @@ </xs:complexType> </xs:element> </xs:schema> - <xs:schema xmlns:ax27="http://partition.common.stratos.apache.org/xsd"; xmlns:ax224="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax25="http://partition.common.stratos.apache.org/xsd"; xmlns:ax224="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> <xs: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="ax27:NetworkPartitionRef"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax25:NetworkPartitionRef"/> <xs:element minOccurs="0" name="tenantId" type="xs:int"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> @@ -767,19 +767,19 @@ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionGroups" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitions" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> <xs:element minOccurs="0" name="tenantId" type="xs:int"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax26="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd";> + <xs:schema xmlns:ax24="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="ax24:PartitionRef"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionRefs" nillable="true" type="ax22:PartitionRef"/> <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> @@ -789,7 +789,7 @@ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="partitionMax" type="xs:int"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> </xs:sequence> </xs:complexType> </xs:schema> @@ -813,7 +813,7 @@ <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://common.stratos.apache.org/xsd";> <xs:complexType name="Properties"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax25:Property"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax23:Property"/> </xs:sequence> </xs:complexType> <xs:complexType name="Property"> http://git-wip-us.apache.org/repos/asf/stratos/blob/ed9c193f/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl index e273689..6a60bcb 100644 --- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl +++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl @@ -5,6 +5,27 @@ <xs:import namespace="http://domain.controller.cloud.stratos.apache.org/xsd"/> <xs:import namespace="http://topology.domain.messaging.stratos.apache.org/xsd"/> <xs:import namespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"/> + <xs:element name="CloudControllerServiceInvalidPartitionException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax21:InvalidPartitionException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="validatePartition"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="partition" nillable="true" type="ax26:Partition"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="validatePartitionResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="CloudControllerServiceCartridgeNotFoundException"> <xs:complexType> <xs:sequence> @@ -78,24 +99,53 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidPartitionException"> + <xs:element name="registerService"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax21:InvalidPartitionException"/> + <xs:element minOccurs="0" name="registrant" nillable="true" type="ax26:Registrant"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="validatePartition"> + <xs:element name="registerServiceResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="partition" nillable="true" type="ax26:Partition"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="validatePartitionResponse"> + <xs:element name="getIaasProviders"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getIaasProvidersResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getNetworkPartitions"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getNetworkPartitionsResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:NetworkPartition"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getCartridges"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getCartridgesResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> @@ -497,56 +547,6 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="registerService"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="registrant" nillable="true" type="ax26:Registrant"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="registerServiceResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getNetworkPartitions"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getNetworkPartitionsResponse"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:NetworkPartition"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getIaasProviders"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getIaasProvidersResponse"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getCartridges"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="getCartridgesResponse"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="getKubernetesClusters"> <xs:complexType> <xs:sequence/> @@ -776,6 +776,11 @@ </xs:complexType> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.controller.cloud.stratos.apache.org/xsd";> + <xs:complexType name="InvalidPartitionException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> <xs:complexType name="CartridgeNotFoundException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> @@ -798,11 +803,6 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidPartitionException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> <xs:complexType name="InvalidCartridgeDefinitionException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> @@ -948,6 +948,17 @@ <xs:schema xmlns:ax28="http://domain.common.stratos.apache.org/xsd"; xmlns:ax25="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.controller.cloud.stratos.apache.org/xsd";> <xs:import namespace="http://common.stratos.apache.org/xsd"/> <xs:import namespace="http://domain.common.stratos.apache.org/xsd"/> + <xs:complexType name="Partition"> + <xs:sequence> + <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> + <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="ax25:Properties"/> + <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> <xs:complexType name="InstanceContext"> <xs:sequence> <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> @@ -962,17 +973,6 @@ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> </xs:sequence> </xs:complexType> - <xs:complexType name="Partition"> - <xs:sequence> - <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> - <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="ax25:Properties"/> - <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> <xs:complexType name="Volume"> <xs:sequence> <xs:element minOccurs="0" name="device" nillable="true" type="xs:string"/> @@ -1026,6 +1026,37 @@ <xs:element minOccurs="0" name="ram" type="xs:int"/> </xs:sequence> </xs:complexType> + <xs:complexType name="Registrant"> + <xs:sequence> + <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="Persistence"> + <xs:sequence> + <xs:element minOccurs="0" name="persistenceRequired" type="xs:boolean"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="NetworkPartition"> + <xs:sequence> + <xs:element minOccurs="0" name="activeByDefault" type="xs:boolean"/> + <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="partitions" nillable="true" type="ax23:Partition"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element minOccurs="0" name="provider" 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"/> + </xs:sequence> + </xs:complexType> <xs:complexType name="Cartridge"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypeMappings" nillable="true" type="ax23:AppType"/> @@ -1095,12 +1126,6 @@ <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="Persistence"> - <xs:sequence> - <xs:element minOccurs="0" name="persistenceRequired" type="xs:boolean"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> - </xs:sequence> - </xs:complexType> <xs:complexType name="PortMapping"> <xs:sequence> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> @@ -1139,31 +1164,6 @@ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> </xs:sequence> </xs:complexType> - <xs:complexType name="NetworkPartition"> - <xs:sequence> - <xs:element minOccurs="0" name="activeByDefault" type="xs:boolean"/> - <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="partitions" nillable="true" type="ax23:Partition"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> - <xs:element minOccurs="0" name="provider" 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"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="Registrant"> - <xs:sequence> - <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> - <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> <xs:complexType name="ApplicationClusterContext"> <xs:sequence> <xs:element minOccurs="0" name="autoscalePolicyName" nillable="true" type="xs:string"/> @@ -1485,12 +1485,6 @@ <wsdl:message name="removeCartridgeResponse"> <wsdl:part name="parameters" element="ns:removeCartridgeResponse"/> </wsdl:message> - <wsdl:message name="getNetworkPartitionsRequest"> - <wsdl:part name="parameters" element="ns:getNetworkPartitions"/> - </wsdl:message> - <wsdl:message name="getNetworkPartitionsResponse"> - <wsdl:part name="parameters" element="ns:getNetworkPartitionsResponse"/> - </wsdl:message> <wsdl:message name="addCartridgeRequest"> <wsdl:part name="parameters" element="ns:addCartridge"/> </wsdl:message> @@ -1500,6 +1494,12 @@ <wsdl:message name="CloudControllerServiceCartridgeAlreadyExistsException"> <wsdl:part name="parameters" element="ns:CloudControllerServiceCartridgeAlreadyExistsException"/> </wsdl:message> + <wsdl:message name="getNetworkPartitionsRequest"> + <wsdl:part name="parameters" element="ns:getNetworkPartitions"/> + </wsdl:message> + <wsdl:message name="getNetworkPartitionsResponse"> + <wsdl:part name="parameters" element="ns:getNetworkPartitionsResponse"/> + </wsdl:message> <wsdl:portType name="CloudControllerServicePortType"> <wsdl:operation name="getCartridges"> <wsdl:input message="ns:getCartridgesRequest" wsaw:Action="urn:getCartridges"/> @@ -1703,10 +1703,6 @@ <wsdl:output message="ns:removeCartridgeResponse" wsaw:Action="urn:removeCartridgeResponse"/> <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeTypeException" name="CloudControllerServiceInvalidCartridgeTypeException" wsaw:Action="urn:removeCartridgeCloudControllerServiceInvalidCartridgeTypeException"/> </wsdl:operation> - <wsdl:operation name="getNetworkPartitions"> - <wsdl:input message="ns:getNetworkPartitionsRequest" wsaw:Action="urn:getNetworkPartitions"/> - <wsdl:output message="ns:getNetworkPartitionsResponse" wsaw:Action="urn:getNetworkPartitionsResponse"/> - </wsdl:operation> <wsdl:operation name="addCartridge"> <wsdl:input message="ns:addCartridgeRequest" wsaw:Action="urn:addCartridge"/> <wsdl:output message="ns:addCartridgeResponse" wsaw:Action="urn:addCartridgeResponse"/> @@ -1714,6 +1710,10 @@ <wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:addCartridgeCloudControllerServiceInvalidIaasProviderException"/> <wsdl:fault message="ns:CloudControllerServiceCartridgeAlreadyExistsException" name="CloudControllerServiceCartridgeAlreadyExistsException" wsaw:Action="urn:addCartridgeCloudControllerServiceCartridgeAlreadyExistsException"/> </wsdl:operation> + <wsdl:operation name="getNetworkPartitions"> + <wsdl:input message="ns:getNetworkPartitionsRequest" wsaw:Action="urn:getNetworkPartitions"/> + <wsdl:output message="ns:getNetworkPartitionsResponse" wsaw:Action="urn:getNetworkPartitionsResponse"/> + </wsdl:operation> </wsdl:portType> <wsdl:binding name="CloudControllerServiceSoap11Binding" type="ns:CloudControllerServicePortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"/> @@ -2206,6 +2206,15 @@ <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getNetworkPartitions"> + <soap:operation soapAction="urn:getNetworkPartitions" style="document"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="addCartridge"> <soap:operation soapAction="urn:addCartridge" style="document"/> <wsdl:input> @@ -2224,15 +2233,6 @@ <soap:fault use="literal" name="CloudControllerServiceCartridgeAlreadyExistsException"/> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getNetworkPartitions"> - <soap:operation soapAction="urn:getNetworkPartitions" 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="CloudControllerServiceSoap12Binding" type="ns:CloudControllerServicePortType"> <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"/> @@ -2725,6 +2725,15 @@ <soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getNetworkPartitions"> + <soap12:operation soapAction="urn:getNetworkPartitions" style="document"/> + <wsdl:input> + <soap12:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal"/> + </wsdl:output> + </wsdl:operation> <wsdl:operation name="addCartridge"> <soap12:operation soapAction="urn:addCartridge" style="document"/> <wsdl:input> @@ -2743,15 +2752,6 @@ <soap12:fault use="literal" name="CloudControllerServiceCartridgeAlreadyExistsException"/> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getNetworkPartitions"> - <soap12:operation soapAction="urn:getNetworkPartitions" 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="CloudControllerServiceHttpBinding" type="ns:CloudControllerServicePortType"> <http:binding verb="POST"/> @@ -3106,8 +3106,8 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="addCartridge"> - <http:operation location="addCartridge"/> + <wsdl:operation name="getNetworkPartitions"> + <http:operation location="getNetworkPartitions"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input> @@ -3115,8 +3115,8 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getNetworkPartitions"> - <http:operation location="getNetworkPartitions"/> + <wsdl:operation name="addCartridge"> + <http:operation location="addCartridge"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input>
