Repository: stratos Updated Branches: refs/heads/master 819f96e57 -> 35a99acf3
Adding name property to port mapping to identify port mappings uniquely Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/35a99acf Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/35a99acf Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/35a99acf Branch: refs/heads/master Commit: 35a99acf3e764a95b1f1fd140362503bf79e95cb Parents: 819f96e Author: Imesh Gunaratne <[email protected]> Authored: Sun May 31 09:17:43 2015 +0100 Committer: Imesh Gunaratne <[email protected]> Committed: Sun May 31 09:17:43 2015 +0100 ---------------------------------------------------------------------- .../cloud/controller/domain/PortMapping.java | 9 + .../iaases/kubernetes/KubernetesIaas.java | 5 +- .../common/beans/cartridge/PortMappingBean.java | 16 +- .../util/converter/ObjectConverter.java | 2 + .../main/resources/CloudControllerService.wsdl | 243 ++++++++++--------- 5 files changed, 150 insertions(+), 125 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/35a99acf/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java index d99145b..81c91a4 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java @@ -24,6 +24,7 @@ public class PortMapping implements Serializable { private static final long serialVersionUID = -5387564414633460306L; + private String name; private String protocol; private int port; private int proxyPort; @@ -39,6 +40,14 @@ public class PortMapping implements Serializable { this.proxyPort = proxyPort; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public String getProtocol() { return protocol; } http://git-wip-us.apache.org/repos/asf/stratos/blob/35a99acf/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java index b720545..2b6d751 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java @@ -595,8 +595,9 @@ public class KubernetesIaas extends Iaas { if (portMappingStrBuilder.toString().length() > 0) { portMappingStrBuilder.append(","); } - portMappingStrBuilder.append(String.format("PROTOCOL:%s|PORT:%d|PROXY_PORT:%d", - portMapping.getProtocol(), portMapping.getKubernetesServicePort(), portMapping.getProxyPort())); + portMappingStrBuilder.append(String.format("NAME:%s|PROTOCOL:%s|PORT:%d|PROXY_PORT:%d", + portMapping.getName(), portMapping.getProtocol(), + portMapping.getKubernetesServicePort(), portMapping.getProxyPort())); if (log.isInfoEnabled()) { log.info(String.format("Kubernetes service port generated: [cluster-id] %s [port] %d " + http://git-wip-us.apache.org/repos/asf/stratos/blob/35a99acf/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PortMappingBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PortMappingBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PortMappingBean.java index def0405..b0db909 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PortMappingBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PortMappingBean.java @@ -24,12 +24,17 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "portMapping") public class PortMappingBean { + private String name; private String protocol; private int port; private int proxyPort; - public String toString() { - return " [ Protocol: " + getProtocol() + ", Port: " + getPort() + ", Proxy port: " + getProxyPort() + "] "; + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; } public String getProtocol() { @@ -55,4 +60,11 @@ public class PortMappingBean { public void setProxyPort(int proxyPort) { this.proxyPort = proxyPort; } + + public String toString() { + return " [ Name: " + getName() + ", " + + "Protocol: " + getProtocol() + ", " + + "Port: " + getPort() + ", " + + "Proxy port: " + getProxyPort() + "] "; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/35a99acf/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 7db6ccb..1ec0179 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 @@ -126,6 +126,7 @@ public class ObjectConverter { for (int i = 0; i < portMappingBeanArray.length; i++) { PortMapping portMapping = new PortMapping(); + portMapping.setName(portMappingBeanArray[i].getName()); portMapping.setProtocol(portMappingBeanArray[i].getProtocol()); portMapping.setPort(portMappingBeanArray[i].getPort()); portMapping.setProxyPort(portMappingBeanArray[i].getProxyPort()); @@ -145,6 +146,7 @@ public class ObjectConverter { for (PortMapping portMapping : portMappingps) { PortMappingBean portMappingBean = new PortMappingBean(); + portMappingBean.setName(portMapping.getName()); portMappingBean.setProtocol(portMapping.getProtocol()); portMappingBean.setPort(portMapping.getPort()); portMappingBean.setProxyPort(portMapping.getProxyPort()); http://git-wip-us.apache.org/repos/asf/stratos/blob/35a99acf/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 c643dab..8ecc2e6 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: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";> +<?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";> <wsdl:types> - <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: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: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,84 +295,84 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceCloudControllerException"> + <xs:element name="CloudControllerServiceInvalidKubernetesClusterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax21:CloudControllerException"/> + <xs:element minOccurs="0" name="InvalidKubernetesClusterException" nillable="true" type="ax21:InvalidKubernetesClusterException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstance"> + <xs:element name="CloudControllerServiceKubernetesClusterAlreadyExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax26:InstanceContext"/> + <xs:element minOccurs="0" name="KubernetesClusterAlreadyExistsException" nillable="true" type="ax21:KubernetesClusterAlreadyExistsException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstanceResponse"> + <xs:element name="addKubernetesCluster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> + <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax29:KubernetesCluster"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidMemberException"> + <xs:element name="addKubernetesClusterResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstance"> + <xs:element name="updateKubernetesCluster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax29:KubernetesCluster"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstanceResponse"> + <xs:element name="updateKubernetesClusterResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </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"/> @@ -405,6 +405,27 @@ </xs:sequence> </xs:complexType> </xs:element> + <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="getServiceGroupSubGroups"> <xs:complexType> <xs:sequence> @@ -447,137 +468,116 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstances"> + <xs:element name="validateDeploymentPolicyNetworkPartition"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="instanceContexts" nillable="true" type="ax26:InstanceContext"/> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstancesResponse"> + <xs:element name="validateDeploymentPolicyNetworkPartitionResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstanceForcefully"> + <xs:element name="registerService"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="registrant" nillable="true" type="ax26:Registrant"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstanceForcefullyResponse"> + <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="CloudControllerServiceInvalidClusterException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax21:InvalidClusterException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="terminateInstances"> + <xs:element name="startInstances"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="instanceContexts" nillable="true" type="ax26:InstanceContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="terminateInstancesResponse"> + <xs:element name="startInstancesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="registerService"> + <xs:element name="terminateInstanceForcefully"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="registrant" nillable="true" type="ax26:Registrant"/> + <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="registerServiceResponse"> + <xs:element name="terminateInstanceForcefullyResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceUnregisteredClusterException"> + <xs:element name="CloudControllerServiceInvalidClusterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax21:UnregisteredClusterException"/> + <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax21:InvalidClusterException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="unregisterService"> + <xs:element name="terminateInstances"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="unregisterServiceResponse"> + <xs:element name="terminateInstancesResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <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="validateDeploymentPolicyNetworkPartition"> + <xs:element name="updateClusterStatus"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="status" nillable="true" type="ax212:ClusterStatus"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="validateDeploymentPolicyNetworkPartitionResponse"> + <xs:element name="updateClusterStatusResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </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:element name="CloudControllerServiceUnregisteredClusterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax21:UnregisteredClusterException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateClusterStatus"> + <xs:element name="unregisterService"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="status" nillable="true" type="ax212:ClusterStatus"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateClusterStatusResponse"> + <xs:element name="unregisterServiceResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> @@ -682,42 +682,42 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidKubernetesMasterException"> + <xs:element name="updateKubernetesHost"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidKubernetesMasterException" nillable="true" type="ax21:InvalidKubernetesMasterException"/> + <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax29:KubernetesHost"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceNonExistingKubernetesMasterException"> + <xs:element name="updateKubernetesHostResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="NonExistingKubernetesMasterException" nillable="true" type="ax21:NonExistingKubernetesMasterException"/> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateKubernetesMaster"> + <xs:element name="CloudControllerServiceInvalidKubernetesMasterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax29:KubernetesMaster"/> + <xs:element minOccurs="0" name="InvalidKubernetesMasterException" nillable="true" type="ax21:InvalidKubernetesMasterException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateKubernetesMasterResponse"> + <xs:element name="CloudControllerServiceNonExistingKubernetesMasterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="NonExistingKubernetesMasterException" nillable="true" type="ax21:NonExistingKubernetesMasterException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateKubernetesHost"> + <xs:element name="updateKubernetesMaster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax29:KubernetesHost"/> + <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax29:KubernetesMaster"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateKubernetesHostResponse"> + <xs:element name="updateKubernetesMasterResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> @@ -820,6 +820,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="CloudControllerException"> <xs:complexContent> <xs:extension base="xs:RuntimeException"> @@ -832,12 +842,7 @@ <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:complexType name="InvalidPartitionException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> @@ -852,11 +857,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="ApplicationClusterRegistrationException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> @@ -883,16 +883,31 @@ </xs:sequence> </xs:complexType> </xs:schema> - <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: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: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="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: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:sequence> </xs:complexType> <xs:complexType name="KubernetesHost"> @@ -900,13 +915,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="ax210:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax28: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="ax29:KubernetesHost"> + <xs:extension base="ax27:KubernetesHost"> <xs:sequence/> </xs:extension> </xs:complexContent> @@ -918,22 +933,7 @@ </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://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: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:import namespace="http://common.stratos.apache.org/xsd"/> <xs:import namespace="http://domain.common.stratos.apache.org/xsd"/> <xs:complexType name="Cartridge"> @@ -1027,6 +1027,7 @@ <xs:sequence> <xs:element minOccurs="0" name="kubernetesServicePort" type="xs:int"/> <xs:element minOccurs="0" name="kubernetesServicePortMapping" type="xs:boolean"/> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="port" type="xs:int"/> <xs:element minOccurs="0" name="protocol" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="proxyPort" type="xs:int"/> @@ -1106,14 +1107,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="ax27:NameValuePair"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="dynamicPayload" nillable="true" type="ax210: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="ax27:LoadBalancingIPType"/> + <xs:element minOccurs="0" name="loadBalancingIPType" nillable="true" type="ax210: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"/>
