Repository: airavata Updated Branches: refs/heads/master 219063e0d -> dda627b26
minor changes to the test case and fix test failures - AIRAVATA-1057 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0a89a10a Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0a89a10a Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0a89a10a Branch: refs/heads/master Commit: 0a89a10a6c8256b80e6ae5f7734089dd0fa33352 Parents: 9c4f64a Author: lahiru <[email protected]> Authored: Fri Mar 7 10:50:26 2014 -0500 Committer: lahiru <[email protected]> Committed: Fri Mar 7 10:50:26 2014 -0500 ---------------------------------------------------------------------- .../apache/airavata/client/samples/CreateLaunchExperiment.java | 1 + .../java/org/apache/airavata/client/tools/DocumentCreator.java | 4 +++- .../airavata/job/monitor/impl/pull/qstat/ResourceConnection.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/0a89a10a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java index 9e6d1b0..300e91b 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java @@ -123,6 +123,7 @@ public class CreateLaunchExperiment { DocumentCreator documentCreator = new DocumentCreator(getAiravataAPI()); documentCreator.createLocalHostDocs(); documentCreator.createGramDocs(); + documentCreator.createPBSDocs(); documentCreator.createSlurmDocs(); } catch (AiravataAPIInvocationException e) { logger.error("Unable to create airavata API", e.getMessage()); http://git-wip-us.apache.org/repos/asf/airavata/blob/0a89a10a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java ---------------------------------------------------------------------- diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java index eac7214..60c53d5 100644 --- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java +++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java @@ -212,6 +212,8 @@ public class DocumentCreator { HostDescription host = new HostDescription(GsisshHostType.type); host.getType().setHostAddress(hpcHostAddress); host.getType().setHostName(gsiSshHostName); + ((GsisshHostType) host.getType()).setPort(22); + ((GsisshHostType) host.getType()).setInstalledPath("/opt/torque/bin/"); try { airavataAPI.getApplicationManager().saveHostDescription(host); @@ -321,7 +323,7 @@ public class DocumentCreator { /* * Service Description creation and saving */ - String serviceName = "SimpleEcho2"; + String serviceName = "SimpleEcho3"; ServiceDescription serv = new ServiceDescription(); serv.getType().setName(serviceName); http://git-wip-us.apache.org/repos/asf/airavata/blob/0a89a10a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java ---------------------------------------------------------------------- diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java index 60d2b9b..b5139d7 100644 --- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java +++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java @@ -64,7 +64,7 @@ public class ResourceConnection { String jobID = monitorID.getJobID(); //todo so currently we execute the qstat for each job but we can use user based monitoring //todo or we should concatenate all the commands and execute them in one go and parse the response - return getStatusFromString(cluster.getJobStatus(monitorID.getJobID()).toString()); + return getStatusFromString(cluster.getJobStatus(jobID).toString()); } private JobState getStatusFromString(String status) {
