Add provider name to cloud job submission
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/30aa6f62 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/30aa6f62 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/30aa6f62 Branch: refs/heads/auroraMesosIntegration Commit: 30aa6f6271d942f99786638040c57666919bd190 Parents: 9d2497c Author: Shameera Rathnayaka <[email protected]> Authored: Tue Nov 1 18:09:27 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Tue Nov 1 18:09:27 2016 -0400 ---------------------------------------------------------------------- .../registry/core/app/catalog/impl/ComputeResourceImpl.java | 6 +++--- .../registry/core/app/catalog/util/AppCatalogJPAUtils.java | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/30aa6f62/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java index 35536f5..84465c2 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java @@ -201,10 +201,10 @@ public class ComputeResourceImpl implements ComputeResource { } @Override - public String addCloudJobSubmission(CloudJobSubmission sshJobSubmission) throws AppCatalogException { + public String addCloudJobSubmission(CloudJobSubmission cloudJobSubmission) throws AppCatalogException { try { - sshJobSubmission.setJobSubmissionInterfaceId(AppCatalogUtils.getID("Cloud")); - CloudSubmissionResource resource = AppCatalogThriftConversion.getCloudJobSubmission(sshJobSubmission); + cloudJobSubmission.setJobSubmissionInterfaceId(AppCatalogUtils.getID("Cloud")); + CloudSubmissionResource resource = AppCatalogThriftConversion.getCloudJobSubmission(cloudJobSubmission); resource.save(); return resource.getJobSubmissionInterfaceId(); }catch (Exception e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/30aa6f62/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java index bd7b442..efac1e2 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java @@ -683,6 +683,7 @@ public class AppCatalogJPAUtils { cloudSubmissionResource.setExecutableType(o.getExecutableType()); cloudSubmissionResource.setUserAccountName(o.getUserAccountName()); cloudSubmissionResource.setNodeId(o.getNodeId()); + cloudSubmissionResource.setProviderName(o.getProviderName()); } return cloudSubmissionResource; }
