From 99f80540e227a2aba40e18f8c6f08365428dd968 Mon Sep 17 00:00:00 2001 From: marounkoussaifi Date: Wed, 26 May 2021 14:18:57 +0200 Subject: [PATCH 1/2] Add process controller endpoints --- .../org/activeeon/morphemic/PAGateway.java | 42 +++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java index feb709fd..3d68d892 100644 --- a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java +++ b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java @@ -6,6 +6,7 @@ import org.activeeon.morphemic.application.deployment.PASchedulerGateway; import org.activeeon.morphemic.infrastructure.deployment.PAConnectorIaasGateway; import org.activeeon.morphemic.infrastructure.deployment.PAResourceManagerGateway; import org.activeeon.morphemic.model.*; +import org.activeeon.morphemic.model.Job; import org.activeeon.morphemic.service.*; import org.apache.commons.lang3.Validate; import org.apache.log4j.Logger; @@ -15,10 +16,7 @@ import org.ow2.proactive.resourcemanager.common.event.RMNodeEvent; import org.ow2.proactive.resourcemanager.exception.RMException; import org.ow2.proactive.scheduler.common.exception.NotConnectedException; import org.ow2.proactive.scheduler.common.exception.UserException; -import org.ow2.proactive.scheduler.common.job.JobId; -import org.ow2.proactive.scheduler.common.job.JobResult; -import org.ow2.proactive.scheduler.common.job.JobState; -import org.ow2.proactive.scheduler.common.job.TaskFlowJob; +import org.ow2.proactive.scheduler.common.job.*; import org.ow2.proactive.scheduler.common.task.ScriptTask; import org.ow2.proactive.scheduler.common.task.TaskResult; import org.ow2.proactive.scheduler.common.task.TaskVariable; @@ -163,6 +161,42 @@ public class PAGateway { return parentTasks; } + /** + * + * @return the list of all available hardware + */ + public List getHardwareList() { + return EntityManagerHelper.createQuery("SELECT hw FROM HARDWARE hw", + Hardware.class).getResultList(); + } + + /** + * + * @return the list of all available locations + */ + public List getLocationList() { + return EntityManagerHelper.createQuery("SELECT loc FROM LOCATION loc", + Location.class).getResultList(); + } + + /** + * + * @return the list of all jobs + */ + public List getJobsList() { + return EntityManagerHelper.createQuery("SELECT j FROM JOB j", + Job.class).getResultList(); + } + + /** + * + * @return the list of all available monitors + */ + public List getMonitorsList() { + return EntityManagerHelper.createQuery("SELECT mon FROM MONITOR mon", + Monitor.class).getResultList(); + } + /** * -- GitLab From f06d4e5a95ba91182427649be49c84fe2adb7cd9 Mon Sep 17 00:00:00 2001 From: Mohamed Khalil Labidi Date: Wed, 26 May 2021 15:42:10 +0000 Subject: [PATCH 2/2] Update endpoints list --- .../src/main/java/org/activeeon/morphemic/PAGateway.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java index 3d68d892..b5643d97 100644 --- a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java +++ b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java @@ -179,15 +179,6 @@ public class PAGateway { Location.class).getResultList(); } - /** - * - * @return the list of all jobs - */ - public List getJobsList() { - return EntityManagerHelper.createQuery("SELECT j FROM JOB j", - Job.class).getResultList(); - } - /** * * @return the list of all available monitors -- GitLab