This is an automated email from the ASF dual-hosted git repository.
shwstppr pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new 57e67afdf0d api,server: list autoscalevmgroups with keyword (#9046)
57e67afdf0d is described below
commit 57e67afdf0da26c35f754ba55f4b8ecf401172fc
Author: Abhishek Kumar <[email protected]>
AuthorDate: Mon May 27 13:47:44 2024 +0530
api,server: list autoscalevmgroups with keyword (#9046)
Fixes #9042
Signed-off-by: Abhishek Kumar <[email protected]>
---
server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git
a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
index c10ff89fa3d..468f238a0c5 100644
--- a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -1174,6 +1174,7 @@ public class AutoScaleManagerImpl extends ManagerBase
implements AutoScaleManage
Long profileId = cmd.getProfileId();
Long zoneId = cmd.getZoneId();
Boolean forDisplay = cmd.getDisplay();
+ String keyword = cmd.getKeyword();
SearchWrapper<AutoScaleVmGroupVO> searchWrapper = new
SearchWrapper<>(autoScaleVmGroupDao, AutoScaleVmGroupVO.class, cmd,
cmd.getId());
SearchBuilder<AutoScaleVmGroupVO> sb =
searchWrapper.getSearchBuilder();
@@ -1184,6 +1185,7 @@ public class AutoScaleManagerImpl extends ManagerBase
implements AutoScaleManage
sb.and("profileId", sb.entity().getProfileId(), SearchCriteria.Op.EQ);
sb.and("zoneId", sb.entity().getZoneId(), SearchCriteria.Op.EQ);
sb.and("display", sb.entity().isDisplay(), SearchCriteria.Op.EQ);
+ sb.and("keyword", sb.entity().getName(), SearchCriteria.Op.LIKE);
if (policyId != null) {
SearchBuilder<AutoScaleVmGroupPolicyMapVO> asVmGroupPolicySearch =
autoScaleVmGroupPolicyMapDao.createSearchBuilder();
@@ -1213,6 +1215,9 @@ public class AutoScaleManagerImpl extends ManagerBase
implements AutoScaleManage
if (forDisplay != null) {
sc.setParameters("display", forDisplay);
}
+ if (StringUtils.isNotBlank(keyword)) {
+ sc.setParameters("keyword", "%" + keyword + "%");
+ }
return searchWrapper.search();
}