From 9df1a7bc0eb8f507c04e5c0a95ed8ad3653d774c Mon Sep 17 00:00:00 2001 From: kiranchavala Date: Thu, 6 Apr 2023 12:09:53 +0530 Subject: [PATCH 1/4] ui: Fixed the Description coloumn in the UI for Quota traffic page (#7402) * added correct description response for quotariff api call * added correct label for Usage description --- ui/public/locales/en.json | 1 + ui/src/config/section/plugin/quota.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index a55455823a7..5bc585fa3f2 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -2030,6 +2030,7 @@ "label.usagename": "Usage type", "label.usageunit": "Unit", "label.usageislocal": "A Usage Server is installed locally", +"label.usagetypedescription": "Usage description", "label.use.kubectl.access.cluster": "kubectl and kubeconfig file to access cluster", "label.use.local.timezone": "Use local timezone", "label.used": "Used", diff --git a/ui/src/config/section/plugin/quota.js b/ui/src/config/section/plugin/quota.js index 12b36b76ae5..ffa1ae86e65 100644 --- a/ui/src/config/section/plugin/quota.js +++ b/ui/src/config/section/plugin/quota.js @@ -78,8 +78,8 @@ export default { icon: 'credit-card-outlined', docHelp: 'plugins/quota.html#quota-tariff', permission: ['quotaTariffList'], - columns: ['usageName', 'description', 'usageUnit', 'tariffValue', 'tariffActions'], - details: ['usageName', 'description', 'usageUnit', 'tariffValue'], + columns: ['usageName', 'usageTypeDescription', 'usageUnit', 'tariffValue', 'tariffActions'], + details: ['usageName', 'usageTypeDescription', 'usageUnit', 'tariffValue'], component: shallowRef(() => import('@/views/plugins/quota/QuotaTariff.vue')) }, { From 1827219b4a8873fd9eaff3e75c3d9afbe06b21cf Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 6 Apr 2023 12:13:50 +0530 Subject: [PATCH 2/4] pom.xml: bump only required dependencies (#7388) Upgrades to some dependencies that address CVEs and improvements Signed-off-by: Rohit Yadav --- pom.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 43779bfa497..824ab363bb4 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 4.4.1 - 1.2.22 + 1.2.25 1.2.17 1.1.1 @@ -98,7 +98,7 @@ 3.7.2 1.6 1.10 - 1.3.1 + 1.3.3 2.9.0 0.5 2.6 @@ -123,10 +123,10 @@ 3.23.1 - 5.16.0 + 5.17.0 1.0.9 - 1.9.9.1 - 1.12.310 + 1.9.19 + 1.12.439 1.2.8 1.6.4 1.14 @@ -136,12 +136,12 @@ 3.2.14 2.6.11 0.0.27 - 1.42.2 + 1.42.3 2.4.17 1.7.2 31.1-jre - 4.5.13 - 4.4.15 + 4.5.14 + 4.4.16 2.22 2.13.3 1.9.3 @@ -152,10 +152,10 @@ 2.3.0 2.3.2-1 2.26 - 9.4.49.v20220914 + 9.4.51.v20230217 9.4.27.v20200227 5.5.0 - 2.11.2 + 2.12.5 2.2.1 0.1.55 20090211 @@ -179,8 +179,8 @@ 0.5.0 6.2.0-3.1 3.1.3 - 1.4.19 - 5.3.23 + 1.4.20 + 5.3.26 0.5.4 1.12.0 From d6b581263f49b88fc1a26d945b63017e3f943716 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 11 Apr 2023 11:55:31 +0530 Subject: [PATCH 3/4] ui: allow creating account networkdomain (#7394) Fixes #7227 Signed-off-by: Abhishek Kumar --- ui/src/views/AutogenView.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue index 55ab17bf1de..7e81386ad80 100644 --- a/ui/src/views/AutogenView.vue +++ b/ui/src/views/AutogenView.vue @@ -1416,13 +1416,13 @@ export default { continue } if (input === undefined || input === null || - (input === '' && !['updateStoragePool', 'updateHost', 'updatePhysicalNetwork', 'updateDiskOffering', 'updateNetworkOffering', 'updateServiceOffering'].includes(action.api))) { + (input === '' && !['updateStoragePool', 'updateHost', 'updatePhysicalNetwork', 'updateDiskOffering', 'updateNetworkOffering', 'updateServiceOffering', 'updateAccount'].includes(action.api))) { if (param.type === 'boolean') { params[key] = false } break } - if (input === '' && !['tags', 'hosttags', 'storagetags'].includes(key)) { + if (input === '' && !['tags', 'hosttags', 'storagetags', 'networkdomain'].includes(key)) { break } if (action.mapping && key in action.mapping && action.mapping[key].options) { From 6886fca10508b605a29460dcf99c812b0bb24c6d Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 11 Apr 2023 12:00:38 +0530 Subject: [PATCH 4/4] server: list vm search vm ip using keyword (#7406) Fixes #7390 Allows searching VMs by IP address using keyword parameter of the listVirtualMachine API. --- .../java/com/cloud/api/query/QueryManagerImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index 211e6db19c0..6fecd2c3c6d 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -1162,11 +1162,15 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q if (keyword != null) { SearchCriteria ssc = _userVmJoinDao.createSearchCriteria(); - ssc.addOr("displayName", SearchCriteria.Op.LIKE, "%" + keyword + "%"); - ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%"); + String likeKeyword = String.format("%%%s%%", keyword); + ssc.addOr("displayName", SearchCriteria.Op.LIKE, likeKeyword); + ssc.addOr("name", SearchCriteria.Op.LIKE, likeKeyword); if (isRootAdmin) { - ssc.addOr("instanceName", SearchCriteria.Op.LIKE, "%" + keyword + "%"); + ssc.addOr("instanceName", SearchCriteria.Op.LIKE, likeKeyword); } + ssc.addOr("ipAddress", SearchCriteria.Op.LIKE, likeKeyword); + ssc.addOr("publicIpAddress", SearchCriteria.Op.LIKE, likeKeyword); + ssc.addOr("ip6Address", SearchCriteria.Op.LIKE, likeKeyword); ssc.addOr("state", SearchCriteria.Op.EQ, keyword); sc.addAnd("displayName", SearchCriteria.Op.SC, ssc); }