Repository: stratos Updated Branches: refs/heads/master fc0f20ab3 -> a0b210d3b
Changed to call through stratos manager Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a0b210d3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a0b210d3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a0b210d3 Branch: refs/heads/master Commit: a0b210d3ba8602deae02621e46014e2e5cff0da3 Parents: b6c3f19 Author: Pubudu Gunatilaka <[email protected]> Authored: Wed May 27 17:17:54 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu May 28 00:22:18 2015 +0530 ---------------------------------------------------------------------- .../services/CloudControllerService.java | 3 +- .../impl/CloudControllerServiceImpl.java | 54 +------ .../client/CloudControllerServiceClient.java | 3 +- .../rest/endpoint/api/StratosApiV41.java | 5 - .../rest/endpoint/api/StratosApiV41Utils.java | 47 +++++- .../main/resources/CloudControllerService.wsdl | 153 +++++++++---------- 6 files changed, 118 insertions(+), 147 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a0b210d3/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 a6572c7..5c417e1 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 @@ -364,8 +364,7 @@ public interface CloudControllerService { * @param networkPartitionId * @throws NetworkPartitionNotExistsException */ - public boolean removeNetworkPartition(String networkPartitionId) throws NetworkPartitionNotExistsException, - InvalidNetworkPartitionException; + public boolean removeNetworkPartition(String networkPartitionId) throws NetworkPartitionNotExistsException; /** * Update network partition http://git-wip-us.apache.org/repos/asf/stratos/blob/a0b210d3/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 45250b0..dfb4f92 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 @@ -21,8 +21,6 @@ package org.apache.stratos.cloud.controller.services.impl; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.stub.deployment.policy.ApplicationPolicy; -import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy; import org.apache.stratos.cloud.controller.concurrent.PartitionValidatorCallable; import org.apache.stratos.cloud.controller.config.CloudControllerConfig; import org.apache.stratos.cloud.controller.context.CloudControllerContext; @@ -37,7 +35,6 @@ 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.AutoscalerServiceClient; import org.apache.stratos.common.domain.LoadBalancingIPType; import org.apache.stratos.common.threading.StratosThreadPool; import org.apache.stratos.messaging.domain.topology.*; @@ -1498,8 +1495,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public boolean removeNetworkPartition(String networkPartitionId) throws NetworkPartitionNotExistsException, - InvalidNetworkPartitionException { + public boolean removeNetworkPartition(String networkPartitionId) throws NetworkPartitionNotExistsException { try { if (log.isInfoEnabled()) { @@ -1513,7 +1509,6 @@ public class CloudControllerServiceImpl implements CloudControllerService { throw new NetworkPartitionNotExistsException(message); } // removing from CC-Context - validateNetworkPartition(networkPartitionId); CloudControllerContext.getInstance().removeNetworkPartition(networkPartitionId); // persisting CC-Context CloudControllerContext.getInstance().persist(); @@ -1529,53 +1524,6 @@ public class CloudControllerServiceImpl implements CloudControllerService { return true; } - private void validateNetworkPartition(String networkPartitionId) { - - try { - DeploymentPolicy[] deploymentPolicies = AutoscalerServiceClient.getInstance().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.getDeploymentPolicyID()); - log.error(message); - throw new InvalidNetworkPartitionException(message); - } - } - } - } - - ApplicationPolicy[] applicationPolicies = AutoscalerServiceClient.getInstance().getApplicationPolicies(); - - if (applicationPolicies != null) { - for (ApplicationPolicy applicationPolicy : applicationPolicies) { - - for (String networkPartition : - applicationPolicy.getNetworkPartitions()) { - - if (networkPartition.equals(networkPartitionId)) { - String message = String.format("Cannot remove the network partition %s, since" + - " it is used in application policy %s", networkPartitionId, - applicationPolicy.getId()); - log.error(message); - throw new InvalidNetworkPartitionException(message); - } - } - } - } - } catch (Exception e) { - String message = e.getMessage(); - log.error(message, e); - throw new CloudControllerException(message, e); - } - - - } - @Override public boolean updateNetworkPartition(NetworkPartition networkPartition) throws NetworkPartitionNotExistsException { try { http://git-wip-us.apache.org/repos/asf/stratos/blob/a0b210d3/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 4bf537f..50d4244 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 @@ -233,8 +233,7 @@ public class CloudControllerServiceClient { } public void removeNetworkPartition(String networkPartitionId) throws RemoteException, - CloudControllerServiceNetworkPartitionNotExistsExceptionException, - CloudControllerServiceInvalidNetworkPartitionExceptionException { + CloudControllerServiceNetworkPartitionNotExistsExceptionException { stub.removeNetworkPartition(networkPartitionId); } http://git-wip-us.apache.org/repos/asf/stratos/blob/a0b210d3/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 38b6d20..fc363ee 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 @@ -22,7 +22,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.stub.*; import org.apache.stratos.cloud.controller.stub.*; -import org.apache.stratos.cloud.controller.stub.exception.InvalidNetworkPartitionException; import org.apache.stratos.common.beans.ResponseMessageBean; import org.apache.stratos.common.beans.TenantInfoBean; import org.apache.stratos.common.beans.UserInfoBean; @@ -715,10 +714,6 @@ public class StratosApiV41 extends AbstractApi { } catch (CloudControllerServiceNetworkPartitionNotExistsExceptionException e) { return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "Network partition is not found")).build(); - } catch (CloudControllerServiceInvalidNetworkPartitionExceptionException e) { - return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean( - ResponseMessageBean.ERROR, "Network partition is not found")).build(); - } return Response.ok().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format("Network partition deleted successfully: [network-partition] %s", http://git-wip-us.apache.org/repos/asf/stratos/blob/a0b210d3/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 9051748..1b86499 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 @@ -25,11 +25,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.stub.*; import org.apache.stratos.autoscaler.stub.deployment.policy.ApplicationPolicy; +import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy; import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext; import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup; import org.apache.stratos.cloud.controller.stub.*; import org.apache.stratos.cloud.controller.stub.domain.Cartridge; -import org.apache.stratos.cloud.controller.stub.exception.InvalidNetworkPartitionException; import org.apache.stratos.common.beans.PropertyBean; import org.apache.stratos.common.beans.TenantInfoBean; import org.apache.stratos.common.beans.UserInfoBean; @@ -57,7 +57,6 @@ import org.apache.stratos.common.client.CloudControllerServiceClient; import org.apache.stratos.common.client.StratosManagerServiceClient; import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.exception.InvalidEmailException; -import org.apache.stratos.common.partition.NetworkPartitionRef; import org.apache.stratos.common.util.ClaimsMgtUtil; import org.apache.stratos.common.util.CommonUtil; import org.apache.stratos.manager.service.stub.StratosManagerServiceApplicationSignUpExceptionException; @@ -2616,10 +2615,11 @@ public class StratosApiV41Utils { * @param networkPartitionId networkPartitionId */ public static void removeNetworkPartition(String networkPartitionId) throws RestAPIException, - CloudControllerServiceNetworkPartitionNotExistsExceptionException, - CloudControllerServiceInvalidNetworkPartitionExceptionException { + CloudControllerServiceNetworkPartitionNotExistsExceptionException { try { - ApplicationContext[] applicationContexts = AutoscalerServiceClient.getInstance().getApplications(); + + AutoscalerServiceClient autoscalerServiceClient = AutoscalerServiceClient.getInstance(); + ApplicationContext[] applicationContexts = autoscalerServiceClient.getApplications(); if (applicationContexts != null) { for (ApplicationContext applicationContext : applicationContexts) { if (applicationContext != null) { @@ -2639,6 +2639,43 @@ public class StratosApiV41Utils { } } } + + 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.getDeploymentPolicyID()); + log.error(message); + throw new RestAPIException(message); + } + } + } + } + + ApplicationPolicy[] applicationPolicies = autoscalerServiceClient.getApplicationPolicies(); + + if (applicationPolicies != null) { + for (ApplicationPolicy applicationPolicy : applicationPolicies) { + + for (String networkPartition : + applicationPolicy.getNetworkPartitions()) { + + if (networkPartition.equals(networkPartitionId)) { + String message = String.format("Cannot remove the network partition %s, since" + + " it is used in application policy %s", networkPartitionId, + applicationPolicy.getId()); + log.error(message); + throw new RestAPIException(message); + } + } + } + } + CloudControllerServiceClient serviceClient = CloudControllerServiceClient.getInstance(); serviceClient.removeNetworkPartition(networkPartitionId); } catch (AutoscalerServiceAutoScalerExceptionException e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/a0b210d3/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 ae3006b..c643dab 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 @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ns="http://impl.services.controller.cloud.stratos.apache.org"; xmlns:ax27="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax23="http://domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax24="http://common.stratos.apache.org/xsd"; xmlns:ax21="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax212="http://topology.domain.messaging.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax210="http://domain.common.stratos.apache.org/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.controller.cloud.stratos.apache.org";> +<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax29="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ns="http://impl.services.controller.cloud.stratos.apache.org"; xmlns:ax27="http://domain.common.stratos.apache.org/xsd"; xmlns:ax23="http://domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax24="http://common.stratos.apache.org/xsd"; xmlns:ax21="http://exception.controller.cloud.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax212="http://topology.domain.messaging.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; 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.controller.cloud.stratos.apache.org";> <wsdl:types> - <xs:schema xmlns:ax29="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax213="http://topology.domain.messaging.stratos.apache.org/xsd"; xmlns:ax26="http://domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax22="http://exception.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org";> + <xs:schema xmlns:ax213="http://topology.domain.messaging.stratos.apache.org/xsd"; xmlns:ax26="http://domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax211="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"; xmlns:ax22="http://exception.controller.cloud.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org";> <xs:import namespace="http://exception.controller.cloud.stratos.apache.org/xsd"/> <xs:import namespace="http://domain.controller.cloud.stratos.apache.org/xsd"/> <xs:import namespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"/> @@ -295,113 +295,113 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidKubernetesClusterException"> + <xs:element name="CloudControllerServiceCloudControllerException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidKubernetesClusterException" nillable="true" type="ax21:InvalidKubernetesClusterException"/> + <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax21:CloudControllerException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceKubernetesClusterAlreadyExistsException"> + <xs:element name="startInstance"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="KubernetesClusterAlreadyExistsException" nillable="true" type="ax21:KubernetesClusterAlreadyExistsException"/> + <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax26:InstanceContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addKubernetesCluster"> + <xs:element name="startInstanceResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax29:KubernetesCluster"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addKubernetesClusterResponse"> + <xs:element name="CloudControllerServiceInvalidMemberException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateKubernetesCluster"> + <xs:element name="terminateInstance"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax29:KubernetesCluster"/> + <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateKubernetesClusterResponse"> + <xs:element name="terminateInstanceResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getKubernetesCluster"> + <xs:element name="CloudControllerServiceInvalidKubernetesClusterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="InvalidKubernetesClusterException" nillable="true" type="ax21:InvalidKubernetesClusterException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getKubernetesClusterResponse"> + <xs:element name="CloudControllerServiceKubernetesClusterAlreadyExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:KubernetesCluster"/> + <xs:element minOccurs="0" name="KubernetesClusterAlreadyExistsException" nillable="true" type="ax21:KubernetesClusterAlreadyExistsException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getKubernetesClusters"> + <xs:element name="addKubernetesCluster"> <xs:complexType> - <xs:sequence/> + <xs:sequence> + <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax29:KubernetesCluster"/> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getKubernetesClustersResponse"> + <xs:element name="addKubernetesClusterResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:KubernetesCluster"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceCloudControllerException"> + <xs:element name="updateKubernetesCluster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax21:CloudControllerException"/> + <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax29:KubernetesCluster"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstance"> + <xs:element name="updateKubernetesClusterResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax26:InstanceContext"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstanceResponse"> + <xs:element name="getKubernetesCluster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> + <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidMemberException"> + <xs:element name="getKubernetesClusterResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax29:KubernetesCluster"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstance"> + <xs:element name="getKubernetesClusters"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> - </xs:sequence> + <xs:sequence/> </xs:complexType> </xs:element> - <xs:element name="terminateInstanceResponse"> + <xs:element name="getKubernetesClustersResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:KubernetesCluster"/> </xs:sequence> </xs:complexType> </xs:element> @@ -820,16 +820,6 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidKubernetesClusterException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="KubernetesClusterAlreadyExistsException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> <xs:complexType name="CloudControllerException"> <xs:complexContent> <xs:extension base="xs:RuntimeException"> @@ -842,6 +832,16 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> + <xs:complexType name="InvalidKubernetesClusterException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="KubernetesClusterAlreadyExistsException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> <xs:complexType name="InvalidClusterException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> @@ -883,31 +883,16 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.common.stratos.apache.org/xsd";> - <xs:complexType name="NameValuePair"> - <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="LoadBalancingIPType"> - <xs:complexContent> - <xs:extension base="xs:Enum"> - <xs:sequence/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:schema> - <xs:schema xmlns:ax28="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd";> + <xs:schema xmlns:ax210="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd";> <xs:import namespace="http://common.stratos.apache.org/xsd"/> <xs:complexType name="KubernetesCluster"> <xs:sequence> <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="kubernetesHosts" nillable="true" type="ax27:KubernetesHost"/> - <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax27:KubernetesMaster"/> - <xs:element minOccurs="0" name="portRange" nillable="true" type="ax27:PortRange"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax28:Properties"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="kubernetesHosts" nillable="true" type="ax29:KubernetesHost"/> + <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax29:KubernetesMaster"/> + <xs:element minOccurs="0" name="portRange" nillable="true" type="ax29:PortRange"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax210:Properties"/> </xs:sequence> </xs:complexType> <xs:complexType name="KubernetesHost"> @@ -915,13 +900,13 @@ <xs:element minOccurs="0" name="hostId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="hostname" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="privateIPAddress" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax28:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax210:Properties"/> <xs:element minOccurs="0" name="publicIPAddress" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> <xs:complexType name="KubernetesMaster"> <xs:complexContent> - <xs:extension base="ax27:KubernetesHost"> + <xs:extension base="ax29:KubernetesHost"> <xs:sequence/> </xs:extension> </xs:complexContent> @@ -933,7 +918,22 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax25="http://common.stratos.apache.org/xsd"; xmlns:ax211="http://domain.common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.controller.cloud.stratos.apache.org/xsd";> + <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.common.stratos.apache.org/xsd";> + <xs:complexType name="NameValuePair"> + <xs:sequence> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="LoadBalancingIPType"> + <xs:complexContent> + <xs:extension base="xs:Enum"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:schema> + <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="Cartridge"> @@ -1106,14 +1106,14 @@ <xs:element minOccurs="0" name="clusterInstanceId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="defaultPrivateIP" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="defaultPublicIP" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="dynamicPayload" nillable="true" type="ax210:NameValuePair"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="dynamicPayload" nillable="true" type="ax27:NameValuePair"/> <xs:element minOccurs="0" name="initTime" type="xs:long"/> <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="instanceMetadata" nillable="true" type="ax23:InstanceMetadata"/> <xs:element minOccurs="0" name="kubernetesPodId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="kubernetesPodLabel" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="loadBalancingIPType" nillable="true" type="ax210:LoadBalancingIPType"/> + <xs:element minOccurs="0" name="loadBalancingIPType" nillable="true" type="ax27:LoadBalancingIPType"/> <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"/> @@ -1304,9 +1304,6 @@ <wsdl:message name="removeNetworkPartitionResponse"> <wsdl:part name="parameters" element="ns:removeNetworkPartitionResponse"/> </wsdl:message> - <wsdl:message name="CloudControllerServiceInvalidNetworkPartitionException"> - <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidNetworkPartitionException"/> - </wsdl:message> <wsdl:message name="addKubernetesHostRequest"> <wsdl:part name="parameters" element="ns:addKubernetesHost"/> </wsdl:message> @@ -1454,6 +1451,9 @@ <wsdl:message name="CloudControllerServiceNetworkPartitionAlreadyExistsException"> <wsdl:part name="parameters" element="ns:CloudControllerServiceNetworkPartitionAlreadyExistsException"/> </wsdl:message> + <wsdl:message name="CloudControllerServiceInvalidNetworkPartitionException"> + <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidNetworkPartitionException"/> + </wsdl:message> <wsdl:message name="getKubernetesClusterRequest"> <wsdl:part name="parameters" element="ns:getKubernetesCluster"/> </wsdl:message> @@ -1564,7 +1564,6 @@ <wsdl:input message="ns:removeNetworkPartitionRequest" wsaw:Action="urn:removeNetworkPartition"/> <wsdl:output message="ns:removeNetworkPartitionResponse" wsaw:Action="urn:removeNetworkPartitionResponse"/> <wsdl:fault message="ns:CloudControllerServiceNetworkPartitionNotExistsException" name="CloudControllerServiceNetworkPartitionNotExistsException" wsaw:Action="urn:removeNetworkPartitionCloudControllerServiceNetworkPartitionNotExistsException"/> - <wsdl:fault message="ns:CloudControllerServiceInvalidNetworkPartitionException" name="CloudControllerServiceInvalidNetworkPartitionException" wsaw:Action="urn:removeNetworkPartitionCloudControllerServiceInvalidNetworkPartitionException"/> </wsdl:operation> <wsdl:operation name="addKubernetesHost"> <wsdl:input message="ns:addKubernetesHostRequest" wsaw:Action="urn:addKubernetesHost"/> @@ -1880,9 +1879,6 @@ <wsdl:output> <soap:body use="literal"/> </wsdl:output> - <wsdl:fault name="CloudControllerServiceInvalidNetworkPartitionException"> - <soap:fault use="literal" name="CloudControllerServiceInvalidNetworkPartitionException"/> - </wsdl:fault> <wsdl:fault name="CloudControllerServiceNetworkPartitionNotExistsException"> <soap:fault use="literal" name="CloudControllerServiceNetworkPartitionNotExistsException"/> </wsdl:fault> @@ -2393,9 +2389,6 @@ <wsdl:output> <soap12:body use="literal"/> </wsdl:output> - <wsdl:fault name="CloudControllerServiceInvalidNetworkPartitionException"> - <soap12:fault use="literal" name="CloudControllerServiceInvalidNetworkPartitionException"/> - </wsdl:fault> <wsdl:fault name="CloudControllerServiceNetworkPartitionNotExistsException"> <soap12:fault use="literal" name="CloudControllerServiceNetworkPartitionNotExistsException"/> </wsdl:fault>
