From 2cdf59a87e3141291caa2270223a85bbf0af68a8 Mon Sep 17 00:00:00 2001 From: Landry JUGE Date: Wed, 3 Dec 2025 16:12:39 +0100 Subject: [PATCH] Fixing categoryId being inconsistent following refactoring of names, breaking functionnality --- .../main/java/org/apache/cloudstack/api/ApiConstants.java | 4 ++-- .../command/admin/offering/CreateServiceOfferingCmd.java | 6 +++--- .../com/cloud/configuration/ConfigurationManagerImpl.java | 2 +- ui/src/config/section/offering.js | 2 +- ui/src/views/compute/DeployVM.vue | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java index 36b1267f2d4..fd35352c793 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -529,8 +529,8 @@ public class ApiConstants { public static final String SENT_BYTES = "sentbytes"; public static final String SERIAL = "serial"; public static final String SERVICE_IP = "serviceip"; - public static final String SERVICE_OFFERING_CATEGORY_ID = "serviceofferingcategoryid"; - public static final String SERVICE_OFFERING_CATEGORY_NAME = "serviceofferingcategoryname"; + public static final String SERVICE_OFFERING_CATEGORY_ID = "categoryid"; + public static final String SERVICE_OFFERING_CATEGORY_NAME = "categoryname"; public static final String SERVICE_OFFERING_ID = "serviceofferingid"; public static final String SERVICE_OFFERING_NAME = "serviceofferingname"; public static final String SESSIONKEY = "sessionkey"; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java index 543f56d0d9b..e01b6498e35 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java @@ -296,7 +296,7 @@ public class CreateServiceOfferingCmd extends BaseCmd { required = false, description = "the ID of the service offering category to associate with this offering", since = "4.23") - private Long serviceOfferingCategoryId; + private Long categoryId; ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// @@ -570,8 +570,8 @@ public class CreateServiceOfferingCmd extends BaseCmd { return Boolean.TRUE.equals(gpuDisplay); } - public Long getServiceOfferingCategoryId() { - return serviceOfferingCategoryId; + public Long getCategoryId() { + return categoryId; } ///////////////////////////////////////////////////// diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java index dc86fd7c49f..3d3281522b6 100644 --- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java @@ -3470,7 +3470,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } // validate optional category id - final Long serviceOfferingCategoryId = cmd.getServiceOfferingCategoryId(); + final Long serviceOfferingCategoryId = cmd.getCategoryId(); if (serviceOfferingCategoryId != null && _serviceOfferingCategoryDao.findById(serviceOfferingCategoryId) == null) { throw new InvalidParameterValueException("Please specify a valid service offering category id"); } diff --git a/ui/src/config/section/offering.js b/ui/src/config/section/offering.js index a551bf3c909..6b2eadfa476 100644 --- a/ui/src/config/section/offering.js +++ b/ui/src/config/section/offering.js @@ -41,7 +41,7 @@ export default { filters: ['active', 'inactive'], columns: ['name', 'displaytext', 'state', 'cpunumber', 'cpuspeed', 'memory', 'gpu', 'category', 'domain', 'zone', 'order'], details: () => { - var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'iscustomizediops', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'storageaccessgroups', 'storagetags', 'domain', 'zone', 'created', 'dynamicscalingenabled', 'diskofferingstrictness', 'encryptroot', 'purgeresources', 'leaseduration', 'gpucardid', 'gpucardname', 'vgpuprofileid', 'vgpuprofilename', 'gpucount', 'gpudisplay', 'leaseexpiryaction', 'externaldetails', 'categoryid', 'category'] + var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'iscustomizediops', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'storageaccessgroups', 'storagetags', 'domain', 'zone', 'created', 'dynamicscalingenabled', 'diskofferingstrictness', 'encryptroot', 'purgeresources', 'leaseduration', 'gpucardid', 'gpucardname', 'vgpuprofileid', 'vgpuprofilename', 'gpucount', 'gpudisplay', 'leaseexpiryaction', 'externaldetails', 'category'] if (store.getters.apis.createServiceOffering && store.getters.apis.createServiceOffering.params.filter(x => x.name === 'storagepolicy').length > 0) { fields.splice(6, 0, 'vspherestoragepolicy') diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue index 579a1a90e2e..b1c409f8e42 100644 --- a/ui/src/views/compute/DeployVM.vue +++ b/ui/src/views/compute/DeployVM.vue @@ -2308,9 +2308,9 @@ export default { pageSize: 10 } if (categoryId && categoryId !== '-1') { - params.serviceofferingcategoryid = categoryId + params.categoryid = categoryId } else { - params.serviceofferingcategoryid = null + params.categoryid = null } this.handleSearchFilter('serviceOfferings', params) },