From 4f80ffeb682bc1306394d47c53e333dd9e0b9563 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 20 Jun 2022 10:50:58 +0200 Subject: [PATCH 1/2] server: update lb rule with new protocol --- .../com/cloud/network/lb/LoadBalancingRulesManagerImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index 087de40cd096..9ce5327ccbf3 100644 --- a/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -2105,6 +2105,7 @@ public LoadBalancer updateLoadBalancerRule(UpdateLoadBalancerRuleCmd cmd) { LoadBalancerVO lbBackup = _lbDao.findById(lbRuleId); String customId = cmd.getCustomId(); Boolean forDisplay = cmd.getDisplay(); + String lbProtocol = cmd.getLbProtocol(); if (lb == null) { throw new InvalidParameterValueException("Unable to find lb rule by id=" + lbRuleId); @@ -2133,6 +2134,10 @@ public LoadBalancer updateLoadBalancerRule(UpdateLoadBalancerRuleCmd cmd) { lb.setDisplay(forDisplay); } + if (lbProtocol != null) { + lb.setLbProtocol(lbProtocol); + } + // Validate rule in LB provider LoadBalancingRule rule = getLoadBalancerRuleToApply(lb); if (!validateLbRule(rule)) { From b83f1b7e6f03278f4aba80e06aa532faaab907cf Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 21 Jun 2022 09:42:07 +0200 Subject: [PATCH 2/2] Update PR #4746: use StringUtils.isNotBlank() instead --- .../com/cloud/network/lb/LoadBalancingRulesManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index 9ce5327ccbf3..3227516e04d7 100644 --- a/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -47,6 +47,7 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO; import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import com.cloud.agent.api.to.LoadBalancerTO; @@ -2134,7 +2135,7 @@ public LoadBalancer updateLoadBalancerRule(UpdateLoadBalancerRuleCmd cmd) { lb.setDisplay(forDisplay); } - if (lbProtocol != null) { + if (StringUtils.isNotBlank(lbProtocol)) { lb.setLbProtocol(lbProtocol); }