Skip to content

List only VMs associated to a userdata #10569

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
Pearl1594 merged 2 commits into from
Mar 17, 2025
Merged

List only VMs associated to a userdata #10569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
363600d
List only VMs associated to a userdata
Pearl1594 Mar 13, 2025
692a80b
add since param
Pearl1594 Mar 17, 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
8 changes: 8 additions & 0 deletions api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.UserDataResponse;
import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VpcResponse;
Expand Down Expand Up @@ -151,6 +152,9 @@
@Parameter(name = ApiConstants.USER_DATA, type = CommandType.BOOLEAN, description = "Whether to return the VMs' user data or not. By default, user data will not be returned.", since = "4.18.0.0")
private Boolean showUserData;

@Parameter(name = ApiConstants.USER_DATA_ID, type = CommandType.UUID, entityType = UserDataResponse.class, required = false, description = "the instances by userdata", since = "4.20.1")
private Long userdataId;

/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
Expand Down Expand Up @@ -245,6 +249,10 @@
return CollectionUtils.isEmpty(viewDetails);
}

public Long getUserdataId() {
return userdataId;
}

Check warning on line 254 in api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java#L252-L254 

Added lines #L252 - L254 were not covered by tests

public EnumSet<VMDetails> getDetails() throws InvalidParameterValueException {
if (isViewDetailsEmpty()) {
if (_queryService.ReturnVmStatsOnVmList.value()) {
Expand Down
9 changes: 9 additions & 0 deletions server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,6 +1267,7 @@
Long storageId = null;
StoragePoolVO pool = null;
Long userId = cmd.getUserId();
Long userdataId = cmd.getUserdataId();

Check warning on line 1270 in server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java#L1270 

Added line #L1270 was not covered by tests
Map<String, String> tags = cmd.getTags();

boolean isAdmin = false;
Expand Down Expand Up @@ -1339,6 +1340,10 @@
userVmSearchBuilder.and("templateId", userVmSearchBuilder.entity().getTemplateId(), Op.EQ);
}

if (userdataId != null) {
userVmSearchBuilder.and("userdataId", userVmSearchBuilder.entity().getUserDataId(), Op.EQ);

Check warning on line 1344 in server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java#L1344 

Added line #L1344 was not covered by tests
}

if (hypervisor != null) {
userVmSearchBuilder.and("hypervisorType", userVmSearchBuilder.entity().getHypervisorType(), Op.EQ);
}
Expand Down Expand Up @@ -1531,6 +1536,10 @@
userVmSearchCriteria.setParameters("templateId", templateId);
}

if (userdataId != null) {
userVmSearchCriteria.setParameters("userdataId", userdataId);

Check warning on line 1540 in server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java#L1540 

Added line #L1540 was not covered by tests
}

if (display != null) {
userVmSearchCriteria.setParameters("display", display);
}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/config/section/compute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@ export default {
related: [{
name: 'vm',
title: 'label.instances',
param: 'userdata'
param: 'userdataid'
}],
tabs: [
{
Expand Down
Loading