Skip to content

ui: Allow edit source CIDR on load balancer rule #11766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 4 commits into from
Oct 14, 2025
Merged

ui: Allow edit source CIDR on load balancer rule #11766

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d227836
ui: Allow edit source CIDR on load balancer rule
CodeBleu Sep 30, 2025
1f9baa9
discard package.json & package-lock.json
CodeBleu Sep 30, 2025
a556707
Normalize cidrlist
CodeBleu Oct 9, 2025
592bc42
Fix: CIDR list sent to VR & UI tooltip
CodeBleu Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix: CIDR list sent to VR & UI tooltip
  • Loading branch information
@CodeBleu
CodeBleu committed Oct 10, 2025
commit 592bc42c9439699f3818bc6aab58020fc0e527e5
5 changes: 4 additions & 1 deletion server/src/main/java/com/cloud/network/router/CommandSetupHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,10 @@ public void createApplyLoadBalancingRulesCommands(final List<LoadBalancingRule>
final List<LbDestination> destinations = rule.getDestinations();
final List<LbStickinessPolicy> stickinessPolicies = rule.getStickinessPolicies();
final LoadBalancerTO lb = new LoadBalancerTO(uuid, srcIp, srcPort, protocol, algorithm, revoked, false, inline, destinations, stickinessPolicies);
lb.setCidrList(rule.getCidrList());
String cidrList = rule.getCidrList();
if (cidrList != null && !cidrList.isEmpty()) {
lb.setCidrList(String.join(" ", cidrList.split(",")));
}
lb.setLbProtocol(lb_protocol);
lb.setLbSslCert(rule.getLbSslCert());
lbs[i++] = lb;
Expand Down
17 changes: 10 additions & 7 deletions ui/src/views/network/LoadBalancing.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,17 +452,20 @@
</a-select>
</div>
<div v-if="lbProvider !== 'Netris'" class="edit-rule__item">
<p class="edit-rule__label">{{ $t('label.sourcecidrlist') }}</p>
<p class="edit-rule__label">
{{ $t('label.sourcecidrlist') }}
<tooltip-label
:title="''"
bold
:tooltip="createLoadBalancerRuleParams.cidrlist.description || 'Enter a comma-separated list of CIDR blocks.'"
:tooltip-placement="'right'"
style="display: inline; margin-left: 5px;"
/>
</p>
<a-input
v-model:value="editRuleDetails.cidrlist"
:placeholder="$t('label.sourcecidrlist')"
/>
<tooltip-label
:title="$t('label.sourcecidrlist')"
bold
:tooltip="createLoadBalancerRuleParams.cidrlist.description"
:tooltip-placement="'right'"
/>
</div>
<div :span="24" class="action-button">
<a-button @click="() => editRuleModalVisible = false">{{ $t('label.cancel') }}</a-button>
Expand Down
Loading