Fixed group deployment changes V1
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/44606680 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/44606680 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/44606680 Branch: refs/heads/master Commit: 446066809153f34fd75df77d07a7dfd0d908bc0c Parents: 6dda7fa Author: Manula Thantriwatte <[email protected]> Authored: Tue Dec 2 10:10:56 2014 +0000 Committer: Manula Thantriwatte <[email protected]> Committed: Tue Dec 2 11:28:39 2014 +0000 ---------------------------------------------------------------------- .../stratos/autoscaler/pojo/ServiceGroup.java | 7 +- .../definitions/ServiceGroupDefinition.java | 2 +- .../deployer/DefaultServiceGroupDeployer.java | 79 +++- .../bean/util/converter/PojoConverter.java | 56 ++- .../src/main/resources/AutoScalerService.wsdl | 438 +++++++++---------- 5 files changed, 340 insertions(+), 242 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/44606680/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/ServiceGroup.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/ServiceGroup.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/ServiceGroup.java index 810998c..381f505 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/ServiceGroup.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/ServiceGroup.java @@ -30,7 +30,7 @@ public class ServiceGroup implements Serializable { private boolean isGroupscalingEnabled; - private List<ServiceGroup> groups; + private ServiceGroup[] groups; private String [] cartridges; @@ -44,7 +44,6 @@ public class ServiceGroup implements Serializable { this.name = name; } - public String [] getCartridges() { return cartridges; } @@ -69,11 +68,11 @@ public class ServiceGroup implements Serializable { this.isGroupscalingEnabled = isGroupscalingEnabled; } - public List<ServiceGroup> getGroups() { + public ServiceGroup[] getGroups() { return groups; } - public void setGroups(List<ServiceGroup> groups) { + public void setGroups(ServiceGroup[] groups) { this.groups = groups; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/44606680/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java index 55278f0..a459e7a 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/definitions/ServiceGroupDefinition.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.List; -@XmlRootElement(name = "serviceGroup") +@XmlRootElement(name = "groups") public class ServiceGroupDefinition implements Serializable { private String name; http://git-wip-us.apache.org/repos/asf/stratos/blob/44606680/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java index da1c326..20e4a4c 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java @@ -36,6 +36,7 @@ import org.apache.stratos.manager.exception.ServiceGroupDefinitioException; import org.apache.stratos.manager.grouping.definitions.DependencyDefinitions; import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition; +import java.lang.reflect.Array; import java.rmi.RemoteException; import java.util.*; @@ -147,15 +148,15 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { throw new InvalidServiceGroupException("Invalid Service Group definition, duplicate subGroups defined:" + buf.toString()); } - for (String subGroupName : groupNames) { - if (getServiceGroupDefinition(subGroupName) == null) { - // sub group not deployed, can't continue - if (log.isDebugEnabled()) { - log.debug("invalid sub group found in service group " + subGroupName); - } - throw new InvalidServiceGroupException("No Service Group Definition found with name " + subGroupName); - } - } +// for (String subGroupName : groupNames) { +// if (getServiceGroupDefinition(subGroupName) == null) { +// // sub group not deployed, can't continue +// if (log.isDebugEnabled()) { +// log.debug("invalid sub group found in service group " + subGroupName); +// } +// throw new InvalidServiceGroupException("No Service Group Definition found with name " + subGroupName); +// } +// } } AutoscalerServiceClient asServiceClient = null; @@ -285,10 +286,16 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { cartridgesDef = new ArrayList<String>(0); } - String[] subGroups = new String[groupsDef.size()]; + ServiceGroup[] subGroups = new ServiceGroup[groupsDef.size()]; String[] cartridges = new String[cartridgesDef.size()]; - subGroups = groupsDef.toArray(subGroups); + for (ServiceGroupDefinition groupDefinition : groupsDef) { + int i = 0; + subGroups[i] = pojoConversion(groupDefinition); + ++i; + } + + //subGroups = groupsDef.toArray(subGroups); cartridges = cartridgesDef.toArray(cartridges); servicegroup.setGroups(subGroups); @@ -313,11 +320,57 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { return servicegroup; } + private ServiceGroup pojoConversion (ServiceGroupDefinition serviceGroupDefinition) { + ServiceGroup servicegroup = new ServiceGroup(); + + servicegroup.setGroupscalingEnabled(serviceGroupDefinition.isGroupScalingEnabled()); + List<String> cartridgesDef = serviceGroupDefinition.getCartridges(); + List<ServiceGroupDefinition> groupsDef = serviceGroupDefinition.getGroups(); + + servicegroup.setName(serviceGroupDefinition.getName()); + + if (cartridgesDef == null) { + cartridgesDef = new ArrayList<String>(0); + } + + if (groupsDef == null) { + groupsDef = new ArrayList<ServiceGroupDefinition>(0); + } + + ServiceGroup[] subGroups = new ServiceGroup[groupsDef.size()]; + String[] cartridges = new String[cartridgesDef.size()]; + + cartridges = cartridgesDef.toArray(cartridges); + servicegroup.setCartridges(cartridges); + + DependencyDefinitions depDefs = serviceGroupDefinition.getDependencies(); + + if (depDefs != null) { + Dependencies deps = new Dependencies(); + List<String> startupOrdersDef = depDefs.getStartupOrders(); + if (startupOrdersDef != null) { + String[] startupOrders = new String[startupOrdersDef.size()]; + startupOrders = startupOrdersDef.toArray(startupOrders); + deps.setStartupOrders(startupOrders); + } + // validate termination behavior + //validateTerminationBehavior(depDefs.getTerminationBehaviour()); + deps.setTerminationBehaviour(depDefs.getTerminationBehaviour()); + servicegroup.setDependencies(deps); + } + + for (ServiceGroupDefinition groupDefinition : groupsDef) { + pojoConversion(groupDefinition); + } + + return servicegroup; + } + private ServiceGroupDefinition populateServiceGroupDefinitionPojo(ServiceGroup serviceGroup) { ServiceGroupDefinition servicegroupDef = new ServiceGroupDefinition(); servicegroupDef.setName(serviceGroup.getName()); String[] cartridges = serviceGroup.getCartridges(); - ServiceGroupDefinition groups = (ServiceGroupDefinition) serviceGroup.getGroups(); + ServiceGroup[] groups = serviceGroup.getGroups(); org.apache.stratos.autoscaler.stub.pojo.Dependencies deps = serviceGroup.getDependencies(); if (deps != null) { @@ -339,7 +392,7 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { } List<String> cartridgesDef = new ArrayList<String>(Arrays.asList(cartridges)); - List<ServiceGroupDefinition> subGroupsDef = new ArrayList<ServiceGroupDefinition>(Arrays.asList(groups)); + List<ServiceGroupDefinition> subGroupsDef = new ArrayList<ServiceGroupDefinition>(groups.length); if (cartridges[0] != null) { servicegroupDef.setCartridges(cartridgesDef); } http://git-wip-us.apache.org/repos/asf/stratos/blob/44606680/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index 0f218ba..605fa91 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@ -23,10 +23,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.stratos.autoscaler.stub.deployment.partition.ChildLevelPartition; import org.apache.stratos.autoscaler.stub.deployment.partition.ChildLevelNetworkPartition; import org.apache.stratos.autoscaler.stub.deployment.policy.ChildPolicy; -import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext; -import org.apache.stratos.autoscaler.stub.pojo.DependencyContext; -import org.apache.stratos.autoscaler.stub.pojo.GroupContext; -import org.apache.stratos.autoscaler.stub.pojo.SubscribableInfoContext; +import org.apache.stratos.autoscaler.stub.pojo.*; import org.apache.stratos.cloud.controller.stub.domain.*; import org.apache.stratos.common.Properties; import org.apache.stratos.common.Property; @@ -35,6 +32,7 @@ import org.apache.stratos.manager.composite.application.beans.GroupDefinition; import org.apache.stratos.manager.composite.application.beans.SubscribableDefinition; import org.apache.stratos.manager.composite.application.beans.SubscribableInfo; import org.apache.stratos.manager.deploy.service.Service; +import org.apache.stratos.manager.exception.ServiceGroupDefinitioException; import org.apache.stratos.manager.grouping.definitions.DependencyDefinitions; import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition; import org.apache.stratos.manager.subscription.SubscriptionDomain; @@ -125,11 +123,59 @@ public class PojoConverter { public static ServiceGroup populateServiceGroupPojo(ServiceGroupDefinition serviceGroupDefinition) { ServiceGroup servicegroup = new ServiceGroup(); - // implement conversion (mostly List -> Array) + servicegroup.setGroupscalingEnabled(serviceGroupDefinition.isGroupScalingEnabled()); + List<String> cartridgesDef = serviceGroupDefinition.getCartridges(); + List<ServiceGroupDefinition> groupsDef = serviceGroupDefinition.getGroups(); + + servicegroup.setName(serviceGroupDefinition.getName()); + + if (cartridgesDef == null) { + cartridgesDef = new ArrayList<String>(0); + } + + if (groupsDef == null) { + groupsDef = new ArrayList<ServiceGroupDefinition>(0); + } + + ServiceGroup[] subGroups = new ServiceGroup[groupsDef.size()]; + String[] cartridges = new String[cartridgesDef.size()]; + + cartridges = cartridgesDef.toArray(cartridges); + servicegroup.setCartridges(cartridges); + + DependencyDefinitions depDefs = serviceGroupDefinition.getDependencies(); + + if (depDefs != null) { + Dependencies deps = new Dependencies(); + List<String> startupOrdersDef = depDefs.getStartupOrders(); + if (startupOrdersDef != null) { + String[] startupOrders = new String[startupOrdersDef.size()]; + startupOrders = startupOrdersDef.toArray(startupOrders); + deps.setStartupOrders(startupOrders); + } + // validate termination behavior + //validateTerminationBehavior(depDefs.getTerminationBehaviour()); + deps.setTerminationBehaviour(depDefs.getTerminationBehaviour()); + servicegroup.setDependencies(deps); + } + + for (ServiceGroupDefinition groupDefinition : groupsDef) { + populateServiceGroupPojo(groupDefinition); + } return servicegroup; } + private static void validateTerminationBehavior(String terminationBehavior) throws ServiceGroupDefinitioException { + + if (!(terminationBehavior == null || "terminate-none".equals(terminationBehavior) || + "terminate-dependents".equals(terminationBehavior) || "terminate-all".equals(terminationBehavior))) { + throw new ServiceGroupDefinitioException("Invalid Termination Behaviour specified: [ " + + terminationBehavior + " ], should be one of 'terminate-none', 'terminate-dependents', " + + " 'terminate-all' "); + } + } + private static Container getContainer(ContainerBean container) { Container cn = new Container(); http://git-wip-us.apache.org/repos/asf/stratos/blob/44606680/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 201acbd..4081a1d 100644 --- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl +++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl @@ -1,4 +1,4 @@ -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax29="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ns="http://api.autoscaler.stratos.apache.org" xmlns:ax25="http://kubernetes.common.stratos.apache.org/xsd" xmlns:ax26="http://common.stratos.apache.org/xsd" xmlns:ax23="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax216="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax219="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax221="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax212="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax223="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax211="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:http="http://schemas.xmlso ap.org/wsdl/http/" xmlns:ax226="http://pojo.applications.autoscaler.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://api.autoscaler.stratos.apache.org"> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax29="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ns="http://api.autoscaler.stratos.apache.org" xmlns:ax25="http://kubernetes.common.stratos.apache.org/xsd" xmlns:ax26="http://common.stratos.apache.org/xsd" xmlns:ax23="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax216="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax219="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax227="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax214="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax212="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax221="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax224="http://exce ption.autoscaler.stratos.apache.org/xsd" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 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://api.autoscaler.stratos.apache.org"> <wsdl:documentation>AutoScalerService</wsdl:documentation> <wsdl:types> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"> @@ -9,15 +9,15 @@ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="instanceRoundingFactor" type="xs:float"></xs:element> <xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element> - <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax219:LoadThresholds"></xs:element> + <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax212:LoadThresholds"></xs:element> <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="LoadThresholds"> <xs:sequence> - <xs:element minOccurs="0" name="loadAverage" nillable="true" type="ax219:LoadAverageThresholds"></xs:element> - <xs:element minOccurs="0" name="memoryConsumption" nillable="true" type="ax219:MemoryConsumptionThresholds"></xs:element> - <xs:element minOccurs="0" name="requestsInFlight" nillable="true" type="ax219:RequestsInFlightThresholds"></xs:element> + <xs:element minOccurs="0" name="loadAverage" nillable="true" type="ax212:LoadAverageThresholds"></xs:element> + <xs:element minOccurs="0" name="memoryConsumption" nillable="true" type="ax212:MemoryConsumptionThresholds"></xs:element> + <xs:element minOccurs="0" name="requestsInFlight" nillable="true" type="ax212:RequestsInFlightThresholds"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="LoadAverageThresholds"> @@ -39,16 +39,16 @@ </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:ax217="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:import> <xs:complexType name="ApplicationContext"> <xs:sequence> <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="components" nillable="true" type="ax226:ComponentContext"></xs:element> + <xs:element minOccurs="0" name="components" nillable="true" type="ax216:ComponentContext"></xs:element> <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax226:SubscribableInfoContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableInfoContext" nillable="true" type="ax216:SubscribableInfoContext"></xs:element> <xs:element minOccurs="0" name="teantAdminUsername" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> @@ -56,9 +56,9 @@ </xs:complexType> <xs:complexType name="ComponentContext"> <xs:sequence> - <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax226:DependencyContext"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax226:GroupContext"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax226:SubscribableContext"></xs:element> + <xs:element minOccurs="0" name="dependencyContext" nillable="true" type="ax216:DependencyContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax216:GroupContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax216:SubscribableContext"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="DependencyContext"> @@ -72,13 +72,13 @@ <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="autoscalingPolicy" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax226:GroupContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groupContexts" nillable="true" type="ax216:GroupContext"></xs:element> <xs:element minOccurs="0" name="groupInstanceMonitoringEnabled" type="xs:boolean"></xs:element> <xs:element minOccurs="0" name="groupMaxInstances" type="xs:int"></xs:element> <xs:element minOccurs="0" name="groupMinInstances" type="xs:int"></xs:element> <xs:element minOccurs="0" name="groupScalingEnabled" type="xs:boolean"></xs:element> <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax226:SubscribableContext"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribableContexts" nillable="true" type="ax216:SubscribableContext"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="SubscribableContext"> @@ -107,10 +107,10 @@ <xs:complexType name="ServiceGroup"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax223:Dependencies"></xs:element> + <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax227:Dependencies"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="groups" nillable="true" type="ax227:ServiceGroup"></xs:element> <xs:element minOccurs="0" name="groupscalingEnabled" type="xs:boolean"></xs:element> <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> </xs:complexType> <xs:complexType name="Dependencies"> @@ -121,16 +121,16 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax214="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"> + <xs:schema xmlns:ax222="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"> <xs:import namespace="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"></xs:import> <xs:complexType name="DeploymentPolicy"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax214:Partition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax29:Partition"></xs:element> <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationLevelNetworkPartitions" nillable="true" type="ax214:ApplicationLevelNetworkPartition"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelNetworkPartitions" nillable="true" type="ax214:ChildLevelNetworkPartition"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="childPolicies" nillable="true" type="ax211:ChildPolicy"></xs:element> - <xs:element minOccurs="0" name="childPolicyHolder" nillable="true" type="ax214:ChildPolicyHolder"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="applicationLevelNetworkPartitions" nillable="true" type="ax29:ApplicationLevelNetworkPartition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelNetworkPartitions" nillable="true" type="ax29:ChildLevelNetworkPartition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="childPolicies" nillable="true" type="ax221:ChildPolicy"></xs:element> + <xs:element minOccurs="0" name="childPolicyHolder" nillable="true" type="ax29:ChildPolicyHolder"></xs:element> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="isPublic" type="xs:boolean"></xs:element> @@ -139,7 +139,7 @@ </xs:complexType> <xs:complexType name="ChildPolicy"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelNetworkPartitions" nillable="true" type="ax214:ChildLevelNetworkPartition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelNetworkPartitions" nillable="true" type="ax29:ChildLevelNetworkPartition"></xs:element> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> @@ -151,7 +151,7 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax213="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"> + <xs:schema xmlns:ax210="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"> <xs:import namespace="http://common.stratos.apache.org/xsd"></xs:import> <xs:complexType name="Partition"> <xs:sequence> @@ -166,12 +166,12 @@ <xs:sequence> <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 maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax212:Partition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax29:Partition"></xs:element> </xs:sequence> </xs:complexType> <xs:complexType name="ChildLevelNetworkPartition"> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelPartitions" nillable="true" type="ax212:ChildLevelPartition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="childLevelPartitions" nillable="true" type="ax29:ChildLevelPartition"></xs:element> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="min" type="xs:int"></xs:element> <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"></xs:element> @@ -204,200 +204,189 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xs:schema xmlns:ax215="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax220="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax28="http://kubernetes.common.stratos.apache.org/xsd" xmlns:ax222="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax210="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax224="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax225="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax24="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax217="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax228="http://pojo.applications.autoscaler.stratos.apache.org/xsd" xmlns:ax218="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.autoscaler.stratos.apache.org"> + <xs:schema xmlns:ax215="http://application.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax220="http://policy.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax213="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax28="http://kubernetes.common.stratos.apache.org/xsd" xmlns:ax223="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax211="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax225="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax226="http://common.stratos.apache.org/xsd" xmlns:ax24="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd" xmlns:ax228="http://pojo.autoscaler.stratos.apache.org/xsd" xmlns:ax218="http://pojo.applications.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.autoscaler.stratos.apache.org"> <xs:import namespace="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd"></xs:import> <xs:import namespace="http://kubernetes.common.stratos.apache.org/xsd"></xs:import> + <xs:import namespace="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"></xs:import> + <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"></xs:import> + <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"></xs:import> + <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"></xs:import> <xs:import namespace="http://policy.exception.autoscaler.stratos.apache.org/xsd"></xs:import> <xs:import namespace="http://deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"></xs:import> <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"></xs:import> <xs:import namespace="http://common.stratos.apache.org/xsd"></xs:import> - <xs:import namespace="http://autoscale.policy.pojo.autoscaler.stratos.apache.org/xsd"></xs:import> - <xs:import namespace="http://application.exception.autoscaler.stratos.apache.org/xsd"></xs:import> <xs:import namespace="http://pojo.autoscaler.stratos.apache.org/xsd"></xs:import> - <xs:import namespace="http://network.partition.deployment.policy.pojo.autoscaler.stratos.apache.org/xsd"></xs:import> - <xs:import namespace="http://pojo.applications.autoscaler.stratos.apache.org/xsd"></xs:import> - <xs:element name="AutoScalerServiceInvalidKubernetesMasterException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidKubernetesMasterException" nillable="true" type="ax23:InvalidKubernetesMasterException"></xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="AutoScalerServiceNonExistingKubernetesMasterException"> + <xs:element name="AutoScalerServiceNonExistingKubernetesGroupException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="NonExistingKubernetesMasterException" nillable="true" type="ax23:NonExistingKubernetesMasterException"></xs:element> + <xs:element minOccurs="0" name="NonExistingKubernetesGroupException" nillable="true" type="ax23:NonExistingKubernetesGroupException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateKubernetesMaster"> + <xs:element name="getKubernetesGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax28:KubernetesMaster"></xs:element> + <xs:element minOccurs="0" name="kubernetesGroupId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateKubernetesMasterResponse"> + <xs:element name="getKubernetesGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax28:KubernetesGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoScalerServiceInvalidKubernetesHostException"> + <xs:element name="getPartitionsOfGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidKubernetesHostException" nillable="true" type="ax23:InvalidKubernetesHostException"></xs:element> + <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoScalerServiceNonExistingKubernetesHostException"> + <xs:element name="getPartitionsOfGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="NonExistingKubernetesHostException" nillable="true" type="ax23:NonExistingKubernetesHostException"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:Partition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateKubernetesHost"> + <xs:element name="getAutoscalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax28:KubernetesHost"></xs:element> + <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateKubernetesHostResponse"> + <xs:element name="getAutoscalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoScalerServiceInvalidPolicyException"> + <xs:element name="AutoScalerServiceApplicationDefinitionException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax29:InvalidPolicyException"></xs:element> + <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax214:ApplicationDefinitionException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateDeploymentPolicy"> + <xs:element name="deployApplicationDefinition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax215:DeploymentPolicy"></xs:element> + <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax216:ApplicationContext"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateDeploymentPolicyResponse"> + <xs:element name="unDeployApplicationDefinition"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> + <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoScalerServiceInvalidArgumentException"> + <xs:element name="AutoScalerServiceInvalidKubernetesMasterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax217:InvalidArgumentException"></xs:element> + <xs:element minOccurs="0" name="InvalidKubernetesMasterException" nillable="true" type="ax23:InvalidKubernetesMasterException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateClusterMonitor"> + <xs:element name="AutoScalerServiceNonExistingKubernetesMasterException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"></xs:element> + <xs:element minOccurs="0" name="NonExistingKubernetesMasterException" nillable="true" type="ax23:NonExistingKubernetesMasterException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateAutoScalingPolicy"> + <xs:element name="updateKubernetesMaster"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax219:AutoscalePolicy"></xs:element> + <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax28:KubernetesMaster"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="updateAutoScalingPolicyResponse"> + <xs:element name="updateKubernetesMasterResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoScalerServiceAutoScalerException"> + <xs:element name="AutoScalerServiceInvalidKubernetesHostException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax217:AutoScalerException"></xs:element> + <xs:element minOccurs="0" name="InvalidKubernetesHostException" nillable="true" type="ax23:InvalidKubernetesHostException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="undeployServiceGroup"> + <xs:element name="AutoScalerServiceNonExistingKubernetesHostException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="NonExistingKubernetesHostException" nillable="true" type="ax23:NonExistingKubernetesHostException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoScalerServiceApplicationDefinitionException"> + <xs:element name="updateKubernetesHost"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax221:ApplicationDefinitionException"></xs:element> + <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax28:KubernetesHost"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="unDeployApplicationDefinition"> + <xs:element name="updateKubernetesHostResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="tenantId" type="xs:int"></xs:element> - <xs:element minOccurs="0" name="tenantDomain" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="serviceGroupExist"> + <xs:element name="AutoScalerServiceInvalidPolicyException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax219:InvalidPolicyException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="serviceGroupExistResponse"> + <xs:element name="updateDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax221:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeKubernetesHost"> + <xs:element name="updateDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="hostId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeKubernetesHostResponse"> + <xs:element name="getAllDeploymentPolicies"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> - </xs:sequence> + <xs:sequence></xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoScalerServiceNonExistingKubernetesGroupException"> + <xs:element name="getAllDeploymentPoliciesResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="NonExistingKubernetesGroupException" nillable="true" type="ax23:NonExistingKubernetesGroupException"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeKubernetesGroup"> + <xs:element name="getAllAutoScalingPolicy"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"></xs:element> - </xs:sequence> + <xs:sequence></xs:sequence> </xs:complexType> </xs:element> - <xs:element name="removeKubernetesGroupResponse"> + <xs:element name="getAllAutoScalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax212:AutoscalePolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -411,48 +400,49 @@ <xs:element name="getValidDeploymentPoliciesforCartridgeResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax221:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroups"> + <xs:element name="addDeploymentPolicy"> <xs:complexType> - <xs:sequence></xs:sequence> + <xs:sequence> + <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax221:DeploymentPolicy"></xs:element> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupsResponse"> + <xs:element name="addDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax223:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroup"> + <xs:element name="addAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax212:AutoscalePolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getServiceGroupResponse"> + <xs:element name="addAutoScalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax223:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getPartitionsOfGroup"> + <xs:element name="updateAutoScalingPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax212:AutoscalePolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getPartitionsOfGroupResponse"> + <xs:element name="updateAutoScalingPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax225:Partition"></xs:element> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -466,35 +456,33 @@ <xs:element name="getNetworkPartitionsResponse"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax225:ApplicationLevelNetworkPartition"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:ApplicationLevelNetworkPartition"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getMasterForKubernetesGroup"> + <xs:element name="getAllKubernetesGroups"> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="kubernetesGroupId" nillable="true" type="xs:string"></xs:element> - </xs:sequence> + <xs:sequence></xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getMasterForKubernetesGroupResponse"> + <xs:element name="getAllKubernetesGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax28:KubernetesMaster"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax28:KubernetesGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getKubernetesGroup"> + <xs:element name="getMasterForKubernetesGroup"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="kubernetesGroupId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getKubernetesGroupResponse"> + <xs:element name="getMasterForKubernetesGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax28:KubernetesGroup"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax28:KubernetesMaster"></xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -512,157 +500,174 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicy"> + <xs:element name="AutoScalerServiceInvalidKubernetesGroupException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="InvalidKubernetesGroupException" nillable="true" type="ax23:InvalidKubernetesGroupException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getDeploymentPolicyResponse"> + <xs:element name="addKubernetesGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"></xs:element> + <xs:element minOccurs="0" name="kubernetesGroup" nillable="true" type="ax28:KubernetesGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoscalingPolicy"> + <xs:element name="addKubernetesGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAutoscalingPolicyResponse"> + <xs:element name="addKubernetesHost"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax219:AutoscalePolicy"></xs:element> + <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax28:KubernetesHost"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAllKubernetesGroups"> + <xs:element name="addKubernetesHostResponse"> <xs:complexType> - <xs:sequence></xs:sequence> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAllKubernetesGroupsResponse"> + <xs:element name="removeKubernetesGroup"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax28:KubernetesGroup"></xs:element> + <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAllDeploymentPolicies"> + <xs:element name="removeKubernetesGroupResponse"> <xs:complexType> - <xs:sequence></xs:sequence> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAllDeploymentPoliciesResponse"> + <xs:element name="removeKubernetesHost"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax215:DeploymentPolicy"></xs:element> + <xs:element minOccurs="0" name="hostId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAllAutoScalingPolicy"> + <xs:element name="removeKubernetesHostResponse"> <xs:complexType> - <xs:sequence></xs:sequence> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="getAllAutoScalingPolicyResponse"> + <xs:element name="AutoScalerServiceInvalidArgumentException"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax219:AutoscalePolicy"></xs:element> + <xs:element minOccurs="0" name="InvalidArgumentException" nillable="true" type="ax224:InvalidArgumentException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoScalerServiceInvalidServiceGroupException"> + <xs:element name="updateClusterMonitor"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax23:InvalidServiceGroupException"></xs:element> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployServiceGroup"> + <xs:element name="AutoScalerServiceInvalidServiceGroupException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax223:ServiceGroup"></xs:element> + <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax23:InvalidServiceGroupException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="deployApplicationDefinition"> + <xs:element name="deployServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax226:ApplicationContext"></xs:element> + <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax228:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addKubernetesHost"> + <xs:element name="serviceGroupExist"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="kubernetesHost" nillable="true" type="ax28:KubernetesHost"></xs:element> + <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addKubernetesHostResponse"> + <xs:element name="serviceGroupExistResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="AutoScalerServiceInvalidKubernetesGroupException"> + <xs:element name="AutoScalerServiceAutoScalerException"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="InvalidKubernetesGroupException" nillable="true" type="ax23:InvalidKubernetesGroupException"></xs:element> + <xs:element minOccurs="0" name="AutoScalerException" nillable="true" type="ax224:AutoScalerException"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addKubernetesGroup"> + <xs:element name="undeployServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="kubernetesGroup" nillable="true" type="ax28:KubernetesGroup"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addKubernetesGroupResponse"> + <xs:element name="getDeploymentPolicy"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addDeploymentPolicy"> + <xs:element name="getDeploymentPolicyResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax215:DeploymentPolicy"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax221:DeploymentPolicy"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addDeploymentPolicyResponse"> + <xs:element name="getServiceGroup"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addAutoScalingPolicy"> + <xs:element name="getServiceGroupResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="autoscalePolicy" nillable="true" type="ax219:AutoscalePolicy"></xs:element> + <xs:element minOccurs="0" name="return" nillable="true" type="ax228:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="addAutoScalingPolicyResponse"> + <xs:element name="getServiceGroups"> + <xs:complexType> + <xs:sequence></xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="getServiceGroupsResponse"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax228:ServiceGroup"></xs:element> </xs:sequence> </xs:complexType> </xs:element> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://kubernetes.exception.autoscaler.stratos.apache.org/xsd"> + <xs:complexType name="NonExistingKubernetesGroupException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> + </xs:sequence> + </xs:complexType> <xs:complexType name="InvalidKubernetesMasterException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> @@ -683,7 +688,7 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="NonExistingKubernetesGroupException"> + <xs:complexType name="InvalidKubernetesGroupException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> @@ -693,14 +698,19 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidKubernetesGroupException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element> - </xs:sequence> - </xs:complexType> </xs:schema> <xs:schema xmlns:ax27="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://kubernetes.common.stratos.apache.org/xsd"> <xs:import namespace="http://common.stratos.apache.org/xsd"></xs:import> + <xs:complexType name="KubernetesGroup"> + <xs:sequence> + <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element> + <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"></xs:element> + <xs:element maxOccurs="unbounded" minOccurs="0" name="kubernetesHosts" nillable="true" type="ax25:KubernetesHost"></xs:element> + <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax25:KubernetesMaster"></xs:element> + <xs:element minOccurs="0" name="portRange" nillable="true" type="ax25:PortRange"></xs:element> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"></xs:element> + </xs:sequence> + </xs:complexType> <xs:complexType name="KubernetesHost"> <xs:sequence> <xs:element minOccurs="0" name="hostId" nillable="true" type="xs:string"></xs:element> @@ -718,16 +728,6 @@ </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="KubernetesGroup"> - <xs:sequence> - <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element> - <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"></xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" name="kubernetesHosts" nillable="true" type="ax25:KubernetesHost"></xs:element> - <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax25:KubernetesMaster"></xs:element> - <xs:element minOccurs="0" name="portRange" nillable="true" type="ax25:PortRange"></xs:element> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax27:Properties"></xs:element> - </xs:sequence> - </xs:complexType> <xs:complexType name="PortRange"> <xs:sequence> <xs:element minOccurs="0" name="lower" type="xs:int"></xs:element> @@ -1137,8 +1137,8 @@ <soap:fault use="literal" name="AutoScalerServiceAutoScalerException"></soap:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getAllAutoScalingPolicy"> - <soap:operation soapAction="urn:getAllAutoScalingPolicy" style="document"></soap:operation> + <wsdl:operation name="getPartitionsOfGroup"> + <soap:operation soapAction="urn:getPartitionsOfGroup" style="document"></soap:operation> <wsdl:input> <soap:body use="literal"></soap:body> </wsdl:input> @@ -1146,8 +1146,8 @@ <soap:body use="literal"></soap:body> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getPartitionsOfGroup"> - <soap:operation soapAction="urn:getPartitionsOfGroup" style="document"></soap:operation> + <wsdl:operation name="getAllAutoScalingPolicy"> + <soap:operation soapAction="urn:getAllAutoScalingPolicy" style="document"></soap:operation> <wsdl:input> <soap:body use="literal"></soap:body> </wsdl:input> @@ -1245,6 +1245,15 @@ <soap:body use="literal"></soap:body> </wsdl:output> </wsdl:operation> + <wsdl:operation name="undeployServiceGroup"> + <soap:operation soapAction="urn:undeployServiceGroup" style="document"></soap:operation> + <wsdl:input> + <soap:body use="literal"></soap:body> + </wsdl:input> + <wsdl:fault name="AutoScalerServiceAutoScalerException"> + <soap:fault use="literal" name="AutoScalerServiceAutoScalerException"></soap:fault> + </wsdl:fault> + </wsdl:operation> <wsdl:operation name="addKubernetesHost"> <soap:operation soapAction="urn:addKubernetesHost" style="document"></soap:operation> <wsdl:input> @@ -1260,15 +1269,6 @@ <soap:fault use="literal" name="AutoScalerServiceNonExistingKubernetesGroupException"></soap:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="undeployServiceGroup"> - <soap:operation soapAction="urn:undeployServiceGroup" style="document"></soap:operation> - <wsdl:input> - <soap:body use="literal"></soap:body> - </wsdl:input> - <wsdl:fault name="AutoScalerServiceAutoScalerException"> - <soap:fault use="literal" name="AutoScalerServiceAutoScalerException"></soap:fault> - </wsdl:fault> - </wsdl:operation> <wsdl:operation name="getAllAvailablePartitions"> <soap:operation soapAction="urn:getAllAvailablePartitions" style="document"></soap:operation> <wsdl:input> @@ -1470,8 +1470,8 @@ <soap12:fault use="literal" name="AutoScalerServiceAutoScalerException"></soap12:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="getAllAutoScalingPolicy"> - <soap12:operation soapAction="urn:getAllAutoScalingPolicy" style="document"></soap12:operation> + <wsdl:operation name="getPartitionsOfGroup"> + <soap12:operation soapAction="urn:getPartitionsOfGroup" style="document"></soap12:operation> <wsdl:input> <soap12:body use="literal"></soap12:body> </wsdl:input> @@ -1479,8 +1479,8 @@ <soap12:body use="literal"></soap12:body> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getPartitionsOfGroup"> - <soap12:operation soapAction="urn:getPartitionsOfGroup" style="document"></soap12:operation> + <wsdl:operation name="getAllAutoScalingPolicy"> + <soap12:operation soapAction="urn:getAllAutoScalingPolicy" style="document"></soap12:operation> <wsdl:input> <soap12:body use="literal"></soap12:body> </wsdl:input> @@ -1578,6 +1578,15 @@ <soap12:body use="literal"></soap12:body> </wsdl:output> </wsdl:operation> + <wsdl:operation name="undeployServiceGroup"> + <soap12:operation soapAction="urn:undeployServiceGroup" style="document"></soap12:operation> + <wsdl:input> + <soap12:body use="literal"></soap12:body> + </wsdl:input> + <wsdl:fault name="AutoScalerServiceAutoScalerException"> + <soap12:fault use="literal" name="AutoScalerServiceAutoScalerException"></soap12:fault> + </wsdl:fault> + </wsdl:operation> <wsdl:operation name="addKubernetesHost"> <soap12:operation soapAction="urn:addKubernetesHost" style="document"></soap12:operation> <wsdl:input> @@ -1593,15 +1602,6 @@ <soap12:fault use="literal" name="AutoScalerServiceNonExistingKubernetesGroupException"></soap12:fault> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="undeployServiceGroup"> - <soap12:operation soapAction="urn:undeployServiceGroup" style="document"></soap12:operation> - <wsdl:input> - <soap12:body use="literal"></soap12:body> - </wsdl:input> - <wsdl:fault name="AutoScalerServiceAutoScalerException"> - <soap12:fault use="literal" name="AutoScalerServiceAutoScalerException"></soap12:fault> - </wsdl:fault> - </wsdl:operation> <wsdl:operation name="getAllAvailablePartitions"> <soap12:operation soapAction="urn:getAllAvailablePartitions" style="document"></soap12:operation> <wsdl:input> @@ -1791,8 +1791,8 @@ <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getAllAutoScalingPolicy"> - <http:operation location="getAllAutoScalingPolicy"></http:operation> + <wsdl:operation name="getPartitionsOfGroup"> + <http:operation location="getPartitionsOfGroup"></http:operation> <wsdl:input> <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:input> @@ -1800,8 +1800,8 @@ <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getPartitionsOfGroup"> - <http:operation location="getPartitionsOfGroup"></http:operation> + <wsdl:operation name="getAllAutoScalingPolicy"> + <http:operation location="getAllAutoScalingPolicy"></http:operation> <wsdl:input> <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:input> @@ -1887,6 +1887,12 @@ <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:output> </wsdl:operation> + <wsdl:operation name="undeployServiceGroup"> + <http:operation location="undeployServiceGroup"></http:operation> + <wsdl:input> + <mime:content type="text/xml" part="parameters"></mime:content> + </wsdl:input> + </wsdl:operation> <wsdl:operation name="addKubernetesHost"> <http:operation location="addKubernetesHost"></http:operation> <wsdl:input> @@ -1896,12 +1902,6 @@ <mime:content type="text/xml" part="parameters"></mime:content> </wsdl:output> </wsdl:operation> - <wsdl:operation name="undeployServiceGroup"> - <http:operation location="undeployServiceGroup"></http:operation> - <wsdl:input> - <mime:content type="text/xml" part="parameters"></mime:content> - </wsdl:input> - </wsdl:operation> <wsdl:operation name="getAllAvailablePartitions"> <http:operation location="getAllAvailablePartitions"></http:operation> <wsdl:input> @@ -2031,22 +2031,22 @@ </wsdl:binding> <wsdl:service name="AutoScalerService"> <wsdl:port name="AutoScalerServiceHttpSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding"> - <soap:address location="http://10.217.249.30:9763/services/AutoScalerService.AutoScalerServiceHttpSoap11Endpoint/"></soap:address> + <soap:address location="http://192.168.30.23:9763/services/AutoScalerService.AutoScalerServiceHttpSoap11Endpoint/"></soap:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpsSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding"> - <soap:address location="https://10.217.249.30:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap11Endpoint/"></soap:address> + <soap:address location="https://192.168.30.23:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap11Endpoint/"></soap:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpsSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding"> - <soap12:address location="https://10.217.249.30:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap12Endpoint/"></soap12:address> + <soap12:address location="https://192.168.30.23:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap12Endpoint/"></soap12:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding"> - <soap12:address location="http://10.217.249.30:9763/services/AutoScalerService.AutoScalerServiceHttpSoap12Endpoint/"></soap12:address> + <soap12:address location="http://192.168.30.23:9763/services/AutoScalerService.AutoScalerServiceHttpSoap12Endpoint/"></soap12:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpEndpoint" binding="ns:AutoScalerServiceHttpBinding"> - <http:address location="http://10.217.249.30:9763/services/AutoScalerService.AutoScalerServiceHttpEndpoint/"></http:address> + <http:address location="http://192.168.30.23:9763/services/AutoScalerService.AutoScalerServiceHttpEndpoint/"></http:address> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpsEndpoint" binding="ns:AutoScalerServiceHttpBinding"> - <http:address location="https://10.217.249.30:9443/services/AutoScalerService.AutoScalerServiceHttpsEndpoint/"></http:address> + <http:address location="https://192.168.30.23:9443/services/AutoScalerService.AutoScalerServiceHttpsEndpoint/"></http:address> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file
