From 8dd0ff068cdabd5c2629f0169ac1b51ba34c9d05 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Tue, 22 Aug 2023 15:31:37 +0200 Subject: [PATCH] prevent payg-dimension-computation from beeing displayed and modified --- .../redhat/rhn/frontend/action/tasko/SatSchedulesAction.java | 4 +++- .../rhn/frontend/action/tasko/ScheduleDetailAction.java | 4 ++++ .../rhn/taskomatic/task/payg/PaygComputeDimensionsTask.java | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java index c94a8aef7bca..e813a40d0c9b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java @@ -56,7 +56,9 @@ public ActionForward execute(ActionMapping mapping, public List> getResult(RequestContext contextIn) { User user = contextIn.getCurrentUser(); try { - return new TaskomaticApi().findActiveSchedules(user); + List> activeSchedules = new TaskomaticApi().findActiveSchedules(user); + activeSchedules.removeIf(s -> s.get("job_label").equals("payg-dimension-computation-default")); + return activeSchedules; } catch (TaskomaticApiException e) { createErrorMessage(contextIn.getRequest(), diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java index ce290d40280e..04a76a548a5b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java @@ -186,6 +186,10 @@ private void setupForm(HttpServletRequest request, DynaActionForm form) { TaskomaticApi tapi = new TaskomaticApi(); Map schedule = tapi.lookupScheduleById(loggedInUser, schid); String scheduleName = (String) schedule.get("job_label"); + if (scheduleName.equals("payg-dimension-computation-default")) { + // not modifiable + return; + } String bunchName = (String) schedule.get("bunch"); request.setAttribute("schedulename", scheduleName); form.set("schedulename", scheduleName); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygComputeDimensionsTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygComputeDimensionsTask.java index d20913ef1452..79d9b3f1fc45 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygComputeDimensionsTask.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygComputeDimensionsTask.java @@ -79,6 +79,7 @@ public String getConfigNamespace() { @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { if (!cloudManager.isPaygInstance()) { + LOGGER.debug("Not a PAYG instance. Exit"); return; }