ZhyliaievD commented on code in PR #12835:
URL: https://github.com/apache/cloudstack/pull/12835#discussion_r3056581343
##########
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java:
##########
@@ -676,27 +689,62 @@ public void
createNsxLbServerPool(List<NsxLoadBalancerMember> memberList, String
}
}
+ private Optional<LBPool> getNsxLbServerPool(LbPools lbPools, String
lbServerPoolName) {
+ try {
+ return Optional.ofNullable(lbPools.get(lbServerPoolName));
+ } catch (NotFound e) {
+ logger.debug("Server Pool not found: {}", lbServerPoolName);
+ return Optional.empty();
+ }
+ }
+
+ private boolean hasSamePoolMembers(List<LBPoolMember> existingMembers,
List<LBPoolMember> membersUpdate) {
+ Set<String> existingMembersSet = existingMembers.stream()
+ .map(this::buildPoolMemberKey)
+ .collect(toSet());
+ Set<String> updateMembersSet = membersUpdate.stream()
+ .map(this::buildPoolMemberKey)
+ .collect(toSet());
+
+ return existingMembersSet.size() == updateMembersSet.size()
+ && existingMembersSet.containsAll(updateMembersSet);
+ }
+
+ private String buildPoolMemberKey(LBPoolMember member) {
+ return member.getIpAddress() + ':' + member.getPort() + ':' +
member.getDisplayName();
+ }
+
private String getLbActiveMonitorPath(String lbServerPoolName, String
port, String protocol) {
LbMonitorProfiles lbActiveMonitor = (LbMonitorProfiles)
nsxService.apply(LbMonitorProfiles.class);
String lbMonitorProfileId =
getActiveMonitorProfileName(lbServerPoolName, port, protocol);
- if ("TCP".equals(protocol.toUpperCase(Locale.ROOT))) {
- LBTcpMonitorProfile lbTcpMonitorProfile = new
LBTcpMonitorProfile.Builder(TCP_MONITOR_PROFILE)
- .setDisplayName(lbMonitorProfileId)
- .setMonitorPort(Long.parseLong(port))
- .build();
- lbActiveMonitor.patch(lbMonitorProfileId, lbTcpMonitorProfile);
- } else if ("UDP".equals(protocol.toUpperCase(Locale.ROOT))) {
- LBIcmpMonitorProfile icmpMonitorProfile = new
LBIcmpMonitorProfile.Builder(ICMP_MONITOR_PROFILE)
- .setDisplayName(lbMonitorProfileId)
- .build();
- lbActiveMonitor.patch(lbMonitorProfileId, icmpMonitorProfile);
+ Optional<Structure> monitorProfile =
getMonitorProfile(lbActiveMonitor, lbMonitorProfileId);
+ if (monitorProfile.isEmpty()) {
+ if ("TCP".equals(protocol.toUpperCase(Locale.ROOT))) {
+ LBTcpMonitorProfile lbTcpMonitorProfile = new
LBTcpMonitorProfile.Builder(TCP_MONITOR_PROFILE)
+ .setDisplayName(lbMonitorProfileId)
+ .setMonitorPort(Long.parseLong(port))
+ .build();
+ lbActiveMonitor.patch(lbMonitorProfileId, lbTcpMonitorProfile);
+ } else if ("UDP".equals(protocol.toUpperCase(Locale.ROOT))) {
+ LBIcmpMonitorProfile icmpMonitorProfile = new
LBIcmpMonitorProfile.Builder(ICMP_MONITOR_PROFILE)
+ .setDisplayName(lbMonitorProfileId)
+ .build();
+ lbActiveMonitor.patch(lbMonitorProfileId, icmpMonitorProfile);
+ }
+ monitorProfile = getMonitorProfile(lbActiveMonitor,
lbMonitorProfileId);
}
-
- LBMonitorProfileListResult listResult =
listLBActiveMonitors(lbActiveMonitor);
- Optional<Structure> monitorProfile =
listResult.getResults().stream().filter(profile ->
profile._getDataValue().getField("id").toString().equals(lbMonitorProfileId)).findFirst();
return monitorProfile.map(structure ->
structure._getDataValue().getField("path").toString()).orElse(null);
}
+ private Optional<Structure> getMonitorProfile(LbMonitorProfiles
lbActiveMonitor, String lbMonitorProfileId) {
+ try {
+ return
Optional.ofNullable(lbActiveMonitor.get(lbMonitorProfileId));
+ } catch (NotFound e) {
+ logger.debug("LB Monitor Profile not found: {}",
lbMonitorProfileId);
Review Comment:
Agree, changed to warn
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
