Fixed issues in network partition remove
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b6c3f19a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b6c3f19a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b6c3f19a Branch: refs/heads/master Commit: b6c3f19ad2748611e96b1b6e6320e360c8588d3f Parents: fc0f20a Author: Pubudu Gunatilaka <[email protected]> Authored: Wed May 27 16:28:20 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu May 28 00:22:18 2015 +0530 ---------------------------------------------------------------------- .../services/impl/AutoscalerServiceImpl.java | 16 + .../services/CloudControllerService.java | 3 +- .../impl/CloudControllerServiceImpl.java | 56 ++- .../client/CloudControllerServiceClient.java | 3 +- .../rest/endpoint/api/StratosApiV41.java | 5 + .../rest/endpoint/api/StratosApiV41Utils.java | 7 +- .../scripts/common/undeploy.sh | 6 +- .../scripts/common/undeploy.sh | 5 +- .../wordpress-app/scripts/common/undeploy.sh | 6 +- .../scripts/common/undeploy.sh | 7 +- .../scripts/common/undeploy.sh | 6 +- .../scripts/common/undeploy.sh | 6 +- .../scripts/common/undeploy.sh | 5 +- .../scripts/common/undeploy.sh | 6 +- .../scripts/common/undeploy.sh | 6 +- .../scripts/common/undeploy.sh | 5 +- .../sample-groups/scripts/common/undeploy.sh | 6 +- .../scripts/common/undeploy.sh | 6 +- .../group-scaling-v1/scripts/common/undeploy.sh | 6 +- .../scripts/common/undeploy.sh | 5 +- .../scripts/common/undeploy.sh | 6 +- .../single-group-app/scripts/common/undeploy.sh | 7 +- .../src/main/resources/AutoscalerService.wsdl | 252 +++++----- .../main/resources/CloudControllerService.wsdl | 474 ++++++++++--------- 24 files changed, 500 insertions(+), 410 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java index 8587279..eed70b7 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java @@ -53,6 +53,7 @@ import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCar import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidPartitionExceptionException; import org.apache.stratos.cloud.controller.stub.domain.MemberContext; import org.apache.stratos.cloud.controller.stub.domain.NetworkPartition; +import org.apache.stratos.cloud.controller.stub.domain.Partition; import org.apache.stratos.common.Properties; import org.apache.stratos.common.client.CloudControllerServiceClient; import org.apache.stratos.common.client.StratosManagerServiceClient; @@ -1049,6 +1050,21 @@ public class AutoscalerServiceImpl implements AutoscalerService { throw new InvalidDeploymentPolicyException(msg); } + // network partition - partition id should be already added + for (PartitionRef partitionRef : networkPartitionRef.getPartitionRefs()) { + String partitionId = partitionRef.getId(); + + for (Partition partition : networkPartition.getPartitions()) { + if (!partition.getId().equals(partitionId)) { + String msg = String.format("Partition Id is not found: [deployment-policy-id] %s " + + "[network-partition-id] %s [partition-id] %s", + deploymentPolicyId, networkPartitionId, partitionId); + log.error(msg); + throw new InvalidDeploymentPolicyException(msg); + } + } + } + // partition algorithm can't be null or empty String partitionAlgorithm = networkPartitionRef.getPartitionAlgo(); if (StringUtils.isBlank(partitionAlgorithm)) { http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java index 5c417e1..a6572c7 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java @@ -364,7 +364,8 @@ public interface CloudControllerService { * @param networkPartitionId * @throws NetworkPartitionNotExistsException */ - public boolean removeNetworkPartition(String networkPartitionId) throws NetworkPartitionNotExistsException; + public boolean removeNetworkPartition(String networkPartitionId) throws NetworkPartitionNotExistsException, + InvalidNetworkPartitionException; /** * Update network partition http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index 13d84ac..45250b0 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -21,6 +21,8 @@ package org.apache.stratos.cloud.controller.services.impl; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.stratos.autoscaler.stub.deployment.policy.ApplicationPolicy; +import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy; import org.apache.stratos.cloud.controller.concurrent.PartitionValidatorCallable; import org.apache.stratos.cloud.controller.config.CloudControllerConfig; import org.apache.stratos.cloud.controller.context.CloudControllerContext; @@ -35,6 +37,7 @@ import org.apache.stratos.cloud.controller.messaging.topology.TopologyManager; import org.apache.stratos.cloud.controller.services.CloudControllerService; import org.apache.stratos.cloud.controller.util.CloudControllerUtil; import org.apache.stratos.common.Property; +import org.apache.stratos.common.client.AutoscalerServiceClient; import org.apache.stratos.common.domain.LoadBalancingIPType; import org.apache.stratos.common.threading.StratosThreadPool; import org.apache.stratos.messaging.domain.topology.*; @@ -1480,7 +1483,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } else { //Following message is shown to the end user in all the the API clients(GUI/CLI/Rest API) throw new InvalidNetworkPartitionException(String.format("Network partition: " + - "%s doesn't not have any partitions ", networkPartition.getId())); + "%s doesn't not have any partitions ", networkPartition.getId())); } // adding network partition to CC-Context @@ -1495,7 +1498,8 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public boolean removeNetworkPartition(String networkPartitionId) throws NetworkPartitionNotExistsException { + public boolean removeNetworkPartition(String networkPartitionId) throws NetworkPartitionNotExistsException, + InvalidNetworkPartitionException { try { if (log.isInfoEnabled()) { @@ -1509,6 +1513,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { throw new NetworkPartitionNotExistsException(message); } // removing from CC-Context + validateNetworkPartition(networkPartitionId); CloudControllerContext.getInstance().removeNetworkPartition(networkPartitionId); // persisting CC-Context CloudControllerContext.getInstance().persist(); @@ -1524,6 +1529,53 @@ public class CloudControllerServiceImpl implements CloudControllerService { return true; } + private void validateNetworkPartition(String networkPartitionId) { + + try { + DeploymentPolicy[] deploymentPolicies = AutoscalerServiceClient.getInstance().getDeploymentPolicies(); + + if (deploymentPolicies != null) { + for (DeploymentPolicy deploymentPolicy : deploymentPolicies) { + for (org.apache.stratos.autoscaler.stub.partition.NetworkPartitionRef networkPartitionRef : + deploymentPolicy.getNetworkPartitionRefs()) { + if (networkPartitionRef.getId().equals(networkPartitionId)) { + String message = String.format("Cannot remove the network partition %s, since" + + " it is used in deployment policy %s", networkPartitionId, + deploymentPolicy.getDeploymentPolicyID()); + log.error(message); + throw new InvalidNetworkPartitionException(message); + } + } + } + } + + ApplicationPolicy[] applicationPolicies = AutoscalerServiceClient.getInstance().getApplicationPolicies(); + + if (applicationPolicies != null) { + for (ApplicationPolicy applicationPolicy : applicationPolicies) { + + for (String networkPartition : + applicationPolicy.getNetworkPartitions()) { + + if (networkPartition.equals(networkPartitionId)) { + String message = String.format("Cannot remove the network partition %s, since" + + " it is used in application policy %s", networkPartitionId, + applicationPolicy.getId()); + log.error(message); + throw new InvalidNetworkPartitionException(message); + } + } + } + } + } catch (Exception e) { + String message = e.getMessage(); + log.error(message, e); + throw new CloudControllerException(message, e); + } + + + } + @Override public boolean updateNetworkPartition(NetworkPartition networkPartition) throws NetworkPartitionNotExistsException { try { http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java index 50d4244..4bf537f 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java @@ -233,7 +233,8 @@ public class CloudControllerServiceClient { } public void removeNetworkPartition(String networkPartitionId) throws RemoteException, - CloudControllerServiceNetworkPartitionNotExistsExceptionException { + CloudControllerServiceNetworkPartitionNotExistsExceptionException, + CloudControllerServiceInvalidNetworkPartitionExceptionException { stub.removeNetworkPartition(networkPartitionId); } http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index fc363ee..38b6d20 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -22,6 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.stub.*; import org.apache.stratos.cloud.controller.stub.*; +import org.apache.stratos.cloud.controller.stub.exception.InvalidNetworkPartitionException; import org.apache.stratos.common.beans.ResponseMessageBean; import org.apache.stratos.common.beans.TenantInfoBean; import org.apache.stratos.common.beans.UserInfoBean; @@ -714,6 +715,10 @@ public class StratosApiV41 extends AbstractApi { } catch (CloudControllerServiceNetworkPartitionNotExistsExceptionException e) { return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "Network partition is not found")).build(); + } catch (CloudControllerServiceInvalidNetworkPartitionExceptionException e) { + return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean( + ResponseMessageBean.ERROR, "Network partition is not found")).build(); + } return Response.ok().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format("Network partition deleted successfully: [network-partition] %s", http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/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 99f57a7..9051748 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 @@ -29,6 +29,7 @@ import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext; import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup; import org.apache.stratos.cloud.controller.stub.*; import org.apache.stratos.cloud.controller.stub.domain.Cartridge; +import org.apache.stratos.cloud.controller.stub.exception.InvalidNetworkPartitionException; import org.apache.stratos.common.beans.PropertyBean; import org.apache.stratos.common.beans.TenantInfoBean; import org.apache.stratos.common.beans.UserInfoBean; @@ -56,6 +57,7 @@ import org.apache.stratos.common.client.CloudControllerServiceClient; import org.apache.stratos.common.client.StratosManagerServiceClient; import org.apache.stratos.common.exception.ApacheStratosException; import org.apache.stratos.common.exception.InvalidEmailException; +import org.apache.stratos.common.partition.NetworkPartitionRef; import org.apache.stratos.common.util.ClaimsMgtUtil; import org.apache.stratos.common.util.CommonUtil; import org.apache.stratos.manager.service.stub.StratosManagerServiceApplicationSignUpExceptionException; @@ -2614,7 +2616,8 @@ public class StratosApiV41Utils { * @param networkPartitionId networkPartitionId */ public static void removeNetworkPartition(String networkPartitionId) throws RestAPIException, - CloudControllerServiceNetworkPartitionNotExistsExceptionException { + CloudControllerServiceNetworkPartitionNotExistsExceptionException, + CloudControllerServiceInvalidNetworkPartitionExceptionException { try { ApplicationContext[] applicationContexts = AutoscalerServiceClient.getInstance().getApplications(); if (applicationContexts != null) { @@ -2626,7 +2629,7 @@ public class StratosApiV41Utils { for (int i = 0; i < networkPartitions.length; i++) { if (networkPartitions[i].equals(networkPartitionId)) { String message = String.format("Cannot remove the network partition %s, since" + - " it is used in application %s", networkPartitionId, + " it is used in application %s", networkPartitionId, applicationContext.getApplicationId()); log.error(message); throw new RestAPIException(message); http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh b/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh index 1d0ada0..b9fa3d0 100644 --- a/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh +++ b/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh @@ -52,10 +52,10 @@ echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-2 +echo "Removing application policies..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 + echo "Removing network partitions..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2 -echo "Removing application policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 - http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh b/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh index 093aec5..419074d 100755 --- a/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh +++ b/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh @@ -41,9 +41,10 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-3 -echo "Removing network partitions..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-3 echo "Removing application policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-2 +echo "Removing network partitions..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-3 + http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/complex/wordpress-app/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/complex/wordpress-app/scripts/common/undeploy.sh b/samples/applications/complex/wordpress-app/scripts/common/undeploy.sh index 8a96273..462691d 100644 --- a/samples/applications/complex/wordpress-app/scripts/common/undeploy.sh +++ b/samples/applications/complex/wordpress-app/scripts/common/undeploy.sh @@ -46,9 +46,9 @@ echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-2 +echo "Removing application policies..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 + echo "Removing network partitions..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2 - -echo "Removing application policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/nested/complex-app-with-lb/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/nested/complex-app-with-lb/scripts/common/undeploy.sh b/samples/applications/nested/complex-app-with-lb/scripts/common/undeploy.sh index 8860f99..b115f03 100644 --- a/samples/applications/nested/complex-app-with-lb/scripts/common/undeploy.sh +++ b/samples/applications/nested/complex-app-with-lb/scripts/common/undeploy.sh @@ -48,10 +48,11 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 -echo "Removing network partitions..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 - echo "Removing application policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 +echo "Removing network partitions..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 + + http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/nested/esb-php-nested-with-esb-php-nested-with-mysql-php-app/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/nested/esb-php-nested-with-esb-php-nested-with-mysql-php-app/scripts/common/undeploy.sh b/samples/applications/nested/esb-php-nested-with-esb-php-nested-with-mysql-php-app/scripts/common/undeploy.sh index 0650635..13b5787 100644 --- a/samples/applications/nested/esb-php-nested-with-esb-php-nested-with-mysql-php-app/scripts/common/undeploy.sh +++ b/samples/applications/nested/esb-php-nested-with-esb-php-nested-with-mysql-php-app/scripts/common/undeploy.sh @@ -47,9 +47,9 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 +echo "Removing application policies..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 + echo "Removing network partitions..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2 - -echo "Removing application policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/nested/five-levels-nested-groups-app/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/nested/five-levels-nested-groups-app/scripts/common/undeploy.sh b/samples/applications/nested/five-levels-nested-groups-app/scripts/common/undeploy.sh index 724c97d..fd78115 100644 --- a/samples/applications/nested/five-levels-nested-groups-app/scripts/common/undeploy.sh +++ b/samples/applications/nested/five-levels-nested-groups-app/scripts/common/undeploy.sh @@ -49,9 +49,11 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 +echo "Removing application policies..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 + echo "Removing network partitions..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2 -echo "Removing application policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 + http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/nested/single-level-nested-group-app/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/nested/single-level-nested-group-app/scripts/common/undeploy.sh b/samples/applications/nested/single-level-nested-group-app/scripts/common/undeploy.sh index 1225436..c310b68 100644 --- a/samples/applications/nested/single-level-nested-group-app/scripts/common/undeploy.sh +++ b/samples/applications/nested/single-level-nested-group-app/scripts/common/undeploy.sh @@ -47,10 +47,11 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-2 +echo "Removing application policies..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 + echo "Removing network partitions..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2 -echo "Removing application policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/nested/single-level-nested-groups-app/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/nested/single-level-nested-groups-app/scripts/common/undeploy.sh b/samples/applications/nested/single-level-nested-groups-app/scripts/common/undeploy.sh index ca8b946..453523c 100644 --- a/samples/applications/nested/single-level-nested-groups-app/scripts/common/undeploy.sh +++ b/samples/applications/nested/single-level-nested-groups-app/scripts/common/undeploy.sh @@ -48,9 +48,9 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 -echo "Removing network partitions..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 - echo "Removing application policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 +echo "Removing network partitions..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 + http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/scaling/app-bursting-pattern/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/scaling/app-bursting-pattern/scripts/common/undeploy.sh b/samples/applications/scaling/app-bursting-pattern/scripts/common/undeploy.sh index a47531c..fc43693 100644 --- a/samples/applications/scaling/app-bursting-pattern/scripts/common/undeploy.sh +++ b/samples/applications/scaling/app-bursting-pattern/scripts/common/undeploy.sh @@ -42,12 +42,12 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-4 +echo "Removing application policies..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-4 + echo "Removing network partitions..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-3 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-4 -echo "Removing application policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-4 - http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh b/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh index 26d9c0c..26fca1d 100644 --- a/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh +++ b/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh @@ -43,8 +43,9 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 +echo "Removing application policies..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 + echo "Removing network partitions..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 -echo "Removing application policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh b/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh index 178bb29..f2d19d2 100644 --- a/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh +++ b/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh @@ -47,9 +47,9 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 -echo "Removing network partitions..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 - echo "Removing application policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 +echo "Removing network partitions..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 + http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh b/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh index e7956c0..718c913 100644 --- a/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh +++ b/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh @@ -51,9 +51,9 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 -echo "Removing network partitions..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 - echo "Removing application policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 +echo "Removing network partitions..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 + http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh b/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh index 00c2384..2183fbc 100644 --- a/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh +++ b/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh @@ -47,9 +47,9 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 -echo "Removing network partitions..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 - echo "Removing application policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 +echo "Removing network partitions..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 + http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh b/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh index fcc543a..8eb5dd0 100644 --- a/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh +++ b/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh @@ -45,12 +45,11 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 -echo "Removing network partitions..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 - echo "Removing application policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 +echo "Removing network partitions..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh b/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh index 3076ee0..938c778 100644 --- a/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh +++ b/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh @@ -42,10 +42,10 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 +echo "Removing application policies..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 + echo "Removing network partitions..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2 -echo "Removing application policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 - http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/samples/applications/simple/single-group-app/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/simple/single-group-app/scripts/common/undeploy.sh b/samples/applications/simple/single-group-app/scripts/common/undeploy.sh index 5e540c5..e294fd1 100644 --- a/samples/applications/simple/single-group-app/scripts/common/undeploy.sh +++ b/samples/applications/simple/single-group-app/scripts/common/undeploy.sh @@ -47,11 +47,10 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing deployment policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 -echo "Removing network partitions..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2 - echo "Removing application policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 +echo "Removing network partitions..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2 http://git-wip-us.apache.org/repos/asf/stratos/blob/b6c3f19a/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 4705610..3a6896e 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,4 +1,4 @@ -<?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://pojo.applications.autoscaler.stratos.apache.org/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:ax216="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax219="http://rmi.java/xsd"; xmlns:ax220="http://io.java/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax212="http://policy.exception.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:ax210="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax225="http://pojo.a utoscaler.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";> +<?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:ax25="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax26="http://partition.common.stratos.apache.org/xsd"; xmlns:ax217="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:ax219="http://rmi.java/xsd"; xmlns:ax214="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax220="http://io.java/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax212="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax210="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax225="http://pojo.a utoscaler.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";> <wsdl:types> <xs:schema xmlns:ax221="http://io.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd";> <xs:import namespace="http://io.java/xsd"/> @@ -21,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="ax210:LoadThresholds"/> + <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax212:LoadThresholds"/> <xs:element minOccurs="0" name="tenantId" type="xs:int"/> </xs:sequence> </xs:complexType> @@ -33,17 +33,17 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax28="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="ax27: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"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax28:Properties"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> <xs:element minOccurs="0" name="status" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="tenantAdminUsername" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"/> @@ -52,10 +52,10 @@ </xs:complexType> <xs:complexType name="ComponentContext"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax27:ApplicationClusterContext"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax27:CartridgeContext"/> - <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax27:DependencyContext"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax27: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"> @@ -66,8 +66,8 @@ <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="ax27:PersistenceContext"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax28:Properties"/> + <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"/> </xs:sequence> @@ -75,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="ax27:VolumeContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax21:VolumeContext"/> </xs:sequence> </xs:complexType> <xs:complexType name="VolumeContext"> @@ -94,21 +94,21 @@ <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="ax27: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="ax27: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="ax27:PersistenceContext"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax28:Properties"/> + <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> <xs:complexType name="ArtifactRepositoryContext"> @@ -130,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="ax27: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="ax27: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"/> @@ -156,27 +156,28 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax29="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax26="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax218="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax215="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax222="http://rmi.java/xsd"; xmlns:ax224="http://common.stratos.apache.org/xsd"; xmlns:ax211="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax226="http://pojo.autoscaler.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> - <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/> + <xs:schema xmlns:ax29="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax24="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax218="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax215="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax222="http://rmi.java/xsd"; xmlns:ax213="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax224="http://common.stratos.apache.org/xsd"; xmlns:ax211="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax226="http://pojo.autoscaler.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://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"/> - <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/> <xs:import namespace="http://rmi.java/xsd"/> <xs:import namespace="http://common.stratos.apache.org/xsd"/> <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/> - <xs:element name="getDeploymentPolicy"> + <xs:element name="findClusterId"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicyResponse"> + <xs:element name="findClusterIdResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:DeploymentPolicy"/> + <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> @@ -188,7 +189,7 @@ <xs:element name="getApplicationsResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:ApplicationContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> @@ -202,7 +203,42 @@ <xs:element name="getApplicationResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ApplicationContext"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getDeploymentPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getDeploymentPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax29:DeploymentPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax210:AutoScalingPolicyAlreadyExistException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addAutoScalingPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax212:AutoscalePolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addAutoScalingPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> @@ -216,7 +252,7 @@ <xs:element name="getAutoscalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax210:AutoscalePolicy"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -228,21 +264,42 @@ <xs:element name="getAutoScalingPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax210:AutoscalePolicy"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceInvalidPolicyException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax214:InvalidPolicyException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateAutoScalingPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax212:AutoscalePolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateAutoScalingPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceUnremovablePolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax215:UnremovablePolicyException"/> + <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax214:UnremovablePolicyException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServicePolicyDoesNotExistException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax215:PolicyDoesNotExistException"/> + <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax214:PolicyDoesNotExistException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -270,21 +327,21 @@ <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax218:CartridgeGroupNotFoundException"/> + <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax210:CartridgeGroupNotFoundException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceCartridgeNotFoundException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax218:CartridgeNotFoundException"/> + <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax210:CartridgeNotFoundException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="addApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax29:ApplicationContext"/> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> @@ -298,7 +355,7 @@ <xs:element name="updateApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax29:ApplicationContext"/> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> @@ -384,14 +441,14 @@ <xs:element name="AutoscalerServiceApplicationPolicyAlreadyExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="ApplicationPolicyAlreadyExistsException" nillable="true" type="ax215:ApplicationPolicyAlreadyExistsException"/> + <xs:element minOccurs="0" name="ApplicationPolicyAlreadyExistsException" nillable="true" type="ax214:ApplicationPolicyAlreadyExistsException"/> </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="ax29:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -412,14 +469,7 @@ <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="AutoscalerServiceInvalidPolicyException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax215:InvalidPolicyException"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -440,14 +490,14 @@ <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax215:ApplicatioinPolicyNotExistsException"/> + <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax214: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="ax29:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -466,64 +516,14 @@ <xs:element name="getApplicationPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:ApplicationPolicy"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="findClusterId"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="findClusterIdResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax218:AutoScalingPolicyAlreadyExistException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="addAutoScalingPolicy"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax210:AutoscalePolicy"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="addAutoScalingPolicyResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="updateAutoScalingPolicy"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax210:AutoscalePolicy"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="updateAutoScalingPolicyResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:ApplicationPolicy"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceInvalidArgumentException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax218:InvalidArgumentException"/> + <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax210:InvalidArgumentException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -531,7 +531,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> @@ -608,7 +608,7 @@ <xs:element name="AutoscalerServiceAutoScalerException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax218:AutoScalerException"/> + <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax210:AutoScalerException"/> </xs:sequence> </xs:complexType> </xs:element> @@ -629,21 +629,21 @@ <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax215:InvalidDeploymentPolicyException"/> + <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax214:InvalidDeploymentPolicyException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax215:DeploymentPolicyAlreadyExistsException"/> + <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax214: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="ax29:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -657,21 +657,21 @@ <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax215:DeploymentPolicyNotExistsException"/> + <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax214:DeploymentPolicyNotExistsException"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="AutoscalerServiceCloudControllerConnectionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax218:CloudControllerConnectionException"/> + <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax210: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="ax29:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -704,7 +704,7 @@ <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="ax29:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> @@ -749,13 +749,13 @@ </xs:complexType> </xs:element> </xs:schema> - <xs:schema xmlns:ax25="http://partition.common.stratos.apache.org/xsd"; xmlns:ax223="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax28="http://partition.common.stratos.apache.org/xsd"; xmlns:ax223="http://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"> @@ -764,17 +764,17 @@ <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:ax27="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="partitionRefs" nillable="true" type="ax22:PartitionRef"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionRefs" nillable="true" type="ax26:PartitionRef"/> </xs:sequence> </xs:complexType> <xs:complexType name="PartitionRef"> @@ -783,7 +783,7 @@ <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="ax27:Properties"/> </xs:sequence> </xs:complexType> </xs:schema> @@ -807,7 +807,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"> @@ -817,18 +817,23 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax214="http://exception.autoscaler.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.exception.autoscaler.stratos.apache.org/xsd";> + <xs:schema xmlns:ax216="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="InvalidPolicyException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> <xs:complexType name="UnremovablePolicyException"> <xs:complexContent> - <xs:extension base="ax214:AutoScalerException"> + <xs:extension base="ax216:AutoScalerException"> <xs:sequence/> </xs:extension> </xs:complexContent> </xs:complexType> <xs:complexType name="PolicyDoesNotExistException"> <xs:complexContent> - <xs:extension base="ax214:AutoScalerException"> + <xs:extension base="ax216:AutoScalerException"> <xs:sequence/> </xs:extension> </xs:complexContent> @@ -836,11 +841,6 @@ <xs:complexType name="ApplicationPolicyAlreadyExistsException"> <xs:sequence/> </xs:complexType> - <xs:complexType name="InvalidPolicyException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> <xs:complexType name="ApplicatioinPolicyNotExistsException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> @@ -864,6 +864,9 @@ </xs:complexType> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.autoscaler.stratos.apache.org/xsd";> + <xs:complexType name="AutoScalingPolicyAlreadyExistException"> + <xs:sequence/> + </xs:complexType> <xs:complexType name="AutoScalerException"> <xs:complexContent> <xs:extension base="xs:RuntimeException"> @@ -881,9 +884,6 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </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"/>
