stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject stratos git commit: Adding kubernetesClusterId property to network partition, partition
Date Mon, 22 Dec 2014 03:52:13 GMT
Repository: stratos
Updated Branches:
  refs/heads/master 9fbb7b388 -> f9168e12f


Adding kubernetesClusterId property to network partition, partition


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f9168e12
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f9168e12
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f9168e12

Branch: refs/heads/master
Commit: f9168e12f9822bf183541f4eb9500cf1d9740800
Parents: 9fbb7b3
Author: Imesh Gunaratne <imesh@apache.org>
Authored: Mon Dec 22 09:11:30 2014 +0530
Committer: Imesh Gunaratne <imesh@apache.org>
Committed: Mon Dec 22 09:11:30 2014 +0530

----------------------------------------------------------------------
 .../autoscaler/api/AutoScalerServiceImpl.java   |  44 ++++-
 .../context/cluster/ClusterContext.java         |  12 +-
 .../interfaces/AutoScalerServiceInterface.java  |   3 +-
 .../deployment/partition/network/Partition.java |  11 +-
 .../cloud/controller/domain/Partition.java      |   8 +
 .../cloud/controller/iaases/KubernetesIaas.java |   5 +-
 .../beans/autoscaler/partition/Partition.java   |   9 +
 .../rest/endpoint/api/StratosApiV40Utils.java   |   2 +-
 .../util/converter/ObjectConverter.java         |  25 +--
 .../main/resources/conf/cloud-controller.xml    |   6 +-
 .../src/main/resources/AutoScalerService.wsdl   |   3 +-
 .../main/resources/CloudControllerService.wsdl  | 169 ++++++++++---------
 12 files changed, 178 insertions(+), 119 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/f9168e12/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
