From 1dff8b7eee35b491a83aa5ecf2ce4b851a082366 Mon Sep 17 00:00:00 2001 From: tpiekarz Date: Wed, 28 Jul 2021 12:15:12 +0200 Subject: [PATCH 1/5] updating version of proactive client to 1.5 --- connectors/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connectors/pom.xml b/connectors/pom.xml index 5152ed9e..af45c72a 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml @@ -6,7 +6,7 @@ cloud.morphemic.connectors connectors - 1.4-SNAPSHOT + 1.5-SNAPSHOT proactive_client -- GitLab From 82347c8ac85b2de736e50c3325c9ffb12af5b738 Mon Sep 17 00:00:00 2001 From: tpiekarz Date: Wed, 28 Jul 2021 12:15:55 +0200 Subject: [PATCH 2/5] updating version of proactive client to 1.5 and SAL to 3.6 --- connectors/proactive_client/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connectors/proactive_client/pom.xml b/connectors/proactive_client/pom.xml index 22456f3a..4926b8ee 100644 --- a/connectors/proactive_client/pom.xml +++ b/connectors/proactive_client/pom.xml @@ -10,7 +10,7 @@ 4.0.0 proactive_client - 1.4-SNAPSHOT + 1.5-SNAPSHOT 1.8 @@ -20,7 +20,7 @@ org.activeeon scheduling-abstraction-layer - 3.5-SNAPSHOT + 3.6-SNAPSHOT -- GitLab From 69f67db9feb5ff35f7492b04a4952252ee96f01a Mon Sep 17 00:00:00 2001 From: tpiekarz Date: Wed, 28 Jul 2021 12:17:34 +0200 Subject: [PATCH 3/5] updating version of proactive client to 1.5 and SAL to 3.6 --- connectors/proactive_client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connectors/proactive_client/pom.xml b/connectors/proactive_client/pom.xml index 4926b8ee..cccbe1c1 100644 --- a/connectors/proactive_client/pom.xml +++ b/connectors/proactive_client/pom.xml @@ -5,7 +5,7 @@ connectors cloud.morphemic.connectors - 1.4-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 -- GitLab From 607c4e524c2664a3a2b61f7f7c89988da85ee73c Mon Sep 17 00:00:00 2001 From: tpiekarz Date: Wed, 28 Jul 2021 12:30:00 +0200 Subject: [PATCH 4/5] updating version of proactive client to 1.5 --- mule_esb/mule-integration/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mule_esb/mule-integration/pom.xml b/mule_esb/mule-integration/pom.xml index 3cc9f706..d571d582 100644 --- a/mule_esb/mule-integration/pom.xml +++ b/mule_esb/mule-integration/pom.xml @@ -261,7 +261,7 @@ cloud.morphemic.connectors proactive_client - 1.4-SNAPSHOT + 1.5-SNAPSHOT org.hibernate.validator -- GitLab From a6f4d0cbdcde3b7680a4e0cb9be0f3616588846c Mon Sep 17 00:00:00 2001 From: LSZ Date: Tue, 31 Aug 2021 17:31:13 +0200 Subject: [PATCH 5/5] change to check if IAAS nodes are already collected by SAL (BYON nodes are not of our interest here) - we want to know if the background process to build NCs for IAAS has finished --- .../ProactiveClientServiceForIntegrationImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mule_esb/mule-integration/src/main/java/cloud/morphemic/mule_integration/proactive/ProactiveClientServiceForIntegrationImpl.java b/mule_esb/mule-integration/src/main/java/cloud/morphemic/mule_integration/proactive/ProactiveClientServiceForIntegrationImpl.java index 6843a1a9..54b90b5d 100644 --- a/mule_esb/mule-integration/src/main/java/cloud/morphemic/mule_integration/proactive/ProactiveClientServiceForIntegrationImpl.java +++ b/mule_esb/mule-integration/src/main/java/cloud/morphemic/mule_integration/proactive/ProactiveClientServiceForIntegrationImpl.java @@ -4,6 +4,8 @@ import cloud.morphemic.connectors.proactive.ProactiveClientServiceConnector; import com.google.common.base.MoreObjects; import org.activeeon.morphemic.PAGateway; import org.activeeon.morphemic.model.NodeCandidate; +import org.activeeon.morphemic.model.NodeType; +import org.activeeon.morphemic.model.NodeTypeRequirement; import org.apache.commons.lang3.ObjectUtils; import org.json.JSONArray; import org.json.JSONObject; @@ -11,10 +13,7 @@ import org.mule.api.annotations.param.Payload; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Optional; -import java.util.UUID; +import java.util.*; public class ProactiveClientServiceForIntegrationImpl extends ProactiveClientServiceConnector implements ProactiveClientServiceForIntegration { private static final Logger log = LoggerFactory.getLogger(ProactiveClientServiceForIntegrationImpl.class); @@ -108,7 +107,10 @@ public class ProactiveClientServiceForIntegrationImpl extends ProactiveClientSer log.info("ProactiveClientServiceForIntegrationImpl->checkNodeCandidatesUpdateFinished: starting..."); Optional paGatewayOptional = getPAGateway(); if(paGatewayOptional.isPresent()) { - List nodeCandidates = paGatewayOptional.get().findNodeCandidates(null); + NodeTypeRequirement nodeTypeRequirement = new NodeTypeRequirement(); + nodeTypeRequirement.setNodeTypes(Collections.singletonList(NodeType.IAAS)); + log.info("ProactiveClientServiceForIntegrationImpl->checkNodeCandidatesUpdateFinished: checking only for occurrence of IAAS nodeCandidates, passing requirement: {}", nodeTypeRequirement); + List nodeCandidates = paGatewayOptional.get().findNodeCandidates(Collections.singletonList(nodeTypeRequirement)); log.info("ProactiveClientServiceForIntegrationImpl->checkNodeCandidatesUpdateFinished: nodeCandidates size= {}", nodeCandidates.size()); if (nodeCandidates.isEmpty()) { -- GitLab