Skip to content

Conversation

shwstppr
Copy link
Contributor

@shwstppr shwstppr commented Sep 6, 2025

Description

Currently, acquire or associate IP action in the UI will load only 500 addresses (or whatever defined by config default.page.size). Also, it will load all 500 of them together. This PR uses InfiniteScrollSelect to iteratively load more addresses. To facilitate retrieving both Free and Reserved addresses api and server change has been made for the listPublicIpAddresses API to pass a comma-separated list of states for state parameter.

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • build/CI
  • test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

image

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Copy link

codecov bot commented Sep 6, 2025

Codecov Report

❌ Patch coverage is 66.66667% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.55%. Comparing base (f67b738) to head (42e8a73).
⚠️ Report is 18 commits behind head on main.

Files with missing lines Patch % Lines
...in/java/com/cloud/server/ManagementServerImpl.java 66.66% 7 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##               main   #11591     +/-   ##
===========================================
  Coverage     17.54%   17.55%             
- Complexity    15483    15523     +40     
===========================================
  Files          5897     5907     +10     
  Lines        527484   528631   +1147     
  Branches      64432    64550    +118     
===========================================
+ Hits          92566    92801    +235     
- Misses       424508   425397    +889     
- Partials      10410    10433     +23     
Flag Coverage Δ
uitests 3.59% <ø> (-0.02%) ⬇️
unittests 18.62% <66.66%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@shwstppr
Copy link
Contributor Author

shwstppr commented Sep 6, 2025

@blueorangutan package

@blueorangutan
Copy link

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 14878

@DaanHoogland
Copy link
Contributor

@blueorangutan test keepEnv

@blueorangutan
Copy link

@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

@shwstppr shwstppr requested a review from Copilot September 10, 2025 09:10
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This pull request enhances the public IP address listing functionality in CloudStack by enabling iterative loading through infinite scroll and supporting multiple states. The primary improvement is in the UI's IP acquisition/association interface, which previously loaded only 500 addresses synchronously.

Key changes include:

  • Modified listPublicIpAddresses API to accept comma-separated states parameter
  • Replaced static select component with infinite scroll select in UI
  • Updated server-side filtering to handle multiple states
  • Enhanced test coverage for new multi-state functionality

Reviewed Changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
ui/src/views/network/IpAddressesTab.vue Replaces static select with InfiniteScrollSelect component and removes manual IP loading logic
ui/src/components/widgets/InfiniteScrollSelect.vue Adds support for custom label functions and auto-selection of first option
server/src/main/java/com/cloud/server/ManagementServerImpl.java Implements comma-separated state parameter parsing and multi-state filtering
api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java Updates API documentation to reflect comma-separated state support
server/src/test/java/com/cloud/server/ManagementServerImplTest.java Updates test methods to accommodate new multi-state parameter structure

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

Copy link
Contributor

@harikrishna-patnala harikrishna-patnala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code LGTM

@harikrishna-patnala
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@harikrishna-patnala a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 14949

Copy link
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code looks good, just one remark, no blocker

