Fixing the improvements on cloud controller
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/98dee05a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/98dee05a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/98dee05a Branch: refs/heads/master Commit: 98dee05a9e47a800aeaa1f183fabc4c07c9d534a Parents: 5578aa4 Author: Vishanth <[email protected]> Authored: Thu Apr 9 12:11:00 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Apr 20 23:42:05 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 3 +- .../context/CloudControllerContext.java | 6 +- .../main/resources/CloudControllerService.wsdl | 368 +++++++++---------- 3 files changed, 189 insertions(+), 188 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/98dee05a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index 9ae5f3b..cde9a97 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -58,6 +58,7 @@ public class DefaultApplicationParser implements ApplicationParser { private static final String METADATA_APPENDER = "-"; public static final String ALIAS = "alias"; public static final String CARTRIDGE_TYPE = "type"; + public static final String LOAD_BALANCER = "lb"; private static Log log = LogFactory.getLog(DefaultApplicationParser.class); private List<ApplicationClusterContext> applicationClusterContexts; @@ -438,7 +439,7 @@ public class DefaultApplicationParser implements ApplicationParser { // Find tenant range of cluster String tenantRange = AutoscalerUtil.findTenantRange(tenantId, cartridge.getTenantPartitions()); Boolean isLB = false; - if (cartridge.getCategory().equals("lb")) { + if (cartridge.getCategory().equals(LOAD_BALANCER)) { isLB = true; } // create and collect this cluster's information http://git-wip-us.apache.org/repos/asf/stratos/blob/98dee05a/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 57d729d..04c7637 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 @@ -727,16 +727,16 @@ public class CloudControllerContext implements Serializable { partitionToIaasProviderByCartridge.put(cartridgeType, partitionToIaasProvider); } - public void addIaasProviders(String cartridgeType, Map<String, IaasProvider> map) { + public void addIaasProviders(String cartridgeType, Map<String, IaasProvider> partitionToIaasProvidersMap) { Map<String, IaasProvider> partitionToIaasProviders; if (partitionToIaasProviderByCartridge.get(cartridgeType) != null) { partitionToIaasProviders = partitionToIaasProviderByCartridge.get(cartridgeType); } else { partitionToIaasProviders = new ConcurrentHashMap<String, IaasProvider>(); } - for (Iterator<String> iterator = map.keySet().iterator(); iterator.hasNext(); ) { + for (Iterator<String> iterator = partitionToIaasProvidersMap.keySet().iterator(); iterator.hasNext(); ) { String key = iterator.next(); - IaasProvider value = map.get(key); + IaasProvider value = partitionToIaasProvidersMap.get(key); partitionToIaasProviders.put(key, value); } http://git-wip-us.apache.org/repos/asf/stratos/blob/98dee05a/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 1adf2f3..c3aa669 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,75 +1,26 @@ -<?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"/> <xs:import namespace="http://topology.domain.messaging.stratos.apache.org/xsd"/> - <xs:element name="CloudControllerServiceCartridgeNotFoundException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax21:CartridgeNotFoundException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="CloudControllerServiceInvalidIaasProviderException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax21:InvalidIaasProviderException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="CloudControllerServiceCloudControllerException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax21:CloudControllerException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="startInstance"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax26:InstanceContext"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="startInstanceResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="CloudControllerServiceInvalidMemberException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> + <xs:element name="getCartridges"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax21:InvalidCartridgeTypeException"/> - </xs:sequence> + <xs:sequence/> </xs:complexType> </xs:element> - <xs:element name="terminateInstance"> + <xs:element name="getCartridgesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> + <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:element name="CloudControllerServiceCartridgeNotFoundException"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax21:CartridgeNotFoundException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -94,6 +45,13 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="CloudControllerServiceInvalidIaasProviderException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax21:InvalidIaasProviderException"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="CloudControllerServiceCartridgeAlreadyExistsException"> <xs:complexType> <xs:sequence> @@ -162,6 +120,13 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax21:InvalidCartridgeTypeException"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="removeCartridge"> <xs:complexType> <xs:sequence> @@ -321,31 +286,38 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="registerService"> + <xs:element name="CloudControllerServiceCloudControllerException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="registrant" nillable="true" type="ax26:Registrant"/> + <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax21:CloudControllerException"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="registerServiceResponse"> + <xs:element name="startInstance"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax26:InstanceContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupSubGroups"> + <xs:element name="startInstanceResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupSubGroupsResponse"> + <xs:element name="CloudControllerServiceInvalidMemberException"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="terminateInstance"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> @@ -370,6 +342,20 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="getServiceGroupSubGroups"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getServiceGroupSubGroupsResponse"> + <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="getServiceGroupCartridges"> <xs:complexType> <xs:sequence> @@ -413,6 +399,20 @@ </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="startInstances"> <xs:complexType> <xs:sequence> @@ -636,29 +636,12 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidIaasProviderException"> - <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"> - <xs:sequence/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:complexType name="InvalidMemberException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="InvalidCartridgeTypeException"> + <xs:complexType name="InvalidCartridgeDefinitionException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidCartridgeDefinitionException"> + <xs:complexType name="InvalidIaasProviderException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> @@ -672,6 +655,11 @@ <xs:complexType name="NetworkPartitionNotExistsException"> <xs:sequence/> </xs:complexType> + <xs:complexType name="InvalidCartridgeTypeException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> <xs:complexType name="CartridgeDefinitionNotExistsException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> @@ -697,6 +685,18 @@ <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"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="InvalidMemberException"> + <xs:sequence> + <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"/> @@ -738,16 +738,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"> @@ -755,13 +770,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:element minOccurs="0" name="endpoint" nillable="true" type="xs:string"/> </xs:sequence> @@ -775,101 +790,9 @@ </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="InstanceContext"> - <xs:sequence> - <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="clusterInstanceId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="initTime" type="xs:long"/> - <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"/> - <xs:element minOccurs="0" name="partition" nillable="true" type="ax23:Partition"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> - <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"/> - <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"/> - <xs:element minOccurs="0" name="iaasType" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="mappingPath" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="removeOntermination" type="xs:boolean"/> - <xs:element minOccurs="0" name="size" type="xs:int"/> - <xs:element minOccurs="0" name="snapshotId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="volumeId" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="MemberContext"> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="allocatedIPs" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="applicationId" 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="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 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="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"/> - <xs:element minOccurs="0" name="obsoleteInitTime" type="xs:long"/> - <xs:element minOccurs="0" name="partition" nillable="true" type="ax23:Partition"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="privateIPs" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="publicIPs" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="InstanceMetadata"> - <xs:sequence> - <xs:element minOccurs="0" name="hostname" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="hypervisor" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="loginPort" type="xs:int"/> - <xs:element minOccurs="0" name="operatingSystem64bit" type="xs:boolean"/> - <xs:element minOccurs="0" name="operatingSystemArchitecture" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="operatingSystemName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="operatingSystemVersion" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="ram" type="xs:int"/> - </xs:sequence> - </xs:complexType> <xs:complexType name="Cartridge"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypeMappings" nillable="true" type="ax23:AppType"/> @@ -945,6 +868,18 @@ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> </xs:sequence> </xs:complexType> + <xs:complexType name="Volume"> + <xs:sequence> + <xs:element minOccurs="0" name="device" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="iaasType" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="mappingPath" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="removeOntermination" type="xs:boolean"/> + <xs:element minOccurs="0" name="size" type="xs:int"/> + <xs:element minOccurs="0" name="snapshotId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="volumeId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> <xs:complexType name="PortMapping"> <xs:sequence> <xs:element minOccurs="0" name="kubernetesServicePort" type="xs:int"/> @@ -963,6 +898,17 @@ <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> </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="ServiceGroup"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"/> @@ -993,6 +939,60 @@ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> </xs:sequence> </xs:complexType> + <xs:complexType name="InstanceContext"> + <xs:sequence> + <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="clusterInstanceId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="initTime" type="xs:long"/> + <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"/> + <xs:element minOccurs="0" name="partition" nillable="true" type="ax23:Partition"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="MemberContext"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="allocatedIPs" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="applicationId" 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="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 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="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"/> + <xs:element minOccurs="0" name="obsoleteInitTime" type="xs:long"/> + <xs:element minOccurs="0" name="partition" nillable="true" type="ax23:Partition"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="privateIPs" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="publicIPs" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="InstanceMetadata"> + <xs:sequence> + <xs:element minOccurs="0" name="hostname" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="hypervisor" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="loginPort" type="xs:int"/> + <xs:element minOccurs="0" name="operatingSystem64bit" type="xs:boolean"/> + <xs:element minOccurs="0" name="operatingSystemArchitecture" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="operatingSystemName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="operatingSystemVersion" nillable="true" type="xs:string"/> + <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"/>
