diff --git a/connectors/pom.xml b/connectors/pom.xml index 5152ed9ec8c364679e9403b3f5e2d1ee0e66e7e3..af45c72af98b00b71d00848a33206d771fb4e1b6 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 diff --git a/connectors/proactive_client/pom.xml b/connectors/proactive_client/pom.xml index 22456f3aac9ee38d94cc79d8d19ab6bef891db5e..cccbe1c175463b9a3e5dd2da17309de35cd900d5 100644 --- a/connectors/proactive_client/pom.xml +++ b/connectors/proactive_client/pom.xml @@ -5,12 +5,12 @@ connectors cloud.morphemic.connectors - 1.4-SNAPSHOT + 1.5-SNAPSHOT 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 diff --git a/mule_esb/mule-integration/pom.xml b/mule_esb/mule-integration/pom.xml index 3cc9f706e7f97524987d3fae5e4ed913dae18d86..d571d5828f64cc78a66266d8df507bf85dae843f 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 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 6843a1a91095a9fbaad5541f5eefb86427bbf9d7..54b90b5d843cb34e80914f661a44c52eeb17f231 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()) {