Repository: stratos Updated Branches: refs/heads/master 215997530 -> 23e2a7580
Adding load balancing ip type to cartridge definition Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/23e2a758 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/23e2a758 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/23e2a758 Branch: refs/heads/master Commit: 23e2a75804ad3d20655c11810a0eb00a40ae6e40 Parents: 2159975 Author: Imesh Gunaratne <[email protected]> Authored: Fri Mar 6 18:45:29 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Mar 6 18:45:40 2015 +0530 ---------------------------------------------------------------------- .../cloud/controller/domain/AppType.java | 3 +- .../cloud/controller/domain/Cartridge.java | 68 ++---- .../controller/domain/CartridgeConfig.java | 46 +--- .../cloud/controller/domain/CartridgeInfo.java | 47 +--- .../controller/util/CloudControllerUtil.java | 19 +- .../common/beans/cartridge/CartridgeBean.java | 93 ++++---- .../rest/endpoint/api/StratosApiV40Utils.java | 17 -- .../rest/endpoint/api/StratosApiV41Utils.java | 10 +- .../util/converter/ObjectConverter.java | 21 +- .../main/resources/CloudControllerService.wsdl | 228 +++++++++---------- 10 files changed, 202 insertions(+), 350 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/23e2a758/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java index 7a8bb2d..738c0aa 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java @@ -30,8 +30,7 @@ public class AppType implements Serializable{ private String name; private boolean appSpecificMapping = true; - public AppType(){ - + public AppType() { } public AppType(String name){ http://git-wip-us.apache.org/repos/asf/stratos/blob/23e2a758/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java index b849170..29542eb 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java @@ -44,13 +44,10 @@ public class Cartridge implements Serializable{ private String version; private boolean multiTenant; private String tenantPartitions; - private String defaultAutoscalingPolicy; - private String defaultDeploymentPolicy; - private LoadbalancerConfig lbConfig; private List<PortMapping> portMappings; private Persistence persistence; private List<AppType> appTypeMappings; - private String serviceGroup; + private String loadBalancingIPType; private String[] metadataKeys; /** @@ -173,18 +170,6 @@ public class Cartridge implements Serializable{ return iaases; } - @Override - public String toString() { - return "Cartridge [type=" + type + ", hostName=" + hostName - + ", provider=" + provider + ", version=" + version - + ", multiTenant=" + multiTenant - + ", defaultAutoscalingPolicy=" + defaultAutoscalingPolicy - + ", defaultDeploymentPolicy=" + defaultDeploymentPolicy - + ", serviceGroup=" + serviceGroup + ", properties=" - + properties + ", partitionToIaasProvider=" - + partitionToIaasProvider + "]"; - } - public void setIaases(List<IaasProvider> iaases) { this.iaases = iaases; } @@ -313,22 +298,6 @@ public class Cartridge implements Serializable{ this.partitionToIaasProvider = partitionToIaasProvider; } - public LoadbalancerConfig getLbConfig() { - return lbConfig; - } - - public void setLbConfig(LoadbalancerConfig lbConfig) { - this.lbConfig = lbConfig; - } - - public String getDefaultAutoscalingPolicy() { - return defaultAutoscalingPolicy; - } - - public void setDefaultAutoscalingPolicy(String defaultAutoscalingPolicy) { - this.defaultAutoscalingPolicy = defaultAutoscalingPolicy; - } - /** * @return the persistence */ @@ -343,22 +312,6 @@ public class Cartridge implements Serializable{ this.persistence = persistence; } - public String getDefaultDeploymentPolicy() { - return defaultDeploymentPolicy; - } - - public void setDefaultDeploymentPolicy(String defaultDeploymentPolicy) { - this.defaultDeploymentPolicy = defaultDeploymentPolicy; - } - - public String getServiceGroup() { - return serviceGroup; - } - - public void setServiceGroup(String serviceGroup) { - this.serviceGroup = serviceGroup; - } - public String[] getExportingProperties() { return exportingProperties; } @@ -390,4 +343,23 @@ public class Cartridge implements Serializable{ public void setMetadataKeys(String[] metadataKeys) { this.metadataKeys = metadataKeys; } + + public String getLoadBalancingIPType() { + return loadBalancingIPType; + } + + public void setLoadBalancingIPType(String loadBalancingIPType) { + this.loadBalancingIPType = loadBalancingIPType; + } + + @Override + public String toString() { + return "Cartridge [type=" + type + + ", hostName=" + hostName + + ", provider=" + provider + + ", version=" + version + + ", multiTenant=" + multiTenant + + ", properties=" + properties + + ", partitionToIaasProvider=" + partitionToIaasProvider + "]"; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/23e2a758/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java index b1253d2..d4989f1 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java @@ -47,14 +47,11 @@ public class CartridgeConfig implements Serializable { private String[] deploymentDirs; private PortMapping[] portMappings; private Persistence persistence; - private String defaultAutoscalingPolicy; - private String defaultDeploymentPolicy; private Properties properties; private IaasConfig[] iaasConfigs; - private LoadbalancerConfig lbConfig; - private String serviceGroup; private String[] exportingProperties; private String deployerType; + private String loadBalancingIPType; private String[] metadataKeys; public String getType() { @@ -225,30 +222,6 @@ public class CartridgeConfig implements Serializable { return propertyDetailBuilder.toString(); } - public LoadbalancerConfig getLbConfig() { - return lbConfig; - } - - public void setLbConfig(LoadbalancerConfig lbConfig) { - this.lbConfig = lbConfig; - } - - public String getDefaultAutoscalingPolicy() { - return defaultAutoscalingPolicy; - } - - public void setDefaultAutoscalingPolicy(String defaultAutoscalingPolicy) { - this.defaultAutoscalingPolicy = defaultAutoscalingPolicy; - } - - public String getDefaultDeploymentPolicy() { - return defaultDeploymentPolicy; - } - - public void setDefaultDeploymentPolicy(String defaultDeploymentPolicy) { - this.defaultDeploymentPolicy = defaultDeploymentPolicy; - } - /** * @return the persistence */ @@ -263,15 +236,6 @@ public class CartridgeConfig implements Serializable { this.persistence = persistence; } - public String getServiceGroup() { - return serviceGroup; - } - - public void setServiceGroup(String serviceGroup) { - this.serviceGroup = serviceGroup; - } - - public String[] getExportingProperties() { return exportingProperties; } @@ -304,6 +268,14 @@ public class CartridgeConfig implements Serializable { this.tenantPartitions = tenantPartitions; } + public String getLoadBalancingIPType() { + return loadBalancingIPType; + } + + public void setLoadBalancingIPType(String loadBalancingIPType) { + this.loadBalancingIPType = loadBalancingIPType; + } + public String[] getMetadataKeys() { return metadataKeys; } http://git-wip-us.apache.org/repos/asf/stratos/blob/23e2a758/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeInfo.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeInfo.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeInfo.java index f945042..0bed133 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeInfo.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeInfo.java @@ -42,14 +42,11 @@ public class CartridgeInfo { private boolean multiTenant; private boolean isPublic; private String baseDir; - private Property[] properties; - private String defaultAutoscalingPolicy; - private String defaultDeploymentPolicy; - private LoadbalancerConfig lbConfig; private String tenantPartitions; private Persistence persistence; - private String serviceGroup; + private String loadBalancingIPType; private String[] metadataKeys; + private Property[] properties; public CartridgeInfo(){ this.tenantPartitions = "*"; @@ -171,30 +168,6 @@ public class CartridgeInfo { this.properties = ArrayUtils.clone(properties); } - public String getDefaultAutoscalingPolicy() { - return defaultAutoscalingPolicy; - } - - public void setDefaultAutoscalingPolicy(String defaultAutoscalingPolicy) { - this.defaultAutoscalingPolicy = defaultAutoscalingPolicy; - } - - public LoadbalancerConfig getLbConfig() { - return lbConfig; - } - - public void setLbConfig(LoadbalancerConfig lbConfig) { - this.lbConfig = lbConfig; - } - - public String getDefaultDeploymentPolicy() { - return defaultDeploymentPolicy; - } - - public void setDefaultDeploymentPolicy(String defaultDeploymentPolicy) { - this.defaultDeploymentPolicy = defaultDeploymentPolicy; - } - /** * @return the persistence */ @@ -209,14 +182,6 @@ public class CartridgeInfo { this.persistence = persistence; } - public String getServiceGroup() { - return serviceGroup; - } - - public void setServiceGroup(String serviceGroup) { - this.serviceGroup = serviceGroup; - } - public String getCategory() { return category; } @@ -233,6 +198,14 @@ public class CartridgeInfo { this.tenantPartitions = tenantPartitions; } + public String getLoadBalancingIPType() { + return loadBalancingIPType; + } + + public void setLoadBalancingIPType(String loadBalancingIPType) { + this.loadBalancingIPType = loadBalancingIPType; + } + public String[] getMetadataKeys() { return metadataKeys; } http://git-wip-us.apache.org/repos/asf/stratos/blob/23e2a758/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java index 4ba9182..abd938f 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java @@ -105,9 +105,7 @@ public class CloudControllerUtil { } cartridge.setMultiTenant(config.isMultiTenant()); cartridge.setTenantPartitions(config.getTenantPartitions()); - cartridge.setDefaultAutoscalingPolicy(config.getDefaultAutoscalingPolicy()); - cartridge.setDefaultDeploymentPolicy(config.getDefaultDeploymentPolicy()); - cartridge.setServiceGroup(config.getServiceGroup()); + cartridge.setLoadBalancingIPType(config.getLoadBalancingIPType()); cartridge.setMetadataKeys(config.getMetadataKeys()); org.apache.stratos.common.Properties props = config.getProperties(); @@ -116,9 +114,6 @@ public class CloudControllerUtil { cartridge.addProperty(prop.getName(), String.valueOf(prop.getValue())); } } - - // populate LB config - cartridge.setLbConfig(config.getLbConfig()); List<IaasProvider> iaases = CloudControllerConfig.getInstance().getIaasProviders(); @@ -214,18 +209,12 @@ public class CloudControllerUtil { cartridgeInfo.setVersion(cartridge.getVersion()); cartridgeInfo.setMultiTenant(cartridge.isMultiTenant()); cartridgeInfo.setBaseDir(cartridge.getBaseDir()); - cartridgeInfo.setLbConfig(cartridge.getLbConfig()); cartridgeInfo.setTenantPartitions(cartridge.getTenantPartitions()); - cartridgeInfo.setDefaultAutoscalingPolicy(cartridge.getDefaultAutoscalingPolicy()); - cartridgeInfo.setDefaultDeploymentPolicy(cartridge.getDefaultDeploymentPolicy()); cartridgeInfo.setPortMappings(cartridge.getPortMappings() - .toArray(new PortMapping[cartridge.getPortMappings() - .size()])); + .toArray(new PortMapping[cartridge.getPortMappings().size()])); cartridgeInfo.setAppTypes(cartridge.getAppTypeMappings() - .toArray(new AppType[cartridge.getAppTypeMappings() - .size()])); - cartridgeInfo.setServiceGroup(cartridge.getServiceGroup()); - + .toArray(new AppType[cartridge.getAppTypeMappings().size()])); + List<Property> propList = new ArrayList<Property>(); cartridgeInfo.setPersistence(cartridge.getPersistence()); http://git-wip-us.apache.org/repos/asf/stratos/blob/23e2a758/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java index 38c09c6..71d8108 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java @@ -22,17 +22,17 @@ package org.apache.stratos.common.beans.cartridge; import javax.xml.bind.annotation.XmlRootElement; import java.util.List; -@XmlRootElement(name = "cartridgeDefinitionBean") +@XmlRootElement(name = "cartridgeBean") public class CartridgeBean { private String type; - private String host; private String provider; /** - * Category: Application|Framework|Data|LoadBalancer + * Category: framework|data|load-balancer */ private String category; - private String displayName; + private String host; + private String displayName; private String description; private String version; private boolean multiTenant; @@ -40,26 +40,16 @@ public class CartridgeBean { private DeploymentBean deployment; private List<PortMappingBean> portMapping; private String tenantPartitions; - private PersistenceBean persistence; private List<IaasProviderBean> iaasProvider; - private String defaultAutoscalingPolicy; - private String defaultDeploymentPolicy; - private String serviceGroup; + private PersistenceBean persistence; + /** + * Load balancing ip type: public|private + */ + private String loadBalancingIPType; + private String[] metadataKeys; private List<PropertyBean> property; - private List<String> exportingProperties; - private String[] metadataKeys; - - public String toString () { - - return "Type: " + getType() + ", Provider: " + getProvider() + ", Category: " + getCategory() + ", Host: " + getHost() + ", Display Name: " + getDisplayName() + - ", Description: " + getDescription() + ", Version: " + getVersion() + ", Multitenant " + isMultiTenant() +", Public " + isPublic() + "\n" + - getDeploymentDetails() + "\n PortMapping: " + getPortMappings() + "\n IaaS: " + getIaasProviders() + - "\n Properties: " + getProperties() +"\n VolumeBean mappings "+ (getPersistence() == null ? "" : getPersistence().toString()) - + "\n Exports " + (getExportingProperties() == null ? "" : getExportingProperties().toString()) ; - } private String getDeploymentDetails () { - if(getDeployment() != null) { return getDeployment().toString(); } @@ -67,7 +57,6 @@ public class CartridgeBean { } private String getPortMappings () { - StringBuilder portMappingBuilder = new StringBuilder(); if(getPortMapping() != null && !getPortMapping().isEmpty()) { for(PortMappingBean portMappingBean : getPortMapping()) { @@ -99,15 +88,6 @@ public class CartridgeBean { return propertyBuilder.toString(); } - public List<String> getExportingProperties() { - return exportingProperties; - } - - public void setExportingProperties(List<String> exportingProperties) { - this.exportingProperties = exportingProperties; - } - - public String getType() { return type; } @@ -220,30 +200,6 @@ public class CartridgeBean { this.property = property; } - public String getDefaultAutoscalingPolicy() { - return defaultAutoscalingPolicy; - } - - public void setDefaultAutoscalingPolicy(String defaultAutoscalingPolicy) { - this.defaultAutoscalingPolicy = defaultAutoscalingPolicy; - } - - public String getDefaultDeploymentPolicy() { - return defaultDeploymentPolicy; - } - - public void setDefaultDeploymentPolicy(String defaultDeploymentPolicy) { - this.defaultDeploymentPolicy = defaultDeploymentPolicy; - } - - public String getServiceGroup() { - return serviceGroup; - } - - public void setServiceGroup(String serviceGroup) { - this.serviceGroup = serviceGroup; - } - public String getTenantPartitions() { return tenantPartitions; } @@ -252,6 +208,14 @@ public class CartridgeBean { this.tenantPartitions = tenantPartitions; } + public String getLoadBalancingIPType() { + return loadBalancingIPType; + } + + public void setLoadBalancingIPType(String loadBalancingIPType) { + this.loadBalancingIPType = loadBalancingIPType; + } + public String[] getMetadataKeys() { return metadataKeys; } @@ -259,4 +223,25 @@ public class CartridgeBean { public void setMetadataKeys(String[] metadataKeys) { this.metadataKeys = metadataKeys; } + + public String toString () { + + return "Type: " + getType() + + ", Provider: " + getProvider() + + ", Category: " + getCategory() + + ", Host: " + getHost() + + ", Display Name: " + getDisplayName() + + ", Description: " + getDescription() + + ", Version: " + getVersion() + + ", Multi-Tenant " + isMultiTenant() + + ", Public " + isPublic() + + ", Deployment" + getDeploymentDetails() + + ", Port Mapping: " + getPortMappings() + + ", Tenant Partitions: " + getTenantPartitions() + + ", IaaS Providers: " + getIaasProviders() + + ", Persistence "+ (getPersistence() == null ? "" : getPersistence().toString()) + + ", Load Balancing IP Type: " + getLoadBalancingIPType() + + ", Metadata Keys: " + getMetadataKeys() + + ", Properties: " + getProperties(); + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/23e2a758/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java index 957a8e0..7c60b33 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java @@ -34,7 +34,6 @@ import org.apache.stratos.common.beans.artifact.repository.GitNotificationPayloa import org.apache.stratos.common.beans.cartridge.CartridgeBean; import org.apache.stratos.common.beans.partition.PartitionBean; import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean; -import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean; import org.apache.stratos.common.client.AutoscalerServiceClient; import org.apache.stratos.common.client.CloudControllerServiceClient; import org.apache.stratos.common.client.StratosManagerServiceClient; @@ -411,21 +410,6 @@ public class StratosApiV40Utils { cartridge.setVersion(cartridgeInfo.getVersion()); cartridge.setMultiTenant(cartridgeInfo.getMultiTenant()); cartridge.setHost(cartridgeInfo.getHostName()); - cartridge.setDefaultAutoscalingPolicy(cartridgeInfo.getDefaultAutoscalingPolicy()); - cartridge.setDefaultDeploymentPolicy(cartridgeInfo.getDefaultDeploymentPolicy()); - //cartridge.setStatus(CartridgeConstants.NOT_SUBSCRIBED); - //cartridge.setCartridgeAlias("-"); - //cartridge.setPersistence(ObjectConverter.convertStubPersistenceToPersistence(cartridgeInfo.getPersistence())); - cartridge.setServiceGroup(cartridgeInfo.getServiceGroup()); - - if(cartridgeInfo.getLbConfig() != null && cartridgeInfo.getProperties() != null) { - for(org.apache.stratos.cloud.controller.stub.Property property: cartridgeInfo.getProperties()) { - if(property.getName().equals("load.balancer")) { - //cartridge.setLoadBalancer(true); - } - } - } - //cartridge.setActiveInstances(0); cartridges.add(cartridge); @@ -438,7 +422,6 @@ public class StratosApiV40Utils { log.debug("Already subscribed to " + cartridgeType + ". This multi-tenant cartridge will not be available to createSubscription"); } - //cartridge.setStatus(CartridgeConstants.SUBSCRIBED); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/23e2a758/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 082e429..abec533 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -99,8 +99,7 @@ public class StratosApiV41Utils { log.debug(String.format("Adding cartridge: [cartridge-type] %s ", cartridgeDefinition.getType())); } - CartridgeConfig cartridgeConfig = - createCartridgeConfig(cartridgeDefinition); + CartridgeConfig cartridgeConfig = createCartridgeConfig(cartridgeDefinition); CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance(); cloudControllerServiceClient.addCartridge(cartridgeConfig); @@ -425,15 +424,14 @@ public class StratosApiV41Utils { cartridge.setType(cartridgeInfo.getType()); cartridge.setProvider(cartridgeInfo.getProvider()); cartridge.setCategory(cartridgeInfo.getCategory()); + cartridge.setHost(cartridgeInfo.getHostName()); cartridge.setDisplayName(cartridgeInfo.getDisplayName()); cartridge.setDescription(cartridgeInfo.getDescription()); cartridge.setVersion(cartridgeInfo.getVersion()); cartridge.setMultiTenant(cartridgeInfo.getMultiTenant()); - cartridge.setHost(cartridgeInfo.getHostName()); - cartridge.setDefaultAutoscalingPolicy(cartridgeInfo.getDefaultAutoscalingPolicy()); - cartridge.setDefaultDeploymentPolicy(cartridgeInfo.getDefaultDeploymentPolicy()); cartridge.setPersistence(convertPersistenceToPersistenceBean(cartridgeInfo.getPersistence())); - cartridge.setServiceGroup(cartridgeInfo.getServiceGroup()); + cartridge.setLoadBalancingIPType(cartridgeInfo.getLoadBalancingIPType()); + cartridge.setMetadataKeys(cartridgeInfo.getMetadataKeys()); return cartridge; } http://git-wip-us.apache.org/repos/asf/stratos/blob/23e2a758/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index b105816..1910c2e 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -75,13 +75,11 @@ public class ObjectConverter { cartridgeConfig.setIsPublic(cartridgeBean.isPublic()); cartridgeConfig.setDisplayName(cartridgeBean.getDisplayName()); cartridgeConfig.setDescription(cartridgeBean.getDescription()); - cartridgeConfig.setDefaultAutoscalingPolicy(cartridgeBean.getDefaultAutoscalingPolicy()); - cartridgeConfig.setDefaultDeploymentPolicy(cartridgeBean.getDefaultDeploymentPolicy()); - cartridgeConfig.setServiceGroup(cartridgeBean.getServiceGroup()); cartridgeConfig.setTenantPartitions(cartridgeBean.getTenantPartitions()); + cartridgeConfig.setLoadBalancingIPType(cartridgeBean.getLoadBalancingIPType()); cartridgeConfig.setMetadataKeys(cartridgeBean.getMetadataKeys()); - //deployment information + // deployment information if (cartridgeBean.getDeployment() != null) { cartridgeConfig.setBaseDir(cartridgeBean.getDeployment().getBaseDir()); if (cartridgeBean.getDeployment().getDir() != null && !cartridgeBean.getDeployment().getDir().isEmpty()) { @@ -89,30 +87,25 @@ public class ObjectConverter { toArray(new String[cartridgeBean.getDeployment().getDir().size()])); } } - //port mapping + // port mapping if (cartridgeBean.getPortMapping() != null && !cartridgeBean.getPortMapping().isEmpty()) { cartridgeConfig.setPortMappings(convertPortMappingBeansToStubPortMappings(cartridgeBean.getPortMapping())); } - //persistance mapping + // persistence mapping if (cartridgeBean.getPersistence() != null) { cartridgeConfig.setPersistence(convertPersistenceBeanToStubPersistence(cartridgeBean.getPersistence())); } - //IaaS + // iaas providers if (cartridgeBean.getIaasProvider() != null && !cartridgeBean.getIaasProvider().isEmpty()) { cartridgeConfig.setIaasConfigs(convertIaasProviderBeansToStubIaasConfig(cartridgeBean.getIaasProvider())); } - //Properties + + // properties if (cartridgeBean.getProperty() != null && !cartridgeBean.getProperty().isEmpty()) { cartridgeConfig.setProperties(convertPropertyBeansToCCStubProperties(cartridgeBean.getProperty())); } - - if (cartridgeBean.getExportingProperties() != null) { - List<String> propertiesList = cartridgeBean.getExportingProperties(); - String[] propertiesArray = propertiesList.toArray(new String[propertiesList.size()]); - cartridgeConfig.setExportingProperties(propertiesArray); - } return cartridgeConfig; } http://git-wip-us.apache.org/repos/asf/stratos/blob/23e2a758/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 48e6d51..a74e5e8 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 @@ -12,6 +12,55 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="CloudControllerServiceInvalidIaasProviderException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax21:InvalidIaasProviderException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="CloudControllerServiceCloudControllerException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax21:CloudControllerException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="startInstance"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax26:InstanceContext"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="startInstanceResponse"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="CloudControllerServiceInvalidMemberException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax21:InvalidCartridgeTypeException"/> + </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:sequence> + </xs:complexType> + </xs:element> <xs:element name="registerService"> <xs:complexType> <xs:sequence> @@ -96,13 +145,6 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidCartridgeTypeException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax21:InvalidCartridgeTypeException"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="validateDeploymentPolicy"> <xs:complexType> <xs:sequence> @@ -118,20 +160,6 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="CloudControllerServiceInvalidIaasProviderException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax21:InvalidIaasProviderException"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="CloudControllerServiceCloudControllerException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="CloudControllerException" nillable="true" type="ax21:CloudControllerException"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="startInstances"> <xs:complexType> <xs:sequence> @@ -638,34 +666,6 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startInstance"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax26:InstanceContext"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="startInstanceResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="CloudControllerServiceInvalidMemberException"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/> - </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:sequence> - </xs:complexType> - </xs:element> </xs:schema> <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://topology.domain.messaging.stratos.apache.org/xsd";> <xs:complexType abstract="true" name="ClusterStatus"> @@ -697,12 +697,19 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidServiceGroupException"> + <xs:complexType name="InvalidIaasProviderException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidPartitionException"> + <xs:complexType name="CloudControllerException"> + <xs:complexContent> + <xs:extension base="xs:RuntimeException"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="InvalidMemberException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> @@ -712,17 +719,15 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidIaasProviderException"> + <xs:complexType name="InvalidServiceGroupException"> <xs:sequence> <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="CloudControllerException"> - <xs:complexContent> - <xs:extension base="xs:RuntimeException"> - <xs:sequence/> - </xs:extension> - </xs:complexContent> + <xs:complexType name="InvalidPartitionException"> + <xs:sequence> + <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> + </xs:sequence> </xs:complexType> <xs:complexType name="InvalidClusterException"> <xs:sequence> @@ -802,11 +807,6 @@ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InvalidMemberException"> - <xs:sequence> - <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> </xs:schema> <xs:schema xmlns:ax212="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd";> <xs:import namespace="http://common.stratos.apache.org/xsd"/> @@ -856,41 +856,16 @@ <xs:schema xmlns:ax28="http://domain.common.stratos.apache.org/xsd"; xmlns:ax25="http://common.stratos.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.controller.cloud.stratos.apache.org/xsd";> <xs:import namespace="http://common.stratos.apache.org/xsd"/> <xs:import namespace="http://domain.common.stratos.apache.org/xsd"/> - <xs:complexType name="Registrant"> + <xs:complexType name="InstanceContext"> <xs:sequence> - <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/> + <xs:element minOccurs="0" name="clusterInstanceId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="initTime" type="xs:long"/> + <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"/> + <xs:element minOccurs="0" name="partition" nillable="true" type="ax23:Partition"/> <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> - <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="Persistence"> - <xs:sequence> - <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="Volume"> - <xs:sequence> - <xs:element minOccurs="0" name="device" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="iaasType" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="mappingPath" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="removeOntermination" type="xs:boolean"/> - <xs:element minOccurs="0" name="size" type="xs:int"/> - <xs:element minOccurs="0" name="snapshotId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="volumeId" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="Dependencies"> - <xs:sequence> - <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"/> - <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrders" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> <xs:complexType name="Partition"> @@ -903,18 +878,6 @@ <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="InstanceContext"> - <xs:sequence> - <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="clusterInstanceId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="initTime" type="xs:long"/> - <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"/> - <xs:element minOccurs="0" name="partition" nillable="true" type="ax23:Partition"/> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> - </xs:sequence> - </xs:complexType> <xs:complexType name="MemberContext"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="allocatedIPs" nillable="true" type="xs:string"/> @@ -954,26 +917,60 @@ <xs:element minOccurs="0" name="ram" type="xs:int"/> </xs:sequence> </xs:complexType> + <xs:complexType name="Registrant"> + <xs:sequence> + <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/> + <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> + <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="Persistence"> + <xs:sequence> + <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="Volume"> + <xs:sequence> + <xs:element minOccurs="0" name="device" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="iaasType" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="mappingPath" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="removeOntermination" type="xs:boolean"/> + <xs:element minOccurs="0" name="size" type="xs:int"/> + <xs:element minOccurs="0" name="snapshotId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="volumeId" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="Dependencies"> + <xs:sequence> + <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrders" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> <xs:complexType name="CartridgeInfo"> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax23:AppType"/> <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="category" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> - <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax23:LoadbalancerConfig"/> + <xs:element minOccurs="0" name="loadBalancingIPType" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="metadataKeys" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/> <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax23:PortMapping"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax25:Property"/> <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="tenantPartitions" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"/> @@ -985,12 +982,6 @@ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> - <xs:complexType name="LoadbalancerConfig"> - <xs:sequence> - <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> - <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> <xs:complexType name="PortMapping"> <xs:sequence> <xs:element minOccurs="0" name="kubernetesServicePort" type="xs:int"/> @@ -1044,8 +1035,6 @@ <xs:sequence> <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="category" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="deployerType" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> @@ -1054,14 +1043,13 @@ <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax23:IaasConfig"/> <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> - <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax23:LoadbalancerConfig"/> + <xs:element minOccurs="0" name="loadBalancingIPType" nillable="true" type="xs:string"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="metadataKeys" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/> <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax23:PortMapping"/> <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/> <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="tenantPartitions" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"/>
