You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/08/06 16:05:04 UTC
[1/4] stratos git commit: Remove UUID and TenantId from
CartridgeGroupBean
Repository: stratos
Updated Branches:
refs/heads/tenant-isolation 5a0a5f600 -> 8382dd71f
http://git-wip-us.apache.org/repos/asf/stratos/blob/203d8933/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 1c6e43f..1be6af2 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,10 +1,10 @@
-<?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:ax28="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax25="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax21="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax216="http://io.java/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax22="http://common.stratos.apache.org/xsd" xmlns:ax219="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax215="http://rmi.java/xsd" xmlns:ax212="http://partition.common.stratos.apache.org/xsd" xmlns:ax222="http://partition.exception.autoscaler.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax210="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax224="http://autoscale.policy.pojo
.autoscaler.stratos.apache.org/xsd" xmlns:ax226="http://pojo.applications.autoscaler.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:ax29="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ns="http://impl.services.autoscaler.stratos.apache.org" xmlns:ax27="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax25="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax21="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax216="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax22="http://common.stratos.apache.org/xsd" xmlns:ax227="http://partition.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax220="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax212="http://partition.common.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax223="http://rmi.java/xsd" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xml
ns:ax211="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax224="http://io.java/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:ax217="http://io.java/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://rmi.java/xsd">
+ <xs:schema xmlns:ax225="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="ax217:IOException">
+ <xs:extension base="ax224:IOException">
<xs:sequence>
<xs:element minOccurs="0" name="cause" nillable="true" type="xs:anyType"/>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
@@ -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="ax224:LoadThresholds"/>
+ <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax216:LoadThresholds"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
<xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/>
</xs:sequence>
@@ -34,18 +34,18 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax227="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="applicationUuid" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="components" nillable="true" type="ax226: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="ax22: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"/>
@@ -54,10 +54,10 @@
</xs:complexType>
<xs:complexType name="ComponentContext">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationClusterContexts" nillable="true" type="ax226:ApplicationClusterContext"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridgeContexts" nillable="true" type="ax226:CartridgeContext"/>
- <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax226:DependencyContext"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax226: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">
@@ -69,8 +69,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="ax226:PersistenceContext"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax22: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>
@@ -78,7 +78,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="ax226:VolumeContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax21:VolumeContext"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="VolumeContext">
@@ -97,7 +97,7 @@
<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="ax226:SubscribableInfoContext"/>
+ <xs:element minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax21:SubscribableInfoContext"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
<xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/>
@@ -106,7 +106,7 @@
<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="ax226: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 minOccurs="0" name="autoscalingPolicyUuid" nillable="true" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="dependencyAliases" nillable="true" type="xs:string"/>
@@ -114,8 +114,8 @@
<xs:element minOccurs="0" name="deploymentPolicyUuid" 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="ax226:PersistenceContext"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax22: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">
@@ -137,10 +137,10 @@
<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="ax226: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 minOccurs="0" name="deploymentPolicyUuid" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax226: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"/>
@@ -153,8 +153,8 @@
<xs:complexType name="ServiceGroup">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax210:Dependencies"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax210:ServiceGroup"/>
+ <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax29:Dependencies"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax29:ServiceGroup"/>
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
<xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/>
@@ -168,817 +168,817 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax29="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax27="http://common.stratos.apache.org/xsd" xmlns:ax26="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax218="http://rmi.java/xsd" xmlns:ax220="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax223="http://partition.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax225="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax228="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax211="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:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://common.stratos.apache.org/xsd"/>
+ <xs:schema xmlns:ax28="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax26="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax217="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax218="http://common.stratos.apache.org/xsd" xmlns:ax221="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax226="http://rmi.java/xsd" xmlns:ax228="http://partition.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax215="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax210="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://application.exception.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/>
<xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://rmi.java/xsd"/>
+ <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://common.stratos.apache.org/xsd"/>
<xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://rmi.java/xsd"/>
<xs:import namespace="http://partition.exception.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"/>
- <xs:element name="getApplicationPolicy">
+ <xs:element name="getApplications">
<xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
- </xs:sequence>
+ <xs:sequence/>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPolicyResponse">
+ <xs:element name="getApplicationsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationPolicy"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="undeployApplication">
+ <xs:element name="AutoscalerServiceApplicationDefinitionException">
<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:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax25:ApplicationDefinitionException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="undeployApplicationResponse">
+ <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax27:CartridgeGroupNotFoundException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deleteApplication">
+ <xs:element name="AutoscalerServiceCartridgeNotFoundException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax27:CartridgeNotFoundException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deleteApplicationResponse">
+ <xs:element name="addApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidArgumentException">
+ <xs:element name="addApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax25:InvalidArgumentException"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateClusterMonitor">
+ <xs:element name="getServiceGroup">
<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:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateClusterMonitorResponse">
+ <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="ax29:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidServiceGroupException">
+ <xs:element name="getApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax29:InvalidServiceGroupException"/>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addServiceGroup">
+ <xs:element name="getApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax210:ServiceGroup"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addServiceGroupResponse">
+ <xs:element name="getDeploymentPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateServiceGroup">
+ <xs:element name="getDeploymentPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="cartridgeGroup" nillable="true" type="ax210:ServiceGroup"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateServiceGroupResponse">
+ <xs:element name="getAutoscalingPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceCartridgeGroupNotFoundException">
+ <xs:element name="getAutoscalingPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="CartridgeGroupNotFoundException" nillable="true" type="ax25:CartridgeGroupNotFoundException"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax217:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeServiceGroup">
+ <xs:element name="AutoscalerServiceInvalidArgumentException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="groupName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax27:InvalidArgumentException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeServiceGroupResponse">
+ <xs:element name="updateClusterMonitor">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getServiceGroup">
+ <xs:element name="updateClusterMonitorResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getServiceGroupResponse">
+ <xs:element name="getApplicationPolicyByUuid">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax210:ServiceGroup"/>
+ <xs:element minOccurs="0" name="applicationPolicyUuid" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getServiceGroupByTenant">
+ <xs:element name="getApplicationPolicyByUuidResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax215:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getServiceGroupByTenantResponse">
+ <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax210:ServiceGroup"/>
+ <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax220:DeploymentPolicyNotExistsException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicyByTenant">
+ <xs:element name="AutoscalerServiceUnremovablePolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
+ <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax220:UnremovablePolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicyByTenantResponse">
+ <xs:element name="removeDeployementPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax24:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="findClusterId">
+ <xs:element name="removeDeployementPolicyResponse">
<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:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="findClusterIdResponse">
+ <xs:element name="getDeploymentPolicyForTenant">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceAutoScalerException">
+ <xs:element name="getDeploymentPolicyForTenantResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax25:AutoScalerException"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getServiceGroups">
+ <xs:element name="getDeploymentPolicies">
<xs:complexType>
<xs:sequence/>
</xs:complexType>
</xs:element>
- <xs:element name="getServiceGroupsResponse">
+ <xs:element name="getDeploymentPoliciesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax210:ServiceGroup"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getServiceGroupsByTenant">
+ <xs:element name="getDeploymentPoliciesByTenant">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getServiceGroupsByTenantResponse">
+ <xs:element name="getDeploymentPoliciesByTenantResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax210:ServiceGroup"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="serviceGroupExist">
+ <xs:element name="getAutoScalingPolicies">
<xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/>
- </xs:sequence>
+ <xs:sequence/>
</xs:complexType>
</xs:element>
- <xs:element name="serviceGroupExistResponse">
+ <xs:element name="getAutoScalingPoliciesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax217:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="undeployServiceGroup">
+ <xs:element name="getAutoScalingPoliciesByTenant">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="undeployServiceGroupResponse">
+ <xs:element name="getAutoScalingPoliciesByTenantResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax217:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationNetworkPartitions">
+ <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="ax27:AutoScalingPolicyAlreadyExistException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationNetworkPartitionsResponse">
+ <xs:element name="addAutoScalingPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax217:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceRemoteException">
+ <xs:element name="addAutoScalingPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax218:RemoteException"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidApplicationPolicyException">
+ <xs:element name="AutoscalerServiceInvalidPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax29:InvalidApplicationPolicyException"/>
+ <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax220:InvalidPolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceApplicationPolicyAlreadyExistsException">
+ <xs:element name="updateAutoScalingPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="ApplicationPolicyAlreadyExistsException" nillable="true" type="ax219:ApplicationPolicyAlreadyExistsException"/>
+ <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax217:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addApplicationPolicy">
+ <xs:element name="updateAutoScalingPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax24:ApplicationPolicy"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addApplicationPolicyResponse">
+ <xs:element name="AutoscalerServicePolicyDoesNotExistException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax220:PolicyDoesNotExistException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPolicyByUuid">
+ <xs:element name="removeAutoScalingPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicyUuid" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="autoscalePolicyId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPolicyByUuidResponse">
+ <xs:element name="removeAutoScalingPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationPolicy"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPolicyByTenant">
+ <xs:element name="getAutoscalingPolicyForTenant">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPolicyByTenantResponse">
+ <xs:element name="getAutoscalingPolicyForTenantResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationPolicy"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax217:AutoscalePolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceInvalidPolicyException">
+ <xs:element name="updateApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax219:InvalidPolicyException"/>
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax24:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceUnremovablePolicyException">
+ <xs:element name="updateApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="UnremovablePolicyException" nillable="true" type="ax219:UnremovablePolicyException"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeApplicationPolicy">
+ <xs:element name="getApplicationByTenant">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeApplicationPolicyResponse">
+ <xs:element name="getApplicationByTenantResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException">
+ <xs:element name="existApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax219:ApplicatioinPolicyNotExistsException"/>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplicationPolicy">
+ <xs:element name="existApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax24:ApplicationPolicy"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplicationPolicyResponse">
+ <xs:element name="getApplicationsByTenant">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPolicies">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getApplicationPoliciesResponse">
+ <xs:element name="getApplicationsByTenantResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationPolicy"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationPoliciesByTenant">
+ <xs:element name="deployApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
+ <xs:element minOccurs="0" name="applicationUuid" 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="getApplicationPoliciesByTenantResponse">
+ <xs:element name="deployApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:ApplicationPolicy"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServicePartitionValidationException">
+ <xs:element name="undeployApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="PartitionValidationException" nillable="true" type="ax222:PartitionValidationException"/>
+ <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="validateNetworkPartitionWithApplication">
+ <xs:element name="undeployApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="validateNetworkPartitionWithApplicationResponse">
+ <xs:element name="deleteApplication">
<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="AutoscalerServiceInvalidDeploymentPolicyException">
+ <xs:element name="deleteApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax219:InvalidDeploymentPolicyException"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException">
+ <xs:element name="AutoscalerServiceInvalidServiceGroupException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax219:DeploymentPolicyAlreadyExistsException"/>
+ <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax25:InvalidServiceGroupException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addDeployementPolicy">
+ <xs:element name="addServiceGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax24:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax29:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addDeployementPolicyResponse">
+ <xs:element name="addServiceGroupResponse">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceDeploymentPolicyNotExistsException">
+ <xs:element name="updateServiceGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax219:DeploymentPolicyNotExistsException"/>
+ <xs:element minOccurs="0" name="cartridgeGroup" nillable="true" type="ax29:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceCloudControllerConnectionException">
+ <xs:element name="updateServiceGroupResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax25:CloudControllerConnectionException"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateDeploymentPolicy">
+ <xs:element name="removeServiceGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax24:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="groupName" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateDeploymentPolicyResponse">
+ <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="removeDeployementPolicy">
+ <xs:element name="getServiceGroupByTenant">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeDeployementPolicyResponse">
+ <xs:element name="getServiceGroupByTenantResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicyForTenant">
+ <xs:element name="getDeploymentPolicyByTenant">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicyForTenantResponse">
+ <xs:element name="getDeploymentPolicyByTenantResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax24:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicies">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getDeploymentPoliciesResponse">
+ <xs:element name="findClusterId">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:DeploymentPolicy"/>
+ <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="getDeploymentPoliciesByTenant">
+ <xs:element name="findClusterIdResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPoliciesByTenantResponse">
+ <xs:element name="AutoscalerServiceAutoScalerException">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax27:AutoScalerException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoScalingPolicies">
+ <xs:element name="getServiceGroups">
<xs:complexType>
<xs:sequence/>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoScalingPoliciesResponse">
+ <xs:element name="getServiceGroupsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax224:AutoscalePolicy"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoScalingPoliciesByTenant">
+ <xs:element name="getServiceGroupsByTenant">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoScalingPoliciesByTenantResponse">
+ <xs:element name="getServiceGroupsByTenantResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax224:AutoscalePolicy"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:ServiceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceAutoScalingPolicyAlreadyExistException">
+ <xs:element name="serviceGroupExist">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="AutoScalingPolicyAlreadyExistException" nillable="true" type="ax25:AutoScalingPolicyAlreadyExistException"/>
+ <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addAutoScalingPolicy">
+ <xs:element name="serviceGroupExistResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax224:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addAutoScalingPolicyResponse">
+ <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="updateAutoScalingPolicy">
+ <xs:element name="getApplicationNetworkPartitions">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax224:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateAutoScalingPolicyResponse">
+ <xs:element name="getApplicationNetworkPartitionsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServicePolicyDoesNotExistException">
+ <xs:element name="AutoscalerServiceRemoteException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="PolicyDoesNotExistException" nillable="true" type="ax219:PolicyDoesNotExistException"/>
+ <xs:element minOccurs="0" name="RemoteException" nillable="true" type="ax223:RemoteException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeAutoScalingPolicy">
+ <xs:element name="AutoscalerServiceInvalidApplicationPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalePolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="InvalidApplicationPolicyException" nillable="true" type="ax25:InvalidApplicationPolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeAutoScalingPolicyResponse">
+ <xs:element name="AutoscalerServiceApplicationPolicyAlreadyExistsException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="ApplicationPolicyAlreadyExistsException" nillable="true" type="ax220:ApplicationPolicyAlreadyExistsException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoscalingPolicy">
+ <xs:element name="addApplicationPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax215:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoscalingPolicyResponse">
+ <xs:element name="addApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax224:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoscalingPolicyForTenant">
+ <xs:element name="getApplicationPolicyByTenant">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getAutoscalingPolicyForTenantResponse">
+ <xs:element name="getApplicationPolicyByTenantResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax224:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax215:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceApplicationDefinitionException">
+ <xs:element name="removeApplicationPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax29:ApplicationDefinitionException"/>
+ <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="AutoscalerServiceCartridgeNotFoundException">
+ <xs:element name="removeApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax25:CartridgeNotFoundException"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addApplication">
+ <xs:element name="AutoscalerServiceApplicatioinPolicyNotExistsException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax228:ApplicationContext"/>
+ <xs:element minOccurs="0" name="ApplicatioinPolicyNotExistsException" nillable="true" type="ax220:ApplicatioinPolicyNotExistsException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addApplicationResponse">
+ <xs:element name="updateApplicationPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="applicationPolicy" nillable="true" type="ax215:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplication">
+ <xs:element name="updateApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax228:ApplicationContext"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="updateApplicationResponse">
+ <xs:element name="getApplicationPolicies">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getApplicationPoliciesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax215:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationByTenant">
+ <xs:element name="getApplicationPoliciesByTenant">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationByTenantResponse">
+ <xs:element name="getApplicationPoliciesByTenantResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax228:ApplicationContext"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax215:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="existApplication">
+ <xs:element name="AutoscalerServicePartitionValidationException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
+ <xs:element minOccurs="0" name="PartitionValidationException" nillable="true" type="ax228:PartitionValidationException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="existApplicationResponse">
+ <xs:element name="validateNetworkPartitionWithApplication">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationsByTenant">
+ <xs:element name="validateNetworkPartitionWithApplicationResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationsByTenantResponse">
+ <xs:element name="AutoscalerServiceInvalidDeploymentPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax228:ApplicationContext"/>
+ <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax220:InvalidDeploymentPolicyException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deployApplication">
+ <xs:element name="AutoscalerServiceDeploymentPolicyAlreadyExistsException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationUuid" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="applicationPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax220:DeploymentPolicyAlreadyExistsException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deployApplicationResponse">
+ <xs:element name="addDeployementPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax215:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicy">
+ <xs:element name="addDeployementPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicyResponse">
+ <xs:element name="AutoscalerServiceCloudControllerConnectionException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax24:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="CloudControllerConnectionException" nillable="true" type="ax27:CloudControllerConnectionException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplications">
+ <xs:element name="updateDeploymentPolicy">
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax215:DeploymentPolicy"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationsResponse">
+ <xs:element name="updateDeploymentPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax228:ApplicationContext"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplication">
+ <xs:element name="getApplicationPolicy">
<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:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationResponse">
+ <xs:element name="getApplicationPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax228:ApplicationContext"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax215:ApplicationPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
- <xs:schema xmlns:ax23="http://common.stratos.apache.org/xsd" xmlns:ax214="http://partition.common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd">
- <xs:import namespace="http://common.stratos.apache.org/xsd"/>
+ <xs:schema xmlns:ax219="http://common.stratos.apache.org/xsd" xmlns:ax214="http://partition.common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd">
<xs:import namespace="http://partition.common.stratos.apache.org/xsd"/>
- <xs:complexType name="ApplicationPolicy">
+ <xs:import namespace="http://common.stratos.apache.org/xsd"/>
+ <xs:complexType name="DeploymentPolicy">
<xs:sequence>
- <xs:element minOccurs="0" name="algorithm" nillable="true" type="xs:string"/>
<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 maxOccurs="unbounded" minOccurs="0" name="networkPartitionsUuid" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax23:Properties"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax214:NetworkPartitionRef"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
<xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="DeploymentPolicy">
+ <xs:complexType name="ApplicationPolicy">
<xs:sequence>
+ <xs:element minOccurs="0" name="algorithm" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionRefs" nillable="true" type="ax214:NetworkPartitionRef"/>
+ <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 maxOccurs="unbounded" minOccurs="0" name="networkPartitionsUuid" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax22:Properties"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
<xs:element minOccurs="0" name="uuid" nillable="true" type="xs:string"/>
</xs:sequence>
@@ -1007,17 +1007,17 @@
</xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://application.exception.autoscaler.stratos.apache.org/xsd">
- <xs:complexType name="InvalidServiceGroupException">
+ <xs:complexType name="ApplicationDefinitionException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidApplicationPolicyException">
+ <xs:complexType name="InvalidServiceGroupException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ApplicationDefinitionException">
+ <xs:complexType name="InvalidApplicationPolicyException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
@@ -1043,23 +1043,33 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax221="http://exception.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.exception.autoscaler.stratos.apache.org/xsd">
+ <xs:schema xmlns:ax222="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="ApplicationPolicyAlreadyExistsException">
+ <xs:complexType name="DeploymentPolicyNotExistsException">
<xs:sequence/>
</xs:complexType>
+ <xs:complexType name="UnremovablePolicyException">
+ <xs:complexContent>
+ <xs:extension base="ax27:AutoScalerException">
+ <xs:sequence/>
+ </xs:extension>
+ </xs:complexContent>
+ </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="UnremovablePolicyException">
+ <xs:complexType name="PolicyDoesNotExistException">
<xs:complexContent>
- <xs:extension base="ax25:AutoScalerException">
+ <xs:extension base="ax27:AutoScalerException">
<xs:sequence/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="ApplicationPolicyAlreadyExistsException">
+ <xs:sequence/>
+ </xs:complexType>
<xs:complexType name="ApplicatioinPolicyNotExistsException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
@@ -1070,18 +1080,8 @@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="DeploymentPolicyAlreadyExistsException">
- <xs:sequence/>
- </xs:complexType>
- <xs:complexType name="DeploymentPolicyNotExistsException">
- <xs:sequence/>
- </xs:complexType>
- <xs:complexType name="PolicyDoesNotExistException">
- <xs:complexContent>
- <xs:extension base="ax25:AutoScalerException">
- <xs:sequence/>
- </xs:extension>
- </xs:complexContent>
+ <xs:complexType name="DeploymentPolicyAlreadyExistsException">
+ <xs:sequence/>
</xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://io.java/xsd">
@@ -1090,12 +1090,17 @@
</xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.autoscaler.stratos.apache.org/xsd">
- <xs:complexType name="InvalidArgumentException">
+ <xs:complexType name="CartridgeGroupNotFoundException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="CartridgeGroupNotFoundException">
+ <xs:complexType name="CartridgeNotFoundException">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="InvalidArgumentException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
@@ -1107,16 +1112,11 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="CloudControllerConnectionException">
- <xs:sequence/>
- </xs:complexType>
<xs:complexType name="AutoScalingPolicyAlreadyExistException">
<xs:sequence/>
</xs:complexType>
- <xs:complexType name="CartridgeNotFoundException">
- <xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
- </xs:sequence>
+ <xs:complexType name="CloudControllerConnectionException">
+ <xs:sequence/>
</xs:complexType>
</xs:schema>
</wsdl:types>
@@ -1216,12 +1216,6 @@
<wsdl:message name="AutoscalerServiceApplicationDefinitionException">
<wsdl:part name="parameters" element="ns:AutoscalerServiceApplicationDefinitionException"/>
</wsdl:message>
- <wsdl:message name="getApplicationsByTenantRequest">
- <wsdl:part name="parameters" element="ns:getApplicationsByTenant"/>
- </wsdl:message>
- <wsdl:message name="getApplicationsByTenantResponse">
- <wsdl:part name="parameters" element="ns:getApplicationsByTenantResponse"/>
- </wsdl:message>
<wsdl:message name="updateApplicationPolicyRequest">
<wsdl:part name="parameters" element="ns:updateApplicationPolicy"/>
</wsdl:message>
@@ -1231,6 +1225,12 @@
<wsdl:message name="AutoscalerServiceApplicatioinPolicyNotExistsException">
<wsdl:part name="parameters" element="ns:AutoscalerServiceApplicatioinPolicyNotExistsException"/>
</wsdl:message>
+ <wsdl:message name="getApplicationsByTenantRequest">
+ <wsdl:part name="parameters" element="ns:getApplicationsByTenant"/>
+ </wsdl:message>
+ <wsdl:message name="getApplicationsByTenantResponse">
+ <wsdl:part name="parameters" element="ns:getApplicationsByTenantResponse"/>
+ </wsdl:message>
<wsdl:message name="getApplicationNetworkPartitionsRequest">
<wsdl:part name="parameters" element="ns:getApplicationNetworkPartitions"/>
</wsdl:message>
@@ -1294,18 +1294,18 @@
<wsdl:message name="existApplicationResponse">
<wsdl:part name="parameters" element="ns:existApplicationResponse"/>
</wsdl:message>
- <wsdl:message name="getServiceGroupRequest">
- <wsdl:part name="parameters" element="ns:getServiceGroup"/>
- </wsdl:message>
- <wsdl:message name="getServiceGroupResponse">
- <wsdl:part name="parameters" element="ns:getServiceGroupResponse"/>
- </wsdl:message>
<wsdl:message name="deleteApplicationRequest">
<wsdl:part name="parameters" element="ns:deleteApplication"/>
</wsdl:message>
<wsdl:message name="deleteApplicationResponse">
<wsdl:part name="parameters" element="ns:deleteApplicationResponse"/>
</wsdl:message>
+ <wsdl:message name="getServiceGroupRequest">
+ <wsdl:part name="parameters" element="ns:getServiceGroup"/>
+ </wsdl:message>
+ <wsdl:message name="getServiceGroupResponse">
+ <wsdl:part name="parameters" element="ns:getServiceGroupResponse"/>
+ </wsdl:message>
<wsdl:message name="undeployServiceGroupRequest">
<wsdl:part name="parameters" element="ns:undeployServiceGroup"/>
</wsdl:message>
@@ -1384,6 +1384,12 @@
<wsdl:message name="getApplicationsResponse">
<wsdl:part name="parameters" element="ns:getApplicationsResponse"/>
</wsdl:message>
+ <wsdl:message name="getDeploymentPoliciesByTenantRequest">
+ <wsdl:part name="parameters" element="ns:getDeploymentPoliciesByTenant"/>
+ </wsdl:message>
+ <wsdl:message name="getDeploymentPoliciesByTenantResponse">
+ <wsdl:part name="parameters" element="ns:getDeploymentPoliciesByTenantResponse"/>
+ </wsdl:message>
<wsdl:message name="addApplicationRequest">
<wsdl:part name="parameters" element="ns:addApplication"/>
</wsdl:message>
@@ -1396,12 +1402,6 @@
<wsdl:message name="AutoscalerServiceCartridgeNotFoundException">
<wsdl:part name="parameters" element="ns:AutoscalerServiceCartridgeNotFoundException"/>
</wsdl:message>
- <wsdl:message name="getDeploymentPoliciesByTenantRequest">
- <wsdl:part name="parameters" element="ns:getDeploymentPoliciesByTenant"/>
- </wsdl:message>
-
<TRUNCATED>
[4/4] stratos git commit: Fixing isuues in integration tests
Posted by ga...@apache.org.
Fixing isuues in integration tests
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8382dd71
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8382dd71
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8382dd71
Branch: refs/heads/tenant-isolation
Commit: 8382dd71fde55e2eab24baea06b99259a705e5ce
Parents: e1e6c1a
Author: Dinithi <di...@wso2.com>
Authored: Thu Aug 6 19:11:25 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Thu Aug 6 19:11:25 2015 +0530
----------------------------------------------------------------------
.../tests/SampleApplicationsTest.java | 30 ++++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/8382dd71/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
index f05bd51..3b89161 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
@@ -481,7 +481,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
restClient);
assertEquals(unDeployed, true);
- assertApplicationUndeploy("g-sc-G123-1");
+ assertApplicationUndeploy(bean.getApplicationUuid());
boolean removed = applicationTest.removeApplication("g-sc-G123-1", endpoint,
restClient);
@@ -911,16 +911,16 @@ public class SampleApplicationsTest extends StratosTestServerManager {
/**
* Assert application activation
*
- * @param applicationName
+ * @param applicationUuid
*/
- private void assertApplicationUndeploy(String applicationName) {
+ private void assertApplicationUndeploy(String applicationUuid) {
long startTime = System.currentTimeMillis();
- Application application = ApplicationManager.getApplications().getApplication(applicationName);
+ Application application = ApplicationManager.getApplications().getApplication(applicationUuid);
ApplicationContext applicationContext = null;
try {
- applicationContext = AutoscalerServiceClient.getInstance().getApplication(applicationName);
+ applicationContext = AutoscalerServiceClient.getInstance().getApplication(applicationUuid);
} catch (RemoteException e) {
- log.error("Error while getting the application context for [application] " + applicationName);
+ log.error("Error while getting the application context for [application] " + applicationUuid);
}
while (((application != null) && application.getInstanceContextCount() > 0) ||
(applicationContext == null || applicationContext.getStatus().equals(APPLICATION_STATUS_UNDEPLOYING))) {
@@ -928,11 +928,11 @@ public class SampleApplicationsTest extends StratosTestServerManager {
Thread.sleep(1000);
} catch (InterruptedException ignore) {
}
- application = ApplicationManager.getApplications().getApplication(applicationName);
+ application = ApplicationManager.getApplications().getApplication(applicationUuid);
try {
- applicationContext = AutoscalerServiceClient.getInstance().getApplication(applicationName);
+ applicationContext = AutoscalerServiceClient.getInstance().getApplication(applicationUuid);
} catch (RemoteException e) {
- log.error("Error while getting the application context for [application] " + applicationName);
+ log.error("Error while getting the application context for [application] " + applicationUuid);
}
if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
break;
@@ -940,29 +940,29 @@ public class SampleApplicationsTest extends StratosTestServerManager {
}
assertNotNull(String.format("Application is not found: [application-id] %s",
- applicationName), application);
+ applicationUuid), application);
assertNotNull(String.format("Application Context is not found: [application-id] %s",
- applicationName), applicationContext);
+ applicationUuid), applicationContext);
//Force undeployment after the graceful deployment
if (application.getInstanceContextCount() > 0 ||
applicationContext.getStatus().equals(APPLICATION_STATUS_UNDEPLOYING)) {
- log.info("Force undeployment is going to start for the [application] " + applicationName);
+ log.info("Force undeployment is going to start for the [application] " + applicationUuid);
- applicationTest.forceUndeployApplication(applicationName, endpoint, restClient);
+ applicationTest.forceUndeployApplication(applicationUuid, endpoint, restClient);
while (application.getInstanceContextCount() > 0 ||
applicationContext.getStatus().equals(APPLICATION_STATUS_UNDEPLOYING)) {
try {
Thread.sleep(1000);
} catch (InterruptedException ignore) {
}
- application = ApplicationManager.getApplications().getApplication(applicationName);
+ application = ApplicationManager.getApplications().getApplication(applicationUuid);
if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
break;
}
}
}
- assertEquals(String.format("Application status did not change to Created: [application-id] %s", applicationName),
+ assertEquals(String.format("Application status did not change to Created: [application-id] %s", applicationUuid),
APPLICATION_STATUS_CREATED, applicationContext.getStatus());
}
[2/4] stratos git commit: Remove UUID and TenantId from
CartridgeGroupBean
Posted by ga...@apache.org.
Remove UUID and TenantId from CartridgeGroupBean
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/203d8933
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/203d8933
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/203d8933
Branch: refs/heads/tenant-isolation
Commit: 203d8933d6189d18ba8404e3a959493e1469a270
Parents: 5a0a5f6
Author: Dinithi <di...@wso2.com>
Authored: Thu Aug 6 14:14:41 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Thu Aug 6 14:14:41 2015 +0530
----------------------------------------------------------------------
.../autoscaler/registry/RegistryManager.java | 2 +-
.../stratos/cli/RestCommandLineService.java | 2 +-
.../beans/cartridge/CartridgeGroupBean.java | 18 -
.../rest/endpoint/api/StratosApiV41.java | 22 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 78 +-
.../util/converter/ObjectConverter.java | 10 +-
.../src/main/resources/AutoscalerService.wsdl | 838 +++++++++----------
7 files changed, 482 insertions(+), 488 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/203d8933/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
index 4ccdb05..b7e659e 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
@@ -645,7 +645,7 @@ public class RegistryManager {
policyID;
delete(resourcePath);
if (log.isDebugEnabled()) {
- log.debug(String.format("Autoscaler policy deleted from registry: [id]", policyID));
+ log.debug(String.format("Autoscaler policy deleted from registry: %s [id]", policyID));
}
} finally {
endTenantFlow();
http://git-wip-us.apache.org/repos/asf/stratos/blob/203d8933/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index 03abca1..140959b 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -387,7 +387,7 @@ public class RestCommandLineService {
RowMapper<CartridgeGroupBean> cartridgeGroupMapper = new RowMapper<CartridgeGroupBean>() {
public String[] getData(CartridgeGroupBean cartridgeGroup) {
String[] data = new String[3];
- data[0] = cartridgeGroup.getUuid();
+ data[0] = cartridgeGroup.getName();
data[1] = cartridgeGroup.getCartridges() == null ? "" : String.valueOf(cartridgeGroup.getCartridges().size());
data[2] = cartridgeGroup.getGroups() == null ? "0" : String.valueOf(cartridgeGroup.getGroups().size());
return data;
http://git-wip-us.apache.org/repos/asf/stratos/blob/203d8933/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeGroupBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeGroupBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeGroupBean.java
index 90d1f6e..d14fd53 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeGroupBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeGroupBean.java
@@ -30,20 +30,10 @@ public class CartridgeGroupBean implements Serializable {
private static final long serialVersionUID = 4696832597498594267L;
- private String uuid;
private String name;
private List<CartridgeGroupBean> groups;
private List<String> cartridges;
private DependencyBean dependencies;
- private int tenantId;
-
- public String getUuid() {
- return uuid;
- }
-
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
public List<String> getCartridges() {
return cartridges;
@@ -69,14 +59,6 @@ public class CartridgeGroupBean implements Serializable {
this.groups = groups;
}
- public int getTenantId() {
- return tenantId;
- }
-
- public void setTenantId(int tenantId) {
- this.tenantId = tenantId;
- }
-
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/203d8933/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 37ff9fb..baa06c6 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
@@ -495,15 +495,15 @@ public class StratosApiV41 extends AbstractApi {
CartridgeGroupBean cartridgeGroupBean) throws RestAPIException {
PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- cartridgeGroupBean.setUuid(UUID.randomUUID().toString());
- cartridgeGroupBean.setTenantId(carbonContext.getTenantId());
+ String cartrideGroupUuid= UUID.randomUUID().toString();
+ int tenantId = carbonContext.getTenantId();
try {
- StratosApiV41Utils.addCartridgeGroup(cartridgeGroupBean);
- URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeGroupBean.getUuid()).build();
-
+ StratosApiV41Utils.addCartridgeGroup(cartridgeGroupBean, cartrideGroupUuid, tenantId);
+ URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeGroupBean.getName()).build();
return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
- String.format("Cartridge Group added successfully: [cartridge-group-uuid] %s [cartridge-group-name] %s [tenant-id] %d",
- cartridgeGroupBean.getUuid(),cartridgeGroupBean.getName(),cartridgeGroupBean.getTenantId()))).build();
+ String.format("Cartridge Group added successfully: [cartridge-group-uuid] %s " +
+ "[cartridge-group-name] %s [tenant-id] %d", cartrideGroupUuid,
+ cartridgeGroupBean.getName(), tenantId))).build();
} catch (InvalidCartridgeGroupDefinitionException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, e.getMessage())).build();
@@ -536,12 +536,12 @@ public class StratosApiV41 extends AbstractApi {
try {
PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- StratosApiV41Utils.updateServiceGroup(cartridgeGroupBean,carbonContext.getTenantId());
- URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeGroupBean.getUuid()).build();
+ StratosApiV41Utils.updateServiceGroup(cartridgeGroupBean, carbonContext.getTenantId());
+ URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeGroupBean.getName()).build();
return Response.ok(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
- String.format("Cartridge group updated successfully: [cartridge-group-uuid] %s [cartridge-group-name] %s [tenant-id] %d",
- cartridgeGroupBean.getUuid(),cartridgeGroupBean.getName(),cartridgeGroupBean.getTenantId()))).build();
+ String.format("Cartridge group updated successfully: [cartridge-group-uuid] %s",
+ cartridgeGroupBean.getName()))).build();
} catch (InvalidCartridgeGroupDefinitionException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
http://git-wip-us.apache.org/repos/asf/stratos/blob/203d8933/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 a183d26..b825d14 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
@@ -1006,7 +1006,8 @@ public class StratosApiV41Utils {
* @throws InvalidCartridgeGroupDefinitionException
* @throws RestAPIException
*/
- public static void addCartridgeGroup(CartridgeGroupBean serviceGroupDefinition)
+ public static void addCartridgeGroup(CartridgeGroupBean serviceGroupDefinition, String cartridgeGroupUuid,
+ int tenantId)
throws InvalidCartridgeGroupDefinitionException, ServiceGroupDefinitionException, RestAPIException,
CloudControllerServiceCartridgeNotFoundExceptionException,
AutoscalerServiceInvalidServiceGroupExceptionException {
@@ -1021,7 +1022,7 @@ public class StratosApiV41Utils {
String[] cartridgeGroupNames;
if (log.isDebugEnabled()) {
- log.debug("Checking cartridges in cartridge group " + serviceGroupDefinition.getUuid());
+ log.debug("Checking cartridges in cartridge group " + cartridgeGroupUuid);
}
findCartridgesInGroupBean(serviceGroupDefinition, cartridgeTypes);
@@ -1031,7 +1032,15 @@ public class StratosApiV41Utils {
//validate the group definition to check if groups duplicate in any groups and
//validate the group definition to check for cyclic group behaviour
- validateGroupDuplicationInGroupDefinition(serviceGroupDefinition);
+
+ try {
+ validateGroupDuplicationInGroupDefinition(serviceGroupDefinition);
+ } catch (RemoteException e) {
+ String message = "Error while validating group duplications in cartridge group: " + cartridgeGroupUuid;
+ log.error(message, e);
+ throw new RestAPIException(message, e);
+ }
+
CloudControllerServiceClient ccServiceClient = getCloudControllerServiceClient();
@@ -1039,7 +1048,7 @@ public class StratosApiV41Utils {
int j = 0;
for (String cartridgeType : cartridgeTypes) {
try {
- Cartridge cartridge = ccServiceClient.getCartridgeByTenant(cartridgeType,serviceGroupDefinition.getTenantId());
+ Cartridge cartridge = ccServiceClient.getCartridgeByTenant(cartridgeType, tenantId);
if (cartridge == null) {
// cartridge is not deployed, can't continue
log.error("Invalid cartridge found in cartridge group " + cartridgeType);
@@ -1049,7 +1058,7 @@ public class StratosApiV41Utils {
j++;
}
} catch (RemoteException e) {
- String message = "Could not add the cartridge group: " + serviceGroupDefinition.getUuid();
+ String message = "Could not add the cartridge group: " + cartridgeGroupUuid;
log.error(message, e);
throw new RestAPIException(message, e);
}
@@ -1059,7 +1068,7 @@ public class StratosApiV41Utils {
// if any sub groups are specified in the group, they should be already deployed
if (serviceGroupDefinition.getGroups() != null) {
if (log.isDebugEnabled()) {
- log.debug("checking subGroups in cartridge group " + serviceGroupDefinition.getUuid());
+ log.debug("checking subGroups in cartridge group " + cartridgeGroupUuid);
}
List<CartridgeGroupBean> groupDefinitions = serviceGroupDefinition.getGroups();
@@ -1067,8 +1076,8 @@ public class StratosApiV41Utils {
cartridgeGroupNames = new String[groupDefinitions.size()];
int i = 0;
for (CartridgeGroupBean groupList : groupDefinitions) {
- groupNames.add(groupList.getUuid());
- cartridgeGroupNames[i] = groupList.getUuid();
+ groupNames.add(groupList.getName());
+ cartridgeGroupNames[i] = groupList.getName();
i++;
}
@@ -1088,7 +1097,7 @@ public class StratosApiV41Utils {
}
ServiceGroup serviceGroup = ObjectConverter.convertServiceGroupDefinitionToASStubServiceGroup(
- serviceGroupDefinition);
+ serviceGroupDefinition, tenantId);
AutoscalerServiceClient asServiceClient = getAutoscalerServiceClient();
try {
@@ -1099,7 +1108,7 @@ public class StratosApiV41Utils {
} catch (RemoteException e) {
String message = String.format("Could not add the cartridge group: [cartridge-group-id] %s " +
- "[cartridge-group-name] %s ", serviceGroupDefinition.getUuid(), serviceGroupDefinition.getName());
+ "[cartridge-group-name] %s ", serviceGroup.getUuid(), serviceGroupDefinition.getName());
log.error(message, e);
throw new RestAPIException(message, e);
}
@@ -1116,19 +1125,17 @@ public class StratosApiV41Utils {
try {
AutoscalerServiceClient autoscalerServiceClient = AutoscalerServiceClient.getInstance();
ServiceGroup existingServiceGroup =autoscalerServiceClient.getServiceGroupByTenant(cartridgeGroup.getName(), tenantId);
- cartridgeGroup.setUuid(existingServiceGroup.getUuid());
- cartridgeGroup.setTenantId(tenantId);
ServiceGroup serviceGroup = ObjectConverter.convertServiceGroupDefinitionToASStubServiceGroup(
- cartridgeGroup);
+ cartridgeGroup, tenantId);
StratosManagerServiceClient smServiceClient = getStratosManagerServiceClient();
// Validate whether cartridge group can be updated
- if (!smServiceClient.canCartirdgeGroupBeRemoved(cartridgeGroup.getUuid())) {
+ if (!smServiceClient.canCartirdgeGroupBeRemoved(existingServiceGroup.getUuid())) {
String message = String.format("Cannot update cartridge group: [cartridge-group-uuid] %s " +
"[cartridge-group-name] %s since it is used in another cartridge group or an application",
- cartridgeGroup.getUuid(), cartridgeGroup.getName());
+ existingServiceGroup.getUuid(), cartridgeGroup.getName());
log.error(message);
throw new RestAPIException(message);
@@ -1143,12 +1150,12 @@ public class StratosApiV41Utils {
if (serviceGroup != null) {
autoscalerServiceClient.updateServiceGroup(
- ObjectConverter.convertServiceGroupDefinitionToASStubServiceGroup(cartridgeGroup));
+ ObjectConverter.convertServiceGroupDefinitionToASStubServiceGroup(cartridgeGroup, tenantId));
List<String> cartridgesBeforeUpdating = new ArrayList<String>();
List<String> cartridgesAfterUpdating = new ArrayList<String>();
- ServiceGroup serviceGroupToBeUpdated = autoscalerServiceClient.getServiceGroup(cartridgeGroup.getUuid());
+ ServiceGroup serviceGroupToBeUpdated = autoscalerServiceClient.getServiceGroup(serviceGroup.getUuid());
findCartridgesInServiceGroup(serviceGroupToBeUpdated, cartridgesBeforeUpdating);
findCartridgesInGroupBean(cartridgeGroup, cartridgesAfterUpdating);
@@ -1188,7 +1195,7 @@ public class StratosApiV41Utils {
if (cartridgesToAdd != null) {
if (!cartridgesToAdd.isEmpty()) {
{
- smServiceClient.addUsedCartridgesInCartridgeGroups(cartridgeGroup.getUuid(),
+ smServiceClient.addUsedCartridgesInCartridgeGroups(existingServiceGroup.getUuid(),
cartridgesToAdd.toArray(new String[cartridgesToRemove.size()]));
}
}
@@ -1197,7 +1204,7 @@ public class StratosApiV41Utils {
// Remove cartridge group elements from SM cache - done after cartridge group has been updated
if (cartridgesToRemove != null) {
if (!cartridgesToRemove.isEmpty()) {
- smServiceClient.removeUsedCartridgesInCartridgeGroups(cartridgeGroup.getUuid(),
+ smServiceClient.removeUsedCartridgesInCartridgeGroups(existingServiceGroup.getUuid(),
cartridgesToRemove.toArray(new String[cartridgesToRemove.size()]));
}
}
@@ -3745,37 +3752,42 @@ public class StratosApiV41Utils {
* @throws InvalidCartridgeGroupDefinitionException
*/
private static void validateGroupDuplicationInGroupDefinition(CartridgeGroupBean groupBean)
- throws InvalidCartridgeGroupDefinitionException {
- validateGroupDuplicationInGroupDefinition(groupBean, new ArrayList<String>());
+ throws InvalidCartridgeGroupDefinitionException, RemoteException {
+ AutoscalerServiceClient autoscalerServiceClient = AutoscalerServiceClient.getInstance();
+ PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+ ServiceGroup serviceGroup = autoscalerServiceClient.getServiceGroupByTenant(groupBean.getName(),
+ + carbonContext.getTenantId());
+ validateGroupDuplicationInGroupDefinition(serviceGroup, new ArrayList<String>());
}
/**
* This is to validate the group duplication in the group definition recursively for group within groups
*
- * @param groupBean - cartridge group definition
+ * @param serviceGroup - cartridge group definition
* @param parentGroups - list of string which holds the parent group names (all parents in the hierarchy)
* @throws InvalidCartridgeGroupDefinitionException - throws when the group definition is invalid
*/
- private static void validateGroupDuplicationInGroupDefinition(CartridgeGroupBean groupBean, List<String> parentGroups)
+ private static void validateGroupDuplicationInGroupDefinition(ServiceGroup serviceGroup, List<String> parentGroups)
throws InvalidCartridgeGroupDefinitionException {
- if (groupBean == null) {
+ if (serviceGroup == null) {
return;
}
List<String> groups = new ArrayList<String>();
- parentGroups.add(groupBean.getUuid());
- if (groupBean.getGroups() != null) {
- if (!groupBean.getGroups().isEmpty()) {
- for (CartridgeGroupBean g : groupBean.getGroups()) {
- groups.add(g.getName());
+ parentGroups.add(serviceGroup.getUuid());
+
+ if (serviceGroup.getGroups() != null) {
+ for (ServiceGroup group : serviceGroup.getGroups()) {
+ if (group != null) {
+ groups.add(group.getUuid());
}
- validateGroupDuplicationInGroup(groups, parentGroups);
}
+ validateGroupDuplicationInGroup(groups, parentGroups);
}
- if (groupBean.getGroups() != null) {
+ if (serviceGroup.getGroups() != null) {
//Recursive because to check groups inside groups
- for (CartridgeGroupBean group : groupBean.getGroups()) {
+ for (ServiceGroup group : serviceGroup.getGroups()) {
validateGroupDuplicationInGroupDefinition(group, parentGroups);
- parentGroups.remove(group.getName());
+ parentGroups.remove(serviceGroup.getUuid());
}
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/203d8933/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index b730d1b..2fce76b 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -1847,7 +1847,8 @@ public class ObjectConverter {
return carbonTenantInfoBean;
}
- public static ServiceGroup convertServiceGroupDefinitionToASStubServiceGroup(CartridgeGroupBean groupBean)
+ public static ServiceGroup convertServiceGroupDefinitionToASStubServiceGroup(CartridgeGroupBean groupBean,
+ int tenantId)
throws ServiceGroupDefinitionException {
if (groupBean == null) {
@@ -1860,7 +1861,7 @@ public class ObjectConverter {
servicegroup.setName(groupBean.getName());
servicegroup.setUuid(UUID.randomUUID().toString());
- servicegroup.setTenantId(groupBean.getTenantId());
+ servicegroup.setTenantId(tenantId);
if (groupsDefinitions == null) {
groupsDefinitions = new ArrayList<CartridgeGroupBean>(0);
@@ -1875,7 +1876,7 @@ public class ObjectConverter {
int i = 0;
for (CartridgeGroupBean groupDefinition : groupsDefinitions) {
- subGroups[i] = convertServiceGroupDefinitionToASStubServiceGroup(groupDefinition);
+ subGroups[i] = convertServiceGroupDefinitionToASStubServiceGroup(groupDefinition, tenantId);
++i;
}
@@ -1927,7 +1928,6 @@ public class ObjectConverter {
}
CartridgeGroupBean serviceGroupDefinition = new CartridgeGroupBean();
- serviceGroupDefinition.setUuid(serviceGroup.getUuid());
serviceGroupDefinition.setName(serviceGroup.getName());
String[] cartridges = serviceGroup.getCartridges();
ServiceGroup[] groups = serviceGroup.getGroups();
@@ -2235,4 +2235,4 @@ public class ObjectConverter {
return iaasProviderInfoBean;
}
-}
+}
\ No newline at end of file
[3/4] stratos git commit: Fixed issues in integration tests
Posted by ga...@apache.org.
Fixed issues in integration tests
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e1e6c1a6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e1e6c1a6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e1e6c1a6
Branch: refs/heads/tenant-isolation
Commit: e1e6c1a6c61712e4efdb628c7f86cb5701b5a3e4
Parents: 203d893
Author: Dinithi <di...@wso2.com>
Authored: Thu Aug 6 18:43:16 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Thu Aug 6 18:43:16 2015 +0530
----------------------------------------------------------------------
.../tests/SampleApplicationsTest.java | 46 ++++++++++----------
.../application-policy-1.json | 4 +-
2 files changed, 26 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1e6c1a6/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
index 61bb287..f05bd51 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
@@ -379,7 +379,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
}
}
-
+ @Test
public void testDeployApplication() {
try {
//Initializing event Receivers
@@ -442,13 +442,13 @@ public class SampleApplicationsTest extends StratosTestServerManager {
assertEquals(deployed, true);
//Application active handling
- assertApplicationActivation(bean.getApplicationId());
+ assertApplicationActivation(bean.getApplicationUuid());
//Group active handling
- assertGroupActivation(bean.getApplicationId());
+ assertGroupActivation(bean.getApplicationUuid());
//Cluster active handling
- assertClusterActivation(bean.getApplicationId());
+ assertClusterActivation(bean.getApplicationUuid());
//Updating application
/* boolean updated = applicationTest.updateApplication("g-sc-G123-1.json",
@@ -825,35 +825,35 @@ public class SampleApplicationsTest extends StratosTestServerManager {
/**
* Assert application activation
*
- * @param applicationName
+ * @param applicationUuid
*/
- private void assertApplicationActivation(String applicationName) {
+ private void assertApplicationActivation(String applicationUuid) {
long startTime = System.currentTimeMillis();
- Application application = ApplicationManager.getApplications().getApplication(applicationName);
+ Application application = ApplicationManager.getApplications().getApplication(applicationUuid);
while (!((application != null) && (application.getStatus() == ApplicationStatus.Active))) {
try {
Thread.sleep(1000);
} catch (InterruptedException ignore) {
}
- application = ApplicationManager.getApplications().getApplication(applicationName);
+ application = ApplicationManager.getApplications().getApplication(applicationUuid);
if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) {
break;
}
}
- assertNotNull(String.format("Application is not found: [application-id] %s", applicationName), application);
- assertEquals(String.format("Application status did not change to active: [application-id] %s", applicationName),
+ assertNotNull(String.format("Application is not found: [application-id] %s", applicationUuid), application);
+ assertEquals(String.format("Application status did not change to active: [application-id] %s", applicationUuid),
ApplicationStatus.Active, application.getStatus());
}
/**
* Assert application activation
*
- * @param applicationName
+ * @param applicationUuid
*/
- private void assertGroupActivation(String applicationName) {
- Application application = ApplicationManager.getApplications().getApplication(applicationName);
+ private void assertGroupActivation(String applicationUuid) {
+ Application application = ApplicationManager.getApplications().getApplication(applicationUuid);
assertNotNull(String.format("Application is not found: [application-id] %s",
- applicationName), application);
+ applicationUuid), application);
Collection<Group> groups = application.getAllGroupsRecursively();
for(Group group : groups) {
@@ -864,24 +864,24 @@ public class SampleApplicationsTest extends StratosTestServerManager {
/**
* Assert application activation
*
- * @param applicationName
+ * @param applicationUuid
*/
- private void assertClusterActivation(String applicationName) {
- Application application = ApplicationManager.getApplications().getApplication(applicationName);
+ private void assertClusterActivation(String applicationUuid) {
+ Application application = ApplicationManager.getApplications().getApplication(applicationUuid);
assertNotNull(String.format("Application is not found: [application-id] %s",
- applicationName), application);
+ applicationUuid), application);
Set<ClusterDataHolder> clusterDataHolderSet = application.getClusterDataRecursively();
for(ClusterDataHolder clusterDataHolder : clusterDataHolderSet) {
- String serviceName = clusterDataHolder.getServiceType();
+ String serviceUuid = clusterDataHolder.getServiceUuid();
String clusterId = clusterDataHolder.getClusterId();
- Service service = TopologyManager.getTopology().getService(serviceName);
+ Service service = TopologyManager.getTopology().getService(serviceUuid);
assertNotNull(String.format("Service is not found: [application-id] %s [service] %s",
- applicationName, serviceName), service);
+ applicationUuid, serviceUuid), service);
Cluster cluster = service.getCluster(clusterId);
assertNotNull(String.format("Cluster is not found: [application-id] %s [service] %s [cluster-id] %s",
- applicationName, serviceName, clusterId), cluster);
+ applicationUuid, serviceUuid, clusterId), cluster);
boolean clusterActive = false;
for (ClusterInstance instance : cluster.getInstanceIdToInstanceContextMap().values()) {
@@ -894,6 +894,8 @@ public class SampleApplicationsTest extends StratosTestServerManager {
}
}
clusterActive = activeInstances >= clusterDataHolder.getMinInstances();
+ log.info(String.format("Active instance count: %s, Min instance count: %s", activeInstances,
+ clusterDataHolder.getMinInstances()));
if (!clusterActive) {
break;
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1e6c1a6/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json b/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json
index 17858bb..12b9bd4 100644
--- a/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json
+++ b/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json
@@ -3,11 +3,11 @@
"algorithm": "one-after-another",
"networkPartitions": [
"network-partition-1",
- "network-partition-2"
+ "network-partition-2"
],
"properties": [
{
- "name": "networkPartitionGroups",
+ "name": "key-1",
"value": "network-partition-1,network-partition-2"
},
{