index 4499f17..551a501 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
@@ -71,7 +71,6 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface
{
 
     private static final Log log = LogFactory.getLog(AutoScalerServiceImpl.class);
 
-
     public AutoscalePolicy[] getAutoScalingPolicies() {
         return PolicyManager.getInstance().getAutoscalePolicyList();
     }
@@ -192,7 +191,7 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface
{
     }
 
     @Override
-    public boolean deployApplication(String applicationId, DeploymentPolicy policy) throws
ApplicationDefinitionException {
+    public boolean deployApplication(String applicationId, DeploymentPolicy deploymentPolicy)
throws ApplicationDefinitionException {
         try {
             ApplicationContext applicationContext = RegistryManager.getInstance().getApplicationContext(applicationId);
             if (applicationContext == null) {
@@ -204,23 +203,22 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface
{
             ApplicationBuilder.handleApplicationCreated(application, applicationParser.getApplicationClusterContexts());
 
             try {
-                PolicyManager.getInstance().addDeploymentPolicy(policy);
+                validateDeploymentPolicy(deploymentPolicy);
+                updateKubernetesClusterIds(deploymentPolicy);
+                PolicyManager.getInstance().addDeploymentPolicy(deploymentPolicy);
                 applicationContext.setStatus(ApplicationContext.STATUS_DEPLOYED);
                 AutoscalerContext.getInstance().updateApplicationContext(applicationContext);
             } catch (InvalidPolicyException e) {
-                String message = "Deployment policy is not valid: [application-id] " + policy.getApplicationId();
+                String message = "Deployment policy is not valid: [application-id] " + deploymentPolicy.getApplicationId();
                 log.error(message, e);
                 throw new RuntimeException(message, e);
             }
 
-            //Need to start the application Monitor after validation of the deployment policies.
-            //FIXME add validation
-            validateDeploymentPolicy(policy);
             //Check whether all the clusters are there
             boolean allClusterInitialized = false;
             try {
                 ApplicationHolder.acquireReadLock();
-                application = ApplicationHolder.getApplications().getApplication(policy.getApplicationId());
+                application = ApplicationHolder.getApplications().getApplication(deploymentPolicy.getApplicationId());
                 if (application != null) {
                     allClusterInitialized = AutoscalerUtil.allClustersInitialized(application);
                 }
@@ -253,6 +251,36 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface
{
         }
     }
 
+    /**
+     * Overwrite partition's kubernetes cluster ids with network partition's kubernetes cluster
ids.
+     * @param deploymentPolicy
+     */
+    private void updateKubernetesClusterIds(DeploymentPolicy deploymentPolicy) {
+        ApplicationLevelNetworkPartition[] networkPartitions =
+                deploymentPolicy.getApplicationLevelNetworkPartitions();
+        if(networkPartitions != null) {
+            for(ApplicationLevelNetworkPartition networkPartition : networkPartitions) {
+                if(StringUtils.isNotBlank(networkPartition.getKubernetesClusterId())) {
+                    Partition[] partitions = networkPartition.getPartitions();
+                    if(partitions != null) {
+                        for(Partition partition : partitions) {
+                            if(partition != null) {
+                                if(log.isInfoEnabled()) {
+                                    log.info(String.format("Overwriting partition's kubernetes
cluster id: " +
+                                                    "[application-id] %s [network-partition-id]
%s [partition-id] %s " +
+                                                    "[kubernetes-cluster-id] %s",
+                                            deploymentPolicy.getApplicationId(), networkPartition.getId(),
+                                            partition.getId(), networkPartition.getKubernetesClusterId()));
+                                }
+                                partition.setKubernetesClusterId(networkPartition.getKubernetesClusterId());
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public void undeployApplication(String applicationId) {
         ApplicationBuilder.handleApplicationUndeployed(applicationId);

http://git-wip-us.apache.org/repos/asf/stratos/blob/f9168e12/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java
index 9b9df39..846129c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java
@@ -341,13 +341,15 @@ public class ClusterContext extends AbstractClusterContext {
     }
 
     private org.apache.stratos.cloud.controller.stub.domain.Partition convertTOCCPartition(Partition
partition) {
-        org.apache.stratos.cloud.controller.stub.domain.Partition partition1 = new
+        org.apache.stratos.cloud.controller.stub.domain.Partition ccPartition = new
                 org.apache.stratos.cloud.controller.stub.domain.Partition();
 
-        partition1.setId(partition.getId());
-        partition1.setProvider(partition.getProvider());
-        partition1.setProperties(AutoscalerUtil.toStubProperties(partition.getProperties()));
+        ccPartition.setId(partition.getId());
+        ccPartition.setProvider(partition.getProvider());
+        ccPartition.setDescription(partition.getDescription());
+        ccPartition.setKubernetesClusterId(partition.getKubernetesClusterId());
+        ccPartition.setProperties(AutoscalerUtil.toStubProperties(partition.getProperties()));
 
-        return partition1;
+        return ccPartition;
     }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/f9168e12/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java
index 0112742..538010a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/interfaces/AutoScalerServiceInterface.java
@@ -113,7 +113,8 @@ public interface AutoScalerServiceInterface {
      * @param deploymentPolicyId
      * @return
      */
-    public org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.ApplicationLevelNetworkPartition[]
getNetworkPartitions(String deploymentPolicyId);
+    public org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.ApplicationLevelNetworkPartition[]
+        getNetworkPartitions(String deploymentPolicyId);
 
     /**
      * Dynamically update the properties of an Autoscaling Cluster Monitor

http://git-wip-us.apache.org/repos/asf/stratos/blob/f9168e12/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/Partition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/Partition.java
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/Partition.java
index 1980374..dc29d49 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/Partition.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/partition/network/Partition.java
@@ -32,10 +32,11 @@ public class Partition implements Serializable {
      * provider should match with an IaasProvider type.
      */
     private String provider;
-    private Properties properties = new Properties();
     private String id;
     private String description;
     private boolean isPublic;
+    private String kubernetesClusterId;
+    private Properties properties = new Properties();
 
     /**
      * Gets the value of the id property.
@@ -138,4 +139,12 @@ public class Partition implements Serializable {
     public int hashCode() {
         return this.id.hashCode();
     }
+
+    public String getKubernetesClusterId() {
+        return kubernetesClusterId;
+    }
+
+    public void setKubernetesClusterId(String kubernetesClusterId) {
+        this.kubernetesClusterId = kubernetesClusterId;
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/f9168e12/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java
index c75c05f..94b41df 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java
@@ -39,6 +39,7 @@ public class Partition implements Serializable{
     private String id;
     private String description;
     private boolean isPublic;
+    private String kubernetesClusterId;
 
 
     /**
@@ -176,4 +177,11 @@ public class Partition implements Serializable{
         return this.id.hashCode();
     }
 
+    public String getKubernetesClusterId() {
+        return kubernetesClusterId;
+    }
+
+    public void setKubernetesClusterId(String kubernetesClusterId) {
+        this.kubernetesClusterId = kubernetesClusterId;
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/f9168e12/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/KubernetesIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/KubernetesIaas.java
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/KubernetesIaas.java
index e9150bd..7d495ce 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/KubernetesIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/KubernetesIaas.java
@@ -148,10 +148,7 @@ public class KubernetesIaas extends Iaas {
             }
 
             try {
-                String kubernetesClusterId = readProperty(StratosConstants.KUBERNETES_CLUSTER_ID,
-                        partition.getProperties(),
-                        partition.toString());
-
+                String kubernetesClusterId = partition.getKubernetesClusterId();
                 KubernetesCluster kubernetesCluster = CloudControllerContext.getInstance().
                         getKubernetesCluster(kubernetesClusterId);
                 handleNullObject(kubernetesCluster, "Could not start container, kubernetes
cluster not found: " +

http://git-wip-us.apache.org/repos/asf/stratos/blob/f9168e12/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/Partition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/Partition.java
b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/Partition.java
index f36f893..bb5a325 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/Partition.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/autoscaler/partition/Partition.java
@@ -31,6 +31,7 @@ public class Partition {
     private String description;
     private boolean isPublic;
     private String provider;
+    private String kubernetesClusterId;
     private List<PropertyBean> property;
 
     public String getId() {
@@ -76,4 +77,12 @@ public class Partition {
     public void setProperty(List<PropertyBean> property) {
         this.property = property;
     }
+
+    public String getKubernetesClusterId() {
+        return kubernetesClusterId;
+    }
+
+    public void setKubernetesClusterId(String kubernetesClusterId) {
+        this.kubernetesClusterId = kubernetesClusterId;
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/f9168e12/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
index 80449b9..6cc8ad9 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
@@ -175,7 +175,7 @@ public class StratosApiV40Utils {
         if (autoscalerServiceClient != null) {
 
            /* FIXME add 4040 org.apache.stratos.cloud.controller.stub.domain.Partition partition
=
-                    PojoConverter.convertToCCPartitionPojo(partitionBean);*/
+                    PojoConverter.convertStubPartitionToPartition(partitionBean);*/
 
 //            try {
 //                autoscalerServiceClient.deployPartition(partition);

http://git-wip-us.apache.org/repos/asf/stratos/blob/f9168e12/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 556b3c6..9cc4207 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
@@ -300,22 +300,22 @@ public class ObjectConverter {
         return floatingNetworks;
     }
 
-    public static org.apache.stratos.autoscaler.stub.deployment.partition.Partition convertToCCPartitionPojo
-            (Partition partitionBean) {
+    public static org.apache.stratos.autoscaler.stub.deployment.partition.Partition convertStubPartitionToPartition
+            (Partition partition) {
 
-        org.apache.stratos.autoscaler.stub.deployment.partition.Partition partition = new
+        org.apache.stratos.autoscaler.stub.deployment.partition.Partition stubPartition =
new
                 org.apache.stratos.autoscaler.stub.deployment.partition.Partition();
 
-        partition.setId(partitionBean.getId());
-        partition.setDescription(partitionBean.getDescription());
-        partition.setIsPublic(partitionBean.isPublic());
-        partition.setProvider(partitionBean.getProvider());
+        stubPartition.setId(partition.getId());
+        stubPartition.setDescription(partition.getDescription());
+        stubPartition.setIsPublic(partition.isPublic());
+        stubPartition.setProvider(partition.getProvider());
+        stubPartition.setKubernetesClusterId(partition.getKubernetesClusterId());
 
-        if (partitionBean.getProperty() != null && !partitionBean.getProperty().isEmpty())
{
-            partition.setProperties(convertProperyBeansToStubProperties(partitionBean.getProperty()));
+        if (partition.getProperty() != null && !partition.getProperty().isEmpty())
{
+            stubPartition.setProperties(convertProperyBeansToStubProperties(partition.getProperty()));
         }
-
-        return partition;
+        return stubPartition;
     }
 
     public static org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy convertToCCAutoscalerPojo(AutoscalePolicy
@@ -518,6 +518,7 @@ public class ObjectConverter {
         partition.setPublic(stubPartition.getIsPublic());
         partition.setDescription(stubPartition.getDescription());
         partition.setProvider(stubPartition.getProvider());
+        partition.setKubernetesClusterId(stubPartition.getKubernetesClusterId());
         if(stubPartition.getProperties() != null) {
             List<PropertyBean> propertyBeanList = new ArrayList<PropertyBean>();
             for(org.apache.stratos.autoscaler.stub.Property stubProperty : stubPartition.getProperties().getProperties())
{
@@ -711,7 +712,7 @@ public class ObjectConverter {
         org.apache.stratos.autoscaler.stub.deployment.partition.Partition[] partitions =
                 new org.apache.stratos.autoscaler.stub.deployment.partition.Partition[partitionList.size()];
         for (int i = 0; i < partitionList.size(); i++) {
-            partitions[i] = convertToCCPartitionPojo(partitionList.get(i));
+            partitions[i] = convertStubPartitionToPartition(partitionList.get(i));
         }
 
         return partitions;

http://git-wip-us.apache.org/repos/asf/stratos/blob/f9168e12/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
index 5d364ba..b049170 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
@@ -53,11 +53,13 @@
 			<property name="X" value="x" />
 			<property name="Y" value="y" />
 		</iaasProvider -->
+        <iaasProvider type="kubernetes" name="Kubernetes">
+            <className>org.apache.stratos.cloud.controller.iaases.KubernetesIaas</className>
+            <provider>kubernetes</provider>
+        </iaasProvider>
         <iaasProvider type="mock" name="Mock">
             <className>org.apache.stratos.cloud.controller.iaases.MockIaas</className>
             <provider>mock</provider>
-            <identity svns:secretAlias="cloud.controller.docker.identity">identity</identity>
-            <credential svns:secretAlias="cloud.controller.docker.credential">credential</credential>
         </iaasProvider>
 	</iaasProviders>
 </cloudController>

http://git-wip-us.apache.org/repos/asf/stratos/blob/f9168e12/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
index b866ee8..f1c1f01 100644
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
@@ -153,6 +153,7 @@
                     <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="properties" nillable="true" type="ax27:Properties"/>
                     <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
                 </xs:sequence>
@@ -345,7 +346,7 @@
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element minOccurs="0" name="applicationId" nillable="true"
type="xs:string"/>
-                        <xs:element minOccurs="0" name="policy" nillable="true" type="ax25:DeploymentPolicy"/>
+                        <xs:element minOccurs="0" name="deploymentPolicy" nillable="true"
type="ax25:DeploymentPolicy"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>

http://git-wip-us.apache.org/repos/asf/stratos/blob/f9168e12/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 632e545..293808f 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
@@ -190,35 +190,49 @@
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getServiceGroupSubGroups">
+            <xs:element name="CloudControllerServiceCartridgeNotFoundException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true"
type="ax21:CartridgeNotFoundException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getServiceGroupSubGroupsResponse">
+            <xs:element name="startInstance">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return"
nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="instanceContext" nillable="true"
type="ax26:InstanceContext"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="CloudControllerServiceInvalidPartitionException">
+            <xs:element name="startInstanceResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true"
type="ax21:InvalidPartitionException"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="validatePartition">
+            <xs:element name="CloudControllerServiceInvalidMemberException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="partition" nillable="true" type="ax26:Partition"/>
+                        <xs:element minOccurs="0" name="InvalidMemberException" nillable="true"
type="ax21:InvalidMemberException"/>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="validatePartitionResponse">
+            <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>
+            <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"/>
@@ -253,6 +267,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="validateDeploymentPolicy">
                 <xs:complexType>
                     <xs:sequence>
@@ -268,10 +303,17 @@
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="CloudControllerServiceCartridgeNotFoundException">
+            <xs:element name="getServiceGroupSubGroups">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true"
type="ax21:CartridgeNotFoundException"/>
+                        <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>
@@ -467,48 +509,6 @@
                     </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="terminateInstance">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/>
-                    </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:schema>
         <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://topology.domain.messaging.stratos.apache.org/xsd">
             <xs:complexType abstract="true" name="ClusterStatus">
@@ -570,12 +570,17 @@
                     <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="InvalidPartitionException">
+            <xs:complexType name="CartridgeNotFoundException">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="CartridgeNotFoundException">
+            <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"/>
                 </xs:sequence>
@@ -615,11 +620,6 @@
                     <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="InvalidMemberException">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
-                </xs:sequence>
-            </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"/>
@@ -791,17 +791,6 @@
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true"
type="ax23:Volume"/>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="Partition">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
-                    <xs:element minOccurs="0" name="partitionMax" type="xs:int"/>
-                    <xs:element minOccurs="0" name="partitionMin" type="xs:int"/>
-                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
-                    <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
-                </xs:sequence>
-            </xs:complexType>
             <xs:complexType name="InstanceContext">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
@@ -814,6 +803,18 @@
                     <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
                 </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="partitionMin" 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="MemberContext">
                 <xs:sequence>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="allocatedIPs"
nillable="true" type="xs:string"/>
@@ -850,6 +851,19 @@
                     <xs:element minOccurs="0" name="ram" type="xs:int"/>
                 </xs:sequence>
             </xs:complexType>
+            <xs:complexType name="Registrant">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true"
type="xs:string"/>
+                    <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true"
type="xs:string"/>
+                    <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
+                    <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/>
+                </xs:sequence>
+            </xs:complexType>
             <xs:complexType name="CartridgeInfo">
                 <xs:sequence>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true"
type="ax23:AppType"/>
@@ -892,19 +906,6 @@
                     <xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"/>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="Registrant">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true"
type="xs:string"/>
-                    <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true"
type="xs:string"/>
-                    <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/>
-                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
-                    <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/>
-                </xs:sequence>
-            </xs:complexType>
         </xs:schema>
     </wsdl:types>
     <wsdl:message name="getCartridgesRequest">


Mime
View raw message