Skip to content

Commit 592bc42

Browse files
committed
Fix: CIDR list sent to VR & UI tooltip
1 parent a556707 commit 592bc42

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

server/src/main/java/com/cloud/network/router/CommandSetupHelper.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,10 @@ public void createApplyLoadBalancingRulesCommands(final List<LoadBalancingRule>
365365
final List<LbDestination> destinations = rule.getDestinations();
366366
final List<LbStickinessPolicy> stickinessPolicies = rule.getStickinessPolicies();
367367
final LoadBalancerTO lb = new LoadBalancerTO(uuid, srcIp, srcPort, protocol, algorithm, revoked, false, inline, destinations, stickinessPolicies);
368-
lb.setCidrList(rule.getCidrList());
368+
String cidrList = rule.getCidrList();
369+
if (cidrList != null && !cidrList.isEmpty()) {
370+
lb.setCidrList(String.join(" ", cidrList.split(",")));
371+
}
369372
lb.setLbProtocol(lb_protocol);
370373
lb.setLbSslCert(rule.getLbSslCert());
371374
lbs[i++] = lb;

ui/src/views/network/LoadBalancing.vue

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -452,17 +452,20 @@
452452
</a-select>
453453
</div>
454454
<div v-if="lbProvider !== 'Netris'" class="edit-rule__item">
455-
<p class="edit-rule__label">{{ $t('label.sourcecidrlist') }}</p>
455+
<p class="edit-rule__label">
456+
{{ $t('label.sourcecidrlist') }}
457+
<tooltip-label
458+
:title="''"
459+
bold
460+
:tooltip="createLoadBalancerRuleParams.cidrlist.description || 'Enter a comma-separated list of CIDR blocks.'"
461+
:tooltip-placement="'right'"
462+
style="display: inline; margin-left: 5px;"
463+
/>
464+
</p>
456465
<a-input
457466
v-model:value="editRuleDetails.cidrlist"
458467
:placeholder="$t('label.sourcecidrlist')"
459468
/>
460-
<tooltip-label
461-
:title="$t('label.sourcecidrlist')"
462-
bold
463-
:tooltip="createLoadBalancerRuleParams.cidrlist.description"
464-
:tooltip-placement="'right'"
465-
/>
466469
</div>
467470
<div :span="24" class="action-button">
468471
<a-button @click="() => editRuleModalVisible = false">{{ $t('label.cancel') }}</a-button>

0 commit comments

Comments
 (0)