From f53d137286ec5abd3ce31ff190a80d7b8098c324 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Sun, 23 Feb 2025 23:20:43 -0300 Subject: [PATCH] Fix since version on API params --- api/src/main/java/com/cloud/server/ManagementService.java | 2 +- .../api/command/user/template/RegisterTemplateCmd.java | 2 +- .../api/command/user/userdata/DeleteCniConfigurationCmd.java | 2 +- .../api/command/user/userdata/ListCniConfigurationCmd.java | 2 +- .../command/user/userdata/RegisterCniConfigurationCmd.java | 4 ++-- .../user/kubernetes/cluster/CreateKubernetesClusterCmd.java | 4 ++-- .../src/main/java/com/cloud/server/ManagementServerImpl.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/src/main/java/com/cloud/server/ManagementService.java b/api/src/main/java/com/cloud/server/ManagementService.java index 3b8fb2c5e4b..d8c2eeffc3f 100644 --- a/api/src/main/java/com/cloud/server/ManagementService.java +++ b/api/src/main/java/com/cloud/server/ManagementService.java @@ -370,7 +370,7 @@ public interface ManagementService { * @param cmd The api command class. * @return A VO with the registered userdata. */ - UserData registerCniConfigration(RegisterCniConfigurationCmd cmd); + UserData registerCniConfiguration(RegisterCniConfigurationCmd cmd); /** * Registers a userdata. diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java index b7c14a6d3c8..6ea149fd90d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java @@ -170,7 +170,7 @@ public class RegisterTemplateCmd extends BaseCmd implements UserCmd { @Parameter(name=ApiConstants.FOR_CKS, type = CommandType.BOOLEAN, - description = "if true, the templates would be available for deploying CKS clusters", since = "4.20.0") + description = "if true, the templates would be available for deploying CKS clusters", since = "4.21.0") protected Boolean forCks; @Parameter(name = ApiConstants.TEMPLATE_TYPE, type = CommandType.STRING, diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/DeleteCniConfigurationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/DeleteCniConfigurationCmd.java index 286ad1f9d2e..819b3761ddb 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/DeleteCniConfigurationCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/DeleteCniConfigurationCmd.java @@ -30,7 +30,7 @@ import org.apache.logging.log4j.Logger; @APICommand(name = "deleteCniConfiguration", description = "Deletes a CNI Configuration", responseObject = SuccessResponse.class, entityType = {UserData.class}, - requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.19", + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.21.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class DeleteCniConfigurationCmd extends DeleteUserDataCmd { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/ListCniConfigurationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/ListCniConfigurationCmd.java index 86b02bd18d0..2270bce942b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/ListCniConfigurationCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/ListCniConfigurationCmd.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.List; @APICommand(name = "listCniConfiguration", description = "List userdata for CNI plugins", responseObject = UserDataResponse.class, entityType = {UserData.class}, - requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.20", + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.21.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class ListCniConfigurationCmd extends ListUserDataCmd { public static final Logger logger = LogManager.getLogger(ListCniConfigurationCmd.class.getName()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterCniConfigurationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterCniConfigurationCmd.java index 87ad87dc1a0..eb80da3be05 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterCniConfigurationCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterCniConfigurationCmd.java @@ -29,7 +29,7 @@ import org.apache.logging.log4j.Logger; @APICommand(name = "registerCniConfiguration", description = "Register a CNI Configuration to be used with CKS cluster", - since = "4.19.0", + since = "4.21.0", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, @@ -58,7 +58,7 @@ public class RegisterCniConfigurationCmd extends BaseRegisterUserDataCmd { @Override public void execute() { - UserData result = _mgr.registerCniConfigration(this); + UserData result = _mgr.registerCniConfiguration(this); UserDataResponse response = _responseGenerator.createUserDataResponse(result); response.setResponseName(getCommandName()); response.setObjectName(ApiConstants.CNI_CONFIG); diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java index 10db364cef3..fbf7dd5e69a 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java @@ -194,13 +194,13 @@ public class CreateKubernetesClusterCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.HYPERVISOR, type = CommandType.STRING, description = "the hypervisor on which the CKS cluster is to be deployed. This is required if the zone in which the CKS cluster is being deployed has clusters with different hypervisor types.") private String hypervisor; - @Parameter(name = ApiConstants.CNI_CONFIG_ID, type = CommandType.UUID, entityType = UserDataResponse.class, description = "the ID of the Userdata", since = "4.19.0") + @Parameter(name = ApiConstants.CNI_CONFIG_ID, type = CommandType.UUID, entityType = UserDataResponse.class, description = "the ID of the Userdata", since = "4.21.0") private Long cniConfigId; @Parameter(name = ApiConstants.CNI_CONFIG_DETAILS, type = CommandType.MAP, description = "used to specify the parameters values for the variables in userdata. " + "Example: cniconfigdetails[0].key=accesskey&cniconfigdetails[0].value=s389ddssaa&" + - "cniconfigdetails[1].key=secretkey&cniconfigdetails[1].value=8dshfsss", since = "4.19.0") + "cniconfigdetails[1].key=secretkey&cniconfigdetails[1].value=8dshfsss", since = "4.21.0") private Map cniConfigDetails; @Parameter(name=ApiConstants.AS_NUMBER, type=CommandType.LONG, description="the AS Number of the network") diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java index 856b607e657..b4629303577 100644 --- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java +++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java @@ -4882,7 +4882,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe @Override @ActionEvent(eventType = EventTypes.EVENT_REGISTER_CNI_CONFIG, eventDescription = "registering CNI configration", async = true) - public UserData registerCniConfigration(RegisterCniConfigurationCmd cmd) { + public UserData registerCniConfiguration(RegisterCniConfigurationCmd cmd) { final Account owner = getOwner(cmd); checkForUserDataByName(cmd, owner); final String name = cmd.getName();