From 252d818c92968dea02b997f24ccb830e49defdc5 Mon Sep 17 00:00:00 2001
From: Rudi Schlatte <rudi@ifi.uio.no>
Date: Wed, 3 Apr 2024 12:03:26 +0200
Subject: [PATCH] Temporarily bypass resource broker

Change-Id: Ibfb4de36e6d3233d4d1271805282e7feee0f1fc2
---
 .../optimiser/controller/NebulousAppDeployer.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousAppDeployer.java b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousAppDeployer.java
index aafbd19..71cb606 100644
--- a/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousAppDeployer.java
+++ b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousAppDeployer.java
@@ -176,7 +176,7 @@ public class NebulousAppDeployer {
         // 2. Find node candidates
 
         // TODO: filter by app resources (check enabled: true in resources array)
-        List<NodeCandidate> controllerCandidates = conn.findNodeCandidates(controllerRequirements, appUUID);
+        List<NodeCandidate> controllerCandidates = conn.findNodeCandidatesFromSal(controllerRequirements, appUUID);
         if (controllerCandidates.isEmpty()) {
             log.error("Could not find node candidates for requirements: {}",
                 controllerRequirements, keyValue("appId", appUUID), keyValue("clusterName", clusterName));
@@ -188,7 +188,7 @@ public class NebulousAppDeployer {
             String nodeName = e.getKey();
             List<Requirement> requirements = e.getValue();
             // TODO: filter by app resources (check enabled: true in resources array)
-            List<NodeCandidate> candidates = conn.findNodeCandidates(requirements, appUUID);
+            List<NodeCandidate> candidates = conn.findNodeCandidatesFromSal(requirements, appUUID);
             if (candidates.isEmpty()) {
                 log.error("Could not find node candidates for for node {}, requirements: {}", nodeName, requirements,
                     keyValue("appId", appUUID), keyValue("clusterName", clusterName));
@@ -443,7 +443,7 @@ public class NebulousAppDeployer {
                     log.debug("Adding {} nodes to component {}", nAdd, componentName,
                         keyValue("appId", appUUID), keyValue("clusterName", clusterName));
                     // TODO: filter by app resources (check enabled: true in resources array)
-                    List<NodeCandidate> candidates = conn.findNodeCandidates(newR, appUUID);
+                    List<NodeCandidate> candidates = conn.findNodeCandidatesFromSal(newR, appUUID);
                     if (candidates.isEmpty()) {
                         log.error("Could not find node candidates for requirements: {}",
                             newR, keyValue("appId", appUUID), keyValue("clusterName", clusterName));
@@ -499,7 +499,7 @@ public class NebulousAppDeployer {
                 log.debug("Redeploying all nodes of component {}", componentName,
                     keyValue("appId", appUUID), keyValue("clusterName", clusterName));
                 // TODO: filter by app resources (check enabled: true in resources array)
-                List<NodeCandidate> candidates = conn.findNodeCandidates(newR, appUUID);
+                List<NodeCandidate> candidates = conn.findNodeCandidatesFromSal(newR, appUUID);
                 if (candidates.size() == 0) {
                     log.error("Empty node candidate list for component {}, continuing without creating node", componentName,
                         keyValue("appId", appUUID), keyValue("clusterName", clusterName));