apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup APIs getCommandName (#7022)

Browse Source 
Co-authored-by: Eduardo Zanetta <eduardo.zanetta@scclouds.com.br>
This commit is contained in:
Eduardo Zanetta 2023-01-03 08:11:52 -03:00 committed by GitHub
parent 4133f0e979
commit a9b49f3ae9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
560 changed files with 481 additions and 3831 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
View File

@ -247,30 +247,36 @@ public abstract class BaseCmd {
this.responseType = responseType;
}
/**
* For some reason this method does not return the actual command name, but more a name that
* is used to create the response. So you can expect for a XCmd a value like xcmdresponse. Anyways
* this methods is used in too many places so for now instead of changing it we just create another
* method {@link BaseCmd#getActualCommandName()} that returns the value from {@link APICommand#name()}
*
* @return
*/
public abstract String getCommandName();
/**
* Gets the CommandName based on the class annotations: the value from {@link APICommand#name()}
*
* @return the value from {@link APICommand#name()}
*/
public String getActualCommandName() {
public static String getCommandNameByClass(Class<?> clazz) {
String cmdName = null;
if (this.getClass().getAnnotation(APICommand.class) != null) {
cmdName = this.getClass().getAnnotation(APICommand.class).name();
APICommand apiClassAnnotation = clazz.getAnnotation(APICommand.class);
if (apiClassAnnotation != null && apiClassAnnotation.name() != null) {
cmdName = apiClassAnnotation.name();
} else {
cmdName = this.getClass().getName();
cmdName = clazz.getName();
}
return cmdName;
return cmdName;
}
public String getActualCommandName() {
return getCommandNameByClass(this.getClass());
}
public String getCommandName() {
return getResponseNameByClass(this.getClass());
}
/**
* Retrieves the name defined in {@link APICommand#name()}, in lower case, with the prefix {@link BaseCmd#RESPONSE_SUFFIX}
*/
public static String getResponseNameByClass(Class<?> clazz) {
return getCommandNameByClass(clazz).toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
/**

6
api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
View File

@ -45,7 +45,6 @@ import com.cloud.user.UserAccount;
public class CreateAccountCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateAccountCmd.class.getName());
private static final String s_name = "createaccountresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -172,11 +171,6 @@ public class CreateAccountCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

10
api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
View File

@ -40,7 +40,6 @@ import com.cloud.user.Account;
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteAccountCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteAccountCmd.class.getName());
private static final String s_name = "deleteaccountresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -64,15 +63,6 @@ public class DeleteAccountCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
public static String getStaticName() {
return s_name;
}
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
Account account = CallContext.current().getCallingAccount();// Let's give the caller here for event logging.

6
api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
View File

@ -44,7 +44,6 @@ import com.cloud.user.Account;
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class DisableAccountCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DisableAccountCmd.class.getName());
private static final String s_name = "disableaccountresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -89,11 +88,6 @@ public class DisableAccountCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public String getEventType() {
return EventTypes.EVENT_ACCOUNT_DISABLE;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
View File

@ -40,7 +40,6 @@ import com.cloud.user.Account;
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class EnableAccountCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(EnableAccountCmd.class.getName());
private static final String s_name = "enableaccountresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -78,11 +77,6 @@ public class EnableAccountCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
Account account = _entityMgr.findById(Account.class, getId());

6
api/src/main/java/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
View File

@ -37,7 +37,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
public class LockAccountCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(LockAccountCmd.class.getName());
private static final String s_name = "lockaccountresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -69,11 +68,6 @@ public class LockAccountCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
final Account account = _accountService.getActiveAccountByName(getAccountName(), getDomainId());

6
api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
View File

@ -44,7 +44,6 @@ import com.cloud.user.Account;
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class UpdateAccountCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateAccountCmd.class.getName());
private static final String s_name = "updateaccountresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -116,11 +115,6 @@ public class UpdateAccountCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
Account account = _entityMgr.findById(Account.class, getId());

9
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java
View File

@ -23,7 +23,6 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandResourceType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.RoleResponse;
@ -31,12 +30,11 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.user.Account;
@APICommand(name = CreateRoleCmd.APINAME, description = "Creates a role", responseObject = RoleResponse.class,
@APICommand(name = "createRole", description = "Creates a role", responseObject = RoleResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.9.0",
authorized = {RoleType.Admin})
public class CreateRoleCmd extends RoleCmd {
public static final String APINAME = "createRole";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -66,11 +64,6 @@ public class CreateRoleCmd extends RoleCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

9
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java
View File

@ -24,7 +24,6 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiArgValidator;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.RolePermissionResponse;
@ -33,12 +32,11 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.user.Account;
@APICommand(name = CreateRolePermissionCmd.APINAME, description = "Adds an API permission to a role", responseObject = RolePermissionResponse.class,
@APICommand(name = "createRolePermission", description = "Adds an API permission to a role", responseObject = RolePermissionResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.9.0",
authorized = {RoleType.Admin})
public class CreateRolePermissionCmd extends BaseRolePermissionCmd {
public static final String APINAME = "createRolePermission";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -60,11 +58,6 @@ public class CreateRolePermissionCmd extends BaseRolePermissionCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java
View File

@ -33,12 +33,11 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.user.Account;
@APICommand(name = DeleteRoleCmd.APINAME, description = "Deletes a role", responseObject = SuccessResponse.class,
@APICommand(name = "deleteRole", description = "Deletes a role", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.9.0",
authorized = {RoleType.Admin})
public class DeleteRoleCmd extends BaseCmd {
public static final String APINAME = "deleteRole";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -60,11 +59,6 @@ public class DeleteRoleCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java
View File

@ -31,12 +31,11 @@ import org.apache.cloudstack.api.response.RolePermissionResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
@APICommand(name = DeleteRolePermissionCmd.APINAME, description = "Deletes a role permission", responseObject = SuccessResponse.class,
@APICommand(name = "deleteRolePermission", description = "Deletes a role permission", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.9.0",
authorized = {RoleType.Admin})
public class DeleteRolePermissionCmd extends BaseCmd {
public static final String APINAME = "deleteRolePermission";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -58,11 +57,6 @@ public class DeleteRolePermissionCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

9
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java
View File

@ -33,7 +33,6 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ApiServerService;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.RoleResponse;
@ -43,12 +42,11 @@ import org.apache.commons.lang3.StringUtils;
import com.cloud.user.Account;
@APICommand(name = ImportRoleCmd.APINAME, description = "Imports a role based on provided map of rule permissions", responseObject = RoleResponse.class,
@APICommand(name = "importRole", description = "Imports a role based on provided map of rule permissions", responseObject = RoleResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.15.0",
authorized = {RoleType.Admin})
public class ImportRoleCmd extends RoleCmd {
public static final String APINAME = "importRole";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -120,11 +118,6 @@ public class ImportRoleCmd extends RoleCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java
View File

@ -37,12 +37,11 @@ import java.util.ArrayList;
import java.util.List;
@APICommand(name = ListRolePermissionsCmd.APINAME, description = "Lists role permissions", responseObject = RolePermissionResponse.class,
@APICommand(name = "listRolePermissions", description = "Lists role permissions", responseObject = RolePermissionResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.9.0",
authorized = {RoleType.Admin})
public class ListRolePermissionsCmd extends BaseCmd {
public static final String APINAME = "listRolePermissions";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -64,11 +63,6 @@ public class ListRolePermissionsCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java
View File

@ -34,10 +34,9 @@ import org.apache.commons.lang3.StringUtils;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
@APICommand(name = ListRolesCmd.APINAME, description = "Lists dynamic roles in CloudStack", responseObject = RoleResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {
@APICommand(name = "listRoles", description = "Lists dynamic roles in CloudStack", responseObject = RoleResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {
RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin })
public class ListRolesCmd extends BaseListCmd {
public static final String APINAME = "listRoles";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -75,11 +74,6 @@ public class ListRolesCmd extends BaseListCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseListCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java
View File

@ -32,12 +32,11 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.user.Account;
@APICommand(name = UpdateRoleCmd.APINAME, description = "Updates a role", responseObject = RoleResponse.class,
@APICommand(name = "updateRole", description = "Updates a role", responseObject = RoleResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.9.0",
authorized = {RoleType.Admin})
public class UpdateRoleCmd extends RoleCmd {
public static final String APINAME = "updateRole";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -69,11 +68,6 @@ public class UpdateRoleCmd extends RoleCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

10
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java
View File

@ -38,12 +38,11 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.user.Account;
@APICommand(name = UpdateRolePermissionCmd.APINAME, description = "Updates a role permission order", responseObject = SuccessResponse.class,
@APICommand(name = "updateRolePermission", description = "Updates a role permission order", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.9.0",
authorized = {RoleType.Admin})
public class UpdateRolePermissionCmd extends BaseCmd {
public static final String APINAME = "updateRolePermission";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -96,11 +95,6 @@ public class UpdateRolePermissionCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;
@ -142,4 +136,4 @@ public class UpdateRolePermissionCmd extends BaseCmd {
response.setSuccess(result);
setResponseObject(response);
}
}
}

8
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRoleCmd.java
View File

@ -30,11 +30,10 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.user.Account;
@APICommand(name = CreateProjectRoleCmd.APINAME, description = "Creates a Project role", responseObject = ProjectRoleResponse.class,
@APICommand(name = "createProjectRole", description = "Creates a Project role", responseObject = ProjectRoleResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User}, since = "4.15.0")
public class CreateProjectRoleCmd extends ProjectRoleCmd {
public static final String APINAME = "createProjectRole";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -66,11 +65,6 @@ public class CreateProjectRoleCmd extends ProjectRoleCmd {
setupProjectRoleResponse(projectRole);
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRolePermissionCmd.java
View File

@ -32,11 +32,10 @@ import org.apache.cloudstack.api.response.ProjectRolePermissionResponse;
import org.apache.cloudstack.api.response.ProjectRoleResponse;
import org.apache.cloudstack.context.CallContext;
@APICommand(name = CreateProjectRolePermissionCmd.APINAME, description = "Adds API permissions to a project role", responseObject = ProjectRolePermissionResponse.class,
@APICommand(name = "createProjectRolePermission", description = "Adds API permissions to a project role", responseObject = ProjectRolePermissionResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {
RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, since = "4.15.0")
public class CreateProjectRolePermissionCmd extends BaseRolePermissionCmd {
public static final String APINAME = "createProjectRolePermission";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -80,11 +79,6 @@ public class CreateProjectRolePermissionCmd extends BaseRolePermissionCmd {
setupResponse(projectRolePermission, projectRole);
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccountId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRoleCmd.java
View File

@ -31,11 +31,10 @@ import org.apache.cloudstack.api.response.ProjectRoleResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
@APICommand(name = DeleteProjectRoleCmd.APINAME, description = "Delete Project roles in CloudStack", responseObject = SuccessResponse.class,
@APICommand(name = "deleteProjectRole", description = "Delete Project roles in CloudStack", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.15.0", authorized = {
RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
public class DeleteProjectRoleCmd extends BaseCmd {
public static final String APINAME = "deleteProjectRole" ;
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -76,11 +75,6 @@ public class DeleteProjectRoleCmd extends BaseCmd {
setResponseObject(response);
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccountId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRolePermissionCmd.java
View File

@ -31,11 +31,10 @@ import org.apache.cloudstack.api.response.ProjectRolePermissionResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
@APICommand(name = DeleteProjectRolePermissionCmd.APINAME, description = "Deletes a project role permission in the project", responseObject = SuccessResponse.class,
@APICommand(name = "deleteProjectRolePermission", description = "Deletes a project role permission in the project", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {
RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, since = "4.15.0")
public class DeleteProjectRolePermissionCmd extends BaseCmd {
public static final String APINAME = "deleteProjectRolePermission";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -77,11 +76,6 @@ public class DeleteProjectRolePermissionCmd extends BaseCmd {
setResponseObject(response);
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccountId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolePermissionsCmd.java
View File

@ -34,11 +34,10 @@ import org.apache.cloudstack.api.response.ProjectRolePermissionResponse;
import org.apache.cloudstack.api.response.ProjectRoleResponse;
import org.apache.cloudstack.context.CallContext;
@APICommand(name = ListProjectRolePermissionsCmd.APINAME, description = "Lists a project's project role permissions", responseObject = ProjectRolePermissionResponse.class,
@APICommand(name = "listProjectRolePermissions", description = "Lists a project's project role permissions", responseObject = ProjectRolePermissionResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {
RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, since = "4.15.0")
public class ListProjectRolePermissionsCmd extends BaseCmd {
public static final String APINAME = "listProjectRolePermissions";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -99,11 +98,6 @@ public class ListProjectRolePermissionsCmd extends BaseCmd {
return rolePermissionResponse;
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccountId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolesCmd.java
View File

@ -33,11 +33,10 @@ import org.apache.cloudstack.api.response.ProjectRoleResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.commons.lang3.StringUtils;
@APICommand(name = ListProjectRolesCmd.APINAME, description = "Lists Project roles in CloudStack", responseObject = ProjectRoleResponse.class,
@APICommand(name = "listProjectRoles", description = "Lists Project roles in CloudStack", responseObject = ProjectRoleResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.15.0", authorized = {
RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
public class ListProjectRolesCmd extends BaseListCmd {
public static final String APINAME = "listProjectRoles";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -104,11 +103,6 @@ public class ListProjectRolesCmd extends BaseListCmd {
return response;
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccountId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRoleCmd.java
View File

@ -28,11 +28,10 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ProjectRoleResponse;
@APICommand(name = UpdateProjectRoleCmd.APINAME, description = "Creates a Project role", responseObject = ProjectRoleResponse.class,
@APICommand(name = "updateProjectRole", description = "Creates a Project role", responseObject = ProjectRoleResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User}, since = "4.15.0")
public class UpdateProjectRoleCmd extends ProjectRoleCmd {
public static final String APINAME = "updateProjectRole";
/////////////////////////////////////////////////////
//////////////// API Parameters /////////////////////
@ -73,11 +72,6 @@ public class UpdateProjectRoleCmd extends ProjectRoleCmd {
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return 0;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRolePermissionCmd.java
View File

@ -38,11 +38,10 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.commons.lang3.EnumUtils;
@APICommand(name = UpdateProjectRolePermissionCmd.APINAME, description = "Updates a project role permission and/or order", responseObject = SuccessResponse.class,
@APICommand(name = "updateProjectRolePermission", description = "Updates a project role permission and/or order", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {
RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, since = "4.15.0")
public class UpdateProjectRolePermissionCmd extends BaseCmd {
public static final String APINAME = "updateProjectRolePermission";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -151,11 +150,6 @@ public class UpdateProjectRolePermissionCmd extends BaseCmd {
return projRoleService.updateProjectRolePermission(projectId, projectRole, rolePermissionsOrder);
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccountId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
View File

@ -37,7 +37,6 @@ public class GenerateAlertCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(GenerateAlertCmd.class.getName());
private static final String s_name = "generatealertresponse";
// ///////////////////////////////////////////////////
// ////////////// API parameters /////////////////////
@ -61,11 +60,6 @@ public class GenerateAlertCmd extends BaseAsyncCmd {
// ///////////////////////////////////////////////////
// ///////////////// Accessors ///////////////////////
// ///////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
public Short getType() {
return type;
}
@ -118,4 +112,4 @@ public class GenerateAlertCmd extends BaseAsyncCmd {
public long getEntityOwnerId() {
return 0;
}
}
}

8
api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
View File

@ -33,11 +33,10 @@ import org.apache.cloudstack.api.response.AnnotationResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.commons.lang3.BooleanUtils;
@APICommand(name = AddAnnotationCmd.APINAME, description = "add an annotation.", responseObject = AnnotationResponse.class,
@APICommand(name = "addAnnotation", description = "add an annotation.", responseObject = AnnotationResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin})
public class AddAnnotationCmd extends BaseCmd {
public static final String APINAME = "addAnnotation";
@Parameter(name = ApiConstants.ANNOTATION, type = CommandType.STRING, description = "the annotation text")
private String annotation;
@ -85,11 +84,6 @@ public class AddAnnotationCmd extends BaseCmd {
this.setResponseObject(annotationResponse);
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getAccountId();

11
api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java
View File

@ -25,7 +25,6 @@ import com.google.common.base.Preconditions;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
@ -33,11 +32,10 @@ import org.apache.cloudstack.api.response.AnnotationResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.commons.lang3.StringUtils;
@APICommand(name = ListAnnotationsCmd.APINAME, description = "Lists annotations.", responseObject = AnnotationResponse.class,
@APICommand(name = "listAnnotations", description = "Lists annotations.", responseObject = AnnotationResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin})
public class ListAnnotationsCmd extends BaseListCmd {
public static final String APINAME = "listAnnotations";
@Parameter(name = ApiConstants.ID, type = CommandType.STRING, description = "the id of the annotation")
private String uuid;
@ -94,9 +92,4 @@ public class ListAnnotationsCmd extends BaseListCmd {
response.setResponseName(getCommandName());
this.setResponseObject(response);
response.setObjectName("annotations");
}
@Override public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
}
}}

8
api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java
View File

@ -30,11 +30,10 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AnnotationResponse;
import org.apache.cloudstack.context.CallContext;
@APICommand(name = RemoveAnnotationCmd.APINAME, description = "remove an annotation.", responseObject = AnnotationResponse.class,
@APICommand(name = "removeAnnotation", description = "remove an annotation.", responseObject = AnnotationResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin})
public class RemoveAnnotationCmd extends BaseCmd {
public static final String APINAME = "removeAnnotation";
@Parameter(name = ApiConstants.ID, type = CommandType.STRING, required = true, description = "the id of the annotation")
private String uuid;
@ -52,11 +51,6 @@ public class RemoveAnnotationCmd extends BaseCmd {
this.setResponseObject(annotationResponse);
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getAccountId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/UpdateAnnotationVisibilityCmd.java
View File

@ -30,13 +30,12 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AnnotationResponse;
import org.apache.cloudstack.context.CallContext;
@APICommand(name = UpdateAnnotationVisibilityCmd.APINAME, description = "update an annotation visibility.",
@APICommand(name = "updateAnnotationVisibility", description = "update an annotation visibility.",
responseObject = AnnotationResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.16", authorized = {RoleType.Admin})
public class UpdateAnnotationVisibilityCmd extends BaseCmd {
public static final String APINAME = "updateAnnotationVisibility";
@Parameter(name = ApiConstants.ID, type = CommandType.STRING, required = true,
description = "the id of the annotation")
@ -62,11 +61,6 @@ public class UpdateAnnotationVisibilityCmd extends BaseCmd {
this.setResponseObject(annotationResponse);
}
@Override
public String getCommandName() {
return String.format("%s%s", APINAME.toLowerCase(), BaseCmd.RESPONSE_SUFFIX);
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getAccountId();

6
api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
View File

@ -37,7 +37,6 @@ import com.cloud.user.Account;
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteCounterCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteCounterCmd.class.getName());
private static final String s_name = "deletecounterresponse";
// ///////////////////////////////////////////////////
// ////////////// API parameters /////////////////////
@ -73,11 +72,6 @@ public class DeleteCounterCmd extends BaseAsyncCmd {
// ///////////////// Accessors ///////////////////////
// ///////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
public Long getId() {
return id;
}

8
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteBackupOfferingCmd.java
View File

@ -37,12 +37,11 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
@APICommand(name = DeleteBackupOfferingCmd.APINAME,
@APICommand(name = "deleteBackupOffering",
description = "Deletes a backup offering",
responseObject = SuccessResponse.class, since = "4.14.0",
authorized = {RoleType.Admin})
public class DeleteBackupOfferingCmd extends BaseCmd {
public static final String APINAME = "deleteBackupOffering";
@Inject
private BackupManager backupManager;
@ -80,11 +79,6 @@ public class DeleteBackupOfferingCmd extends BaseCmd {
}
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ImportBackupOfferingCmd.java
View File

@ -41,12 +41,11 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = ImportBackupOfferingCmd.APINAME,
@APICommand(name = "importBackupOffering",
description = "Imports a backup offering using a backup provider",
responseObject = BackupOfferingResponse.class, since = "4.14.0",
authorized = {RoleType.Admin})
public class ImportBackupOfferingCmd extends BaseAsyncCmd {
public static final String APINAME = "importBackupOffering";
@Inject
private BackupManager backupManager;
@ -123,11 +122,6 @@ public class ImportBackupOfferingCmd extends BaseAsyncCmd {
}
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getId();

7
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProviderOfferingsCmd.java
View File

@ -38,12 +38,11 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = ListBackupProviderOfferingsCmd.APINAME,
@APICommand(name = "listBackupProviderOfferings",
description = "Lists external backup offerings of the provider",
responseObject = BackupOfferingResponse.class, since = "4.14.0",
authorized = {RoleType.Admin})
public class ListBackupProviderOfferingsCmd extends BaseBackupListCmd {
public static final String APINAME = "listBackupProviderOfferings";
@Inject
private BackupManager backupManager;
@ -87,8 +86,4 @@ public class ListBackupProviderOfferingsCmd extends BaseBackupListCmd {
}
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + RESPONSE_SUFFIX;
}
}

8
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java
View File

@ -33,12 +33,11 @@ import org.apache.cloudstack.backup.BackupProvider;
import com.cloud.user.Account;
@APICommand(name = ListBackupProvidersCmd.APINAME,
@APICommand(name = "listBackupProviders",
description = "Lists Backup and Recovery providers",
responseObject = BackupProviderResponse.class, since = "4.14.0",
authorized = {RoleType.Admin})
public class ListBackupProvidersCmd extends BaseCmd {
public static final String APINAME = "listBackupProviders";
@Inject
private BackupManager backupManager;
@ -58,11 +57,6 @@ public class ListBackupProvidersCmd extends BaseCmd {
return name;
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java
View File

@ -40,7 +40,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.16.0")
public class UpdateBackupOfferingCmd extends BaseCmd {
private static final Logger LOGGER = Logger.getLogger(UpdateBackupOfferingCmd.class.getName());
private static final String APINAME = "updateBackupOffering";
@Inject
private BackupManager backupManager;
@ -106,11 +105,6 @@ public class UpdateBackupOfferingCmd extends BaseCmd {
}
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;
@ -125,4 +119,4 @@ public class UpdateBackupOfferingCmd extends BaseCmd {
public ApiCommandResourceType getApiResourceType() {
return ApiCommandResourceType.BackupOffering;
}
}
}

8
api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java
View File

@ -41,7 +41,7 @@ import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
@APICommand(name = IssueCertificateCmd.APINAME,
@APICommand(name = "issueCertificate",
description = "Issues a client certificate using configured or provided CA plugin",
responseObject = CertificateResponse.class,
requestHasSensitiveInfo = true,
@ -51,7 +51,6 @@ import com.cloud.event.EventTypes;
public class IssueCertificateCmd extends BaseAsyncCmd {
private static final Logger LOG = Logger.getLogger(IssueCertificateCmd.class);
public static final String APINAME = "issueCertificate";
@Inject
private CAManager caManager;
@ -140,11 +139,6 @@ public class IssueCertificateCmd extends BaseAsyncCmd {
setResponseObject(certificateResponse);
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java
View File

@ -34,7 +34,7 @@ import org.apache.cloudstack.framework.ca.CAProvider;
import com.cloud.user.Account;
@APICommand(name = ListCAProvidersCmd.APINAME,
@APICommand(name = "listCAProviders",
description = "Lists available certificate authority providers in CloudStack",
responseObject = CAProviderResponse.class,
requestHasSensitiveInfo = false,
@ -42,7 +42,6 @@ import com.cloud.user.Account;
since = "4.11.0",
authorized = {RoleType.Admin})
public class ListCAProvidersCmd extends BaseCmd {
public static final String APINAME = "listCAProviders";
@Inject
private CAManager caManager;
@ -66,11 +65,6 @@ public class ListCAProvidersCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java
View File

@ -32,7 +32,7 @@ import org.apache.cloudstack.ca.CAManager;
import com.cloud.user.Account;
import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = ListCaCertificateCmd.APINAME,
@APICommand(name = "listCaCertificate",
description = "Lists the CA public certificate(s) as support by the configured/provided CA plugin",
responseObject = CertificateResponse.class,
requestHasSensitiveInfo = false,
@ -40,7 +40,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
since = "4.11.0",
authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
public class ListCaCertificateCmd extends BaseCmd {
public static final String APINAME = "listCaCertificate";
@Inject
private CAManager caManager;
@ -78,11 +77,6 @@ public class ListCaCertificateCmd extends BaseCmd {
setResponseObject(certificateResponse);
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.Type.NORMAL.ordinal();

9
api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java
View File

@ -25,7 +25,6 @@ import org.apache.cloudstack.api.ApiCommandResourceType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
@ -36,7 +35,7 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.host.Host;
@APICommand(name = ProvisionCertificateCmd.APINAME,
@APICommand(name = "provisionCertificate",
description = "Issues and propagates client certificate on a connected host/agent using configured CA plugin",
responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false,
@ -44,7 +43,6 @@ import com.cloud.host.Host;
since = "4.11.0",
authorized = {RoleType.Admin})
public class ProvisionCertificateCmd extends BaseAsyncCmd {
public static final String APINAME = "provisionCertificate";
@Inject
private CAManager caManager;
@ -98,11 +96,6 @@ public class ProvisionCertificateCmd extends BaseAsyncCmd {
setResponseObject(response);
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java
View File

@ -36,7 +36,7 @@ import org.apache.commons.lang3.StringUtils;
import com.cloud.event.EventTypes;
@APICommand(name = RevokeCertificateCmd.APINAME,
@APICommand(name = "revokeCertificate",
description = "Revokes certificate using configured CA plugin",
responseObject = SuccessResponse.class,
requestHasSensitiveInfo = true,
@ -45,7 +45,6 @@ import com.cloud.event.EventTypes;
authorized = {RoleType.Admin})
public class RevokeCertificateCmd extends BaseAsyncCmd {
public static final String APINAME = "revokeCertificate";
@Inject
private CAManager caManager;
@ -94,11 +93,6 @@ public class RevokeCertificateCmd extends BaseAsyncCmd {
setResponseObject(response);
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getId();

6
api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
View File

@ -44,7 +44,6 @@ import com.cloud.user.Account;
public class AddClusterCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddClusterCmd.class.getName());
private static final String s_name = "addclusterresponse";
@Parameter(name = ApiConstants.CLUSTER_NAME, type = CommandType.STRING, required = true, description = "the cluster name")
private String clusterName;
@ -181,11 +180,6 @@ public class AddClusterCmd extends BaseCmd {
return hypervisor;
}
@Override
public String getCommandName() {
return s_name;
}
public String getClusterType() {
return clusterType;
}

6
api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
View File

@ -35,7 +35,6 @@ import com.cloud.user.Account;
public class DeleteClusterCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteClusterCmd.class.getName());
private static final String s_name = "deleteclusterresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -56,11 +55,6 @@ public class DeleteClusterCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
View File

@ -38,7 +38,6 @@ import com.cloud.utils.Pair;
public class ListClustersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListClustersCmd.class.getName());
private static final String s_name = "listclustersresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -119,11 +118,6 @@ public class ListClustersCmd extends BaseListCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
protected Pair<List<ClusterResponse>, Integer> getClusterResponses() {
Pair<List<? extends Cluster>, Integer> result = _mgr.searchForClusters(this);
List<ClusterResponse> clusterResponses = new ArrayList<ClusterResponse>();

6
api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
View File

@ -36,7 +36,6 @@ import com.cloud.user.Account;
public class UpdateClusterCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddClusterCmd.class.getName());
private static final String s_name = "updateclusterresponse";
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ClusterResponse.class, required = true, description = "the ID of the Cluster")
private Long id;
@ -72,11 +71,6 @@ public class UpdateClusterCmd extends BaseCmd {
return hypervisor;
}
@Override
public String getCommandName() {
return s_name;
}
public String getClusterType() {
return clusterType;
}

6
api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
View File

@ -42,7 +42,6 @@ import com.cloud.utils.Pair;
public class ListCfgsByCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListCfgsByCmd.class.getName());
private static final String s_name = "listconfigurationsresponse";
// ///////////////////////////////////////////////////
// ////////////// API parameters /////////////////////
@ -144,11 +143,6 @@ public class ListCfgsByCmd extends BaseListCmd {
// ///////////// API Implementation///////////////////
// ///////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public void execute() {
Pair<List<? extends Configuration>, Integer> result = _mgr.searchForConfigurations(this);

6
api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
View File

@ -31,7 +31,6 @@ import org.apache.cloudstack.api.response.ListResponse;
public class ListDeploymentPlannersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListDeploymentPlannersCmd.class.getName());
private static final String s_name = "listdeploymentplannersresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -45,11 +44,6 @@ public class ListDeploymentPlannersCmd extends BaseListCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public void execute() {
List<String> planners = _mgr.listDeploymentPlanners();

6
api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
View File

@ -41,7 +41,6 @@ import com.cloud.utils.Pair;
public class ListHypervisorCapabilitiesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListHypervisorCapabilitiesCmd.class.getName());
private static final String s_name = "listhypervisorcapabilitiesresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -73,11 +72,6 @@ public class ListHypervisorCapabilitiesCmd extends BaseListCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public void execute() {
Pair<List<? extends HypervisorCapabilities>, Integer> hpvCapabilities =

6
api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java
View File

@ -42,7 +42,6 @@ import com.cloud.utils.Pair;
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.16.0")
public class ResetCfgCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ResetCfgCmd.class.getName());
private static final String s_name = "resetconfigurationresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -123,11 +122,6 @@ public class ResetCfgCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
View File

@ -41,7 +41,6 @@ import com.cloud.user.Account;
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateCfgCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateCfgCmd.class.getName());
private static final String s_name = "updateconfigurationresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -134,11 +133,6 @@ public class UpdateCfgCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
View File

@ -37,7 +37,6 @@ import com.cloud.user.Account;
responseHasSensitiveInfo = false)
public class UpdateHypervisorCapabilitiesCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateHypervisorCapabilitiesCmd.class.getName());
private static final String s_name = "updatehypervisorcapabilitiesresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -100,11 +99,6 @@ public class UpdateHypervisorCapabilitiesCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java
View File

@ -43,7 +43,7 @@ import com.cloud.user.Account;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VirtualMachine;
@APICommand(name = GetDiagnosticsDataCmd.APINAME,
@APICommand(name = "getDiagnosticsData",
responseObject = GetDiagnosticsDataResponse.class,
entityType = {VirtualMachine.class},
responseHasSensitiveInfo = false,
@ -52,7 +52,6 @@ import com.cloud.vm.VirtualMachine;
since = "4.14.0.0",
authorized = {RoleType.Admin})
public class GetDiagnosticsDataCmd extends BaseAsyncCmd {
public static final String APINAME = "getDiagnosticsData";
@Inject
private DiagnosticsService diagnosticsService;
@ -90,11 +89,6 @@ public class GetDiagnosticsDataCmd extends BaseAsyncCmd {
/////////////////// Implementation //////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
Account account = CallContext.current().getCallingAccount();

11
api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/RunDiagnosticsCmd.java
View File

@ -30,7 +30,6 @@ import org.apache.cloudstack.api.ApiCommandResourceType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.RunDiagnosticsResponse;
@ -47,7 +46,7 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import com.cloud.vm.VirtualMachine;
@APICommand(name = RunDiagnosticsCmd.APINAME, responseObject = RunDiagnosticsResponse.class, entityType = {VirtualMachine.class},
@APICommand(name = "runDiagnostics", responseObject = RunDiagnosticsResponse.class, entityType = {VirtualMachine.class},
responseHasSensitiveInfo = false,
requestHasSensitiveInfo = false,
description = "Execute network-utility command (ping/arping/tracert) on system VMs remotely",
@ -55,7 +54,6 @@ import com.cloud.vm.VirtualMachine;
since = "4.12.0.0")
public class RunDiagnosticsCmd extends BaseAsyncCmd {
private static final Logger LOGGER = Logger.getLogger(RunDiagnosticsCmd.class);
public static final String APINAME = "runDiagnostics";
@Inject
private DiagnosticsService diagnosticsService;
@ -108,11 +106,6 @@ public class RunDiagnosticsCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
/////////////////// Implementation //////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
Account account = CallContext.current().getCallingAccount();
@ -182,4 +175,4 @@ public class RunDiagnosticsCmd extends BaseAsyncCmd {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
}
}
}
}

9
api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ListTemplateDirectDownloadCertificatesCmd.java
View File

@ -24,7 +24,6 @@ import com.cloud.exception.ResourceUnavailableException;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
@ -42,7 +41,7 @@ import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
@APICommand(name = ListTemplateDirectDownloadCertificatesCmd.APINAME,
@APICommand(name = "listTemplateDirectDownloadCertificates",
description = "List the uploaded certificates for direct download templates",
responseObject = DirectDownloadCertificateResponse.class,
since = "4.17.0",
@ -65,7 +64,6 @@ public class ListTemplateDirectDownloadCertificatesCmd extends BaseListCmd {
private Boolean listHosts;
private static final Logger LOG = Logger.getLogger(ListTemplateDirectDownloadCertificatesCmd.class);
public static final String APINAME = "listTemplateDirectDownloadCertificates";
public boolean isListHosts() {
return listHosts != null && listHosts;
@ -98,11 +96,6 @@ public class ListTemplateDirectDownloadCertificatesCmd extends BaseListCmd {
createResponse(certificates);
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ProvisionTemplateDirectDownloadCertificateCmd.java
View File

@ -38,14 +38,13 @@ import org.apache.cloudstack.direct.download.DirectDownloadManager;
import javax.inject.Inject;
@APICommand(name = ProvisionTemplateDirectDownloadCertificateCmd.APINAME,
@APICommand(name = "provisionTemplateDirectDownloadCertificate",
description = "Provisions a host with a direct download certificate",
responseObject = DirectDownloadCertificateHostStatusResponse.class,
since = "4.17.0",
authorized = {RoleType.Admin})
public class ProvisionTemplateDirectDownloadCertificateCmd extends BaseCmd {
public static final String APINAME = "provisionTemplateDirectDownloadCertificate";
@Inject
DirectDownloadManager directDownloadManager;
@ -66,11 +65,6 @@ public class ProvisionTemplateDirectDownloadCertificateCmd extends BaseCmd {
setResponseObject(response);
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getId();

10
api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/RevokeTemplateDirectDownloadCertificateCmd.java
View File

@ -47,7 +47,7 @@ import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
@APICommand(name = RevokeTemplateDirectDownloadCertificateCmd.APINAME,
@APICommand(name = "revokeTemplateDirectDownloadCertificate",
description = "Revoke a direct download certificate from hosts in a zone",
responseObject = DirectDownloadCertificateHostStatusResponse.class,
since = "4.13",
@ -58,7 +58,6 @@ public class RevokeTemplateDirectDownloadCertificateCmd extends BaseCmd {
DirectDownloadManager directDownloadManager;
private static final Logger LOG = Logger.getLogger(RevokeTemplateDirectDownloadCertificateCmd.class);
public static final String APINAME = "revokeTemplateDirectDownloadCertificate";
@Parameter(name = ApiConstants.ID, type = CommandType.UUID,
entityType = DirectDownloadCertificateResponse.class,
@ -120,13 +119,8 @@ public class RevokeTemplateDirectDownloadCertificateCmd extends BaseCmd {
}
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getId();
}
}
}

240
api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java
View File

@ -1,123 +1,117 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.api.command.admin.direct.download;
import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.response.DirectDownloadCertificateResponse;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.DirectDownloadCertificateHostStatusResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.direct.download.DirectDownloadCertificate;
import org.apache.cloudstack.direct.download.DirectDownloadManager;
import org.apache.cloudstack.direct.download.DirectDownloadManager.HostCertificateStatus;
import org.apache.log4j.Logger;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
@APICommand(name = UploadTemplateDirectDownloadCertificateCmd.APINAME,
description = "Upload a certificate for HTTPS direct template download on KVM hosts",
responseObject = DirectDownloadCertificateResponse.class,
since = "4.11.0",
authorized = {RoleType.Admin})
public class UploadTemplateDirectDownloadCertificateCmd extends BaseCmd {
@Inject
DirectDownloadManager directDownloadManager;
private static final Logger LOG = Logger.getLogger(UploadTemplateDirectDownloadCertificateCmd.class);
public static final String APINAME = "uploadTemplateDirectDownloadCertificate";
@Parameter(name = ApiConstants.CERTIFICATE, type = BaseCmd.CommandType.STRING, required = true, length = 65535,
description = "SSL certificate")
private String certificate;
@Parameter(name = ApiConstants.NAME , type = BaseCmd.CommandType.STRING, required = true,
description = "Name for the uploaded certificate")
private String name;
@Parameter(name = ApiConstants.HYPERVISOR, type = BaseCmd.CommandType.STRING, required = true, description = "Hypervisor type")
private String hypervisor;
@Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class,
description = "Zone to upload certificate", required = true)
private Long zoneId;
@Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class,
description = "(optional) the host ID to upload certificate")
private Long hostId;
private void createResponse(DirectDownloadCertificate certificate, final List<HostCertificateStatus> hostStatusList) {
final List<DirectDownloadCertificateHostStatusResponse> hostMapsResponse = new ArrayList<>();
if (certificate == null) {
throw new CloudRuntimeException("Unable to upload certificate");
}
DirectDownloadCertificateResponse response = _responseGenerator.createDirectDownloadCertificateResponse(certificate);
for (final HostCertificateStatus status : hostStatusList) {
if (status == null) {
continue;
}
DirectDownloadCertificateHostStatusResponse uploadResponse =
_responseGenerator.createDirectDownloadCertificateHostStatusResponse(status);
hostMapsResponse.add(uploadResponse);
}
response.setHostsMap(hostMapsResponse);
response.setResponseName(getCommandName());
response.setObjectName("uploadtemplatedirectdownloadcertificate");
setResponseObject(response);
}
@Override
public void execute() {
if (!hypervisor.equalsIgnoreCase("kvm")) {
throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Currently supporting KVM hosts only");
}
try {
LOG.debug("Uploading certificate " + name + " to agents for Direct Download");
Pair<DirectDownloadCertificate, List<HostCertificateStatus>> uploadStatus =
directDownloadManager.uploadCertificateToHosts(certificate, name, hypervisor, zoneId, hostId);
DirectDownloadCertificate certificate = uploadStatus.first();
List<HostCertificateStatus> hostStatus = uploadStatus.second();
createResponse(certificate, hostStatus);
} catch (Exception e) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
}
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getId();
}
}
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.api.command.admin.direct.download;
import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.response.DirectDownloadCertificateResponse;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.DirectDownloadCertificateHostStatusResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.direct.download.DirectDownloadCertificate;
import org.apache.cloudstack.direct.download.DirectDownloadManager;
import org.apache.cloudstack.direct.download.DirectDownloadManager.HostCertificateStatus;
import org.apache.log4j.Logger;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
@APICommand(name = "uploadTemplateDirectDownloadCertificate",
description = "Upload a certificate for HTTPS direct template download on KVM hosts",
responseObject = DirectDownloadCertificateResponse.class,
since = "4.11.0",
authorized = {RoleType.Admin})
public class UploadTemplateDirectDownloadCertificateCmd extends BaseCmd {
@Inject
DirectDownloadManager directDownloadManager;
private static final Logger LOG = Logger.getLogger(UploadTemplateDirectDownloadCertificateCmd.class);
@Parameter(name = ApiConstants.CERTIFICATE, type = BaseCmd.CommandType.STRING, required = true, length = 65535,
description = "SSL certificate")
private String certificate;
@Parameter(name = ApiConstants.NAME , type = BaseCmd.CommandType.STRING, required = true,
description = "Name for the uploaded certificate")
private String name;
@Parameter(name = ApiConstants.HYPERVISOR, type = BaseCmd.CommandType.STRING, required = true, description = "Hypervisor type")
private String hypervisor;
@Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class,
description = "Zone to upload certificate", required = true)
private Long zoneId;
@Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class,
description = "(optional) the host ID to upload certificate")
private Long hostId;
private void createResponse(DirectDownloadCertificate certificate, final List<HostCertificateStatus> hostStatusList) {
final List<DirectDownloadCertificateHostStatusResponse> hostMapsResponse = new ArrayList<>();
if (certificate == null) {
throw new CloudRuntimeException("Unable to upload certificate");
}
DirectDownloadCertificateResponse response = _responseGenerator.createDirectDownloadCertificateResponse(certificate);
for (final HostCertificateStatus status : hostStatusList) {
if (status == null) {
continue;
}
DirectDownloadCertificateHostStatusResponse uploadResponse =
_responseGenerator.createDirectDownloadCertificateHostStatusResponse(status);
hostMapsResponse.add(uploadResponse);
}
response.setHostsMap(hostMapsResponse);
response.setResponseName(getCommandName());
response.setObjectName("uploadtemplatedirectdownloadcertificate");
setResponseObject(response);
}
@Override
public void execute() {
if (!hypervisor.equalsIgnoreCase("kvm")) {
throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Currently supporting KVM hosts only");
}
try {
LOG.debug("Uploading certificate " + name + " to agents for Direct Download");
Pair<DirectDownloadCertificate, List<HostCertificateStatus>> uploadStatus =
directDownloadManager.uploadCertificateToHosts(certificate, name, hypervisor, zoneId, hostId);
DirectDownloadCertificate certificate = uploadStatus.first();
List<HostCertificateStatus> hostStatus = uploadStatus.second();
createResponse(certificate, hostStatus);
} catch (Exception e) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
}
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getId();
}
}

6
api/src/main/java/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
View File

@ -37,7 +37,6 @@ import com.cloud.user.Account;
public class CreateDomainCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateDomainCmd.class.getName());
private static final String s_name = "createdomainresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -82,11 +81,6 @@ public class CreateDomainCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
View File

@ -41,7 +41,6 @@ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized =
RoleType.Admin, RoleType.DomainAdmin })
public class DeleteDomainCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteDomainCmd.class.getName());
private static final String s_name = "deletedomainresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -74,11 +73,6 @@ public class DeleteDomainCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
Domain domain = _entityMgr.findById(Domain.class, getId());

6
api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
View File

@ -39,7 +39,6 @@ import com.cloud.utils.Pair;
public class ListDomainChildrenCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListDomainChildrenCmd.class.getName());
private static final String s_name = "listdomainchildrenresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -93,11 +92,6 @@ public class ListDomainChildrenCmd extends BaseListCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public void execute() {
Pair<List<? extends Domain>, Integer> result = _domainService.searchForDomainChildren(this);

6
api/src/main/java/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
View File

@ -38,7 +38,6 @@ import com.cloud.user.Account;
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateDomainCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateDomainCmd.class.getName());
private static final String s_name = "updatedomainresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -78,11 +77,6 @@ public class UpdateDomainCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java
View File

@ -43,7 +43,6 @@ import java.util.Map;
public class AddGuestOsCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(AddGuestOsCmd.class.getName());
private static final String s_name = "addguestosresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -98,11 +97,6 @@ public class AddGuestOsCmd extends BaseAsyncCreateCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java
View File

@ -37,7 +37,6 @@ import com.cloud.user.Account;
public class AddGuestOsMappingCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(AddGuestOsMappingCmd.class.getName());
private static final String s_name = "addguestosmappingresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -86,11 +85,6 @@ public class AddGuestOsMappingCmd extends BaseAsyncCreateCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java
View File

@ -37,7 +37,6 @@ import com.cloud.utils.Pair;
public class ListGuestOsMappingCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListGuestOsMappingCmd.class.getName());
private static final String s_name = "listguestosmappingresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -79,11 +78,6 @@ public class ListGuestOsMappingCmd extends BaseListCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public void execute() {
Pair<List<? extends GuestOSHypervisor>, Integer> result = _mgr.listGuestOSMappingByCriteria(this);
@ -98,4 +92,4 @@ public class ListGuestOsMappingCmd extends BaseListCmd {
response.setResponseName(getCommandName());
setResponseObject(response);
}
}
}

6
api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java
View File

@ -37,7 +37,6 @@ import com.cloud.user.Account;
public class RemoveGuestOsCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RemoveGuestOsCmd.class.getName());
private static final String s_name = "removeguestosresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -58,11 +57,6 @@ public class RemoveGuestOsCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java
View File

@ -37,7 +37,6 @@ import com.cloud.user.Account;
public class RemoveGuestOsMappingCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RemoveGuestOsMappingCmd.class.getName());
private static final String s_name = "removeguestosmappingresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -58,11 +57,6 @@ public class RemoveGuestOsMappingCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java
View File

@ -42,7 +42,6 @@ public class UpdateGuestOsCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateGuestOsCmd.class.getName());
private static final String s_name = "updateguestosresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -89,11 +88,6 @@ public class UpdateGuestOsCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java
View File

@ -36,7 +36,6 @@ import com.cloud.user.Account;
public class UpdateGuestOsMappingCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateGuestOsMappingCmd.class.getName());
private static final String s_name = "updateguestosmappingresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -74,11 +73,6 @@ public class UpdateGuestOsMappingCmd extends BaseAsyncCmd {
}
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

9
api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java
View File

@ -31,7 +31,6 @@ import org.apache.cloudstack.api.ApiArgValidator;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostHAResponse;
@ -42,12 +41,11 @@ import org.apache.cloudstack.ha.HAResource;
import javax.inject.Inject;
@APICommand(name = ConfigureHAForHostCmd.APINAME, description = "Configures HA for a host",
@APICommand(name = "configureHAForHost", description = "Configures HA for a host",
responseObject = HostHAResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.11", authorized = {RoleType.Admin})
public final class ConfigureHAForHostCmd extends BaseAsyncCmd {
public static final String APINAME = "configureHAForHost";
@Inject
private HAConfigManager haConfigManager;
@ -80,11 +78,6 @@ public final class ConfigureHAForHostCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java
View File

@ -40,12 +40,11 @@ import org.apache.cloudstack.ha.HAConfigManager;
import javax.inject.Inject;
@APICommand(name = DisableHAForClusterCmd.APINAME, description = "Disables HA cluster-wide",
@APICommand(name = "disableHAForCluster", description = "Disables HA cluster-wide",
responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.11", authorized = {RoleType.Admin})
public final class DisableHAForClusterCmd extends BaseAsyncCmd {
public static final String APINAME = "disableHAForCluster";
@Inject
private HAConfigManager haConfigManager;
@ -70,11 +69,6 @@ public final class DisableHAForClusterCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccountId();

9
api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java
View File

@ -30,7 +30,6 @@ import org.apache.cloudstack.api.ApiArgValidator;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostHAResponse;
@ -41,12 +40,11 @@ import org.apache.cloudstack.ha.HAResource;
import javax.inject.Inject;
@APICommand(name = DisableHAForHostCmd.APINAME, description = "Disables HA for a host",
@APICommand(name = "disableHAForHost", description = "Disables HA for a host",
responseObject = HostHAResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.11", authorized = {RoleType.Admin})
public final class DisableHAForHostCmd extends BaseAsyncCmd {
public static final String APINAME = "disableHAForHost";
@Inject
private HAConfigManager haConfigManager;
@ -71,11 +69,6 @@ public final class DisableHAForHostCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccountId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java
View File

@ -40,12 +40,11 @@ import org.apache.cloudstack.ha.HAConfigManager;
import javax.inject.Inject;
@APICommand(name = DisableHAForZoneCmd.APINAME, description = "Disables HA for a zone",
@APICommand(name = "disableHAForZone", description = "Disables HA for a zone",
responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.11", authorized = {RoleType.Admin})
public final class DisableHAForZoneCmd extends BaseAsyncCmd {
public static final String APINAME = "disableHAForZone";
@Inject
private HAConfigManager haConfigManager;
@ -70,11 +69,6 @@ public final class DisableHAForZoneCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccountId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java
View File

@ -40,12 +40,11 @@ import org.apache.cloudstack.ha.HAConfigManager;
import javax.inject.Inject;
@APICommand(name = EnableHAForClusterCmd.APINAME, description = "Enables HA cluster-wide",
@APICommand(name = "enableHAForCluster", description = "Enables HA cluster-wide",
responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.11", authorized = {RoleType.Admin})
public final class EnableHAForClusterCmd extends BaseAsyncCmd {
public static final String APINAME = "enableHAForCluster";
@Inject
private HAConfigManager haConfigManager;
@ -70,11 +69,6 @@ public final class EnableHAForClusterCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccountId();

9
api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java
View File

@ -30,7 +30,6 @@ import org.apache.cloudstack.api.ApiArgValidator;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostHAResponse;
@ -41,12 +40,11 @@ import org.apache.cloudstack.ha.HAResource;
import javax.inject.Inject;
@APICommand(name = EnableHAForHostCmd.APINAME, description = "Enables HA for a host",
@APICommand(name = "enableHAForHost", description = "Enables HA for a host",
responseObject = HostHAResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.11", authorized = {RoleType.Admin})
public final class EnableHAForHostCmd extends BaseAsyncCmd {
public static final String APINAME = "enableHAForHost";
@Inject
private HAConfigManager haConfigManager;
@ -71,11 +69,6 @@ public final class EnableHAForHostCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccountId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java
View File

@ -40,12 +40,11 @@ import org.apache.cloudstack.ha.HAConfigManager;
import javax.inject.Inject;
@APICommand(name = EnableHAForZoneCmd.APINAME, description = "Enables HA for a zone",
@APICommand(name = "enableHAForZone", description = "Enables HA for a zone",
responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.11", authorized = {RoleType.Admin})
public final class EnableHAForZoneCmd extends BaseAsyncCmd {
public static final String APINAME = "enableHAForZone";
@Inject
private HAConfigManager haConfigManager;
@ -70,11 +69,6 @@ public final class EnableHAForZoneCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return CallContext.current().getCallingAccountId();

8
api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java
View File

@ -42,11 +42,10 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@APICommand(name = ListHostHAProvidersCmd.APINAME, description = "Lists HA providers", responseObject = HostHAResponse.class,
@APICommand(name = "listHostHAProviders", description = "Lists HA providers", responseObject = HostHAResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.11", authorized = {RoleType.Admin})
public final class ListHostHAProvidersCmd extends BaseCmd {
public static final String APINAME = "listHostHAProviders";
@Inject
private HAConfigManager haConfigManager;
@ -71,11 +70,6 @@ public final class ListHostHAProvidersCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java
View File

@ -42,11 +42,10 @@ import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
@APICommand(name = ListHostHAResourcesCmd.APINAME, description = "Lists host HA resources", responseObject = HostHAResponse.class,
@APICommand(name = "listHostHAResources", description = "Lists host HA resources", responseObject = HostHAResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
since = "4.11", authorized = {RoleType.Admin})
public final class ListHostHAResourcesCmd extends BaseCmd {
public static final String APINAME = "listHostHAResources";
@Inject
private HAConfigManager haConfigManager;
@ -71,11 +70,6 @@ public final class ListHostHAResourcesCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
View File

@ -42,7 +42,6 @@ import com.cloud.user.Account;
public class AddHostCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddHostCmd.class.getName());
private static final String s_name = "addhostresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -126,11 +125,6 @@ public class AddHostCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
View File

@ -35,7 +35,6 @@ import com.cloud.user.Account;
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddSecondaryStorageCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddSecondaryStorageCmd.class.getName());
private static final String s_name = "addsecondarystorageresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -63,11 +62,6 @@ public class AddSecondaryStorageCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

5
api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelHostAsDegradedCmd.java
View File

@ -62,11 +62,6 @@ public class CancelHostAsDegradedCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return COMMAND_RESPONSE_NAME;
}
public static String getResultObjectName() {
return "host";
}

6
api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
View File

@ -37,7 +37,6 @@ import com.cloud.user.Account;
public class CancelMaintenanceCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CancelMaintenanceCmd.class.getName());
private static final String s_name = "cancelhostmaintenanceresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -58,11 +57,6 @@ public class CancelMaintenanceCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
public static String getResultObjectName() {
return "host";
}

5
api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeclareHostAsDegradedCmd.java
View File

@ -62,11 +62,6 @@ public class DeclareHostAsDegradedCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return COMMAND_RESPONSE_NAME;
}
public static String getResultObjectName() {
return "host";
}

6
api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
View File

@ -34,7 +34,6 @@ import com.cloud.user.Account;
public class DeleteHostCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteHostCmd.class.getName());
private static final String s_name = "deletehostresponse";
// ///////////////////////////////////////////////////
// ////////////// API parameters /////////////////////
@ -73,11 +72,6 @@ public class DeleteHostCmd extends BaseCmd {
// ///////////// API Implementation///////////////////
// ///////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
View File

@ -39,7 +39,6 @@ import com.cloud.utils.Ternary;
public class FindHostsForMigrationCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(FindHostsForMigrationCmd.class.getName());
private static final String s_name = "findhostsformigrationresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -64,11 +63,6 @@ public class FindHostsForMigrationCmd extends BaseListCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public void execute() {
ListResponse<HostForMigrationResponse> response = null;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java
View File

@ -29,7 +29,6 @@ import org.apache.cloudstack.api.response.HostTagResponse;
public class ListHostTagsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListHostTagsCmd.class.getName());
private static final String s_name = "listhosttagsresponse";
// ///////////////////////////////////////////////////
// ////////////// API parameters /////////////////////
@ -43,11 +42,6 @@ public class ListHostTagsCmd extends BaseListCmd {
// ///////////// API Implementation///////////////////
// ///////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public ApiCommandResourceType getApiResourceType() {
return ApiCommandResourceType.Host;
@ -61,4 +55,4 @@ public class ListHostTagsCmd extends BaseListCmd {
setResponseObject(response);
}
}
}

6
api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
View File

@ -47,7 +47,6 @@ import com.cloud.utils.Ternary;
public class ListHostsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListHostsCmd.class.getName());
private static final String s_name = "listhostsresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -192,11 +191,6 @@ public class ListHostsCmd extends BaseListCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public ApiCommandResourceType getApiResourceType() {
return ApiCommandResourceType.Host;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
View File

@ -37,7 +37,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
public class PrepareForMaintenanceCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(PrepareForMaintenanceCmd.class.getName());
private static final String s_name = "preparehostformaintenanceresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -58,11 +57,6 @@ public class PrepareForMaintenanceCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
public static String getResultObjectName() {
return "host";
}

6
api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
View File

@ -38,7 +38,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
public class ReconnectHostCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ReconnectHostCmd.class.getName());
private static final String s_name = "reconnecthostresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -59,11 +58,6 @@ public class ReconnectHostCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
public static String getResultObjectName() {
return "host";
}

6
api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
View File

@ -37,7 +37,6 @@ import com.cloud.user.Account;
public class ReleaseHostReservationCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ReleaseHostReservationCmd.class.getName());
private static final String s_name = "releasehostreservationresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -58,11 +57,6 @@ public class ReleaseHostReservationCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
Account account = CallContext.current().getCallingAccount();

6
api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
View File

@ -36,7 +36,6 @@ import java.util.List;
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateHostCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateHostCmd.class.getName());
private static final String s_name = "updatehostresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -104,11 +103,6 @@ public class UpdateHostCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
public static String getResultObjectName() {
return "updatehost";
}

6
api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
View File

@ -32,7 +32,6 @@ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class UpdateHostPasswordCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateHostPasswordCmd.class.getName());
private static final String s_name = "updatehostpasswordresponse";
// ///////////////////////////////////////////////////
// ////////////// API parameters /////////////////////
@ -82,11 +81,6 @@ public class UpdateHostPasswordCmd extends BaseCmd {
// ///////////// API Implementation///////////////////
// ///////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
View File

@ -48,7 +48,6 @@ import com.cloud.user.Account;
responseHasSensitiveInfo = false)
public class ConfigureInternalLoadBalancerElementCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ConfigureInternalLoadBalancerElementCmd.class.getName());
private static final String s_name = "configureinternalloadbalancerelementresponse";
@Inject
private List<InternalLoadBalancerElementService> _service;
@ -83,11 +82,6 @@ public class ConfigureInternalLoadBalancerElementCmd extends BaseAsyncCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
View File

@ -46,7 +46,6 @@ import com.cloud.user.Account;
responseHasSensitiveInfo = false)
public class CreateInternalLoadBalancerElementCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateInternalLoadBalancerElementCmd.class.getName());
private static final String s_name = "createinternalloadbalancerelementresponse";
@Inject
private List<InternalLoadBalancerElementService> _service;
@ -78,11 +77,6 @@ public class CreateInternalLoadBalancerElementCmd extends BaseAsyncCreateCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
View File

@ -47,7 +47,6 @@ import com.cloud.network.VirtualRouterProvider;
responseHasSensitiveInfo = false)
public class ListInternalLoadBalancerElementsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListInternalLoadBalancerElementsCmd.class.getName());
private static final String s_name = "listinternalloadbalancerelementsresponse";
@Inject
private InternalLoadBalancerElementService _service;
@ -86,11 +85,6 @@ public class ListInternalLoadBalancerElementsCmd extends BaseListCmd {
return enabled;
}
@Override
public String getCommandName() {
return s_name;
}
@Override
public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
ResourceAllocationException {

9
api/src/main/java/org/apache/cloudstack/api/command/admin/management/ListMgmtsCmd.java
View File

@ -19,19 +19,17 @@ package org.apache.cloudstack.api.command.admin.management;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandResourceType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ManagementServerResponse;
import org.apache.log4j.Logger;
@APICommand(name = ListMgmtsCmd.APINAME, description = "Lists management servers.", responseObject = ManagementServerResponse.class,
@APICommand(name = "listManagementServers", description = "Lists management servers.", responseObject = ManagementServerResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListMgmtsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListMgmtsCmd.class.getName());
public static final String APINAME = "listManagementServers";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -59,11 +57,6 @@ public class ListMgmtsCmd extends BaseListCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
}
@Override
public ApiCommandResourceType getApiResourceType() {
return ApiCommandResourceType.Host;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
View File

@ -45,7 +45,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddNetworkDeviceCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddNetworkDeviceCmd.class);
private static final String s_name = "addnetworkdeviceresponse";
// ///////////////////////////////////////////////////
// ////////////// API parameters /////////////////////
@ -86,11 +85,6 @@ public class AddNetworkDeviceCmd extends BaseCmd {
}
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
// TODO Auto-generated method stub

6
api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
View File

@ -45,7 +45,6 @@ import com.cloud.user.Account;
public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(AddNetworkServiceProviderCmd.class.getName());
private static final String s_name = "addnetworkserviceproviderresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -97,11 +96,6 @@ public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateGuestNetworkIpv6PrefixCmd.java
View File

@ -37,7 +37,7 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
@APICommand(name = CreateGuestNetworkIpv6PrefixCmd.APINAME,
@APICommand(name = "createGuestNetworkIpv6Prefix",
description = "Creates a guest network IPv6 prefix.",
responseObject = DataCenterGuestIpv6PrefixResponse.class,
since = "4.17.0.0",
@ -47,7 +47,6 @@ import com.cloud.user.Account;
public class CreateGuestNetworkIpv6PrefixCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CreateGuestNetworkIpv6PrefixCmd.class);
public static final String APINAME = "createGuestNetworkIpv6Prefix";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -102,11 +101,6 @@ public class CreateGuestNetworkIpv6PrefixCmd extends BaseAsyncCmd {
}
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

8
api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java
View File

@ -36,7 +36,7 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
@APICommand(name = CreateManagementNetworkIpRangeCmd.APINAME,
@APICommand(name = "createManagementNetworkIpRange",
description = "Creates a Management network IP range.",
responseObject = PodResponse.class,
since = "4.11.0.0",
@ -46,7 +46,6 @@ import com.cloud.user.Account;
public class CreateManagementNetworkIpRangeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CreateManagementNetworkIpRangeCmd.class);
public static final String APINAME = "createManagementNetworkIpRange";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -150,11 +149,6 @@ public class CreateManagementNetworkIpRangeCmd extends BaseAsyncCmd {
}
}
@Override
public String getCommandName() {
return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

10
api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
View File

@ -50,7 +50,6 @@ import com.cloud.user.Account;
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateNetworkOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateNetworkOfferingCmd.class.getName());
private static final String s_name = "createnetworkofferingresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -201,10 +200,6 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
return networkRate;
}
public static String getName() {
return s_name;
}
public Long getServiceOfferingId() {
return serviceOfferingId;
}
@ -362,11 +357,6 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

6
api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
View File

@ -42,7 +42,6 @@ import com.cloud.user.Account;
public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreatePhysicalNetworkCmd.class.getName());
private static final String s_name = "createphysicalnetworkresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -120,11 +119,6 @@ public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd {
return networkName;
}
@Override
public String getCommandName() {
return s_name;
}
@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;

Some files were not shown because too many files have changed in this diff Show More