resolving merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/00847097 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/00847097 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/00847097 Branch: refs/heads/master Commit: 008470977d46b7c4219ef81ac44d7def3d5de35f Parents: eb656c1 977bf94 Author: Vishanth <[email protected]> Authored: Thu May 14 11:51:10 2015 +0530 Committer: Vishanth <[email protected]> Committed: Thu May 14 11:51:10 2015 +0530 ---------------------------------------------------------------------- .../applications/topic/ApplicationBuilder.java | 2 - .../client/CloudControllerClient.java | 4 +- .../context/cluster/ClusterContext.java | 46 +- .../partition/ClusterLevelPartitionContext.java | 4 +- .../context/partition/PartitionContext.java | 10 +- .../internal/AutoscalerServiceComponent.java | 24 +- .../autoscaler/monitor/MonitorFactory.java | 18 +- .../monitor/component/GroupMonitor.java | 44 +- .../policy/deployment/DeploymentPolicy.java | 36 +- .../autoscaler/rule/RuleTasksDelegator.java | 6 + .../services/impl/AutoscalerServiceImpl.java | 56 +- .../util/AutoscalerObjectConverter.java | 128 +--- .../stratos/autoscaler/util/AutoscalerUtil.java | 4 +- .../CloudControllerServiceComponent.java | 24 +- .../impl/CloudControllerServiceImpl.java | 7 +- .../ComponentStartUpSynchronizerImpl.java | 72 ++- .../common/partition/NetworkPartition.java | 102 ---- .../common/partition/NetworkPartitionRef.java | 84 +++ .../stratos/common/partition/Partition.java | 151 ----- .../stratos/common/partition/PartitionRef.java | 124 ++++ .../services/ComponentStartUpSynchronizer.java | 2 + .../StratosManagerServiceComponent.java | 30 +- .../rest/endpoint/api/StratosApiV41Utils.java | 39 +- .../util/converter/ObjectConverter.java | 44 +- .../modules/distribution/src/bin/stratos.bat | 2 +- .../modules/distribution/src/bin/stratos.sh | 1 + .../src/main/conf/drools/scaling.drl | 4 +- .../single-cartridge-app/scripts/gce/deploy.sh | 9 + .../scripts/gce/undeploy.sh | 7 + .../src/main/resources/AutoscalerService.wsdl | 611 ++++++++++++++++++- 30 files changed, 1105 insertions(+), 590 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/00847097/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/00847097/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/00847097/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl ---------------------------------------------------------------------- diff --cc service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl index e8a2ac5,6df34ae..036ccb2 --- 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,10 -1,10 +1,20 @@@ ++<<<<<<< HEAD +<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:ax27="http://common.stratos.apache.org/xsd"; 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:ax23="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax21="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax216="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:ax218="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax214="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ax222="http://rmi.java/xsd"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:ax223="http://io.java/xsd"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax211="http://pojo.applications.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:ax224="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="ax223:IOException"> ++======= + <?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.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:ax29="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"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <xs:sequence> <xs:element minOccurs="0" name="cause" nillable="true" type="xs:anyType"/> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> @@@ -21,7 -21,7 +31,11 @@@ <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"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax23:LoadThresholds"/> ++======= + <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax218:LoadThresholds"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <xs:element minOccurs="0" name="tenantId" type="xs:int"/> </xs:sequence> </xs:complexType> @@@ -33,17 -33,17 +47,29 @@@ </xs:sequence> </xs:complexType> </xs:schema> ++<<<<<<< HEAD + <xs:schema xmlns:ax212="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";> ++======= + <xs:schema xmlns:ax225="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd";> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <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"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="components" nillable="true" type="ax211: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="ax27:Properties"/> ++======= + <xs:element minOccurs="0" name="components" nillable="true" type="ax224: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="ax23:Properties"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <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 +78,17 @@@ </xs:complexType> <xs:complexType name="ComponentContext"> <xs:sequence> ++<<<<<<< HEAD + <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax211:ApplicationClusterContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax211:CartridgeContext"/> + <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax211:DependencyContext"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax211:GroupContext"/> ++======= + <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"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> <xs:complexType name="ApplicationClusterContext"> @@@ -66,8 -66,8 +99,13 @@@ <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"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax211:PersistenceContext"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> ++======= + <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax224:PersistenceContext"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <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 +113,11 @@@ <xs:complexType name="PersistenceContext"> <xs:sequence> <xs:element minOccurs="0" name="persistenceRequired" type="xs:boolean"/> ++<<<<<<< HEAD + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax211:VolumeContext"/> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax224:VolumeContext"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> <xs:complexType name="VolumeContext"> @@@ -94,21 -94,21 +136,34 @@@ <xs:sequence> <xs:element minOccurs="0" name="cartridgeMax" type="xs:int"/> <xs:element minOccurs="0" name="cartridgeMin" type="xs:int"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax211:SubscribableInfoContext"/> ++======= + <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax224:SubscribableInfoContext"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <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"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax211:ArtifactRepositoryContext"/> ++======= + <xs:element minOccurs="0" name="artifactRepositoryContext" nillable="true" type="ax224:ArtifactRepositoryContext"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <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"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax211:PersistenceContext"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> ++======= + <xs:element minOccurs="0" name="persistenceContext" nillable="true" type="ax224:PersistenceContext"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> <xs:complexType name="ArtifactRepositoryContext"> @@@ -130,9 -130,9 +185,15 @@@ <xs:complexType name="GroupContext"> <xs:sequence> <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"/> ++<<<<<<< HEAD + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax211:CartridgeContext"/> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax211:GroupContext"/> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax224: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"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <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"/> @@@ -143,8 -143,8 +204,13 @@@ <xs:complexType name="ServiceGroup"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax21:Dependencies"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax21:ServiceGroup"/> ++======= + <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax222:Dependencies"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax222:ServiceGroup"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> @@@ -156,97 -156,67 +222,139 @@@ </xs:sequence> </xs:complexType> </xs:schema> ++<<<<<<< HEAD + <xs:schema xmlns:ax24="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax217="http://exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax22="http://pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax219="http://policy.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax215="http://application.exception.autoscaler.stratos.apache.org/xsd"; xmlns:ax221="http://common.stratos.apache.org/xsd"; xmlns:ax213="http://pojo.applications.autoscaler.stratos.apache.org/xsd"; xmlns:ax210="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"; xmlns:ax225="http://rmi.java/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.autoscaler.stratos.apache.org";> + <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://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/> + <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://exception.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/> + <xs:import namespace="http://common.stratos.apache.org/xsd"/> + <xs:import namespace="http://rmi.java/xsd"/> + <xs:element name="getServiceGroup"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getServiceGroupResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax21:ServiceGroup"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getAutoscalingPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getAutoscalingPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax23:AutoscalePolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getDeploymentPolicy"> ++======= + <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: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://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="getDeploymentPolicies"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <xs:complexType> - <xs:sequence/> + <xs:sequence> + <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPoliciesResponse"> + <xs:element name="getDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"/> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:DeploymentPolicy"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceRemoteException"> + <xs:element name="getApplication"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> ++======= + <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax27:RemoteException"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException"> + <xs:element name="getApplicationResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="return" nillable="true" type="ax213:ApplicationContext"/> ++======= + <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax212:InvalidDeploymentPolicyException"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException"> + <xs:element name="AutoscalerServiceApplicationDefinitionException"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax214:ApplicationDefinitionException"/> ++======= + <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax212:DeploymentPolicyNotExistsException"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidPolicyException"> + <xs:element name="updateApplication"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax213:ApplicationContext"/> ++======= + <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax212:InvalidPolicyException"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceCloudControllerConnectionException"> + <xs:element name="updateApplicationResponse"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="return" type="xs:boolean"/> ++======= + <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax214:CloudControllerConnectionException"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateDeploymentPolicy"> + <xs:element name="deleteApplication"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> ++======= + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax26:DeploymentPolicy"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> </xs:element> @@@ -257,17 -227,17 +365,25 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceInvalidApplicationPolicyException"> + <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax217:AutoScalingPolicyAlreadyExistException"/> ++======= + <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax216:InvalidApplicationPolicyException"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addApplicationPolicy"> + <xs:element name="addAutoScalingPolicy"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax23:AutoscalePolicy"/> ++======= + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax26:ApplicationPolicy"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> </xs:element> @@@ -290,17 -262,17 +406,25 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException"> + <xs:element name="AutoscalerServiceInvalidPolicyException"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax219:InvalidPolicyException"/> ++======= + <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax212:ApplicatioinPolicyNotExistsException"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateApplicationPolicy"> + <xs:element name="updateAutoScalingPolicy"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax23:AutoscalePolicy"/> ++======= + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax26:ApplicationPolicy"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> </xs:element> @@@ -311,437 -283,451 +435,832 @@@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationPolicies"> + <xs:element name="AutoscalerServiceUnremovablePolicyException"> <xs:complexType> - <xs:sequence/> + <xs:sequence> + <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax219:UnremovablePolicyException"/> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getApplicationPoliciesResponse"> + <xs:element name="AutoscalerServicePolicyDoesNotExistException"> <xs:complexType> <xs:sequence> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax219:PolicyDoesNotExistException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="removeAutoScalingPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="autoscalePolicyId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="removeAutoScalingPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="existApplication"> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:ApplicationPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax214: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:sequence> </xs:complexType> </xs:element> + <xs:element name="addAutoScalingPolicyResponse"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> ++<<<<<<< HEAD + <xs:element name="existApplicationResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="deployApplication"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationId" 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="deployApplicationResponse"> ++======= + <xs:element name="getAutoScalingPolicies"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getAutoScalingPoliciesResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax219: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:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateAutoScalingPolicyResponse"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> ++<<<<<<< HEAD + <xs:element name="undeployApplication"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="force" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="undeployApplicationResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="AutoscalerServiceInvalidArgumentException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax217:InvalidArgumentException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateClusterMonitor"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateClusterMonitorResponse"> ++======= + <xs:element name="AutoscalerServiceUnremovablePolicyException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax212: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:sequence> + </xs:complexType> + </xs:element> + <xs:element name="removeAutoScalingPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="autoscalePolicyId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="removeAutoScalingPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="existApplication"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="existApplicationResponse"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> ++<<<<<<< HEAD + <xs:element name="AutoscalerServiceInvalidServiceGroupException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax214:InvalidServiceGroupException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addServiceGroup"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax21:ServiceGroup"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addServiceGroupResponse"> ++======= + <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> + <xs:element minOccurs="0" name="applicationId" 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="deployApplicationResponse"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> ++<<<<<<< HEAD + <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:element name="undeployApplication"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="force" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="undeployApplicationResponse"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> ++<<<<<<< HEAD + <xs:element name="AutoscalerServiceAutoScalerException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax217:AutoScalerException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationNetworkPartitions"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationNetworkPartitionsResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceRemoteException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax222:RemoteException"/> </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax219:InvalidDeploymentPolicyException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException"> ++======= + <xs:element name="AutoscalerServiceInvalidArgumentException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax214:InvalidArgumentException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateClusterMonitor"> + <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:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateClusterMonitorResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceInvalidServiceGroupException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax216: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:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addServiceGroupResponse"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax219:DeploymentPolicyAlreadyExistsException"/> + </xs:sequence> + </xs:complexType> + </xs:element> ++<<<<<<< HEAD + <xs:element name="addDeployementPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax25:DeploymentPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addDeployementPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax219:DeploymentPolicyNotExistsException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="removeDeployementPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="removeDeployementPolicyResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="undeployServiceGroup"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="undeployServiceGroupResponse"> ++======= + <xs:element name="findClusterId"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <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="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> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationNetworkPartitionsResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax212:DeploymentPolicyAlreadyExistsException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addDeployementPolicy"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax26:DeploymentPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> ++<<<<<<< HEAD + <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="ax25:ApplicationPolicy"/> + </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="ax213:ApplicationContext"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addApplication"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax213:ApplicationContext"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addApplicationResponse"> ++======= + <xs:element name="addDeployementPolicyResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="removeDeployementPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="removeDeployementPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="undeployServiceGroup"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="undeployServiceGroupResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getApplications"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationsResponse"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax224:ApplicationContext"/> + </xs:sequence> + </xs:complexType> + </xs:element> ++<<<<<<< HEAD + <xs:element name="getDeploymentPolicies"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getDeploymentPoliciesResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax25:DeploymentPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceCloudControllerConnectionException"> ++======= + <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"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax217:CloudControllerConnectionException"/> + </xs:sequence> + </xs:complexType> + </xs:element> ++<<<<<<< HEAD + <xs:element name="updateDeploymentPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax25:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="updateDeploymentPolicyResponse"> ++======= + <xs:element name="getApplication"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationResponse"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax224:ApplicationContext"/> </xs:sequence> </xs:complexType> </xs:element> ++<<<<<<< HEAD + <xs:element name="AutoscalerServiceInvalidApplicationPolicyException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax214:InvalidApplicationPolicyException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addApplicationPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax25:ApplicationPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="addApplicationPolicyResponse"> ++======= + <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"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> ++<<<<<<< HEAD + <xs:element name="removeApplicationPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="removeApplicationPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException"> ++======= + <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:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="serviceGroupExistResponse"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax219:ApplicatioinPolicyNotExistsException"/> + </xs:sequence> + </xs:complexType> + </xs:element> ++<<<<<<< HEAD + <xs:element name="updateApplicationPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax25:ApplicationPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateApplicationPolicyResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"/> </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="getApplicationPolicies"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="getApplicationPoliciesResponse"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax25:ApplicationPolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateServiceGroup"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="cartridgeGroup" nillable="true" type="ax21:ServiceGroup"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="updateServiceGroupResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"/> + </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: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="ax222:ServiceGroup"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax214: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="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"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> ++<<<<<<< HEAD + <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="ax21:ServiceGroup"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax217: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:element name="getServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"/> + <xs:element minOccurs="0" name="return" nillable="true" type="ax222:ServiceGroup"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getAutoscalingPolicy"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getAutoscalingPolicyResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax219:AutoscalePolicy"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getDeploymentPolicy"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a + <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="ax26:DeploymentPolicy"/> </xs:sequence> </xs:complexType> </xs:element> </xs:schema> ++<<<<<<< HEAD + <xs:schema xmlns:ax29="http://partition.common.stratos.apache.org/xsd"; xmlns:ax226="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd";> ++======= + <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";> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <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"/> ++<<<<<<< HEAD + <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitions" nillable="true" type="ax29:NetworkPartition"/> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax25:NetworkPartitionRef"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> <xs:complexType name="ApplicationPolicy"> @@@ -750,18 -736,17 +1269,29 @@@ <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"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> + </xs:sequence> + </xs:complexType> + </xs:schema> + <xs:schema xmlns:ax28="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.common.stratos.apache.org/xsd";> ++======= + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23: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";> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <xs:import namespace="http://common.stratos.apache.org/xsd"/> - <xs:complexType name="NetworkPartition"> + <xs:complexType name="NetworkPartitionRef"> <xs:sequence> - <xs:element minOccurs="0" name="activeByDefault" type="xs:boolean"/> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"/> ++<<<<<<< HEAD + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax26:Partition"/> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax22:PartitionRef"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> @@@ -769,11 -754,9 +1299,14 @@@ <xs:sequence> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="partitionMax" type="xs:int"/> ++<<<<<<< HEAD + <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"/> + <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> ++======= + <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> </xs:schema> @@@ -797,7 -780,7 +1330,11 @@@ <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://common.stratos.apache.org/xsd";> <xs:complexType name="Properties"> <xs:sequence> ++<<<<<<< HEAD + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax27:Property"/> ++======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax23:Property"/> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a </xs:sequence> </xs:complexType> <xs:complexType name="Property"> @@@ -814,16 -803,21 +1351,24 @@@ <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"/> - </xs:sequence> - </xs:complexType> <xs:complexType name="UnremovablePolicyException"> <xs:complexContent> ++<<<<<<< HEAD + <xs:extension base="ax216:AutoScalerException"> ++======= + <xs:extension base="ax220:AutoScalerException"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <xs:sequence/> </xs:extension> </xs:complexContent> </xs:complexType> <xs:complexType name="PolicyDoesNotExistException"> <xs:complexContent> ++<<<<<<< HEAD + <xs:extension base="ax216:AutoScalerException"> ++======= + <xs:extension base="ax220:AutoScalerException"> ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <xs:sequence/> </xs:extension> </xs:complexContent> @@@ -849,9 -832,12 +1394,12 @@@ </xs:complexType> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.autoscaler.stratos.apache.org/xsd";> - <xs:complexType name="CloudControllerConnectionException"> + <xs:complexType name="AutoScalingPolicyAlreadyExistException"> <xs:sequence/> </xs:complexType> + <xs:complexType name="AutoScalingPolicyAlreadyExistException"> + <xs:sequence/> + </xs:complexType> <xs:complexType name="AutoScalerException"> <xs:complexContent> <xs:extension base="xs:RuntimeException"> @@@ -864,9 -850,6 +1412,12 @@@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> ++<<<<<<< HEAD + <xs:complexType name="CloudControllerConnectionException"> + <xs:sequence/> + </xs:complexType> ++======= ++>>>>>>> 977bf9404ebd2107d13cb716fc758adbf9ad3f5a <xs:complexType name="CartridgeGroupNotFoundException"> <xs:sequence/> </xs:complexType>
