Update the missing references in UUID
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b553f49d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b553f49d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b553f49d Branch: refs/heads/tenant-isolation Commit: b553f49d05fbd5a4f18e6c5748217af0d522cc81 Parents: cba4acb Author: Gayan Gunarathne <[email protected]> Authored: Sat Jul 11 02:53:48 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Sat Jul 11 02:53:48 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 3 +- .../domain/application/Applications.java | 9 +++++ .../tests/SampleApplicationsTest.java | 40 ++++++++------------ 3 files changed, 27 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b553f49d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index 5a974ea..aaaaa2f 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -254,7 +254,8 @@ public class DefaultApplicationParser implements ApplicationParser { application.setTenantId(applicationContext.getTenantId()); application.setTenantDomain(applicationContext.getTenantDomain()); application.setTenantAdminUserName(applicationContext.getTenantAdminUsername()); - + application.setId(applicationContext.getApplicationId()); + Set<StartupOrder> startupOrderSet = new LinkedHashSet<StartupOrder>(); DependencyOrder dependencyOrder = new DependencyOrder(); dependencyOrder.setStartupOrders(startupOrderSet); http://git-wip-us.apache.org/repos/asf/stratos/blob/b553f49d/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java index aa0db86..b4b8ab5 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Applications.java @@ -47,6 +47,15 @@ public class Applications implements Serializable { return this.getApplications().get(applicationUuid); } + public Application getApplicationByTenent(String applicationid) { + for(Application application:this.getApplications().values()){ + if(application.getId().equals(applicationid)){ + return application; + } + } + return null; + } + public boolean isInitialized() { return initialized; } http://git-wip-us.apache.org/repos/asf/stratos/blob/b553f49d/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java index 3e8d209..5bac1b9 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java @@ -72,9 +72,10 @@ public class SampleApplicationsTest extends StratosTestServerManager { private void runApplicationTest(String applicationFolderName, String applicationId) { executeCommand(getApplicationsPath() + "/" + applicationFolderName + "/scripts/mock/deploy.sh"); - assertApplicationActivation(applicationId); + assertApplicationActivation(applicationId); // executeCommand(getApplicationsPath() + "/" + applicationFolderName + "/scripts/mock/undeploy.sh"); // assertApplicationNotExists(applicationId); + } /** @@ -113,33 +114,24 @@ public class SampleApplicationsTest extends StratosTestServerManager { * @param applicationName */ private void assertApplicationActivation(String applicationName) { - long startTime = System.currentTimeMillis(); - Application application=null; - for (Application applicationExists : ApplicationManager.getApplications().getApplications().values()){ - if(applicationExists.getName().equals(applicationName)){ - application=applicationExists; + long startTime = System.currentTimeMillis(); + Application application = ApplicationManager.getApplications().getApplicationByTenent(applicationName); + while (!((application != null) && (application.getStatus() == ApplicationStatus.Active))) { + try { + Thread.sleep(1000); + } catch (InterruptedException ignore) { + } + application = ApplicationManager.getApplications().getApplicationByTenent(applicationName); + if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) { + break; } } - while(!((application != null) && (application.getStatus() == ApplicationStatus.Active))) { - try { - Thread.sleep(1000); - } catch (InterruptedException ignore) { - } - for (Application applicationExists : ApplicationManager.getApplications().getApplications().values()) { - if (applicationExists.getName().equals(applicationName)) { - application = applicationExists; - } - } - if((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) { - break; - } - } - assertNotNull(String.format("Application is not found: [application-id] %s", applicationName), application); - assertEquals(String.format("Application status did not change to active: [application-id] %s", applicationName), - ApplicationStatus.Active, application.getStatus()); + assertNotNull(String.format("Application is not found: [application-id] %s", applicationName), application); + assertEquals(String.format("Application status did not change to active: [application-id] %s", applicationName), + ApplicationStatus.Active, application.getStatus()); } - + private void assertApplicationNotExists(String applicationName) { Application application = ApplicationManager.getApplications().getApplication(applicationName); assertNull(String.format("Application is found in the topology : [application-id] %s", applicationName), application);
