Incremental checkin

This commit is contained in:
abhishek 2010-08-19 16:40:41 -07:00
parent 21f7c0dec8
commit d468a0bd7f
4 changed files with 7 additions and 4 deletions

View File

@ -48,7 +48,7 @@ public abstract class BaseCmd {
} }
public enum Manager { public enum Manager {
AccountManager, AgentManager, ConfigManager, ManagementServer, NetworkGroupManager, NetworkManager, StorageManager, UserVmManager, SnapshotManager AccountManager, AgentManager, ConfigManager, ManagementServer, NetworkGroupManager, NetworkManager, StorageManager, UserVmManager, SnapshotManager, TemplateManager
} }
// FIXME: Extract these out into a separate file // FIXME: Extract these out into a separate file

View File

@ -21,8 +21,11 @@ package com.cloud.api.commands;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter; import com.cloud.api.Parameter;
import com.cloud.api.BaseCmd.Manager;
@Implementation(method="registerTemplate", manager=Manager.TemplateManager)
public class RegisterTemplateCmd extends BaseCmd { public class RegisterTemplateCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(RegisterTemplateCmd.class.getName()); public static final Logger s_logger = Logger.getLogger(RegisterTemplateCmd.class.getName());

View File

@ -66,7 +66,7 @@ public interface TemplateManager extends Manager {
* @return id of the template created. * @return id of the template created.
*/ */
Long create(long userId, Long zoneId, String name, String displayText, boolean isPublic, boolean featured, ImageFormat format, FileSystem fs, URI url, String chksum, boolean requiresHvm, int bits, boolean enablePassword, long guestOSId, boolean bootable); Long create(long userId, Long zoneId, String name, String displayText, boolean isPublic, boolean featured, ImageFormat format, FileSystem fs, URI url, String chksum, boolean requiresHvm, int bits, boolean enablePassword, long guestOSId, boolean bootable);
Long create(RegisterTemplateCmd cmd) throws InvalidParameterValueException, URISyntaxException, ResourceAllocationException; Long registerTemplate(RegisterTemplateCmd cmd) throws InvalidParameterValueException, URISyntaxException, ResourceAllocationException;
/** /**
* Creates a Template * Creates a Template

View File

@ -124,7 +124,7 @@ public class TemplateManagerImpl implements TemplateManager {
@Override @Override
public Long create(RegisterTemplateCmd cmd) throws InvalidParameterValueException, URISyntaxException, ResourceAllocationException{ public Long registerTemplate(RegisterTemplateCmd cmd) throws InvalidParameterValueException, URISyntaxException, ResourceAllocationException{
Account account = (Account)UserContext.current().getAccountObject(); Account account = (Account)UserContext.current().getAccountObject();
Long userId = UserContext.current().getUserId(); Long userId = UserContext.current().getUserId();