You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/05/14 11:54:14 UTC
[2/2] stratos git commit: Fixing network partition and partition
reference object conversion issues
Fixing network partition and partition reference object conversion issues
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0bc07771
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0bc07771
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0bc07771
Branch: refs/heads/master
Commit: 0bc0777156b035c198fd48700318210809e78081
Parents: c1b5f69
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu May 14 15:24:04 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu May 14 15:24:04 2015 +0530
----------------------------------------------------------------------
.../NetworkPartitionReferenceBean.java | 6 +-
.../common/beans/partition/PartitionBean.java | 9 -
.../beans/partition/PartitionReferenceBean.java | 66 +
.../policy/deployment/DeploymentPolicyBean.java | 8 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 4 +-
.../stratos/rest/endpoint/mock/MockContext.java | 14 +-
.../util/converter/ObjectConverter.java | 115 +-
.../src/main/resources/AutoscalerService.wsdl | 387 +++---
.../main/resources/CloudControllerService.wsdl | 1153 +++++++++---------
9 files changed, 882 insertions(+), 880 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0bc07771/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java
index 227eef9..ae04853 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java
@@ -29,7 +29,7 @@ public class NetworkPartitionReferenceBean {
private String id;
private String provider;
- private List<PartitionBean> partitions;
+ private List<PartitionReferenceBean> partitions;
private String partitionAlgo;
private List<PropertyBean> properties;
@@ -41,11 +41,11 @@ public class NetworkPartitionReferenceBean {
this.id = id;
}
- public List<PartitionBean> getPartitions() {
+ public List<PartitionReferenceBean> getPartitions() {
return partitions;
}
- public void setPartitions(List<PartitionBean> partitions) {
+ public void setPartitions(List<PartitionReferenceBean> partitions) {
this.partitions = partitions;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0bc07771/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java
index ae7fba3..b6a6fee 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java
@@ -30,7 +30,6 @@ public class PartitionBean {
private String id;
private String description;
private List<PropertyBean> property;
- private int partitionMax;
public String getId() {
return id;
@@ -55,12 +54,4 @@ public class PartitionBean {
public void setProperty(List<PropertyBean> property) {
this.property = property;
}
-
- public int getPartitionMax() {
- return partitionMax;
- }
-
- public void setPartitionMax(int partitionMax) {
- this.partitionMax = partitionMax;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0bc07771/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java
new file mode 100644
index 0000000..a7b57c2
--- /dev/null
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.common.beans.partition;
+
+import org.apache.stratos.common.beans.PropertyBean;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+
+@XmlRootElement
+public class PartitionReferenceBean {
+
+ private String id;
+ private String description;
+ private List<PropertyBean> property;
+ private int partitionMax;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public List<PropertyBean> getProperty() {
+ return property;
+ }
+
+ public void setProperty(List<PropertyBean> property) {
+ this.property = property;
+ }
+
+ public int getPartitionMax() {
+ return partitionMax;
+ }
+
+ public void setPartitionMax(int partitionMax) {
+ this.partitionMax = partitionMax;
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0bc07771/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java
index f07ee33..1837714 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java
@@ -19,7 +19,7 @@
package org.apache.stratos.common.beans.policy.deployment;
-import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
+import org.apache.stratos.common.beans.partition.NetworkPartitionReferenceBean;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
@@ -29,7 +29,7 @@ public class DeploymentPolicyBean {
private String id;
- private List<NetworkPartitionBean> networkPartitions;
+ private List<NetworkPartitionReferenceBean> networkPartitions;
public String getId() {
return id;
@@ -39,11 +39,11 @@ public class DeploymentPolicyBean {
this.id = id;
}
- public List<NetworkPartitionBean> getNetworkPartitions() {
+ public List<NetworkPartitionReferenceBean> getNetworkPartitions() {
return networkPartitions;
}
- public void setNetworkPartitions(List<NetworkPartitionBean> networkPartitions) {
+ public void setNetworkPartitions(List<NetworkPartitionReferenceBean> networkPartitions) {
this.networkPartitions = networkPartitions;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0bc07771/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 39d6101..88a56fd 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -2588,7 +2588,7 @@ public class StratosApiV41Utils {
org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy =
- ObjectConverter.convertToASDeploymentPolicy(deployementPolicyDefinitionBean);
+ ObjectConverter.convertDeploymentPolicyBeanToASDeploymentPolicy(deployementPolicyDefinitionBean);
AutoscalerServiceClient.getInstance().addDeploymentPolicy(deploymentPolicy);
if (log.isDebugEnabled()) {
@@ -2666,7 +2666,7 @@ public class StratosApiV41Utils {
}
org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy =
- ObjectConverter.convertToASDeploymentPolicy(deploymentPolicyDefinitionBean);
+ ObjectConverter.convertDeploymentPolicyBeanToASDeploymentPolicy(deploymentPolicyDefinitionBean);
AutoscalerServiceClient.getInstance().updateDeploymentPolicy(deploymentPolicy);
http://git-wip-us.apache.org/repos/asf/stratos/blob/0bc07771/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
index 0f4bc39..1b0d298 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
@@ -23,7 +23,9 @@ import org.apache.stratos.common.beans.TenantInfoBean;
import org.apache.stratos.common.beans.UserInfoBean;
import org.apache.stratos.common.beans.cartridge.CartridgeBean;
import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
+import org.apache.stratos.common.beans.partition.NetworkPartitionReferenceBean;
import org.apache.stratos.common.beans.partition.PartitionBean;
+import org.apache.stratos.common.beans.partition.PartitionReferenceBean;
import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
import org.apache.stratos.common.beans.topology.ClusterBean;
@@ -443,7 +445,7 @@ public class MockContext {
if (!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)) {
throw new RestAPIException(Status.NO_CONTENT, "There is no deployment policy with id: " + deploymentPolicyId);
}
- List<PartitionBean> partitions = (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getNetworkPartitions().get(0).getPartitions();
+ List<PartitionReferenceBean> partitions = (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getNetworkPartitions().get(0).getPartitions();
return partitions.toArray(new PartitionBean[partitions.size()]);
}
}
@@ -452,7 +454,7 @@ public class MockContext {
throw new RestAPIException(Status.NO_CONTENT, "There is no deployment policy with id: " + deploymentPolicyId);
}
//FIXME to parse thr all the NW partitions
- List<PartitionBean> partitions = (deploymentPolicyMap.get(tenantId)).
+ List<PartitionReferenceBean> partitions = (deploymentPolicyMap.get(tenantId)).
get(deploymentPolicyId).getNetworkPartitions().get(0).getPartitions();
return partitions.toArray(new PartitionBean[partitions.size()]);
}
@@ -466,7 +468,7 @@ public class MockContext {
if (!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)) {
throw new RestAPIException(Status.NO_CONTENT, "There is no deployment policy with id: " + deploymentPolicyId);
}
- List<NetworkPartitionBean> networkPartitionsList = (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getNetworkPartitions();
+ List<NetworkPartitionReferenceBean> networkPartitionsList = (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getNetworkPartitions();
return networkPartitionsList.toArray(new NetworkPartitionBean[networkPartitionsList.size()]);
}
}
@@ -474,7 +476,7 @@ public class MockContext {
if (!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)) {
throw new RestAPIException(Status.NO_CONTENT, "There is no deployment policy with id: " + deploymentPolicyId);
}
- List<NetworkPartitionBean> networkPartitionsList = (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId).getNetworkPartitions();
+ List<NetworkPartitionReferenceBean> networkPartitionsList = (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId).getNetworkPartitions();
return networkPartitionsList.toArray(new NetworkPartitionBean[networkPartitionsList.size()]);
}
@@ -604,9 +606,9 @@ public class MockContext {
}
PartitionBean[] partitionsArray = null;
- for (NetworkPartitionBean networkPartition : deploymentPolicy.getNetworkPartitions()) {
+ for (NetworkPartitionReferenceBean networkPartition : deploymentPolicy.getNetworkPartitions()) {
if (networkPartition.getId().equals(partitionGroupId)) {
- List<PartitionBean> partitions = networkPartition.getPartitions();
+ List<PartitionReferenceBean> partitions = networkPartition.getPartitions();
partitionsArray = partitions.toArray(new PartitionBean[partitions.size()]);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0bc07771/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 30ede69..ef80291 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
@@ -35,7 +35,9 @@ import org.apache.stratos.common.beans.artifact.repository.ArtifactRepositoryBea
import org.apache.stratos.common.beans.cartridge.*;
import org.apache.stratos.common.beans.kubernetes.*;
import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
+import org.apache.stratos.common.beans.partition.NetworkPartitionReferenceBean;
import org.apache.stratos.common.beans.partition.PartitionBean;
+import org.apache.stratos.common.beans.partition.PartitionReferenceBean;
import org.apache.stratos.common.beans.policy.autoscale.*;
import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
@@ -288,9 +290,7 @@ public class ObjectConverter {
org.apache.stratos.cloud.controller.stub.domain.Partition stubPartition = new
org.apache.stratos.cloud.controller.stub.domain.Partition();
-
stubPartition.setId(partition.getId());
- stubPartition.setPartitionMax(partition.getPartitionMax());
stubPartition.setProperties(convertPropertyBeansToCCStubProperties(partition.getProperty()));
return stubPartition;
@@ -456,9 +456,7 @@ public class ObjectConverter {
}
PartitionBean partition = new PartitionBean();
partition.setId(stubPartition.getId());
- partition.setPublic(stubPartition.getIsPublic());
partition.setDescription(stubPartition.getDescription());
- partition.setKubernetesClusterId(stubPartition.getKubernetesClusterId());
if (stubPartition.getProperties() != null) {
List<org.apache.stratos.common.beans.PropertyBean> propertyBeanList
= new ArrayList<org.apache.stratos.common.beans.PropertyBean>();
@@ -476,8 +474,8 @@ public class ObjectConverter {
}
- public static org.apache.stratos.cloud.controller.stub.domain.NetworkPartition convertNetworkPartitionToCCStubNetworkPartition(
- NetworkPartitionBean networkPartitionBean) {
+ public static org.apache.stratos.cloud.controller.stub.domain.NetworkPartition
+ convertNetworkPartitionToCCStubNetworkPartition(NetworkPartitionBean networkPartitionBean) {
org.apache.stratos.cloud.controller.stub.domain.NetworkPartition networkPartition
= new org.apache.stratos.cloud.controller.stub.domain.NetworkPartition();
@@ -492,16 +490,16 @@ public class ObjectConverter {
return networkPartition;
}
- private static List<NetworkPartitionBean> convertASStubNetworkPartitionsToNetworkPartitions(
+ private static List<NetworkPartitionReferenceBean> convertASStubNetworkPartitionsToNetworkPartitionReferences(
NetworkPartitionRef[] networkPartitions) {
- List<NetworkPartitionBean> networkPartitionBeans = new ArrayList<NetworkPartitionBean>();
- for (NetworkPartitionRef networkPartition : networkPartitions) {
- NetworkPartitionBean networkPartitionBean = new NetworkPartitionBean();
- networkPartitionBean.setId(networkPartition.getId());
- networkPartitionBean.setPartitionAlgo(networkPartition.getPartitionAlgo());
- networkPartitionBean.setPartitions(convertASStubPartitionsToPartitions(networkPartition.getPartitions()));
- networkPartitionBeans.add(networkPartitionBean);
+ List<NetworkPartitionReferenceBean> networkPartitionBeans = new ArrayList<NetworkPartitionReferenceBean>();
+ for (NetworkPartitionRef networkPartitionRef : networkPartitions) {
+ NetworkPartitionReferenceBean networkPartitionReferenceBean = new NetworkPartitionReferenceBean();
+ networkPartitionReferenceBean.setId(networkPartitionRef.getId());
+ networkPartitionReferenceBean.setPartitions(
+ convertASStubPartitionsToPartitions(networkPartitionRef.getPartitions()));
+ networkPartitionBeans.add(networkPartitionReferenceBean);
}
return networkPartitionBeans;
@@ -654,22 +652,19 @@ public class ObjectConverter {
for (int i = 0; i < partitionList.size(); i++) {
partitions[i] = convertPartitionToStubPartition(partitionList.get(i));
}
-
return partitions;
}
- private static List<PartitionBean> convertASStubPartitionsToPartitions(
+ private static List<PartitionReferenceBean> convertASStubPartitionsToPartitions(
PartitionRef[] partitions) {
- List<PartitionBean> partitionBeans = new ArrayList<PartitionBean>();
+ List<PartitionReferenceBean> partitionBeans = new ArrayList<PartitionReferenceBean>();
for (PartitionRef partition : partitions) {
- PartitionBean partitionBean = new PartitionBean();
+ PartitionReferenceBean partitionBean = new PartitionReferenceBean();
partitionBean.setId(partition.getId());
- partitionBean.setPartitionMax(partition.getPartitionMax());
partitionBeans.add(partitionBean);
}
-
return partitionBeans;
}
@@ -698,15 +693,12 @@ public class ObjectConverter {
partitionBeans.setId(partition.getId());
partitionBeans.setDescription(partition.getDescription());
- partitionBeans.setPublic(partition.getIsPublic());
- partitionBeans.setPartitionMax(partition.getPartitionMax());
//properties
if (partition.getProperties() != null) {
List<org.apache.stratos.common.beans.PropertyBean> propertyBeans
= convertCCStubPropertiesToPropertyBeans(partition.getProperties());
partitionBeans.setProperty(propertyBeans);
}
-
return partitionBeans;
}
@@ -1764,7 +1756,7 @@ public class ObjectConverter {
DeploymentPolicyBean deploymentPolicyBean = new DeploymentPolicyBean();
deploymentPolicyBean.setId(deploymentPolicy.getDeploymentPolicyID());
- deploymentPolicyBean.setNetworkPartitions(convertASStubNetworkPartitionsToNetworkPartitions(
+ deploymentPolicyBean.setNetworkPartitions(convertASStubNetworkPartitionsToNetworkPartitionReferences(
deploymentPolicy.getNetworkPartitionRefs()));
return deploymentPolicyBean;
}
@@ -1789,18 +1781,15 @@ public class ObjectConverter {
}
- public static DeploymentPolicy convertToASDeploymentPolicy(
+ public static DeploymentPolicy convertDeploymentPolicyBeanToASDeploymentPolicy(
DeploymentPolicyBean deploymentPolicyBean) {
if (deploymentPolicyBean == null) {
return null;
}
- DeploymentPolicy deploymentPolicy =
- new DeploymentPolicy();
-
+ DeploymentPolicy deploymentPolicy = new DeploymentPolicy();
deploymentPolicy.setDeploymentPolicyID(deploymentPolicyBean.getId());
-
if (deploymentPolicyBean.getNetworkPartitions() != null) {
deploymentPolicy.setNetworkPartitionRefs(convertNetworkPartitionToASStubNetworkPartition(
deploymentPolicyBean.getNetworkPartitions()));
@@ -1839,78 +1828,74 @@ public class ObjectConverter {
return deploymentPolicyBean;
}
- private static List<NetworkPartitionBean> convertASStubNetworkPartitionRefsToNetworkPartitions(
+ private static List<NetworkPartitionReferenceBean> convertASStubNetworkPartitionRefsToNetworkPartitions(
NetworkPartitionRef[] networkPartitions) {
- List<NetworkPartitionBean> networkPartitionBeans = new ArrayList<NetworkPartitionBean>();
+ List<NetworkPartitionReferenceBean> networkPartitionBeans = new ArrayList<NetworkPartitionReferenceBean>();
for (NetworkPartitionRef networkPartition : networkPartitions) {
- NetworkPartitionBean networkPartitionBean = new NetworkPartitionBean();
- networkPartitionBean.setId(networkPartition.getId());
- networkPartitionBean.setPartitionAlgo(networkPartition.getPartitionAlgo());
- networkPartitionBean.setPartitions(convertASStubPartitionRefsToPartitionRefs(networkPartition.getPartitions()));
- networkPartitionBeans.add(networkPartitionBean);
+ NetworkPartitionReferenceBean networkPartitionReferenceBean = new NetworkPartitionReferenceBean();
+ networkPartitionReferenceBean.setId(networkPartition.getId());
+ networkPartitionReferenceBean.setPartitionAlgo(networkPartition.getPartitionAlgo());
+ networkPartitionReferenceBean.setPartitions(convertASStubPartitionRefsToPartitionReferences(networkPartition.getPartitions()));
+ networkPartitionBeans.add(networkPartitionReferenceBean);
}
return networkPartitionBeans;
}
- private static List<PartitionBean> convertASStubPartitionRefsToPartitionRefs(
+ private static List<PartitionReferenceBean> convertASStubPartitionRefsToPartitionReferences(
PartitionRef[] partitions) {
- List<PartitionBean> partitionRefBeans = new ArrayList<PartitionBean>();
+ List<PartitionReferenceBean> partitionRefBeans = new ArrayList<PartitionReferenceBean>();
for (PartitionRef partition : partitions) {
- PartitionBean partitionRefBean = new PartitionBean();
+ PartitionReferenceBean partitionRefBean = new PartitionReferenceBean();
partitionRefBean.setId(partition.getId());
partitionRefBean.setPartitionMax(partition.getPartitionMax());
partitionRefBeans.add(partitionRefBean);
}
-
return partitionRefBeans;
}
private static PartitionRef convertPartitionToASStubPartition(
- PartitionBean partition) {
+ PartitionReferenceBean partitionReferenceBean) {
- if (partition == null) {
+ if (partitionReferenceBean == null) {
return null;
}
- PartitionRef stubPartition = new
- PartitionRef();
-
- stubPartition.setId(partition.getId());
- stubPartition.setPartitionMax(partition.getPartitionMax());
-
+ PartitionRef stubPartition = new PartitionRef();
+ stubPartition.setId(partitionReferenceBean.getId());
+ stubPartition.setPartitionMax(partitionReferenceBean.getPartitionMax());
return stubPartition;
}
private static PartitionRef[] convertToASStubPartitions
- (List<PartitionBean> partitionList) {
+ (List<PartitionReferenceBean> partitionReferenceBeanList) {
PartitionRef[] partitions
- = new PartitionRef[partitionList.size()];
- for (int i = 0; i < partitionList.size(); i++) {
- partitions[i] = convertPartitionToASStubPartition(partitionList.get(i));
+ = new PartitionRef[partitionReferenceBeanList.size()];
+ for (int i = 0; i < partitionReferenceBeanList.size(); i++) {
+ partitions[i] = convertPartitionToASStubPartition(partitionReferenceBeanList.get(i));
}
-
return partitions;
}
private static NetworkPartitionRef[] convertNetworkPartitionToASStubNetworkPartition(
- List<NetworkPartitionBean> networkPartitionBean) {
-
- NetworkPartitionRef[] networkPartition =
- new NetworkPartitionRef[networkPartitionBean.size()];
- for (int i = 0; i < networkPartitionBean.size(); i++) {
- networkPartition[i] = new NetworkPartitionRef();
- networkPartition[i].setId(networkPartitionBean.get(i).getId());
- networkPartition[i].setPartitionAlgo(networkPartitionBean.get(i).getPartitionAlgo());
- networkPartition[i].setPartitions(convertToASStubPartitions(networkPartitionBean.get(i).getPartitions()));
- }
-
- return networkPartition;
+ List<NetworkPartitionReferenceBean> networkPartitionReferenceBeans) {
+
+ List<NetworkPartitionRef> networkPartitionRefList =
+ new ArrayList<NetworkPartitionRef>();
+ for (NetworkPartitionReferenceBean networkPartitionReferenceBean : networkPartitionReferenceBeans) {
+ NetworkPartitionRef networkPartitionRef = new NetworkPartitionRef();
+ networkPartitionRef.setId(networkPartitionReferenceBean.getId());
+ networkPartitionRef.setPartitionAlgo(networkPartitionReferenceBean.getPartitionAlgo());
+ networkPartitionRef.setPartitions(convertToASStubPartitions(
+ networkPartitionReferenceBean.getPartitions()));
+ networkPartitionRefList.add(networkPartitionRef);
+ }
+ return networkPartitionRefList.toArray(new NetworkPartitionRef[networkPartitionRefList.size()]);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0bc07771/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 54e14b1..d5f5531 100644
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
@@ -1,33 +1,10 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://impl.services.autoscaler.stratos.apache.org" xmlns:ax27="http://rmi.java/xsd" xmlns:ax28="http://io.java/xsd" xmlns:ax23="http://common.stratos.apache.org/xsd" xmlns:ax21="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax22="http://partition.common.stratos.apache.org/xsd" xmlns:ax218="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax215="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax222="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax213="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax211="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax224="http://pojo.applications.au
toscaler.stratos.apache.org/xsd" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
-=======
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax29="http://rmi.java/xsd" xmlns:ns="http://impl.services.autoscaler.stratos.apache.org" xmlns:ax25="http://common.stratos.apache.org/xsd" xmlns:ax23="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://partition.common.stratos.apache.org/xsd" xmlns:ax21="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax217="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax215="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax220="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax213="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax223="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax210="http://io.java/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.autoscaler.stratos.apache.org">
->>>>>>> ce6e4bd... Adding missing license headers in files
+<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax27="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ns="http://impl.services.autoscaler.stratos.apache.org" xmlns:ax28="http://partition.common.stratos.apache.org/xsd" xmlns:ax25="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax21="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax22="http://common.stratos.apache.org/xsd" xmlns:ax216="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax218="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax221="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax212="http://rmi.java/xsd" xmlns:ax213="http://io.java/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax223="http://autoscale.policy.pojo.autoscaler.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.autoscaler.stratos.apache.org">
<wsdl:types>
- <xs:schema xmlns:ax29="http://io.java/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd">
+ <xs:schema xmlns:ax214="http://io.java/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd">
<xs:import namespace="http://io.java/xsd"/>
<xs:complexType name="RemoteException">
<xs:complexContent>
- <xs:extension base="ax29:IOException">
+ <xs:extension base="ax214:IOException">
<xs:sequence>
<xs:element minOccurs="0" name="cause" nillable="true" type="xs:anyType"/>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
@@ -44,7 +21,7 @@
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="instanceRoundingFactor" type="xs:float"/>
<xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
- <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax218:LoadThresholds"/>
+ <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax223:LoadThresholds"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
@@ -56,13 +33,13 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax225="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd">
+ <xs:schema xmlns:ax23="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd">
<xs:import namespace="http://common.stratos.apache.org/xsd"/>
<xs:complexType name="ApplicationContext">
<xs:sequence>
<xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="components" nillable="true" type="ax224:ComponentContext"/>
+ <xs:element minOccurs="0" name="components" nillable="true" type="ax21:ComponentContext"/>
<xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/>
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
@@ -75,10 +52,10 @@
</xs:complexType>
<xs:complexType name="ComponentContext">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax224:ApplicationClusterContext"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax224:CartridgeContext"/>
- <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax224:DependencyContext"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax224:GroupContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax21:ApplicationClusterContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax21:CartridgeContext"/>
+ <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax21:DependencyContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax21:GroupContext"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ApplicationClusterContext">
@@ -89,7 +66,7 @@
<xs:element maxOccurs="unbounded" minOccurs="0" name="dependencyClusterIds" 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="persistenceContext" nillable="true" type="ax224:PersistenceContext"/>
+ <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax21:PersistenceContext"/>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/>
<xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"/>
@@ -98,7 +75,7 @@
<xs:complexType name="PersistenceContext">
<xs:sequence>
<xs:element minOccurs="0" name="persistenceRequired" type="xs:boolean"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax224:VolumeContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax21:VolumeContext"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="VolumeContext">
@@ -117,20 +94,20 @@
<xs:sequence>
<xs:element minOccurs="0" name="cartridgeMax" type="xs:int"/>
<xs:element minOccurs="0" name="cartridgeMin" type="xs:int"/>
- <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax224:SubscribableInfoContext"/>
+ <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax21:SubscribableInfoContext"/>
<xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="SubscribableInfoContext">
<xs:sequence>
<xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax224:ArtifactRepositoryContext"/>
+ <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax21:ArtifactRepositoryContext"/>
<xs:element minOccurs="0" name="autoscalingPolicy" nillable="true" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="dependencyAliases" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="maxMembers" type="xs:int"/>
<xs:element minOccurs="0" name="minMembers" type="xs:int"/>
- <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax224:PersistenceContext"/>
+ <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax21:PersistenceContext"/>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/>
</xs:sequence>
</xs:complexType>
@@ -153,9 +130,9 @@
<xs:complexType name="GroupContext">
<xs:sequence>
<xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax224:CartridgeContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax21:CartridgeContext"/>
<xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax224:GroupContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax21:GroupContext"/>
<xs:element minOccurs="0" name="groupMaxInstances" type="xs:int"/>
<xs:element minOccurs="0" name="groupMinInstances" type="xs:int"/>
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
@@ -166,8 +143,8 @@
<xs:complexType name="ServiceGroup">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax222:Dependencies"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax222:ServiceGroup"/>
+ <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax221:Dependencies"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax221:ServiceGroup"/>
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
@@ -179,16 +156,65 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax26="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax216="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax219="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax214="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax221="http://common.stratos.apache.org/xsd" xmlns:ax212="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax223="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax210="http://rmi.java/xsd" xmlns:ax226="http://pojo.applications.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
+ <xs:schema xmlns:ax26="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax217="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax219="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax215="http://rmi.java/xsd" xmlns:ax222="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax224="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax211="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax226="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org">
+ <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://rmi.java/xsd"/>
<xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://common.stratos.apache.org/xsd"/>
- <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/>
+ <xs:element name="getApplication">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getApplicationResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AutoscalerServiceApplicationDefinitionException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax25:ApplicationDefinitionException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateApplication">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateApplicationResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deleteApplication">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deleteApplicationResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="getDeploymentPolicies">
<xs:complexType>
<xs:sequence/>
@@ -197,49 +223,49 @@
<xs:element name="getDeploymentPoliciesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:DeploymentPolicy"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AutoscalerServiceRemoteException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax27:RemoteException"/>
+ <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax215:RemoteException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AutoscalerServiceInvalidDeploymentPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax212:InvalidDeploymentPolicyException"/>
+ <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax217:InvalidDeploymentPolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax212:DeploymentPolicyNotExistsException"/>
+ <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax217:DeploymentPolicyNotExistsException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AutoscalerServiceInvalidPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax212:InvalidPolicyException"/>
+ <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax217:InvalidPolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AutoscalerServiceCloudControllerConnectionException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax214:CloudControllerConnectionException"/>
+ <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax219:CloudControllerConnectionException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="updateDeploymentPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax26:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax27:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -253,14 +279,14 @@
<xs:element name="AutoscalerServiceInvalidApplicationPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax216:InvalidApplicationPolicyException"/>
+ <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax25:InvalidApplicationPolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addApplicationPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax26:ApplicationPolicy"/>
+ <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax27:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -288,14 +314,14 @@
<xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax212:ApplicatioinPolicyNotExistsException"/>
+ <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax217:ApplicatioinPolicyNotExistsException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="updateApplicationPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax26:ApplicationPolicy"/>
+ <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax27:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -314,21 +340,75 @@
<xs:element name="getApplicationPoliciesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:ApplicationPolicy"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:ApplicationPolicy"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="serviceGroupExist">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="serviceGroupExistResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AutoscalerServiceAutoScalerException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax219:AutoScalerException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getServiceGroups">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getServiceGroupsResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax219:CartridgeGroupNotFoundException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeServiceGroup">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="groupName" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeServiceGroupResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax214:AutoScalingPolicyAlreadyExistException"/>
+ <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax219:AutoScalingPolicyAlreadyExistException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addAutoScalingPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax219:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax223:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -347,14 +427,14 @@
<xs:element name="getAutoScalingPoliciesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax219:AutoscalePolicy"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="updateAutoScalingPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax219:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax223:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -368,14 +448,14 @@
<xs:element name="AutoscalerServiceUnremovablePolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax212:UnremovablePolicyException"/>
+ <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax217:UnremovablePolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AutoscalerServicePolicyDoesNotExistException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax212:PolicyDoesNotExistException"/>
+ <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax217:PolicyDoesNotExistException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -407,13 +487,6 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceApplicationDefinitionException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax216:ApplicationDefinitionException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
<xs:element name="deployApplication">
<xs:complexType>
<xs:sequence>
@@ -447,7 +520,7 @@
<xs:element name="AutoscalerServiceInvalidArgumentException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax214:InvalidArgumentException"/>
+ <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax219:InvalidArgumentException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -455,7 +528,7 @@
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -469,14 +542,14 @@
<xs:element name="AutoscalerServiceInvalidServiceGroupException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax216:InvalidServiceGroupException"/>
+ <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax25:InvalidServiceGroupException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addServiceGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax222:ServiceGroup"/>
+ <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax221:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -502,13 +575,6 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceAutoScalerException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax214:AutoScalerException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
<xs:element name="getApplicationNetworkPartitions">
<xs:complexType>
<xs:sequence>
@@ -526,14 +592,14 @@
<xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax212:DeploymentPolicyAlreadyExistsException"/>
+ <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax217:DeploymentPolicyAlreadyExistsException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addDeployementPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax26:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax27:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -572,135 +638,46 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplications">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getApplicationsResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax224:ApplicationContext"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="addApplication">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax224:ApplicationContext"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="addApplicationResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getApplication">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getApplicationResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax224:ApplicationContext"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="updateApplication">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax224:ApplicationContext"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="updateApplicationResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="deleteApplication">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="deleteApplicationResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="serviceGroupExist">
+ <xs:element name="getApplicationPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="serviceGroupExistResponse">
+ <xs:element name="getApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax27:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getServiceGroups">
+ <xs:element name="getApplications">
<xs:complexType>
<xs:sequence/>
</xs:complexType>
</xs:element>
- <xs:element name="getServiceGroupsResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax222:ServiceGroup"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException">
+ <xs:element name="getApplicationsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax214:CartridgeGroupNotFoundException"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeServiceGroup">
+ <xs:element name="addApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="groupName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeServiceGroupResponse">
+ <xs:element name="addApplicationResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPolicy">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getApplicationPolicyResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax26:ApplicationPolicy"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
<xs:element name="getServiceGroup">
<xs:complexType>
<xs:sequence>
@@ -711,7 +688,7 @@
<xs:element name="getServiceGroupResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax222:ServiceGroup"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax221:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -725,7 +702,7 @@
<xs:element name="getAutoscalingPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax219:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax223:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -739,18 +716,18 @@
<xs:element name="getDeploymentPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax26:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax27:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
- <xs:schema xmlns:ax25="http://partition.common.stratos.apache.org/xsd" xmlns:ax217="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd">
+ <xs:schema xmlns:ax220="http://common.stratos.apache.org/xsd" xmlns:ax210="http://partition.common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd">
<xs:import namespace="http://partition.common.stratos.apache.org/xsd"/>
<xs:import namespace="http://common.stratos.apache.org/xsd"/>
<xs:complexType name="DeploymentPolicy">
<xs:sequence>
<xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax25:NetworkPartitionRef"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax28:NetworkPartitionRef"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ApplicationPolicy">
@@ -759,18 +736,18 @@
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionGroups" nillable="true" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitions" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax24="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd">
+ <xs:schema xmlns:ax29="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd">
<xs:import namespace="http://common.stratos.apache.org/xsd"/>
<xs:complexType name="NetworkPartitionRef">
<xs:sequence>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax22:PartitionRef"/>
- <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionRefs" nillable="true" type="ax28:PartitionRef"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax28:PartitionRef"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="PartitionRef">
@@ -779,17 +756,17 @@
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="partitionMax" type="xs:int"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax29:Properties"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://application.exception.autoscaler.stratos.apache.org/xsd">
- <xs:complexType name="InvalidApplicationPolicyException">
+ <xs:complexType name="ApplicationDefinitionException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ApplicationDefinitionException">
+ <xs:complexType name="InvalidApplicationPolicyException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
@@ -803,7 +780,7 @@
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://common.stratos.apache.org/xsd">
<xs:complexType name="Properties">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax23:Property"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax22:Property"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="Property">
@@ -813,7 +790,7 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax220="http://exception.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.exception.autoscaler.stratos.apache.org/xsd">
+ <xs:schema xmlns:ax225="http://exception.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.exception.autoscaler.stratos.apache.org/xsd">
<xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/>
<xs:complexType name="InvalidDeploymentPolicyException">
<xs:sequence/>
@@ -833,14 +810,14 @@
</xs:complexType>
<xs:complexType name="UnremovablePolicyException">
<xs:complexContent>
- <xs:extension base="ax220:AutoScalerException">
+ <xs:extension base="ax218:AutoScalerException">
<xs:sequence/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PolicyDoesNotExistException">
<xs:complexContent>
- <xs:extension base="ax220:AutoScalerException">
+ <xs:extension base="ax218:AutoScalerException">
<xs:sequence/>
</xs:extension>
</xs:complexContent>
@@ -858,9 +835,6 @@
<xs:complexType name="CloudControllerConnectionException">
<xs:sequence/>
</xs:complexType>
- <xs:complexType name="AutoScalingPolicyAlreadyExistException">
- <xs:sequence/>
- </xs:complexType>
<xs:complexType name="AutoScalerException">
<xs:complexContent>
<xs:extension base="xs:RuntimeException">
@@ -868,14 +842,17 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="CartridgeGroupNotFoundException">
+ <xs:sequence/>
+ </xs:complexType>
+ <xs:complexType name="AutoScalingPolicyAlreadyExistException">
+ <xs:sequence/>
+ </xs:complexType>
<xs:complexType name="InvalidArgumentException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="CartridgeGroupNotFoundException">
- <xs:sequence/>
- </xs:complexType>
</xs:schema>
</wsdl:types>
<wsdl:message name="removeAutoScalingPolicyRequest">