Comment on lines 2454 to 2450
List<IpAddress.State> states = new ArrayList<>();
if (StringUtils.isNotBlank(state)) {
for (String s : StringUtils.split(state, ",")) {
try {
states.add(IpAddress.State.valueOf(s));
} catch (IllegalArgumentException e) {
throw new InvalidParameterValueException("Invalid state: " + s);
}
}
}
Boolean isAllocated = cmd.isAllocatedOnly();
if (isAllocated == null) {
if (state != null && (state.equalsIgnoreCase(IpAddress.State.Free.name()) || state.equalsIgnoreCase(IpAddress.State.Reserved.name()))) {
if (states.contains(IpAddress.State.Free) || states.contains(IpAddress.State.Reserved)) {
isAllocated = Boolean.FALSE;
} else {
isAllocated = Boolean.TRUE; // default
}
} else {
if (state != null && (state.equalsIgnoreCase(IpAddress.State.Free.name()) || state.equalsIgnoreCase(IpAddress.State.Reserved.name()))) {
if (states.contains(IpAddress.State.Free) || states.contains(IpAddress.State.Reserved)) {
if (isAllocated) {
throw new InvalidParameterValueException("Conflict: allocatedonly is true but state is Free");
}
} else if (state != null && state.equalsIgnoreCase(IpAddress.State.Allocated.name())) {
} else if (states.contains(IpAddress.State.Allocated)) {
isAllocated = Boolean.TRUE;
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we move this logic to its own method?

Copy link

github-actions bot commented Oct 7, 2025

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

@shwstppr
Copy link
Contributor Author

shwstppr commented Oct 7, 2025

@blueorangutan package

@blueorangutan
Copy link

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15327

@harikrishna-patnala harikrishna-patnala self-requested a review October 8, 2025 07:48
},
listApiParamsForAssociate () {
const params = this.listApiParams
params.state = 'Free,Reserved'
Copy link
Contributor

@harikrishna-patnala harikrishna-patnala Oct 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shwstppr I tested the changes, it is not listing any IPs now

Image

Seems to be problem with these params

http://10.0.32.194:8080/client/api/?page=1&pagesize=20&zoneid=eb21bc9a-4c08-4456-938b-af605ef36aae&domainid=d3a3e350-a40d-11f0-b82c-1e009c000155&account=admin&forvirtualnetwork=true&allocatedonly=false& state=Free,Reserved &showicon=true&command=listPublicIpAddresses&response=json&sessionkey=fSa-6YW14skm_KeFEJvTnLPpQQs

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for checking @harikrishna-patnala. Will check and fix. Moving to draft for now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@harikrishna-patnala changes should work now

@harikrishna-patnala harikrishna-patnala self-requested a review October 8, 2025 07:54
@shwstppr shwstppr marked this pull request as draft October 9, 2025 12:22
Currently, acquire or associate IP action in the UI will load only 500 addresses. ALso, it will load all 500 of them together.
This PR uses InfiniteScrollSelect to iteratively load more addresses.
To facilitate retrieving both Free and Reserved addresses api and server
change has been made for the listPublicIpAddresses API to pass a
comma-separated list of states for state parameter.

Signed-off-by: Abhishek Kumar <[email protected]>
@shwstppr shwstppr force-pushed the improve-publicip-associate branch from f7999bc to 8e414a6 Compare October 9, 2025 14:10
@shwstppr
Copy link
Contributor Author

shwstppr commented Oct 9, 2025

@blueorangutan package

@blueorangutan
Copy link

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result [SF]: ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 15370

Signed-off-by: Abhishek Kumar <[email protected]>
@shwstppr
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✖️ debian ✔️ suse15. SL-JID 15387

@shwstppr shwstppr marked this pull request as ready for review October 10, 2025 07:49
@vishesh92 vishesh92 self-assigned this Oct 10, 2025
Signed-off-by: Abhishek Kumar <[email protected]>
@shwstppr
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15420

return null;
}

public static <T extends Enum<T>> T getEnumIgnoreCase(Class<T> enumClass, String name) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can use org.apache.commons.lang3.EnumUtils's getEnumIgnoreCase instead of this which does the exact the same thing.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so let’s make this class a child of the commons one (keeping the enum related utils in one place.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done @vishesh92

@shwstppr
Copy link
Contributor Author

shwstppr commented Oct 13, 2025

Will work later
Updated code to use commons' class

@shwstppr shwstppr closed this Oct 13, 2025
@github-project-automation github-project-automation bot moved this from In Progress to Done in Apache CloudStack 4.22.0 Oct 13, 2025
Signed-off-by: Abhishek Kumar <[email protected]>
@shwstppr shwstppr reopened this Oct 13, 2025
@shwstppr
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

Copy link
Member

@vishesh92 vishesh92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clgtm. didn't test.

@blueorangutan
Copy link

Packaging result [SF]: ✖️ el8 ✖️ el9 ✔️ debian ✖️ suse15. SL-JID 15436

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants