etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

volume upload: renamed command classes to follow the naming convention

This commit is contained in:
Rajani Karuturi 2014-12-16 12:48:37 +05:30
parent 7e030ee72d
commit f70a2a1486
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/com/cloud/template/TemplateApiService.java
View File

@ -30,7 +30,7 @@ import org.apache.cloudstack.api.command.user.template.CopyTemplateCmd;
import org.apache.cloudstack.api.command.user.template.CreateTemplateCmd;
import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd;
import org.apache.cloudstack.api.command.user.template.ExtractTemplateCmd;
import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplate;
import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd;
import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
import org.apache.cloudstack.api.command.user.template.UpdateTemplateCmd;
@ -45,7 +45,7 @@ public interface TemplateApiService {
VirtualMachineTemplate registerTemplate(RegisterTemplateCmd cmd) throws URISyntaxException, ResourceAllocationException;
public GetUploadParamsResponse registerTemplateForPostUpload(GetUploadParamsForTemplate cmd) throws ResourceAllocationException, MalformedURLException;
public GetUploadParamsResponse registerTemplateForPostUpload(GetUploadParamsForTemplateCmd cmd) throws ResourceAllocationException, MalformedURLException;
VirtualMachineTemplate registerIso(RegisterIsoCmd cmd) throws IllegalArgumentException, ResourceAllocationException;

4
api/src/org/apache/cloudstack/api/AbstractGetUploadParamsCommand.java → api/src/org/apache/cloudstack/api/AbstractGetUploadParamsCmd.java
View File

@ -27,9 +27,9 @@ import org.apache.log4j.Logger;
import java.net.URL;
import java.util.UUID;
public abstract class AbstractGetUploadParamsCommand extends BaseCmd {
public abstract class AbstractGetUploadParamsCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AbstractGetUploadParamsCommand.class.getName());
public static final Logger s_logger = Logger.getLogger(AbstractGetUploadParamsCmd.class.getName());
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "the name of the volume/template")
private String name;

6
api/src/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplate.java → api/src/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java
View File

@ -24,7 +24,7 @@ import java.util.Map;
import com.cloud.exception.ResourceAllocationException;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.AbstractGetUploadParamsCommand;
import org.apache.cloudstack.api.AbstractGetUploadParamsCmd;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.Parameter;
@ -36,8 +36,8 @@ import org.apache.log4j.Logger;
@APICommand(name = "getUploadParamsForTemplate", description = "upload an existing template into the CloudStack cloud. ", responseObject = GetUploadParamsResponse.class, since =
"4.6.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class GetUploadParamsForTemplate extends AbstractGetUploadParamsCommand {
public static final Logger s_logger = Logger.getLogger(GetUploadParamsForTemplate.class.getName());
public class GetUploadParamsForTemplateCmd extends AbstractGetUploadParamsCmd {
public static final Logger s_logger = Logger.getLogger(GetUploadParamsForTemplateCmd.class.getName());
private static final String s_name = "postuploadtemplateresponse";

6
api/src/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolume.java → api/src/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolumeCmd.java
View File

@ -23,7 +23,7 @@ import java.net.URL;
import java.util.UUID;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.AbstractGetUploadParamsCommand;
import org.apache.cloudstack.api.AbstractGetUploadParamsCmd;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.Parameter;
@ -35,8 +35,8 @@ import org.apache.log4j.Logger;
@APICommand(name = "getUploadParamsForVolume", description = "Upload a data disk to the cloudstack cloud.", responseObject = GetUploadParamsResponse.class, since = "4.6.0",
requestHasSensitiveInfo= false, responseHasSensitiveInfo = false)
public class GetUploadParamsForVolume extends AbstractGetUploadParamsCommand {
public static final Logger s_logger = Logger.getLogger(GetUploadParamsForVolume.class.getName());
public class GetUploadParamsForVolumeCmd extends AbstractGetUploadParamsCmd {
public static final Logger s_logger = Logger.getLogger(GetUploadParamsForVolumeCmd.class.getName());
private static final String s_name = "postuploadvolumeresponse";

8
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -38,8 +38,8 @@ import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.command.user.snapshot.UpdateSnapshotPolicyCmd;
import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplate;
import org.apache.cloudstack.api.command.user.volume.GetUploadParamsForVolume;
import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd;
import org.apache.cloudstack.api.command.user.volume.GetUploadParamsForVolumeCmd;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.ControlledEntity;
@ -2996,8 +2996,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
cmdList.add(UpdateVPCCmdByAdmin.class);
cmdList.add(UpdateLBStickinessPolicyCmd.class);
cmdList.add(UpdateLBHealthCheckPolicyCmd.class);
cmdList.add(GetUploadParamsForTemplate.class);
cmdList.add(GetUploadParamsForVolume.class);
cmdList.add(GetUploadParamsForTemplateCmd.class);
cmdList.add(GetUploadParamsForVolumeCmd.class);
return cmdList;
}

4
server/src/com/cloud/template/HypervisorTemplateAdapter.java
View File

@ -26,7 +26,7 @@ import java.util.concurrent.ExecutionException;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplate;
import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd;
import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand;
@ -137,7 +137,7 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase {
}
@Override
public TemplateProfile prepare(GetUploadParamsForTemplate cmd) throws ResourceAllocationException {
public TemplateProfile prepare(GetUploadParamsForTemplateCmd cmd) throws ResourceAllocationException {
TemplateProfile profile = super.prepare(cmd);
// Check that the resource limit for secondary storage won't be exceeded

4
server/src/com/cloud/template/TemplateAdapter.java
View File

@ -23,7 +23,7 @@ import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd;
import org.apache.cloudstack.api.command.user.template.ExtractTemplateCmd;
import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplate;
import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd;
import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
import com.cloud.exception.ResourceAllocationException;
@ -53,7 +53,7 @@ public interface TemplateAdapter extends Adapter {
public TemplateProfile prepare(RegisterTemplateCmd cmd) throws ResourceAllocationException;
public TemplateProfile prepare(GetUploadParamsForTemplate cmd) throws ResourceAllocationException;
public TemplateProfile prepare(GetUploadParamsForTemplateCmd cmd) throws ResourceAllocationException;
public TemplateProfile prepare(RegisterIsoCmd cmd) throws ResourceAllocationException;

4
server/src/com/cloud/template/TemplateAdapterBase.java
View File

@ -22,7 +22,7 @@ import java.util.Map;
import javax.inject.Inject;
import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplate;
import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.ApiConstants;
@ -275,7 +275,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
}
@Override
public TemplateProfile prepare(GetUploadParamsForTemplate cmd) throws ResourceAllocationException {
public TemplateProfile prepare(GetUploadParamsForTemplateCmd cmd) throws ResourceAllocationException {
//check if the caller can operate with the template owner
Account caller = CallContext.current().getCallingAccount();
Account owner = _accountMgr.getAccount(cmd.getEntityOwnerId());

4
server/src/com/cloud/template/TemplateManagerImpl.java
View File

@ -38,7 +38,7 @@ import javax.inject.Inject;
import javax.naming.ConfigurationException;
import com.google.gson.Gson;
import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplate;
import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd;
import org.apache.cloudstack.api.response.GetUploadParamsResponse;
import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand;
import org.apache.commons.codec.binary.Base64;
@ -336,7 +336,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
@Override
@ActionEvent(eventType = EventTypes.EVENT_TEMPLATE_CREATE, eventDescription = "creating post upload template")
public GetUploadParamsResponse registerTemplateForPostUpload(GetUploadParamsForTemplate cmd) throws ResourceAllocationException, MalformedURLException {
public GetUploadParamsResponse registerTemplateForPostUpload(GetUploadParamsForTemplateCmd cmd) throws ResourceAllocationException, MalformedURLException {
TemplateAdapter adapter = getAdapter(HypervisorType.getType(cmd.getHypervisor()));
TemplateProfile profile = adapter.prepare(cmd);
List<TemplateOrVolumePostUploadCommand> payload = adapter.createTemplateForPostUpload(profile);