adding tenant info. to Application in Topology
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/265088b3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/265088b3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/265088b3 Branch: refs/heads/4.0.0-grouping Commit: 265088b30a62fb17319f4b32ef6ebb5d97120704 Parents: 2ca08d4 Author: Isuru Haththotuwa <[email protected]> Authored: Wed Sep 17 18:00:44 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Wed Sep 17 18:00:44 2014 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 6 + .../pojo/application/ApplicationContext.java | 30 + .../messaging/domain/topology/Application.java | 30 + .../rest/endpoint/services/ServiceUtils.java | 3 + .../main/resources/CloudControllerService.wsdl | 589 ++++++++++--------- 5 files changed, 365 insertions(+), 293 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/265088b3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java index 44edc49..c6ab42e 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/parser/DefaultApplicationParser.java @@ -179,6 +179,12 @@ public class DefaultApplicationParser implements ApplicationParser { throws ApplicationDefinitionException { Application application = new Application(appCtxt.getApplicationId()); + + // set tenant related information + application.setTenantId(appCtxt.getTenantId()); + application.setTenantDomain(appCtxt.getTenantDomain()); + application.setTenantAdminUserName(appCtxt.getTeantAdminUsername()); + // following keeps track of all Clusters created for this application Set<Cluster> clusters = new HashSet<Cluster>(); http://git-wip-us.apache.org/repos/asf/stratos/blob/265088b3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java index 7dfdb44..3a8af44 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java @@ -21,6 +21,12 @@ package org.apache.stratos.cloud.controller.pojo.application; public class ApplicationContext { + private int tenantId; + + private String tenantDomain; + + private String teantAdminUsername; + private String applicationId; private String alias; @@ -60,4 +66,28 @@ public class ApplicationContext { public void setSubscribableInfoContext(SubscribableInfoContext[] subscribableInfoContexts) { this.subscribableInfoContexts = subscribableInfoContexts; } + + public int getTenantId() { + return tenantId; + } + + public void setTenantId(int tenantId) { + this.tenantId = tenantId; + } + + public String getTenantDomain() { + return tenantDomain; + } + + public void setTenantDomain(String tenantDomain) { + this.tenantDomain = tenantDomain; + } + + public String getTeantAdminUsername() { + return teantAdminUsername; + } + + public void setTeantAdminUsername(String teantAdminUsername) { + this.teantAdminUsername = teantAdminUsername; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/265088b3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Application.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Application.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Application.java index 035b52a..3902947 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Application.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Application.java @@ -32,6 +32,12 @@ public class Application implements ParentBehavior { private String id; // Key used for authentication (with metadata service, etc.) private String key; + // tenant id + private int tenantId; + // tenant domain + private String tenantDomain; + // tenant admin user + private String tenantAdminUserName; // Dependency Order private DependencyOrder dependencyOrder; // Group Map, key = Group.name @@ -137,4 +143,28 @@ public class Application implements ParentBehavior { public void setStatus(Status status) { this.status = status; } + + public int getTenantId() { + return tenantId; + } + + public void setTenantId(int tenantId) { + this.tenantId = tenantId; + } + + public String getTenantDomain() { + return tenantDomain; + } + + public void setTenantDomain(String tenantDomain) { + this.tenantDomain = tenantDomain; + } + + public String getTenantAdminUserName() { + return tenantAdminUserName; + } + + public void setTenantAdminUserName(String tenantAdminUserName) { + this.tenantAdminUserName = tenantAdminUserName; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/265088b3/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 69d09e0..887dbfd 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 @@ -264,6 +264,9 @@ public class ServiceUtils { // } ApplicationContext applicationContext = PojoConverter.convertApplicationBeanToApplicationContext(compositeAppDefinition); + applicationContext.setTenantId(ApplicationManagementUtil.getTenantId(ctxt)); + applicationContext.setTenantDomain(tenantDomain); + applicationContext.setTeantAdminUsername(userName); try { CloudControllerServiceClient.getServiceClient().deployApplicationDefinition(applicationContext);
