Repository: airavata Updated Branches: refs/heads/master 10103a445 -> 342d8e9c6
adding host id to generating application deployment id Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/342d8e9c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/342d8e9c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/342d8e9c Branch: refs/heads/master Commit: 342d8e9c62f9589d3bf9fa15eb2236700c1ea2e3 Parents: 10103a4 Author: Chathuri Wimalasena <[email protected]> Authored: Tue Jul 22 14:13:43 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Tue Jul 22 14:13:43 2014 -0400 ---------------------------------------------------------------------- .../application/catalog/data/impl/ApplicationDeploymentImpl.java | 2 +- .../org/apache/airavata/app/catalog/test/AppDeploymentTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/342d8e9c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java index 2394d3c..1a3776f 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java @@ -55,7 +55,7 @@ public class ApplicationDeploymentImpl implements ApplicationDeployment { throw new AppCatalogException("Application module does not exist in the system. Please create an application module first..."); } AppModuleResource module = (AppModuleResource)moduleResource.get(deploymentDescription.getAppModuleId()); - deploymentResource.setDeploymentId(AppCatalogUtils.getID(module.getModuleName())); + deploymentResource.setDeploymentId(deploymentDescription.getComputeHostId() + "_" + module.getModuleName()); deploymentResource.setAppModuleId(deploymentDescription.getAppModuleId()); deploymentResource.setModuleResource(module); deploymentResource.setHostId(deploymentDescription.getComputeHostId()); http://git-wip-us.apache.org/repos/asf/airavata/blob/342d8e9c/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java index 11e87f9..3b2f27e 100644 --- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java +++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java @@ -107,6 +107,7 @@ public class AppDeploymentTest { ApplicationDeploymentDescription app = null; if (appDep.isAppDeploymentExists(appDepId)){ app = appDep.getApplicationDeployement(appDepId); + System.out.println("*********** application deployment id ********* : " + app.getAppDeploymentId()); System.out.println("*********** application deployment desc ********* : " + app.getAppDeploymentDescription()); }
