From 3122486f8dae92bc665e358d0577527e06ba2439 Mon Sep 17 00:00:00 2001 From: pkazimierowski <pkazimierowski@man.poznan.pl> Date: Wed, 28 May 2025 14:34:43 +0200 Subject: [PATCH] changed argument method from AppDeployment to Identifier --- .../kubernetes/KServiceLifecycleManager.java | 3 +-- .../kubernetes/components/helm/HelmKServiceManager.java | 2 +- .../nmaas/orchestration/DefaultAppLifecycleManager.java | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/KServiceLifecycleManager.java b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/KServiceLifecycleManager.java index ab4595b2c..f730fcbeb 100644 --- a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/KServiceLifecycleManager.java +++ b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/KServiceLifecycleManager.java @@ -2,7 +2,6 @@ package net.geant.nmaas.nmservice.deployment.containerorchestrators.kubernetes; import net.geant.nmaas.nmservice.deployment.containerorchestrators.kubernetes.entities.KubernetesTemplate; import net.geant.nmaas.orchestration.Identifier; -import net.geant.nmaas.orchestration.entities.AppDeployment; public interface KServiceLifecycleManager { @@ -16,7 +15,7 @@ public interface KServiceLifecycleManager { void updateHelmRepo(); - void scaleDeployment(AppDeployment deployment, int replicas); + void scaleDeployment(Identifier deploymentId, int replicas); } diff --git a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmKServiceManager.java b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmKServiceManager.java index 8767a2a2a..54f10b9f4 100644 --- a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmKServiceManager.java +++ b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmKServiceManager.java @@ -194,7 +194,7 @@ public class HelmKServiceManager implements KServiceLifecycleManager { @Override @Loggable(LogLevel.TRACE) - public void scaleDeployment(AppDeployment deployment, int replicas) { + public void scaleDeployment(Identifier deploymentId, int replicas) { } } \ No newline at end of file diff --git a/src/main/java/net/geant/nmaas/orchestration/DefaultAppLifecycleManager.java b/src/main/java/net/geant/nmaas/orchestration/DefaultAppLifecycleManager.java index d05c5d31b..e73935198 100644 --- a/src/main/java/net/geant/nmaas/orchestration/DefaultAppLifecycleManager.java +++ b/src/main/java/net/geant/nmaas/orchestration/DefaultAppLifecycleManager.java @@ -285,7 +285,7 @@ public class DefaultAppLifecycleManager implements AppLifecycleManager { @Transactional(propagation = Propagation.REQUIRES_NEW) public void scaleDown(Identifier deploymentId) { AppDeployment appDeployment = deploymentRepositoryManager.load(deploymentId); - kServiceLifecycleManager.scaleDeployment(appDeployment, 0); + kServiceLifecycleManager.scaleDeployment(deploymentId, 0); appDeployment.setState(AppDeploymentState.SCALED_DOWN); log.warn("Scaled down deployment NOT IMPLEMENT YET"); @@ -295,9 +295,8 @@ public class DefaultAppLifecycleManager implements AppLifecycleManager { @Loggable(LogLevel.INFO) @Transactional(propagation = Propagation.REQUIRES_NEW) public void scaleUp(Identifier deploymentId) { - AppDeployment appDeployment = deploymentRepositoryManager.load(deploymentId); int replicas = 1; - kServiceLifecycleManager.scaleDeployment(appDeployment, replicas); + kServiceLifecycleManager.scaleDeployment(deploymentId, replicas); log.warn("Scaled up deployment NOT IMPLEMENT YET"); } -- GitLab