Adding in isPublic property to beans and Service interface / utils for tenant isolation requirements
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0aaa1521 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0aaa1521 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0aaa1521 Branch: refs/heads/master Commit: 0aaa1521142f60657cee84469f372b2720d20a4b Parents: a025ddd Author: Shiro <[email protected]> Authored: Tue Sep 23 17:32:52 2014 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Fri Sep 26 05:31:21 2014 +0000 ---------------------------------------------------------------------- .../org.apache.stratos.autoscaler/pom.xml | 5 +++ .../deployment/policy/DeploymentPolicy.java | 46 +++++++++++++++++++- .../policy/model/AutoscalePolicy.java | 44 ++++++++++++++++++- .../deployment/partition/Partition.java | 24 +++++++++- .../cloud/controller/pojo/CartridgeConfig.java | 12 ++++- .../cloud/controller/pojo/CartridgeInfo.java | 10 +++++ .../stratos/manager/deploy/service/Service.java | 12 ++++- .../service/ServiceDeploymentManager.java | 10 ++--- .../service/multitenant/MultiTenantService.java | 4 +- .../multitenant/lb/DefaultLBService.java | 4 +- .../multitenant/lb/ExistingLBService.java | 4 +- .../service/multitenant/lb/LBService.java | 4 +- .../multitenant/lb/MultiTenantLBService.java | 4 +- .../multitenant/lb/ServiceAwareLBService.java | 4 +- .../bean/util/converter/PojoConverter.java | 36 +++++++-------- .../rest/endpoint/services/ServiceUtils.java | 13 +++--- .../rest/endpoint/services/StratosAdmin.java | 16 ++++--- .../webapp/stratos/WEB-INF/schemas/schema.xsd | 5 +++ .../src/main/resources/AutoScalerService.wsdl | 31 +++++++++++++ .../main/resources/CloudControllerService.wsdl | 31 +++++++++++++ 20 files changed, 262 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.autoscaler/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/pom.xml b/components/org.apache.stratos.autoscaler/pom.xml index 0376648..a270686 100644 --- a/components/org.apache.stratos.autoscaler/pom.xml +++ b/components/org.apache.stratos.autoscaler/pom.xml @@ -176,6 +176,11 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.common</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java index cf0efb4..a8a44d0 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java @@ -34,7 +34,9 @@ public class DeploymentPolicy implements Serializable{ private static final long serialVersionUID = 5675507196284400099L; private String id; private String description; + private boolean isPublic; private PartitionGroup[] partitionGroups; + private int tenantId; /** * Gets the value of the id property. @@ -84,6 +86,46 @@ public class DeploymentPolicy implements Serializable{ this.description = value; } + /** + * Gets the value of the isPublic property. + * + * @return + * possible object is boolean + * + */ + public boolean getIsPublic() { + return isPublic; + } + + /** + * Sets the value of the isPublic property. + * + * @param description + * allowed object is boolean + * + */ + public void setIsPublic(boolean isPublic) { + this.isPublic = isPublic; + } + + /** + * Gets the value of the tenantId property. + * + * + */ + public int getTenantId() { + return tenantId; + } + + /** + * Sets the value of the tenantId property. + * + * + */ + public void setTenantId(int tenantId) { + this.tenantId = tenantId; + } + public void setPartitionGroups(PartitionGroup[] groups) { this.partitionGroups = groups; } @@ -125,7 +167,9 @@ public class DeploymentPolicy implements Serializable{ } public String toString() { - return "Deployment Policy [id]" + this.id + " Description " + this.description +" [partitions] " + Arrays.toString(this.getAllPartitions()); + return "Deployment Policy [id]" + this.id + " Description " + this.description + + " isPublic " + this.isPublic + +" [partitions] " + Arrays.toString(this.getAllPartitions()); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java index cdfba84..e1630b8 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java @@ -31,6 +31,8 @@ public class AutoscalePolicy implements Serializable { private String id; private String displayName; private String description; + private boolean isPublic; + private int tenantId; /** * Gets the value of the loadThresholds property. @@ -127,11 +129,51 @@ public class AutoscalePolicy implements Serializable { public void setDescription(String description) { this.description = description; } + + /** + * Gets the value of the isPublic property. + * + * @return + * possible object is boolean + * + */ + public boolean getIsPublic() { + return isPublic; + } + + /** + * Sets the value of the isPublic property. + * + * @param description + * allowed object is boolean + * + */ + public void setIsPublic(boolean isPublic) { + this.isPublic = isPublic; + } + + /** + * Gets the value of the tenantId property. + * + * + */ + public int getTenantId() { + return tenantId; + } + + /** + * Sets the value of the tenantId property. + * + * + */ + public void setTenantId(int tenantId) { + this.tenantId = tenantId; + } @Override public String toString() { return "ASPolicy [id=" + id + ", displayName=" + displayName - + ", description=" + description + "]"; + + ", description=" + description + ", isPublic=" + isPublic + "]"; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java index cdd1fea..2376fd9 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java @@ -38,6 +38,7 @@ public class Partition implements Serializable{ private Properties properties = new Properties(); private String id; private String description; + private boolean isPublic; /** @@ -120,6 +121,25 @@ public class Partition implements Serializable{ this.description = description; } + /** + * Sets the value of the isPublic property. + * + * @param value + * allowed object is boolean + * + */ + public void setIsPublic(boolean isPublic) { + this.isPublic = isPublic; + } + + /** + * Gets the value of the isPublic property. + * + */ + public boolean getIsPublic() { + return isPublic; + } + public Properties getProperties() { return properties; } @@ -138,8 +158,8 @@ public class Partition implements Serializable{ @Override public String toString() { - return "Partition [id=" + id + ", description=" + description + ", provider=" + provider - + ", partitionMin=" + partitionMin + ", partitionMax=" + return "Partition [id=" + id + ", description=" + description + ", isPublic=" + isPublic + + ", provider=" + provider + ", partitionMin=" + partitionMin + ", partitionMax=" + partitionMax + ", properties=" + properties + "]"; } http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java index 95bc22c..d9d59fc 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java @@ -42,6 +42,8 @@ public class CartridgeConfig implements Serializable { private String version; private boolean multiTenant; + + private boolean isPublic; private String baseDir; @@ -122,6 +124,14 @@ public class CartridgeConfig implements Serializable { public void setMultiTenant(boolean multiTenant) { this.multiTenant = multiTenant; } + + public boolean getIsPublic() { + return isPublic; + } + + public void setisPublic(boolean isPublic) { + this.isPublic = isPublic; + } public String getBaseDir() { return baseDir; @@ -166,7 +176,7 @@ public class CartridgeConfig implements Serializable { public String toString () { return "Type: " + type + ", Provider: " + provider + ", Host: " + hostName + ", Display Name: " + displayName + - ", Description: " + description + ", Version: " + version + ", Multitenant " + multiTenant + + ", Description: " + description + ", Version: " + version + ", Multitenant " + multiTenant + ", IsPublic " + isPublic + "\n Deployment: " + getDeploymentDetails() + "\n PortMapping: " + getPortMappingDetails() + "\n IaaS: " + getIaasConfigDetails() + "\n Properties: " + getPropertyDetails(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java index 0064b2e..163f6aa 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java @@ -46,6 +46,8 @@ public class CartridgeInfo { private boolean multiTenant; + private boolean isPublic; + private String baseDir; private Property[] properties; @@ -138,6 +140,14 @@ public class CartridgeInfo { public void setMultiTenant(boolean multiTenant) { this.multiTenant = multiTenant; } + + public boolean getIsPublic() { + return isPublic; + } + + public void setIsPublic(boolean isPublic) { + this.isPublic = isPublic; + } public String getBaseDir() { return baseDir; http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java index 30b123f..72176c3 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java @@ -42,9 +42,10 @@ public abstract class Service extends CartridgeMgtBehaviour { private CartridgeInfo cartridgeInfo; private PayloadData payloadData; private Cluster cluster; + private boolean isPublic; public Service (String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, CartridgeInfo cartridgeInfo, - String tenantRange) { + String tenantRange, boolean isPublic) { this.type = type; this.autoscalingPolicyName = autoscalingPolicyName; @@ -54,6 +55,7 @@ public abstract class Service extends CartridgeMgtBehaviour { this.tenantRange = tenantRange; this.subscriptionKey = CartridgeSubscriptionUtils.generateSubscriptionKey(); this.setCluster(new Cluster()); + this.isPublic = isPublic; } public void create () throws ADCException { @@ -179,4 +181,12 @@ public abstract class Service extends CartridgeMgtBehaviour { public void setCluster(Cluster cluster) { this.cluster = cluster; } + + public boolean getIsPublic() { + return isPublic; + } + + public void setIsPublic(boolean isPublic) { + this.isPublic = isPublic; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java index 08589b3..c5921b6 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java @@ -47,7 +47,7 @@ public class ServiceDeploymentManager { private static Log log = LogFactory.getLog(ServiceDeploymentManager.class); public Service deployService (String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, String tenantRange, - String tenantDomain, String userName) + String tenantDomain, String userName, boolean isPublic) throws ADCException, UnregisteredCartridgeException, ServiceAlreadyDeployedException { //check if already we have a Multitenant service deployed for the same type @@ -319,7 +319,7 @@ public class ServiceDeploymentManager { deployLBCluster(type, lbDataCtxt, tenantRange); } - Service service = new MultiTenantService(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange); + Service service = new MultiTenantService(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic); Properties serviceClusterProperties = null; if (lbDataCtxt != null) { @@ -353,17 +353,17 @@ public class ServiceDeploymentManager { if (lbDataCtxt.getLbCategory().equals(Constants.EXISTING_LOAD_BALANCERS)) { lbService = new ExistingLBService(lbDataCtxt.getLbCartridgeInfo().getType(), lbDataCtxt.getAutoscalePolicy(), lbDataCtxt.getDeploymentPolicy(), -1234, lbDataCtxt.getLbCartridgeInfo(), - tenantRange); + tenantRange, false); } else if (lbDataCtxt.getLbCategory().equals(Constants.DEFAULT_LOAD_BALANCER)) { lbService = new DefaultLBService(lbDataCtxt.getLbCartridgeInfo().getType(), lbDataCtxt.getAutoscalePolicy(), lbDataCtxt.getDeploymentPolicy(), -1234, lbDataCtxt.getLbCartridgeInfo(), - tenantRange); + tenantRange, false); } else if (lbDataCtxt.getLbCategory().equals(Constants.SERVICE_AWARE_LOAD_BALANCER)) { lbService = new ServiceAwareLBService(lbDataCtxt.getLbCartridgeInfo().getType(), lbDataCtxt.getAutoscalePolicy(), lbDataCtxt.getDeploymentPolicy(), -1234, lbDataCtxt.getLbCartridgeInfo(), - tenantRange); + tenantRange, false); } if (lbService == null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java index fc7a639..b8a468b 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java @@ -27,7 +27,7 @@ public class MultiTenantService extends Service { private static final long serialVersionUID = 3038272784193474660L; public MultiTenantService (String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, CartridgeInfo cartridgeInfo, - String tenantRange) { - super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange); + String tenantRange, boolean isPublic) { + super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java index 487140c..982535a 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java @@ -44,9 +44,9 @@ public class DefaultLBService extends LBService { private boolean defaultLBServiceExists = false; public DefaultLBService (String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, - CartridgeInfo cartridgeInfo, String tenantRange) { + CartridgeInfo cartridgeInfo, String tenantRange, boolean isPublic) { - super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange); + super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic); } public PayloadData create(String alias, Cluster cluster, Subscriber subscriber, Repository repository, CartridgeInfo cartridgeInfo, http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java index 78acae7..4a67d8b 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java @@ -35,8 +35,8 @@ public class ExistingLBService extends LBService { private static final long serialVersionUID = -421015139303889832L; - public ExistingLBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, CartridgeInfo cartridgeInfo, String tenantRange) { - super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange); + public ExistingLBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, CartridgeInfo cartridgeInfo, String tenantRange, boolean isPublic) { + super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic); } public PayloadData create(String alias, Cluster cluster, Subscriber subscriber, Repository repository, CartridgeInfo cartridgeInfo, http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java index f062626..1214c0e 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java @@ -33,9 +33,9 @@ public class LBService extends Service { private String loadBalancedServiceType; public LBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, - CartridgeInfo cartridgeInfo, String tenantRange) { + CartridgeInfo cartridgeInfo, String tenantRange, boolean isPublic) { - super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange); + super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic); } public void create () throws ADCException { http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java index 993afde..c22c545 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java @@ -33,9 +33,9 @@ public class MultiTenantLBService extends Service { private LoadBalancerCategory loadBalancerCategory; public MultiTenantLBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, - CartridgeInfo cartridgeInfo, String tenantRange, LoadBalancerCategory loadBalancerCategory) { + CartridgeInfo cartridgeInfo, String tenantRange, boolean isPublic, LoadBalancerCategory loadBalancerCategory) { - super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange); + super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic); this.loadBalancerCategory = loadBalancerCategory; } http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java index f5c3ea4..4f4cae7 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java @@ -44,9 +44,9 @@ public class ServiceAwareLBService extends LBService { private static final long serialVersionUID = -4107281204555031986L; public ServiceAwareLBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, - CartridgeInfo cartridgeInfo, String tenantRange) { + CartridgeInfo cartridgeInfo, String tenantRange, boolean isPublic) { - super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange); + super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic); } private static Log log = LogFactory.getLog(ServiceAwareLBService.class); http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/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 0942170..724e554 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 @@ -54,6 +54,7 @@ public class PojoConverter { cartridgeConfig.setProvider(cartridgeDefinitionBean.provider); cartridgeConfig.setVersion(cartridgeDefinitionBean.version); cartridgeConfig.setMultiTenant(cartridgeDefinitionBean.multiTenant); + cartridgeConfig.setIsPublic(cartridgeDefinitionBean.isPublic); cartridgeConfig.setDisplayName(cartridgeDefinitionBean.displayName); cartridgeConfig.setDescription(cartridgeDefinitionBean.description); cartridgeConfig.setDefaultAutoscalingPolicy(cartridgeDefinitionBean.defaultAutoscalingPolicy); @@ -61,6 +62,7 @@ public class PojoConverter { cartridgeConfig.setServiceGroup(cartridgeDefinitionBean.serviceGroup); cartridgeConfig.setDeployerType(cartridgeDefinitionBean.deployerType); + //deployment information if (cartridgeDefinitionBean.deployment != null) { cartridgeConfig.setBaseDir(cartridgeDefinitionBean.deployment.baseDir); @@ -260,6 +262,7 @@ public class PojoConverter { partition.setId(partitionBean.id); partition.setDescription(partitionBean.description); + partition.setIsPublic(partitionBean.isPublic); partition.setProvider(partitionBean.provider); partition.setPartitionMin(partitionBean.partitionMin); partition.setPartitionMax(partitionBean.partitionMax); @@ -279,6 +282,7 @@ public class PojoConverter { autoscalePolicy.setId(autoscalePolicyBean.getId()); autoscalePolicy.setDescription(autoscalePolicyBean.getDescription()); + autoscalePolicy.setIsPublic(autoscalePolicyBean.getIsPublic()); autoscalePolicy.setDisplayName(autoscalePolicyBean.getDisplayName()); if (autoscalePolicyBean.getLoadThresholds() != null) { @@ -332,7 +336,8 @@ public class PojoConverter { deploymentPolicy.setId(deploymentPolicyBean.id); deploymentPolicy.setDescription(deploymentPolicyBean.description); - if (deploymentPolicyBean.partitionGroup != null && !deploymentPolicyBean.partitionGroup.isEmpty()) { + deploymentPolicy.setIsPublic(deploymentPolicyBean.isPublic); + if(deploymentPolicyBean.partitionGroup != null && !deploymentPolicyBean.partitionGroup.isEmpty()) { deploymentPolicy.setPartitionGroups(convertToCCPartitionGroup(deploymentPolicyBean.partitionGroup)); } @@ -421,17 +426,7 @@ public class PojoConverter { } partitionBeans = new Partition[partitions.length]; - for (int i = 0; i < partitions.length; i++) { - /*Partition partition = new Partition(); - partition.id = partitions[i].getId(); - partition.provider = partitions[i].getProvider(); - partition.partitionMin = partitions[i].getPartitionMin(); - partition.partitionMax = partitions[i].getPartitionMax();*/ - //properties are not added currently, TODO if required - //if(partitions[i].getProperties() != null) { - // List<PropertyBean> propertyBeans = getPropertyBeans(partitions[i].getProperties()); - // partition.property = propertyBeans; - //} + for (int i = 0 ; i < partitions.length ; i++) { partitionBeans[i] = populatePartitionPojo(partitions[i]); } return partitionBeans; @@ -447,6 +442,7 @@ public class PojoConverter { partitionBeans.id = partition.getId(); partitionBeans.description = partition.getDescription(); + partitionBeans.isPublic = partition.getIsPublic(); partitionBeans.provider = partition.getProvider(); partitionBeans.partitionMin = partition.getPartitionMin(); partitionBeans.partitionMax = partition.getPartitionMax(); @@ -458,6 +454,8 @@ public class PojoConverter { return partitionBeans; } + + public static List<SubscriptionDomainBean> populateSubscriptionDomainPojos(List<SubscriptionDomain> subscriptionDomains) { public static List<SubscriptionDomainBean> populateSubscriptionDomainPojos(List<SubscriptionDomain> subscriptionDomains) { @@ -536,6 +534,7 @@ public class PojoConverter { autoscalePolicyBean.setId(autoscalePolicy.getId()); autoscalePolicyBean.setDescription(autoscalePolicy.getDescription()); + autoscalePolicyBean.setIsPublic(autoscalePolicy.getIsPublic()); autoscalePolicyBean.setDisplayName(autoscalePolicy.getDisplayName()); autoscalePolicyBean.setDescription(autoscalePolicy.getDescription()); if (autoscalePolicy.getLoadThresholds() != null) { @@ -579,15 +578,7 @@ public class PojoConverter { } deploymentPolicyBeans = new DeploymentPolicy[deploymentPolicies.length]; - for (int i = 0; i < deploymentPolicies.length; i++) { - //DeploymentPolicy deploymentPolicy = new DeploymentPolicy(); - //deploymentPolicy.id = deploymentPolicies[i].getId(); - - //if(deploymentPolicies[i].getPartitionGroups() != null && - // deploymentPolicies[i].getPartitionGroups().length > 0) { - // deploymentPolicy.partitionGroup = getPartitionGroups(deploymentPolicies[i].getPartitionGroups()); - //} - + for (int i = 0 ; i < deploymentPolicies.length ; i++) { deploymentPolicyBeans[i] = populateDeploymentPolicyPojo(deploymentPolicies[i]); } @@ -604,6 +595,7 @@ public class PojoConverter { deploymentPolicyBean.id = deploymentPolicy.getId(); deploymentPolicyBean.description = deploymentPolicy.getDescription(); + deploymentPolicyBean.isPublic = deploymentPolicy.getIsPublic(); if (deploymentPolicy.getPartitionGroups() != null && deploymentPolicy.getPartitionGroups().length > 0) { deploymentPolicyBean.partitionGroup = Arrays.asList(populatePartitionGroupPojos(deploymentPolicy.getPartitionGroups())); @@ -681,6 +673,7 @@ public class PojoConverter { serviceDefinitionBean.setCartridgeType(service.getType()); serviceDefinitionBean.setTenantRange(service.getTenantRange()); serviceDefinitionBean.setClusterDomain(service.getClusterId()); + serviceDefinitionBean.setIsPublic(service.getIsPublic()); serviceDefinitionBean.setAutoscalingPolicyName(service.getAutoscalingPolicyName()); serviceDefinitionBean.setDeploymentPolicyName(service.getDeploymentPolicyName()); @@ -690,6 +683,7 @@ public class PojoConverter { public static List<ServiceDefinitionBean> convertToServiceDefinitionBeans(Collection<Service> services) { List<ServiceDefinitionBean> serviceDefinitionBeans = new ArrayList<ServiceDefinitionBean>(); + for (Service service : services) { serviceDefinitionBeans.add(convertToServiceDefinitionBean(service)); } http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index d136afc..08e3334 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -80,6 +80,7 @@ import org.wso2.carbon.user.api.UserStoreManager; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; + import java.rmi.RemoteException; import java.util.*; import java.util.regex.Pattern; @@ -242,7 +243,7 @@ public class ServiceUtils { } public static Partition[] getAvailablePartitions() throws RestAPIException { - + org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null; AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { @@ -255,7 +256,7 @@ public class ServiceUtils { throw new RestAPIException(errorMsg, e); } } - + return PojoConverter.populatePartitionPojos(partitions); } @@ -1040,8 +1041,8 @@ public class ServiceUtils { return arrCluster; } - - public static org.apache.stratos.rest.endpoint.bean.topology.Cluster[] getClustersForCartridgeType(String cartridgeType) { + + public static org.apache.stratos.rest.endpoint.bean.topology.Cluster[] getClustersForCartridgeType(String cartridgeType) { Set<Cluster> clusterSet = TopologyClusterInformationModel .getInstance() @@ -1128,10 +1129,10 @@ public class ServiceUtils { * @param clusterSubdomain */ static void deployService(String cartridgeType, String alias, String autoscalingPolicy, String deploymentPolicy, - String tenantDomain, String tenantUsername, int tenantId, String clusterDomain, String clusterSubdomain, String tenantRange) throws RestAPIException { + String tenantDomain, String tenantUsername, int tenantId, String clusterDomain, String clusterSubdomain, String tenantRange, boolean isPublic) throws RestAPIException { log.info("Deploying service.."); try { - serviceDeploymentManager.deployService(cartridgeType, autoscalingPolicy, deploymentPolicy, tenantId, tenantRange, tenantDomain, tenantUsername); + serviceDeploymentManager.deployService(cartridgeType, autoscalingPolicy, deploymentPolicy, tenantId, tenantRange, tenantDomain, tenantUsername, isPublic); } catch (Exception e) { String msg = String.format("Failed to deploy the Service [Cartridge type] %s [alias] %s . Cause: %s", cartridgeType, alias, e.getMessage()); http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java index 3f42af2..c8980b2 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java @@ -30,6 +30,7 @@ import org.apache.stratos.manager.dto.SubscriptionInfo; import org.apache.stratos.manager.exception.DomainMappingExistsException; import org.apache.stratos.manager.exception.ServiceDoesNotExistException; import org.apache.stratos.manager.subscription.CartridgeSubscription; +import org.apache.stratos.manager.subscription.SubscriptionDomain; import org.apache.stratos.manager.user.mgt.beans.UserInfoBean; import org.apache.stratos.rest.endpoint.ServiceHolder; import org.apache.stratos.rest.endpoint.Utils; @@ -47,6 +48,7 @@ import org.apache.stratos.rest.endpoint.bean.kubernetes.KubernetesGroup; import org.apache.stratos.rest.endpoint.bean.kubernetes.KubernetesHost; import org.apache.stratos.rest.endpoint.bean.kubernetes.KubernetesMaster; import org.apache.stratos.rest.endpoint.bean.repositoryNotificationInfoBean.Payload; +import org.apache.stratos.rest.endpoint.bean.repositoryNotificationInfoBean.Repository; import org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDomainBean; import org.apache.stratos.rest.endpoint.bean.topology.Cluster; import org.apache.stratos.rest.endpoint.exception.RestAPIException; @@ -941,13 +943,13 @@ public class StratosAdmin extends AbstractAdmin { public Response deployService(ServiceDefinitionBean serviceDefinitionBean) throws RestAPIException { - log.info("Service definition request.. : " + serviceDefinitionBean.getServiceName()); - // super tenant Deploying service (MT) - // here an alias is generated - ServiceUtils.deployService(serviceDefinitionBean.getCartridgeType(), UUID.randomUUID().toString(), serviceDefinitionBean.getAutoscalingPolicyName(), - serviceDefinitionBean.getDeploymentPolicyName(), getTenantDomain(), getUsername(), getTenantId(), - serviceDefinitionBean.getClusterDomain(), serviceDefinitionBean.getClusterSubDomain(), - serviceDefinitionBean.getTenantRange()); + log.info("Service definition request.. : " + serviceDefinitionBean.getServiceName()); + // super tenant Deploying service (MT) + // here an alias is generated + ServiceUtils.deployService(serviceDefinitionBean.getCartridgeType(), UUID.randomUUID().toString(), serviceDefinitionBean.getAutoscalingPolicyName(), + serviceDefinitionBean.getDeploymentPolicyName(), getTenantDomain(), getUsername(), getTenantId(), + serviceDefinitionBean.getClusterDomain(), serviceDefinitionBean.getClusterSubDomain(), + serviceDefinitionBean.getTenantRange(), serviceDefinitionBean.getIsPublic()); URI url = uriInfo.getAbsolutePathBuilder().path(serviceDefinitionBean.getServiceName()).build(); return Response.created(url).build(); http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd index d9e276c..4267728 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd +++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd @@ -33,6 +33,7 @@ <xs:sequence> <xs:element name="id" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/> + <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/> <xs:element name="provider" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="property" minOccurs="1" maxOccurs="unbounded"> <xs:complexType> @@ -51,6 +52,7 @@ <xs:sequence> <xs:element name="id" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/> + <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/> <xs:element name="loadThresholds" minOccurs="1" maxOccurs="1" nillable="false"> <xs:complexType> <xs:all> @@ -69,6 +71,7 @@ <xs:sequence> <xs:element name="id" type="xs:string" maxOccurs="1" minOccurs="1" nillable="false"/> <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/> + <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/> <xs:element name="partitionGroup"> <xs:complexType> <xs:sequence> @@ -102,6 +105,7 @@ <xs:complexType> <xs:sequence> <xs:element name="type" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> + <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/> <xs:element name="provider" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="host" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="displayName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> @@ -227,6 +231,7 @@ <xs:complexType> <xs:all> <xs:element name="serviceName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> + <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/> <xs:element name="cartridgeType" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="deploymentPolicyName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="autoscalingPolicyName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/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 b0ad8de..b8eae78 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 @@ -594,7 +594,12 @@ <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="id" nillable="true" type="xs:string"/> +<<<<<<< HEAD <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax216:LoadThresholds"/> +======= + <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> + <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax214:LoadThresholds"/> +>>>>>>> Adding in isPublic property to beans and Service interface / utils for tenant isolation requirements </xs:sequence> </xs:complexType> <xs:complexType name="LoadThresholds"> @@ -631,7 +636,12 @@ <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax29:Partition"/> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> +<<<<<<< HEAD <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionGroups" nillable="true" type="ax212:PartitionGroup"/> +======= + <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionGroups" nillable="true" type="ax28:PartitionGroup"/> +>>>>>>> Adding in isPublic property to beans and Service interface / utils for tenant isolation requirements </xs:sequence> </xs:complexType> </xs:schema> @@ -643,6 +653,8 @@ <xs:element minOccurs="0" name="descriptionSpecified" type="xs:boolean"/> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="idSpecified" type="xs:boolean"/> + <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> + <xs:element minOccurs="0" name="isPublicSpecified" type="xs:boolean"/> <xs:element minOccurs="0" name="partitionMax" type="xs:int"/> <xs:element minOccurs="0" name="partitionMaxSpecified" type="xs:boolean"/> <xs:element minOccurs="0" name="partitionMin" type="xs:int"/> @@ -1867,6 +1879,7 @@ </wsdl:binding> <wsdl:service name="AutoScalerService"> <wsdl:port name="AutoScalerServiceHttpSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding"> +<<<<<<< HEAD <soap:address location="http://localhost:8080/axis2/services/AutoScalerService"/> </wsdl:port> <wsdl:port name="AutoScalerServiceHttpSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding"> @@ -1874,6 +1887,24 @@ </wsdl:port> <wsdl:port name="AutoScalerServiceHttpEndpoint" binding="ns:AutoScalerServiceHttpBinding"> <http:address location="http://localhost:8080/axis2/services/AutoScalerService"/> +======= + <soap:address location="http://192.168.0.100:9763/services/AutoScalerService.AutoScalerServiceHttpSoap11Endpoint/"/> + </wsdl:port> + <wsdl:port name="AutoScalerServiceHttpsSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding"> + <soap:address location="https://192.168.0.100:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap11Endpoint/"/> + </wsdl:port> + <wsdl:port name="AutoScalerServiceHttpsSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding"> + <soap12:address location="https://192.168.0.100:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap12Endpoint/"/> + </wsdl:port> + <wsdl:port name="AutoScalerServiceHttpSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding"> + <soap12:address location="http://192.168.0.100:9763/services/AutoScalerService.AutoScalerServiceHttpSoap12Endpoint/"/> + </wsdl:port> + <wsdl:port name="AutoScalerServiceHttpEndpoint" binding="ns:AutoScalerServiceHttpBinding"> + <http:address location="http://192.168.0.100:9763/services/AutoScalerService.AutoScalerServiceHttpEndpoint/"/> + </wsdl:port> + <wsdl:port name="AutoScalerServiceHttpsEndpoint" binding="ns:AutoScalerServiceHttpBinding"> + <http:address location="https://192.168.0.100:9443/services/AutoScalerService.AutoScalerServiceHttpsEndpoint/"/> +>>>>>>> Adding in isPublic property to beans and Service interface / utils for tenant isolation requirements </wsdl:port> </wsdl:service> </wsdl:definitions> http://git-wip-us.apache.org/repos/asf/stratos/blob/0aaa1521/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 fcc7bb3..afe87fa 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 @@ -354,7 +354,12 @@ <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"/> +<<<<<<< HEAD <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax223:LoadbalancerConfig"/> +======= + <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> + <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax221:LoadbalancerConfig"/> +>>>>>>> Adding in isPublic property to beans and Service interface / utils for tenant isolation requirements <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/> <xs:element minOccurs="0" name="persistence" nillable="true" type="ax223:Persistence"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax223:PortMapping"/> @@ -395,8 +400,14 @@ <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"/> +<<<<<<< HEAD <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax223:IaasConfig"/> <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax223:LoadbalancerConfig"/> +======= + <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax221:IaasConfig"/> + <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> + <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax221:LoadbalancerConfig"/> +>>>>>>> Adding in isPublic property to beans and Service interface / utils for tenant isolation requirements <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/> <xs:element minOccurs="0" name="persistence" nillable="true" type="ax223:Persistence"/> <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax223:PortMapping"/> @@ -448,6 +459,7 @@ <xs:sequence> <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/> <xs:element minOccurs="0" name="partitionMax" type="xs:int"/> <xs:element minOccurs="0" name="partitionMin" type="xs:int"/> <xs:element minOccurs="0" name="properties" nillable="true" type="ax223:Properties"/> @@ -1109,6 +1121,7 @@ </wsdl:binding> <wsdl:service name="CloudControllerService"> <wsdl:port name="CloudControllerServiceHttpSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> +<<<<<<< HEAD <soap:address location="http://172.17.8.1:9763/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"/> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> @@ -1125,6 +1138,24 @@ </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsEndpoint" binding="ns:CloudControllerServiceHttpBinding"> <http:address location="https://172.17.8.1:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"/> +======= + <soap:address location="http://192.168.0.100:9763/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"/> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpsSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> + <soap:address location="https://192.168.0.100:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/"/> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> + <soap12:address location="http://192.168.0.100:9763/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/"/> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpsSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> + <soap12:address location="https://192.168.0.100:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/"/> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpEndpoint" binding="ns:CloudControllerServiceHttpBinding"> + <http:address location="http://192.168.0.100:9763/services/CloudControllerService.CloudControllerServiceHttpEndpoint/"/> + </wsdl:port> + <wsdl:port name="CloudControllerServiceHttpsEndpoint" binding="ns:CloudControllerServiceHttpBinding"> + <http:address location="https://192.168.0.100:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"/> +>>>>>>> Adding in isPublic property to beans and Service interface / utils for tenant isolation requirements </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file
