From 3e792223afa4f4836340ad9668e4bda6aaf7f70e Mon Sep 17 00:00:00 2001 From: Jan Marchel Date: Fri, 26 Nov 2021 11:26:13 +0100 Subject: [PATCH] cleaning byon nodes from sal --- .../proactive/ProactiveClientServiceGUI.java | 2 ++ .../proactive/ProactiveClientServiceGUIImpl.java | 5 +++++ .../guibackend/controller/byon/ByonController.java | 8 ++++++++ .../upperware/guibackend/service/byon/ByonService.java | 10 ++++++++++ 4 files changed, 25 insertions(+) diff --git a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUI.java b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUI.java index b0d71ce8a..180b8c27e 100644 --- a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUI.java +++ b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUI.java @@ -26,4 +26,6 @@ public interface ProactiveClientServiceGUI extends IProactiveClientServiceConnec List getAllNodes(); List getAllMonitors(); + + boolean deleteByonNode(String byonId); } diff --git a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUIImpl.java b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUIImpl.java index 484522982..440ea1104 100644 --- a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUIImpl.java +++ b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/communication/proactive/ProactiveClientServiceGUIImpl.java @@ -64,4 +64,9 @@ public class ProactiveClientServiceGUIImpl extends ProactiveClientServiceConnect public List getAllMonitors() { return getPAGateway().map(PAGateway::getMonitorsList).orElse(Collections.emptyList()); } + + @Override + public boolean deleteByonNode(String byonId) { + return getPAGateway().map(paGateway -> paGateway.deleteByonNode(byonId)).orElse(false); + } } diff --git a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/controller/byon/ByonController.java b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/controller/byon/ByonController.java index 15ab5cded..3246e260f 100644 --- a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/controller/byon/ByonController.java +++ b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/controller/byon/ByonController.java @@ -95,4 +95,12 @@ public class ByonController { log.info("GET request for byon enums"); return byonService.getByonEnums(); } + + @PutMapping("/cleanByon") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void cleanByonNodes() { + log.info("Put request for byon nodes purging"); + byonService.cleanByon(); + log.info("Put request for byon nodes purging finished"); + } } diff --git a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/service/byon/ByonService.java b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/service/byon/ByonService.java index 9ef14da97..111587778 100644 --- a/gui-backend/src/main/java/eu/melodic/upperware/guibackend/service/byon/ByonService.java +++ b/gui-backend/src/main/java/eu/melodic/upperware/guibackend/service/byon/ByonService.java @@ -199,4 +199,14 @@ public class ByonService { return byonNodes; } + + public void cleanByon() { + log.info("[ByonService]: cleanByon starting"); + List byonNodeList = getAllByonNodesList(); + for(ByonNode byonNode : byonNodeList) { + String byonId = byonNode.getId(); + log.info("[ByonService]: deletingByon for id: {}", byonId); + proactiveClientServiceGUI.deleteByonNode(byonId); + } + } } -- GitLab