You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/02/25 19:55:13 UTC
[38/50] [abbrv] stratos git commit: adding getApplicationPolicy web
service, rest API and updating AS CC wsdls
http://git-wip-us.apache.org/repos/asf/stratos/blob/4656d194/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
index 9fe9054..20a364e 100644
--- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
+++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
@@ -1,11 +1,20 @@
+<<<<<<< HEAD
<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://impl.services.controller.cloud.stratos.apache.org" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax228="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax231="http://topology.domain.messaging.stratos.apache.org/xsd" xmlns:ax222="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax224="http://domain.controller.cloud.stratos.apache.org/xsd" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax226="http://common.stratos.apache.org/xsd" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org">
<wsdl:documentation>CloudControllerService</wsdl:documentation>
<wsdl:types>
<xs:schema xmlns:ax232="http://topology.domain.messaging.stratos.apache.org/xsd" xmlns:ax230="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd" xmlns:ax223="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:ax225="http://domain.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org">
<xs:import namespace="http://exception.controller.cloud.stratos.apache.org/xsd"></xs:import>
+=======
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://impl.services.controller.cloud.stratos.apache.org" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax229="http://common.stratos.apache.org/xsd" xmlns:ax227="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax231="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax234="http://topology.domain.messaging.stratos.apache.org/xsd" xmlns:ax225="http://domain.controller.cloud.stratos.apache.org/xsd" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org">
+ <wsdl:documentation>CloudControllerService</wsdl:documentation>
+ <wsdl:types>
+ <xs:schema xmlns:ax233="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd" xmlns:ax228="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:ax226="http://domain.controller.cloud.stratos.apache.org/xsd" xmlns:ax235="http://topology.domain.messaging.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org">
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:import namespace="http://domain.controller.cloud.stratos.apache.org/xsd"></xs:import>
+ <xs:import namespace="http://exception.controller.cloud.stratos.apache.org/xsd"></xs:import>
<xs:import namespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"></xs:import>
<xs:import namespace="http://topology.domain.messaging.stratos.apache.org/xsd"></xs:import>
+<<<<<<< HEAD
<xs:element name="CloudControllerServiceDeploymentPolicyNotExistsException">
<xs:complexType>
<xs:sequence>
@@ -134,6 +143,100 @@
</xs:complexType>
</xs:element>
<xs:element name="getNetworkPartition">
+=======
+ <xs:element name="getDeploymentPolicies">
+ <xs:complexType>
+ <xs:sequence></xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getDeploymentPoliciesResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax225:DeploymentPolicy"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax228:InvalidCartridgeDefinitionException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceInvalidIaasProviderException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax228:InvalidIaasProviderException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceCartridgeDefinitionNotExistsException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="CartridgeDefinitionNotExistsException" nillable="true" type="ax228:CartridgeDefinitionNotExistsException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateCartridge">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax225:CartridgeConfig"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getCartridges">
+ <xs:complexType>
+ <xs:sequence></xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getCartridgesResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceInvalidCartridgeTypeException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax228:InvalidCartridgeTypeException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeCartridge">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceNetworkPartitionAlreadyExistsException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="NetworkPartitionAlreadyExistsException" nillable="true" type="ax228:NetworkPartitionAlreadyExistsException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addNetworkPartition">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="networkPartition" nillable="true" type="ax225:NetworkPartition"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getNetworkPartitions">
+ <xs:complexType>
+ <xs:sequence></xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getNetworkPartitionsResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax225:NetworkPartition"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getNetworkPartition">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element>
@@ -143,6 +246,29 @@
<xs:element name="getNetworkPartitionResponse">
<xs:complexType>
<xs:sequence>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax225:NetworkPartition"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceNetworkPartitionNotExistsException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="NetworkPartitionNotExistsException" nillable="true" type="ax228:NetworkPartitionNotExistsException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeNetworkPartition">
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+<<<<<<< HEAD
+ <xs:element name="getNetworkPartitionResponse">
+ <xs:complexType>
+ <xs:sequence>
<xs:element minOccurs="0" name="return" nillable="true" type="ax224:NetworkPartition"></xs:element>
</xs:sequence>
</xs:complexType>
@@ -198,12 +324,73 @@
</xs:complexType>
</xs:element>
<xs:element name="CloudControllerServiceInvalidKubernetesMasterException">
+=======
+ <xs:element name="updateNetworkPartition">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="networkPartition" nillable="true" type="ax225:NetworkPartition"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceInvalidKubernetesHostException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="InvalidKubernetesHostException" nillable="true" type="ax228:InvalidKubernetesHostException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceNonExistingKubernetesClusterException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="NonExistingKubernetesClusterException" nillable="true" type="ax228:NonExistingKubernetesClusterException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addKubernetesHost">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax233:KubernetesHost"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addKubernetesHostResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceInvalidKubernetesMasterException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="InvalidKubernetesMasterException" nillable="true" type="ax228:InvalidKubernetesMasterException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceNonExistingKubernetesMasterException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="NonExistingKubernetesMasterException" nillable="true" type="ax228:NonExistingKubernetesMasterException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateKubernetesMaster">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax233:KubernetesMaster"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateKubernetesMasterResponse">
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="InvalidKubernetesMasterException" nillable="true" type="ax222:InvalidKubernetesMasterException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
+<<<<<<< HEAD
<xs:element name="CloudControllerServiceNonExistingKubernetesMasterException">
<xs:complexType>
<xs:sequence>
@@ -229,34 +416,70 @@
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="NonExistingKubernetesHostException" nillable="true" type="ax222:NonExistingKubernetesHostException"></xs:element>
+=======
+ <xs:element name="CloudControllerServiceNonExistingKubernetesHostException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="NonExistingKubernetesHostException" nillable="true" type="ax228:NonExistingKubernetesHostException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="updateKubernetesHost">
<xs:complexType>
<xs:sequence>
+ <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax233:KubernetesHost"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateKubernetesHostResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="updateKubernetesHost">
+ <xs:complexType>
+ <xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax230:KubernetesHost"></xs:element>
+=======
+ <xs:element minOccurs="0" name="CartridgeAlreadyExistsException" nillable="true" type="ax228:CartridgeAlreadyExistsException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="updateKubernetesHostResponse">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+=======
+ <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax225:CartridgeConfig"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CloudControllerServiceInvalidKubernetesClusterException">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="InvalidKubernetesClusterException" nillable="true" type="ax222:InvalidKubernetesClusterException"></xs:element>
+=======
+ <xs:element minOccurs="0" name="InvalidKubernetesClusterException" nillable="true" type="ax228:InvalidKubernetesClusterException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addKubernetesCluster">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax230:KubernetesCluster"></xs:element>
+=======
+ <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax233:KubernetesCluster"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -277,7 +500,11 @@
<xs:element name="getKubernetesClusterResponse">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="return" nillable="true" type="ax230:KubernetesCluster"></xs:element>
+=======
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax233:KubernetesCluster"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -312,7 +539,11 @@
<xs:element name="CloudControllerServiceInvalidServiceGroupException">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax222:InvalidServiceGroupException"></xs:element>
+=======
+ <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax228:InvalidServiceGroupException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -354,42 +585,66 @@
<xs:element name="getServiceGroupDependenciesResponse">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="return" nillable="true" type="ax224:Dependencies"></xs:element>
+=======
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax225:Dependencies"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CloudControllerServiceCartridgeNotFoundException">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax222:CartridgeNotFoundException"></xs:element>
+=======
+ <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax228:CartridgeNotFoundException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CloudControllerServiceCloudControllerException">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax222:CloudControllerException"></xs:element>
+=======
+ <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax228:CloudControllerException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="startInstances">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element maxOccurs="unbounded" minOccurs="0" name="instanceContexts" nillable="true" type="ax224:InstanceContext"></xs:element>
+=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="instanceContexts" nillable="true" type="ax225:InstanceContext"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="startInstancesResponse">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax224:MemberContext"></xs:element>
+=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax225:MemberContext"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CloudControllerServiceInvalidClusterException">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax222:InvalidClusterException"></xs:element>
+=======
+ <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax228:InvalidClusterException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -410,14 +665,22 @@
<xs:element name="getCartridgeInfoResponse">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="return" nillable="true" type="ax224:CartridgeInfo"></xs:element>
+=======
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax225:CartridgeInfo"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CloudControllerServiceInvalidPartitionException">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax222:InvalidPartitionException"></xs:element>
+=======
+ <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax228:InvalidPartitionException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -425,7 +688,11 @@
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax224:Partition"></xs:element>
+=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax225:Partition"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -439,7 +706,11 @@
<xs:element name="validatePartition">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element>
+=======
+ <xs:element minOccurs="0" name="partition" nillable="true" type="ax225:Partition"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -460,7 +731,11 @@
<xs:element name="getClusterContextResponse">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="return" nillable="true" type="ax224:ClusterContext"></xs:element>
+=======
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax225:ClusterContext"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -470,14 +745,22 @@
<xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="status" nillable="true" type="ax232:ClusterStatus"></xs:element>
+=======
+ <xs:element minOccurs="0" name="status" nillable="true" type="ax234:ClusterStatus"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CloudControllerServiceApplicationClusterRegistrationException">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="ApplicationClusterRegistrationException" nillable="true" type="ax222:ApplicationClusterRegistrationException"></xs:element>
+=======
+ <xs:element minOccurs="0" name="ApplicationClusterRegistrationException" nillable="true" type="ax228:ApplicationClusterRegistrationException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -485,14 +768,22 @@
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="appId" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element maxOccurs="unbounded" minOccurs="0" name="appClustersContexts" nillable="true" type="ax224:ApplicationClusterContext"></xs:element>
+=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="appClustersContexts" nillable="true" type="ax225:ApplicationClusterContext"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CloudControllerServiceClusterInstanceCreationException">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="ClusterInstanceCreationException" nillable="true" type="ax222:ClusterInstanceCreationException"></xs:element>
+=======
+ <xs:element minOccurs="0" name="ClusterInstanceCreationException" nillable="true" type="ax228:ClusterInstanceCreationException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -551,28 +842,51 @@
<xs:element name="CloudControllerServiceDeploymentPolicyAlreadyExistsException">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax222:DeploymentPolicyAlreadyExistsException"></xs:element>
+=======
+ <xs:element minOccurs="0" name="DeploymentPolicyAlreadyExistsException" nillable="true" type="ax228:DeploymentPolicyAlreadyExistsException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CloudControllerServiceInvalidDeploymentPolicyException">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax222:InvalidDeploymentPolicyException"></xs:element>
+=======
+ <xs:element minOccurs="0" name="InvalidDeploymentPolicyException" nillable="true" type="ax228:InvalidDeploymentPolicyException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addDeployementPolicy">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax224:DeploymentPolicy"></xs:element>
+=======
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax225:DeploymentPolicy"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceDeploymentPolicyNotExistsException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="DeploymentPolicyNotExistsException" nillable="true" type="ax228:DeploymentPolicyNotExistsException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="updateDeployementPolicy">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax224:DeploymentPolicy"></xs:element>
+=======
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax225:DeploymentPolicy"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -583,52 +897,89 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceInvalidMemberException">
+ <xs:element name="CloudControllerServiceUnregisteredClusterException">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax222:InvalidMemberException"></xs:element>
+=======
+ <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax228:UnregisteredClusterException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="terminateInstance">
+ <xs:element name="unregisterService">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
+<<<<<<< HEAD
<xs:element name="CloudControllerServiceUnregisteredClusterException">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax222:UnregisteredClusterException"></xs:element>
+=======
+ <xs:element name="getDeploymentPolicy">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="unregisterService">
+ <xs:element name="getDeploymentPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax225:DeploymentPolicy"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceInvalidMemberException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax228:InvalidMemberException"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="terminateInstance">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="startInstance">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax224:InstanceContext"></xs:element>
+=======
+ <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax225:InstanceContext"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="startInstanceResponse">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="return" nillable="true" type="ax224:MemberContext"></xs:element>
+=======
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax225:MemberContext"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addServiceGroup">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax224:ServiceGroup"></xs:element>
+=======
+ <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax225:ServiceGroup"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -649,14 +1000,22 @@
<xs:element name="getServiceGroupResponse">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="return" nillable="true" type="ax224:ServiceGroup"></xs:element>
+=======
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax225:ServiceGroup"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="registerService">
<xs:complexType>
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="registrant" nillable="true" type="ax224:Registrant"></xs:element>
+=======
+ <xs:element minOccurs="0" name="registrant" nillable="true" type="ax225:Registrant"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -682,7 +1041,11 @@
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://common.stratos.apache.org/xsd">
<xs:complexType name="Properties">
<xs:sequence>
+<<<<<<< HEAD
<xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax226:Property"></xs:element>
+=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax229:Property"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
<xs:complexType name="Property">
@@ -693,9 +1056,12 @@
</xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.controller.cloud.stratos.apache.org/xsd">
+<<<<<<< HEAD
<xs:complexType name="DeploymentPolicyNotExistsException">
<xs:sequence></xs:sequence>
</xs:complexType>
+=======
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:complexType name="InvalidCartridgeDefinitionException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
@@ -706,9 +1072,12 @@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+<<<<<<< HEAD
<xs:complexType name="CartridgeAlreadyExistsException">
<xs:sequence></xs:sequence>
</xs:complexType>
+=======
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:complexType name="CartridgeDefinitionNotExistsException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
@@ -750,6 +1119,12 @@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+<<<<<<< HEAD
+=======
+ <xs:complexType name="CartridgeAlreadyExistsException">
+ <xs:sequence></xs:sequence>
+ </xs:complexType>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:complexType name="InvalidKubernetesClusterException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
@@ -798,12 +1173,19 @@
<xs:complexType name="InvalidDeploymentPolicyException">
<xs:sequence></xs:sequence>
</xs:complexType>
+<<<<<<< HEAD
<xs:complexType name="InvalidMemberException">
+=======
+ <xs:complexType name="DeploymentPolicyNotExistsException">
+ <xs:sequence></xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="UnregisteredClusterException">
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="UnregisteredClusterException">
+ <xs:complexType name="InvalidMemberException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
@@ -845,19 +1227,31 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
+<<<<<<< HEAD
<xs:schema xmlns:ax227="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.controller.cloud.stratos.apache.org/xsd">
+=======
+ <xs:schema xmlns:ax230="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.controller.cloud.stratos.apache.org/xsd">
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:import namespace="http://common.stratos.apache.org/xsd"></xs:import>
<xs:complexType name="DeploymentPolicy">
<xs:sequence>
<xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionsRef" nillable="true" type="ax224:NetworkPartitionRef"></xs:element>
+=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkPartitionsRef" nillable="true" type="ax225:NetworkPartitionRef"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
<xs:complexType name="NetworkPartitionRef">
<xs:sequence>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax224:PartitionRef"></xs:element>
+=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax225:PartitionRef"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
<xs:complexType name="PartitionRef">
@@ -878,6 +1272,7 @@
<xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"></xs:element>
<xs:element maxOccurs="unbounded" minOccurs="0" name="exportingProperties" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax224:IaasConfig"></xs:element>
<xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element>
<xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax224:LoadbalancerConfig"></xs:element>
@@ -886,6 +1281,16 @@
<xs:element minOccurs="0" name="persistence" nillable="true" type="ax224:Persistence"></xs:element>
<xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax224:PortMapping"></xs:element>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax225:IaasConfig"></xs:element>
+ <xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax225:LoadbalancerConfig"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="metadataKeys" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="persistence" nillable="true" type="ax225:Persistence"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax225:PortMapping"></xs:element>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="tenantPartitions" nillable="true" type="xs:string"></xs:element>
@@ -900,29 +1305,47 @@
<xs:element minOccurs="0" name="identity" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax224:NetworkInterfaces"></xs:element>
<xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"></xs:element>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+=======
+ <xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax225:NetworkInterfaces"></xs:element>
+ <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"></xs:element>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="NetworkInterfaces">
<xs:sequence>
+<<<<<<< HEAD
<xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax224:NetworkInterface"></xs:element>
+=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax225:NetworkInterface"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
<xs:complexType name="NetworkInterface">
<xs:sequence>
<xs:element minOccurs="0" name="fixedIp" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="floatingNetworks" nillable="true" type="ax224:FloatingNetworks"></xs:element>
+=======
+ <xs:element minOccurs="0" name="floatingNetworks" nillable="true" type="ax225:FloatingNetworks"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="portUuid" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="FloatingNetworks">
<xs:sequence>
+<<<<<<< HEAD
<xs:element maxOccurs="unbounded" minOccurs="0" name="floatingNetworks" nillable="true" type="ax224:FloatingNetwork"></xs:element>
+=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="floatingNetworks" nillable="true" type="ax225:FloatingNetwork"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
<xs:complexType name="FloatingNetwork">
@@ -934,14 +1357,22 @@
</xs:complexType>
<xs:complexType name="LoadbalancerConfig">
<xs:sequence>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+=======
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="Persistence">
<xs:sequence>
<xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"></xs:element>
+<<<<<<< HEAD
<xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax224:Volume"></xs:element>
+=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax225:Volume"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
<xs:complexType name="Volume">
@@ -970,7 +1401,11 @@
<xs:element minOccurs="0" name="activeByDefault" type="xs:boolean"></xs:element>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax224:Partition"></xs:element>
+=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax225:Partition"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
<xs:complexType name="Partition">
@@ -979,7 +1414,11 @@
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element>
<xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+=======
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
@@ -997,8 +1436,13 @@
<xs:element minOccurs="0" name="initTime" type="xs:long"></xs:element>
<xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"></xs:element>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+=======
+ <xs:element minOccurs="0" name="partition" nillable="true" type="ax225:Partition"></xs:element>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
<xs:complexType name="MemberContext">
@@ -1013,15 +1457,25 @@
<xs:element minOccurs="0" name="dynamicPayload" nillable="true" type="xs:anyType"></xs:element>
<xs:element minOccurs="0" name="initTime" type="xs:long"></xs:element>
<xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="instanceMetadata" nillable="true" type="ax224:InstanceMetadata"></xs:element>
+=======
+ <xs:element minOccurs="0" name="instanceMetadata" nillable="true" type="ax225:InstanceMetadata"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"></xs:element>
<xs:element minOccurs="0" name="obsoleteInitTime" type="xs:long"></xs:element>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="partition" nillable="true" type="ax224:Partition"></xs:element>
<xs:element maxOccurs="unbounded" minOccurs="0" name="privateIPs" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+=======
+ <xs:element minOccurs="0" name="partition" nillable="true" type="ax225:Partition"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="privateIPs" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:element maxOccurs="unbounded" minOccurs="0" name="publicIPs" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
@@ -1040,7 +1494,11 @@
</xs:complexType>
<xs:complexType name="CartridgeInfo">
<xs:sequence>
+<<<<<<< HEAD
<xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax224:AppType"></xs:element>
+=======
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax225:AppType"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="category" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"></xs:element>
@@ -1050,12 +1508,21 @@
<xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax224:LoadbalancerConfig"></xs:element>
<xs:element maxOccurs="unbounded" minOccurs="0" name="metadataKeys" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element>
<xs:element minOccurs="0" name="persistence" nillable="true" type="ax224:Persistence"></xs:element>
<xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax224:PortMapping"></xs:element>
<xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax226:Property"></xs:element>
+=======
+ <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax225:LoadbalancerConfig"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="metadataKeys" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="persistence" nillable="true" type="ax225:Persistence"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax225:PortMapping"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax230:Property"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="tenantPartitions" nillable="true" type="xs:string"></xs:element>
@@ -1079,10 +1546,17 @@
<xs:element minOccurs="0" name="kubernetesServices" nillable="true" type="xs:anyType"></xs:element>
<xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element>
<xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
<xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"></xs:element>
<xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"></xs:element>
<xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax224:Volume"></xs:element>
+=======
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
+ <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"></xs:element>
+ <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax225:Volume"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
</xs:sequence>
</xs:complexType>
<xs:complexType name="ApplicationClusterContext">
@@ -1094,7 +1568,11 @@
<xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+=======
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
@@ -1102,7 +1580,11 @@
<xs:complexType name="ServiceGroup">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="dependencies" nillable="true" type="ax224:Dependencies"></xs:element>
+=======
+ <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax225:Dependencies"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
<xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
@@ -1115,8 +1597,13 @@
<xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element>
+<<<<<<< HEAD
<xs:element minOccurs="0" name="persistence" nillable="true" type="ax224:Persistence"></xs:element>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax226:Properties"></xs:element>
+=======
+ <xs:element minOccurs="0" name="persistence" nillable="true" type="ax225:Persistence"></xs:element>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax230:Properties"></xs:element>
+>>>>>>> adding getApplicationPolicy web service, rest API and updating AS CC wsdls
<xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
@@ -1392,18 +1879,18 @@
<wsdl:message name="removeCartridgeRequest">
<wsdl:part name="parameters" element="ns:removeCartridge"></wsdl:part>
</wsdl:message>
- <wsdl:message name="getNetworkPartitionsRequest">
- <wsdl:part name="parameters" element="ns:getNetworkPartitions"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNetworkPartitionsResponse">
- <wsdl:part name="parameters" element="ns:getNetworkPartitionsResponse"></wsdl:part>
- </wsdl:message>
<wsdl:message name="addCartridgeRequest">
<wsdl:part name="parameters" element="ns:addCartridge"></wsdl:part>
</wsdl:message>
<wsdl:message name="CloudControllerServiceCartridgeAlreadyExistsException">
<wsdl:part name="parameters" element="ns:CloudControllerServiceCartridgeAlreadyExistsException"></wsdl:part>
</wsdl:message>
+ <wsdl:message name="getNetworkPartitionsRequest">
+ <wsdl:part name="parameters" element="ns:getNetworkPartitions"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="getNetworkPartitionsResponse">
+ <wsdl:part name="parameters" element="ns:getNetworkPartitionsResponse"></wsdl:part>
+ </wsdl:message>
<wsdl:portType name="CloudControllerServicePortType">
<wsdl:operation name="getDeploymentPolicies">
<wsdl:input message="ns:getDeploymentPoliciesRequest" wsaw:Action="urn:getDeploymentPolicies"></wsdl:input>
@@ -1602,16 +2089,16 @@
<wsdl:input message="ns:removeCartridgeRequest" wsaw:Action="urn:removeCartridge"></wsdl:input>
<wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeTypeException" name="CloudControllerServiceInvalidCartridgeTypeException" wsaw:Action="urn:removeCartridgeCloudControllerServiceInvalidCartridgeTypeException"></wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="getNetworkPartitions">
- <wsdl:input message="ns:getNetworkPartitionsRequest" wsaw:Action="urn:getNetworkPartitions"></wsdl:input>
- <wsdl:output message="ns:getNetworkPartitionsResponse" wsaw:Action="urn:getNetworkPartitionsResponse"></wsdl:output>
- </wsdl:operation>
<wsdl:operation name="addCartridge">
<wsdl:input message="ns:addCartridgeRequest" wsaw:Action="urn:addCartridge"></wsdl:input>
<wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeDefinitionException" name="CloudControllerServiceInvalidCartridgeDefinitionException" wsaw:Action="urn:addCartridgeCloudControllerServiceInvalidCartridgeDefinitionException"></wsdl:fault>
<wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:addCartridgeCloudControllerServiceInvalidIaasProviderException"></wsdl:fault>
<wsdl:fault message="ns:CloudControllerServiceCartridgeAlreadyExistsException" name="CloudControllerServiceCartridgeAlreadyExistsException" wsaw:Action="urn:addCartridgeCloudControllerServiceCartridgeAlreadyExistsException"></wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="getNetworkPartitions">
+ <wsdl:input message="ns:getNetworkPartitionsRequest" wsaw:Action="urn:getNetworkPartitions"></wsdl:input>
+ <wsdl:output message="ns:getNetworkPartitionsResponse" wsaw:Action="urn:getNetworkPartitionsResponse"></wsdl:output>
+ </wsdl:operation>
</wsdl:portType>
<wsdl:binding name="CloudControllerServiceSoap11Binding" type="ns:CloudControllerServicePortType">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"></soap:binding>
@@ -2083,6 +2570,15 @@
<soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="getNetworkPartitions">
+ <soap:operation soapAction="urn:getNetworkPartitions" style="document"></soap:operation>
+ <wsdl:input>
+ <soap:body use="literal"></soap:body>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"></soap:body>
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="addCartridge">
<soap:operation soapAction="urn:addCartridge" style="document"></soap:operation>
<wsdl:input>
@@ -2098,15 +2594,6 @@
<soap:fault use="literal" name="CloudControllerServiceCartridgeAlreadyExistsException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="getNetworkPartitions">
- <soap:operation soapAction="urn:getNetworkPartitions" style="document"></soap:operation>
- <wsdl:input>
- <soap:body use="literal"></soap:body>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"></soap:body>
- </wsdl:output>
- </wsdl:operation>
</wsdl:binding>
<wsdl:binding name="CloudControllerServiceSoap12Binding" type="ns:CloudControllerServicePortType">
<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"></soap12:binding>
@@ -2578,6 +3065,15 @@
<soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="getNetworkPartitions">
+ <soap12:operation soapAction="urn:getNetworkPartitions" style="document"></soap12:operation>
+ <wsdl:input>
+ <soap12:body use="literal"></soap12:body>
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal"></soap12:body>
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="addCartridge">
<soap12:operation soapAction="urn:addCartridge" style="document"></soap12:operation>
<wsdl:input>
@@ -2593,15 +3089,6 @@
<soap12:fault use="literal" name="CloudControllerServiceCartridgeAlreadyExistsException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="getNetworkPartitions">
- <soap12:operation soapAction="urn:getNetworkPartitions" style="document"></soap12:operation>
- <wsdl:input>
- <soap12:body use="literal"></soap12:body>
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal"></soap12:body>
- </wsdl:output>
- </wsdl:operation>
</wsdl:binding>
<wsdl:binding name="CloudControllerServiceHttpBinding" type="ns:CloudControllerServicePortType">
<http:binding verb="POST"></http:binding>
@@ -2926,12 +3413,6 @@
<mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
</wsdl:operation>
- <wsdl:operation name="addCartridge">
- <http:operation location="addCartridge"></http:operation>
- <wsdl:input>
- <mime:content type="text/xml" part="parameters"></mime:content>
- </wsdl:input>
- </wsdl:operation>
<wsdl:operation name="getNetworkPartitions">
<http:operation location="getNetworkPartitions"></http:operation>
<wsdl:input>
@@ -2941,6 +3422,12 @@
<mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="addCartridge">
+ <http:operation location="addCartridge"></http:operation>
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters"></mime:content>
+ </wsdl:input>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="CloudControllerService">
<wsdl:port name="CloudControllerServiceHttpSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding">