diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java index d518eed714e..860d5c47e5e 100644 --- a/server/src/com/cloud/api/ApiDispatcher.java +++ b/server/src/com/cloud/api/ApiDispatcher.java @@ -29,26 +29,15 @@ import java.util.StringTokenizer; import org.apache.log4j.Logger; -import com.cloud.agent.AgentManager; import com.cloud.api.BaseCmd.CommandType; import com.cloud.async.AsyncCommandQueued; -import com.cloud.configuration.ConfigurationManager; -import com.cloud.consoleproxy.ConsoleProxyManager; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceAllocationException; -import com.cloud.network.DomainRouterService; -import com.cloud.network.NetworkManager; -import com.cloud.network.security.NetworkGroupManager; import com.cloud.server.ManagementServer; -import com.cloud.storage.StorageManager; -import com.cloud.storage.snapshot.SnapshotManager; -import com.cloud.template.TemplateManager; -import com.cloud.user.AccountManager; import com.cloud.utils.DateUtil; import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.vm.UserVmService; /** * A class that dispatches API commands to the appropriate manager for execution. @@ -56,18 +45,7 @@ import com.cloud.vm.UserVmService; public class ApiDispatcher { private static final Logger s_logger = Logger.getLogger(ApiDispatcher.class.getName()); - private AccountManager _accountMgr; - private AgentManager _agentMgr; - private ConfigurationManager _configMgr; - private ConsoleProxyManager _consoleProxyMgr; - private ManagementServer _mgmtServer; - private NetworkGroupManager _networkGroupMgr; - private NetworkManager _networkMgr; - private SnapshotManager _snapshotMgr; - private StorageManager _storageMgr; - private TemplateManager _templateMgr; - private UserVmService _userVmMgr; - private DomainRouterService _domainRouterService; + ComponentLocator _locator = null; // singleton class private static ApiDispatcher s_instance = new ApiDispatcher(); @@ -77,19 +55,7 @@ public class ApiDispatcher { } private ApiDispatcher() { - ComponentLocator locator = ComponentLocator.getLocator(ManagementServer.Name); - _mgmtServer = (ManagementServer)ComponentLocator.getComponent(ManagementServer.Name); - _accountMgr = locator.getManager(AccountManager.class); - _agentMgr = locator.getManager(AgentManager.class); - _configMgr = locator.getManager(ConfigurationManager.class); - _consoleProxyMgr = locator.getManager(ConsoleProxyManager.class); - _networkGroupMgr = locator.getManager(NetworkGroupManager.class); - _networkMgr = locator.getManager(NetworkManager.class); - _snapshotMgr = locator.getManager(SnapshotManager.class); - _storageMgr = locator.getManager(StorageManager.class); - _templateMgr = locator.getManager(TemplateManager.class); - _userVmMgr = locator.getManager(UserVmService.class); - _domainRouterService = locator.getManager(DomainRouterService.class); + _locator = ComponentLocator.getLocator(ManagementServer.Name); } public Long dispatchCreateCmd(BaseAsyncCreateCmd cmd, Map params) { @@ -101,41 +67,16 @@ public class ApiDispatcher { } String methodName = impl.createMethod(); - Object mgr = _mgmtServer; - switch (impl.manager()) { - case AccountManager: - mgr = _accountMgr; - break; - case AgentManager: - mgr = _agentMgr; - break; - case ConfigManager: - mgr = _configMgr; - break; - case ConsoleProxyManager: - mgr = _consoleProxyMgr; - break; - case NetworkGroupManager: - mgr = _networkGroupMgr; - break; - case NetworkManager: - mgr = _networkMgr; - break; - case SnapshotManager: - mgr = _snapshotMgr; - break; - case StorageManager: - mgr = _storageMgr; - break; - case TemplateManager: - mgr = _templateMgr; - break; - case UserVmManager: - mgr = _userVmMgr; - break; - case DomainRouterService: - mgr = _domainRouterService; - break; + Class mgrClass = impl.manager(); + Object mgr = null; + if (mgrClass.equals(ManagementServer.class)) { + mgr = ComponentLocator.getComponent(ManagementServer.Name); + } else { + mgr = _locator.getManager(impl.manager()); + } + + if (mgr == null) { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Unable to execute method " + methodName + " for command " + cmd.getClass().getSimpleName() + ", unable to find manager " + impl.manager() + " to execute method " + methodName); } try { @@ -178,41 +119,16 @@ public class ApiDispatcher { } String methodName = impl.method(); - Object mgr = _mgmtServer; - switch (impl.manager()) { - case AccountManager: - mgr = _accountMgr; - break; - case AgentManager: - mgr = _agentMgr; - break; - case ConfigManager: - mgr = _configMgr; - break; - case ConsoleProxyManager: - mgr = _consoleProxyMgr; - break; - case NetworkGroupManager: - mgr = _networkGroupMgr; - break; - case NetworkManager: - mgr = _networkMgr; - break; - case SnapshotManager: - mgr = _snapshotMgr; - break; - case StorageManager: - mgr = _storageMgr; - break; - case TemplateManager: - mgr = _templateMgr; - break; - case UserVmManager: - mgr = _userVmMgr; - break; - case DomainRouterService: - mgr = _domainRouterService; - break; + Class mgrClass = impl.manager(); + Object mgr = null; + if (mgrClass.equals(ManagementServer.class)) { + mgr = ComponentLocator.getComponent(ManagementServer.Name); + } else { + mgr = _locator.getManager(impl.manager()); + } + + if (mgr == null) { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Unable to execute method " + methodName + " for command " + cmd.getClass().getSimpleName() + ", unable to find manager " + impl.manager() + " to execute method " + methodName); } try { diff --git a/server/src/com/cloud/api/BaseCmd.java b/server/src/com/cloud/api/BaseCmd.java index 75ae5dbe16e..ad27127a2b7 100755 --- a/server/src/com/cloud/api/BaseCmd.java +++ b/server/src/com/cloud/api/BaseCmd.java @@ -40,10 +40,6 @@ public abstract class BaseCmd { public enum CommandType { BOOLEAN, DATE, FLOAT, INTEGER, LIST, LONG, OBJECT, MAP, STRING, TZDATE } - - public enum Manager { - AccountManager, AgentManager, ConfigManager, ManagementServer, NetworkGroupManager, NetworkManager, StorageManager, UserVmManager, SnapshotManager, TemplateManager, ConsoleProxyManager, DomainRouterService - } // FIXME: Extract these out into a separate file // Client error codes diff --git a/server/src/com/cloud/api/Implementation.java b/server/src/com/cloud/api/Implementation.java index ffb469bcf7c..b9c9f077bab 100644 --- a/server/src/com/cloud/api/Implementation.java +++ b/server/src/com/cloud/api/Implementation.java @@ -6,13 +6,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.cloud.api.BaseCmd.Manager; +import com.cloud.server.ManagementServer; @Retention(RetentionPolicy.RUNTIME) @Target({TYPE}) public @interface Implementation { String createMethod() default ""; String method() default ""; - Manager manager() default Manager.ManagementServer; + Class manager() default ManagementServer.class; String description() default ""; } diff --git a/server/src/com/cloud/api/commands/AddConfigCmd.java b/server/src/com/cloud/api/commands/AddConfigCmd.java index 10bbcd00bb5..8b4236ee4ae 100644 --- a/server/src/com/cloud/api/commands/AddConfigCmd.java +++ b/server/src/com/cloud/api/commands/AddConfigCmd.java @@ -20,14 +20,14 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.ConfigurationResponse; +import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ConfigurationVO; -@Implementation(method="addConfig", manager=Manager.ConfigManager) +@Implementation(method="addConfig", manager=ConfigurationManager.class) public class AddConfigCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddConfigCmd.class.getName()); private static final String s_name = "addconfigresponse"; diff --git a/server/src/com/cloud/api/commands/AddHostCmd.java b/server/src/com/cloud/api/commands/AddHostCmd.java index 6076d3d489a..af64c0b4781 100644 --- a/server/src/com/cloud/api/commands/AddHostCmd.java +++ b/server/src/com/cloud/api/commands/AddHostCmd.java @@ -26,9 +26,9 @@ import java.util.Set; import org.apache.log4j.Logger; +import com.cloud.agent.AgentManager; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; @@ -43,7 +43,7 @@ import com.cloud.offering.ServiceOffering; import com.cloud.storage.GuestOSCategoryVO; import com.cloud.vm.UserVmVO; -@Implementation(method="discoverHosts", manager=Manager.AgentManager, description="Adds a new host.") +@Implementation(method="discoverHosts", manager=AgentManager.class, description="Adds a new host.") public class AddHostCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddHostCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java b/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java index bf6c7552ede..74dcb32a9ea 100644 --- a/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java +++ b/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java @@ -26,9 +26,9 @@ import java.util.Set; import org.apache.log4j.Logger; +import com.cloud.agent.AgentManager; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; @@ -39,7 +39,7 @@ import com.cloud.host.HostVO; import com.cloud.host.Status.Event; import com.cloud.storage.GuestOSCategoryVO; -@Implementation(method="discoverHosts", manager=Manager.AgentManager, description="Adds secondary storage.") +@Implementation(method="discoverHosts", manager=AgentManager.class, description="Adds secondary storage.") public class AddSecondaryStorageCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddSecondaryStorageCmd.class.getName()); private static final String s_name = "addsecondarystorageresponse"; diff --git a/server/src/com/cloud/api/commands/AssignPortForwardingServiceCmd.java b/server/src/com/cloud/api/commands/AssignPortForwardingServiceCmd.java index 22fef170011..e10bde45313 100644 --- a/server/src/com/cloud/api/commands/AssignPortForwardingServiceCmd.java +++ b/server/src/com/cloud/api/commands/AssignPortForwardingServiceCmd.java @@ -23,15 +23,15 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.network.SecurityGroupVO; +import com.cloud.server.ManagementServer; import com.cloud.user.Account; -@Implementation(method="assignSecurityGroup", manager=Manager.ManagementServer, description="Assigns a single or a list of port forwarding services to a virtual machine. If a list of port forwarding services is given, it will overwrite the previous assignment of port forwarding services. For example, on the first call, if you assigned port forwarding service A to virtual machine 1 and on the next call, you assign port forwarding services B and C to virtual machine 1, the ultimate result of these two commands would be that virtual machine 1 would only have port forwarding services B and C assigned to it. Individual port forwarding services can be assigned to the virtual machine by specifying a single port forwarding service group.") +@Implementation(method="assignSecurityGroup", manager=ManagementServer.class, description="Assigns a single or a list of port forwarding services to a virtual machine. If a list of port forwarding services is given, it will overwrite the previous assignment of port forwarding services. For example, on the first call, if you assigned port forwarding service A to virtual machine 1 and on the next call, you assign port forwarding services B and C to virtual machine 1, the ultimate result of these two commands would be that virtual machine 1 would only have port forwarding services B and C assigned to it. Individual port forwarding services can be assigned to the virtual machine by specifying a single port forwarding service group.") public class AssignPortForwardingServiceCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AssignPortForwardingServiceCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java index 4bace7e6c09..75a6963de5f 100644 --- a/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java @@ -23,15 +23,15 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.network.LoadBalancerVO; +import com.cloud.network.NetworkManager; import com.cloud.user.Account; -@Implementation(method="assignToLoadBalancer", manager=Manager.NetworkManager, description="Assigns virtual machine or a list of virtual machines to a load balancer rule.") +@Implementation(method="assignToLoadBalancer", manager=NetworkManager.class, description="Assigns virtual machine or a list of virtual machines to a load balancer rule.") public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AssignToLoadBalancerRuleCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java b/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java index eff51ff62a4..82082f3e544 100644 --- a/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java +++ b/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java @@ -21,17 +21,17 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.IPAddressResponse; import com.cloud.dc.Vlan.VlanType; import com.cloud.dc.VlanVO; import com.cloud.network.IPAddressVO; +import com.cloud.network.NetworkManager; import com.cloud.user.Account; import com.cloud.user.UserContext; -@Implementation(method="associateIP", manager=Manager.NetworkManager, description="Acquires and associates a public IP to an account.") +@Implementation(method="associateIP", manager=NetworkManager.class, description="Acquires and associates a public IP to an account.") public class AssociateIPAddrCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AssociateIPAddrCmd.class.getName()); private static final String s_name = "associateipaddressresponse"; diff --git a/server/src/com/cloud/api/commands/AttachIsoCmd.java b/server/src/com/cloud/api/commands/AttachIsoCmd.java index bdb8019e443..81394579f32 100755 --- a/server/src/com/cloud/api/commands/AttachIsoCmd.java +++ b/server/src/com/cloud/api/commands/AttachIsoCmd.java @@ -18,23 +18,21 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; -import org.hamcrest.core.Is; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.IsoVmResponse; -import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.storage.VMTemplateVO; +import com.cloud.template.TemplateManager; import com.cloud.user.Account; import com.cloud.vm.VMInstanceVO; -@Implementation(method="attachIso", manager=Manager.TemplateManager, description="Attaches an ISO to a virtual machine.") +@Implementation(method="attachIso", manager=TemplateManager.class, description="Attaches an ISO to a virtual machine.") public class AttachIsoCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AttachIsoCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/AttachVolumeCmd.java b/server/src/com/cloud/api/commands/AttachVolumeCmd.java index 7cd1b4785de..4d368243f05 100755 --- a/server/src/com/cloud/api/commands/AttachVolumeCmd.java +++ b/server/src/com/cloud/api/commands/AttachVolumeCmd.java @@ -22,7 +22,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.VolumeResponse; @@ -30,8 +29,9 @@ import com.cloud.event.EventTypes; import com.cloud.storage.VolumeVO; import com.cloud.user.Account; import com.cloud.uservm.UserVm; +import com.cloud.vm.UserVmManager; -@Implementation(method="attachVolumeToVM", manager=Manager.UserVmManager, description="Attaches a disk volume to a virtual machine.") +@Implementation(method="attachVolumeToVM", manager=UserVmManager.class, description="Attaches a disk volume to a virtual machine.") public class AttachVolumeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AttachVolumeCmd.class.getName()); private static final String s_name = "attachvolumeresponse"; diff --git a/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java b/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java index 2415a1ab377..b2138614220 100644 --- a/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java +++ b/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java @@ -29,18 +29,18 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.IngressRuleResponse; import com.cloud.api.response.ListResponse; import com.cloud.event.EventTypes; import com.cloud.network.security.IngressRuleVO; +import com.cloud.network.security.NetworkGroupManager; import com.cloud.user.Account; import com.cloud.user.UserContext; import com.cloud.utils.StringUtils; -@Implementation(method="authorizeNetworkGroupIngress", manager=Manager.NetworkGroupManager) @SuppressWarnings("rawtypes") +@Implementation(method="authorizeNetworkGroupIngress", manager=NetworkGroupManager.class) @SuppressWarnings("rawtypes") public class AuthorizeNetworkGroupIngressCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AuthorizeNetworkGroupIngressCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java b/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java index a52af58c555..8eaffb21ab5 100644 --- a/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java @@ -26,9 +26,9 @@ import java.util.Set; import org.apache.log4j.Logger; +import com.cloud.agent.AgentManager; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.HostResponse; @@ -44,7 +44,7 @@ import com.cloud.user.Account; import com.cloud.user.UserContext; import com.cloud.vm.UserVmVO; -@Implementation(method="cancelMaintenance", manager=Manager.AgentManager, description="Cancels host maintenance.") +@Implementation(method="cancelMaintenance", manager=AgentManager.class, description="Cancels host maintenance.") public class CancelMaintenanceCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(CancelMaintenanceCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java b/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java index 9e22d8e8ec0..a1acbf44533 100644 --- a/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java @@ -22,18 +22,18 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.StoragePoolResponse; import com.cloud.dc.ClusterVO; import com.cloud.event.EventTypes; +import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePoolVO; import com.cloud.storage.StorageStats; import com.cloud.user.Account; import com.cloud.user.UserContext; -@Implementation(method="cancelPrimaryStorageForMaintenance", manager=Manager.StorageManager) +@Implementation(method="cancelPrimaryStorageForMaintenance", manager=StorageManager.class) public class CancelPrimaryStorageMaintenanceCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(CancelPrimaryStorageMaintenanceCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/CopyIsoCmd.java b/server/src/com/cloud/api/commands/CopyIsoCmd.java index fa6883e01b5..4957ce011c3 100644 --- a/server/src/com/cloud/api/commands/CopyIsoCmd.java +++ b/server/src/com/cloud/api/commands/CopyIsoCmd.java @@ -23,7 +23,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; @@ -33,10 +32,11 @@ import com.cloud.storage.GuestOS; import com.cloud.storage.VMTemplateHostVO; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; import com.cloud.storage.VMTemplateVO; +import com.cloud.template.TemplateManager; import com.cloud.user.Account; import com.cloud.user.UserContext; -@Implementation(method="copyIso", manager=Manager.TemplateManager, description="Copies an ISO file.") +@Implementation(method="copyIso", manager=TemplateManager.class, description="Copies an ISO file.") public class CopyIsoCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(CopyIsoCmd.class.getName()); private static final String s_name = "copyisoresponse"; diff --git a/server/src/com/cloud/api/commands/CopyTemplateCmd.java b/server/src/com/cloud/api/commands/CopyTemplateCmd.java index a6a04f1f096..c7dda7a404a 100644 --- a/server/src/com/cloud/api/commands/CopyTemplateCmd.java +++ b/server/src/com/cloud/api/commands/CopyTemplateCmd.java @@ -23,7 +23,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; @@ -33,10 +32,11 @@ import com.cloud.storage.GuestOS; import com.cloud.storage.VMTemplateHostVO; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; import com.cloud.storage.VMTemplateVO; +import com.cloud.template.TemplateManager; import com.cloud.user.Account; import com.cloud.user.UserContext; -@Implementation(method="copyTemplate", manager=Manager.TemplateManager, description="Copies a template from one zone to another.") +@Implementation(method="copyTemplate", manager=TemplateManager.class, description="Copies a template from one zone to another.") public class CopyTemplateCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(CopyTemplateCmd.class.getName()); private static final String s_name = "copytemplateresponse"; diff --git a/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java b/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java index 6a7602d45ea..de8f9ce253b 100755 --- a/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java +++ b/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java @@ -21,14 +21,14 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.DiskOfferingResponse; +import com.cloud.configuration.ConfigurationManager; import com.cloud.storage.DiskOfferingVO; -@Implementation(method="createDiskOffering", manager=Manager.ConfigManager, description="Creates a disk offering.") +@Implementation(method="createDiskOffering", manager=ConfigurationManager.class, description="Creates a disk offering.") public class CreateDiskOfferingCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateDiskOfferingCmd.class.getName()); @@ -93,7 +93,7 @@ public class CreateDiskOfferingCmd extends BaseCmd { if (responseObject != null) { response.setId(responseObject.getId()); response.setCreated(responseObject.getCreated()); - response.setDiskSize(responseObject.getDiskSize()); + response.setDiskSize(responseObject.getDiskSizeInBytes()); response.setDisplayText(responseObject.getDisplayText()); response.setDomainId(responseObject.getDomainId()); response.setDomain(ApiDBUtils.findDomainById(responseObject.getDomainId()).getName()); diff --git a/server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java b/server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java index d6c3c414b37..6a55d46cada 100644 --- a/server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java @@ -22,15 +22,15 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.FirewallRuleResponse; import com.cloud.network.FirewallRuleVO; +import com.cloud.network.NetworkManager; import com.cloud.uservm.UserVm; -@Implementation(method="createPortForwardingRule", manager=Manager.NetworkManager, description="Creates a port forwarding rule") +@Implementation(method="createPortForwardingRule", manager=NetworkManager.class, description="Creates a port forwarding rule") public class CreateIPForwardingRuleCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateIPForwardingRuleCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java index 737d482d69e..d254df36cc8 100644 --- a/server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java @@ -22,13 +22,13 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.LoadBalancerResponse; import com.cloud.network.LoadBalancerVO; +import com.cloud.network.NetworkManager; -@Implementation(method="createLoadBalancerRule", manager=Manager.NetworkManager, description="Creates a load balancer rule") +@Implementation(method="createLoadBalancerRule", manager=NetworkManager.class, description="Creates a load balancer rule") public class CreateLoadBalancerRuleCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateLoadBalancerRuleCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java b/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java index 58698b3fea1..45324a5498d 100644 --- a/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java +++ b/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java @@ -21,13 +21,13 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.NetworkGroupResponse; +import com.cloud.network.security.NetworkGroupManager; import com.cloud.network.security.NetworkGroupVO; -@Implementation(method="createNetworkGroup", manager=Manager.NetworkGroupManager) +@Implementation(method="createNetworkGroup", manager=NetworkGroupManager.class) public class CreateNetworkGroupCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateNetworkGroupCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/CreatePodCmd.java b/server/src/com/cloud/api/commands/CreatePodCmd.java index 5eaa1cf6e88..73266dd1e89 100644 --- a/server/src/com/cloud/api/commands/CreatePodCmd.java +++ b/server/src/com/cloud/api/commands/CreatePodCmd.java @@ -22,13 +22,13 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.PodResponse; +import com.cloud.configuration.ConfigurationManager; import com.cloud.dc.HostPodVO; -@Implementation(method="createPod", manager=Manager.ConfigManager, description="Creates a new Pod.") +@Implementation(method="createPod", manager=ConfigurationManager.class, description="Creates a new Pod.") public class CreatePodCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreatePodCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java b/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java index e5a1c903f96..73dda4f700f 100644 --- a/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java +++ b/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java @@ -21,14 +21,14 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.ServiceOfferingResponse; +import com.cloud.configuration.ConfigurationManager; import com.cloud.offering.NetworkOffering.GuestIpType; import com.cloud.service.ServiceOfferingVO; -@Implementation(method="createServiceOffering", manager=Manager.ConfigManager, description="Creates a service offering.") +@Implementation(method="createServiceOffering", manager=ConfigurationManager.class, description="Creates a service offering.") public class CreateServiceOfferingCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateServiceOfferingCmd.class.getName()); private static final String _name = "createserviceofferingresponse"; diff --git a/server/src/com/cloud/api/commands/CreateSnapshotCmd.java b/server/src/com/cloud/api/commands/CreateSnapshotCmd.java index 256940e5463..d34a8a90164 100644 --- a/server/src/com/cloud/api/commands/CreateSnapshotCmd.java +++ b/server/src/com/cloud/api/commands/CreateSnapshotCmd.java @@ -22,7 +22,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCreateCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SnapshotResponse; @@ -30,9 +29,10 @@ import com.cloud.event.EventTypes; import com.cloud.storage.Snapshot.SnapshotType; import com.cloud.storage.SnapshotVO; import com.cloud.storage.VolumeVO; +import com.cloud.storage.snapshot.SnapshotManager; import com.cloud.user.Account; -@Implementation(createMethod="createSnapshotDB", method="createSnapshot", manager=Manager.SnapshotManager, description="Creates an instant snapshot of a volume.") +@Implementation(createMethod="createSnapshotDB", method="createSnapshot", manager=SnapshotManager.class, description="Creates an instant snapshot of a volume.") public class CreateSnapshotCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateSnapshotCmd.class.getName()); private static final String s_name = "createsnapshotresponse"; diff --git a/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java b/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java index 8f0483d3d9f..8dc46983d4c 100644 --- a/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java +++ b/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java @@ -23,15 +23,15 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.response.SnapshotResponse; import com.cloud.event.EventTypes; import com.cloud.storage.Snapshot.SnapshotType; import com.cloud.storage.SnapshotVO; import com.cloud.storage.VolumeVO; +import com.cloud.storage.snapshot.SnapshotManager; import com.cloud.user.Account; -@Implementation(method="createSnapshotInternal", manager=Manager.SnapshotManager, description="Creates an instant snapshot of a volume.") +@Implementation(method="createSnapshotInternal", manager=SnapshotManager.class, description="Creates an instant snapshot of a volume.") public class CreateSnapshotInternalCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(CreateSnapshotInternalCmd.class.getName()); private static final String s_name = "createsnapshotresponse"; diff --git a/server/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java b/server/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java index 895d0bb03b4..824dc248f22 100644 --- a/server/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java +++ b/server/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java @@ -21,13 +21,13 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SnapshotPolicyResponse; import com.cloud.storage.SnapshotPolicyVO; +import com.cloud.storage.snapshot.SnapshotManager; -@Implementation(method="createPolicy", manager=Manager.SnapshotManager, description="Creates a snapshot policy for the account.") +@Implementation(method="createPolicy", manager=SnapshotManager.class, description="Creates a snapshot policy for the account.") public class CreateSnapshotPolicyCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateSnapshotPolicyCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/CreateStoragePoolCmd.java b/server/src/com/cloud/api/commands/CreateStoragePoolCmd.java index 27b981ac84d..98d70e40407 100644 --- a/server/src/com/cloud/api/commands/CreateStoragePoolCmd.java +++ b/server/src/com/cloud/api/commands/CreateStoragePoolCmd.java @@ -24,16 +24,16 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.ServerApiException; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; +import com.cloud.api.ServerApiException; import com.cloud.api.response.StoragePoolResponse; +import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePoolVO; import com.cloud.storage.StorageStats; @SuppressWarnings("rawtypes") -@Implementation(method="createPool", manager=Manager.StorageManager, description="Creates a storage pool.") +@Implementation(method="createPool", manager=StorageManager.class, description="Creates a storage pool.") public class CreateStoragePoolCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateStoragePoolCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/CreateTemplateCmd.java b/server/src/com/cloud/api/commands/CreateTemplateCmd.java index c04459750d2..08737488236 100644 --- a/server/src/com/cloud/api/commands/CreateTemplateCmd.java +++ b/server/src/com/cloud/api/commands/CreateTemplateCmd.java @@ -22,7 +22,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCreateCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.TemplateResponse; @@ -35,8 +34,9 @@ import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VolumeVO; import com.cloud.user.Account; +import com.cloud.vm.UserVmManager; -@Implementation(method="createPrivateTemplate", createMethod="createPrivateTemplateRecord", manager=Manager.UserVmManager, description="Creates a template of a virtual machine. " + +@Implementation(method="createPrivateTemplate", createMethod="createPrivateTemplateRecord", manager=UserVmManager.class, description="Creates a template of a virtual machine. " + "The virtual machine must be in a STOPPED state. " + "A template created from this command is automatically designated as a private template visible to the account that created it.") public class CreateTemplateCmd extends BaseAsyncCreateCmd { diff --git a/server/src/com/cloud/api/commands/CreateVMGroupCmd.java b/server/src/com/cloud/api/commands/CreateVMGroupCmd.java index d03b524b62d..3caaaba444d 100644 --- a/server/src/com/cloud/api/commands/CreateVMGroupCmd.java +++ b/server/src/com/cloud/api/commands/CreateVMGroupCmd.java @@ -21,14 +21,14 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.InstanceGroupResponse; import com.cloud.user.Account; import com.cloud.vm.InstanceGroupVO; +import com.cloud.vm.UserVmManager; -@Implementation(method="createVmGroup", manager=Manager.UserVmManager) +@Implementation(method="createVmGroup", manager=UserVmManager.class) public class CreateVMGroupCmd extends BaseCmd{ public static final Logger s_logger = Logger.getLogger(CreateVMGroupCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java b/server/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java index 11e84dda13e..0df8beff618 100644 --- a/server/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java +++ b/server/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java @@ -22,13 +22,13 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.VlanIpRangeResponse; +import com.cloud.configuration.ConfigurationManager; import com.cloud.dc.VlanVO; -@Implementation(method="createVlanAndPublicIpRange", manager=Manager.ConfigManager, description="Creates a VLAN IP range.") +@Implementation(method="createVlanAndPublicIpRange", manager=ConfigurationManager.class, description="Creates a VLAN IP range.") public class CreateVlanIpRangeCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateVlanIpRangeCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/CreateVolumeCmd.java b/server/src/com/cloud/api/commands/CreateVolumeCmd.java index 4cfb29a6139..7d712c4e74b 100644 --- a/server/src/com/cloud/api/commands/CreateVolumeCmd.java +++ b/server/src/com/cloud/api/commands/CreateVolumeCmd.java @@ -22,17 +22,17 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCreateCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.VolumeResponse; import com.cloud.event.EventTypes; import com.cloud.storage.DiskOfferingVO; +import com.cloud.storage.StorageManager; import com.cloud.storage.VolumeVO; import com.cloud.user.Account; import com.cloud.user.UserContext; -@Implementation(createMethod="allocVolume", method="createVolume", manager=Manager.StorageManager, description="Creates a disk volume from a disk offering. " + +@Implementation(createMethod="allocVolume", method="createVolume", manager=StorageManager.class, description="Creates a disk volume from a disk offering. " + "This disk volume must still be attached to a virtual machine to make use of it.") public class CreateVolumeCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateVolumeCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/CreateZoneCmd.java b/server/src/com/cloud/api/commands/CreateZoneCmd.java index beda30082af..ea3a2208c0b 100644 --- a/server/src/com/cloud/api/commands/CreateZoneCmd.java +++ b/server/src/com/cloud/api/commands/CreateZoneCmd.java @@ -21,14 +21,13 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.CommandType; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.ZoneResponse; +import com.cloud.configuration.ConfigurationManager; import com.cloud.dc.DataCenterVO; -@Implementation(method="createZone", manager=Manager.ConfigManager, description="Creates a Zone.") +@Implementation(method="createZone", manager=ConfigurationManager.class, description="Creates a Zone.") public class CreateZoneCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateZoneCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java b/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java index c7c5c8e7206..29949338b09 100644 --- a/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java +++ b/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java @@ -20,13 +20,13 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; +import com.cloud.configuration.ConfigurationManager; -@Implementation(method="deleteDiskOffering", manager=Manager.ConfigManager, description="Updates a disk offering.") +@Implementation(method="deleteDiskOffering", manager=ConfigurationManager.class, description="Updates a disk offering.") public class DeleteDiskOfferingCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteDiskOfferingCmd.class.getName()); private static final String s_name = "deletediskofferingresponse"; diff --git a/server/src/com/cloud/api/commands/DeleteHostCmd.java b/server/src/com/cloud/api/commands/DeleteHostCmd.java index 5f727bbb435..5cf3028c831 100644 --- a/server/src/com/cloud/api/commands/DeleteHostCmd.java +++ b/server/src/com/cloud/api/commands/DeleteHostCmd.java @@ -20,15 +20,15 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; +import com.cloud.agent.AgentManager; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; -@Implementation(method="deleteHost", manager=Manager.AgentManager, description="Deletes a host.") +@Implementation(method="deleteHost", manager=AgentManager.class, description="Deletes a host.") public class DeleteHostCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteHostCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java b/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java index 1ebda3908a2..84fbd862759 100644 --- a/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java @@ -20,12 +20,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.network.NetworkManager; -@Implementation(method="deleteIpForwardingRule", manager=Manager.NetworkManager, description="Deletes a port forwarding rule") +@Implementation(method="deleteIpForwardingRule", manager=NetworkManager.class, description="Deletes a port forwarding rule") public class DeleteIPForwardingRuleCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteIPForwardingRuleCmd.class.getName()); private static final String s_name = "deleteportforwardingruleresponse"; diff --git a/server/src/com/cloud/api/commands/DeleteIsoCmd.java b/server/src/com/cloud/api/commands/DeleteIsoCmd.java index 39efa1759b7..d7f59d17b51 100644 --- a/server/src/com/cloud/api/commands/DeleteIsoCmd.java +++ b/server/src/com/cloud/api/commands/DeleteIsoCmd.java @@ -22,16 +22,16 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.storage.VMTemplateVO; +import com.cloud.template.TemplateManager; import com.cloud.user.Account; -@Implementation(method="deleteIso", manager=Manager.TemplateManager, description="Deletes an ISO file.") +@Implementation(method="deleteIso", manager=TemplateManager.class, description="Deletes an ISO file.") public class DeleteIsoCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteIsoCmd.class.getName()); private static final String s_name = "deleteisosresponse"; diff --git a/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java index 12430fca000..62ccaa419d7 100644 --- a/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java @@ -21,15 +21,15 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.network.LoadBalancerVO; +import com.cloud.network.NetworkManager; import com.cloud.user.Account; -@Implementation(method="deleteLoadBalancerRule", manager=Manager.NetworkManager, description="Deletes a load balancer rule.") +@Implementation(method="deleteLoadBalancerRule", manager=NetworkManager.class, description="Deletes a load balancer rule.") public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteLoadBalancerRuleCmd.class.getName()); private static final String s_name = "deleteloadbalancerruleresponse"; diff --git a/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java b/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java index a14e0fef420..e3a676254dc 100644 --- a/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java +++ b/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java @@ -3,12 +3,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.network.security.NetworkGroupManager; -@Implementation(method="deleteNetworkGroup", manager=Manager.NetworkGroupManager) +@Implementation(method="deleteNetworkGroup", manager=NetworkGroupManager.class) public class DeleteNetworkGroupCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteNetworkGroupCmd.class.getName()); private static final String s_name = "deletenetworkgroupresponse"; diff --git a/server/src/com/cloud/api/commands/DeletePodCmd.java b/server/src/com/cloud/api/commands/DeletePodCmd.java index ff854ca8242..9ec4276f548 100644 --- a/server/src/com/cloud/api/commands/DeletePodCmd.java +++ b/server/src/com/cloud/api/commands/DeletePodCmd.java @@ -21,13 +21,13 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; +import com.cloud.configuration.ConfigurationManager; -@Implementation(method="deletePod", manager=Manager.ConfigManager, description="Deletes a Pod.") +@Implementation(method="deletePod", manager=ConfigurationManager.class, description="Deletes a Pod.") public class DeletePodCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeletePodCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/DeletePoolCmd.java b/server/src/com/cloud/api/commands/DeletePoolCmd.java index 5d26634565b..69c3a3410c8 100644 --- a/server/src/com/cloud/api/commands/DeletePoolCmd.java +++ b/server/src/com/cloud/api/commands/DeletePoolCmd.java @@ -3,13 +3,13 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; +import com.cloud.storage.StorageManager; -@Implementation(method="deletePool", manager=Manager.StorageManager, description="Deletes a storage pool.") +@Implementation(method="deletePool", manager=StorageManager.class, description="Deletes a storage pool.") public class DeletePoolCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeletePoolCmd.class.getName()); private static final String s_name = "deletepoolresponse"; diff --git a/server/src/com/cloud/api/commands/DeletePortForwardingServiceCmd.java b/server/src/com/cloud/api/commands/DeletePortForwardingServiceCmd.java index c29127fb213..9b9023b3cfa 100644 --- a/server/src/com/cloud/api/commands/DeletePortForwardingServiceCmd.java +++ b/server/src/com/cloud/api/commands/DeletePortForwardingServiceCmd.java @@ -23,16 +23,16 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.network.SecurityGroupVO; +import com.cloud.server.ManagementServer; import com.cloud.user.Account; -@Implementation(method="deleteSecurityGroup", manager=Manager.ManagementServer, description="Deletes a port forwarding service") +@Implementation(method="deleteSecurityGroup", manager=ManagementServer.class, description="Deletes a port forwarding service") public class DeletePortForwardingServiceCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeletePortForwardingServiceCmd.class.getName()); private static final String s_name = "deleteportforwardingserviceresponse"; diff --git a/server/src/com/cloud/api/commands/DeletePortForwardingServiceRuleCmd.java b/server/src/com/cloud/api/commands/DeletePortForwardingServiceRuleCmd.java index 2881c670459..c823bde2d2b 100644 --- a/server/src/com/cloud/api/commands/DeletePortForwardingServiceRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeletePortForwardingServiceRuleCmd.java @@ -22,16 +22,16 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; +import com.cloud.network.NetworkManager; import com.cloud.network.NetworkRuleConfigVO; import com.cloud.network.SecurityGroupVO; import com.cloud.user.Account; -@Implementation(method="deleteNetworkRuleConfig", manager=Manager.NetworkManager, description="Deletes a port forwarding service rule") +@Implementation(method="deleteNetworkRuleConfig", manager=NetworkManager.class, description="Deletes a port forwarding service rule") public class DeletePortForwardingServiceRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeletePortForwardingServiceRuleCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java b/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java index 048f1f9dc11..49af19a1ed9 100644 --- a/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java +++ b/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java @@ -21,12 +21,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.configuration.ConfigurationManager; -@Implementation(method="deleteServiceOffering", manager=Manager.ConfigManager, description="Deletes a service offering.") +@Implementation(method="deleteServiceOffering", manager=ConfigurationManager.class, description="Deletes a service offering.") public class DeleteServiceOfferingCmd extends BaseCmd{ public static final Logger s_logger = Logger.getLogger(DeleteServiceOfferingCmd.class.getName()); private static final String s_name = "deleteserviceofferingresponse"; diff --git a/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java b/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java index 71c9f3bd5cf..8b0e0e7c176 100644 --- a/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java +++ b/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java @@ -22,15 +22,15 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.storage.Snapshot; +import com.cloud.storage.snapshot.SnapshotManager; import com.cloud.user.Account; -@Implementation(method="deleteSnapshot", manager=Manager.SnapshotManager, description="Deletes a snapshot of a disk volume.") +@Implementation(method="deleteSnapshot", manager=SnapshotManager.class, description="Deletes a snapshot of a disk volume.") public class DeleteSnapshotCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteSnapshotCmd.class.getName()); private static final String s_name = "deletesnapshotresponse"; diff --git a/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java b/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java index 7725adba353..373a120fcec 100644 --- a/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java +++ b/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java @@ -23,12 +23,12 @@ import java.util.List; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.storage.snapshot.SnapshotManager; -@Implementation(method="deleteSnapshotPolicies", manager=Manager.SnapshotManager, description="Deletes snapshot policies for the account.") +@Implementation(method="deleteSnapshotPolicies", manager=SnapshotManager.class, description="Deletes snapshot policies for the account.") public class DeleteSnapshotPoliciesCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteSnapshotPoliciesCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/DeleteTemplateCmd.java b/server/src/com/cloud/api/commands/DeleteTemplateCmd.java index 56e89dc05ee..b7649b466aa 100644 --- a/server/src/com/cloud/api/commands/DeleteTemplateCmd.java +++ b/server/src/com/cloud/api/commands/DeleteTemplateCmd.java @@ -22,15 +22,15 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.storage.VMTemplateVO; +import com.cloud.template.TemplateManager; import com.cloud.user.Account; -@Implementation(method="deleteTemplate", manager=Manager.TemplateManager, description="Deletes a template from the system. All virtual machines using the deleted template will not be affected.") +@Implementation(method="deleteTemplate", manager=TemplateManager.class, description="Deletes a template from the system. All virtual machines using the deleted template will not be affected.") public class DeleteTemplateCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteTemplateCmd.class.getName()); private static final String s_name = "deletetemplateresponse"; diff --git a/server/src/com/cloud/api/commands/DeleteUserCmd.java b/server/src/com/cloud/api/commands/DeleteUserCmd.java index 4d9d3169365..c7a9a0d9d9d 100644 --- a/server/src/com/cloud/api/commands/DeleteUserCmd.java +++ b/server/src/com/cloud/api/commands/DeleteUserCmd.java @@ -20,18 +20,18 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; -import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.ApiDBUtils; +import com.cloud.api.BaseAsyncCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; +import com.cloud.server.ManagementServer; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserContext; -@Implementation(method="deleteUser", manager=Manager.ManagementServer, description="Deletes a user account") +@Implementation(method="deleteUser", manager=ManagementServer.class, description="Deletes a user account") public class DeleteUserCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteUserCmd.class.getName()); private static final String s_name = "deleteuserresponse"; diff --git a/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java b/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java index cfea134ff55..2419098cd48 100644 --- a/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java @@ -20,12 +20,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.vm.UserVmManager; -@Implementation(method="deleteVmGroup", manager=Manager.UserVmManager) +@Implementation(method="deleteVmGroup", manager=UserVmManager.class) public class DeleteVMGroupCmd extends BaseCmd{ public static final Logger s_logger = Logger.getLogger(DeleteVMGroupCmd.class.getName()); private static final String s_name = "deleteinstancegroupresponse"; diff --git a/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java b/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java index 9c2bfa8340f..daa6ea40cf9 100644 --- a/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java @@ -21,12 +21,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.configuration.ConfigurationManager; -@Implementation(method="deleteVlanIpRange", manager=Manager.ConfigManager, description="Creates a VLAN IP range.") +@Implementation(method="deleteVlanIpRange", manager=ConfigurationManager.class, description="Creates a VLAN IP range.") public class DeleteVlanIpRangeCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteVlanIpRangeCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/DeleteVolumeCmd.java b/server/src/com/cloud/api/commands/DeleteVolumeCmd.java index 45a0b805480..eb3cad2cfdf 100644 --- a/server/src/com/cloud/api/commands/DeleteVolumeCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVolumeCmd.java @@ -21,12 +21,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.storage.StorageManager; -@Implementation(method="deleteVolume", manager=Manager.StorageManager, description="Deletes a detached disk volume.") +@Implementation(method="deleteVolume", manager=StorageManager.class, description="Deletes a detached disk volume.") public class DeleteVolumeCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteVolumeCmd.class.getName()); private static final String s_name = "deletevolumeresponse"; diff --git a/server/src/com/cloud/api/commands/DeleteZoneCmd.java b/server/src/com/cloud/api/commands/DeleteZoneCmd.java index 63ecc2ff667..01c4d8e86eb 100644 --- a/server/src/com/cloud/api/commands/DeleteZoneCmd.java +++ b/server/src/com/cloud/api/commands/DeleteZoneCmd.java @@ -21,12 +21,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.configuration.ConfigurationManager; -@Implementation(method="deleteZone", manager=Manager.ConfigManager, description="Deletes a Zone.") +@Implementation(method="deleteZone", manager=ConfigurationManager.class, description="Deletes a Zone.") public class DeleteZoneCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteZoneCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/DeployVMCmd.java b/server/src/com/cloud/api/commands/DeployVMCmd.java index 818748f0ad2..4251c380a3f 100644 --- a/server/src/com/cloud/api/commands/DeployVMCmd.java +++ b/server/src/com/cloud/api/commands/DeployVMCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.UserVmResponse; diff --git a/server/src/com/cloud/api/commands/DeployVm2Cmd.java b/server/src/com/cloud/api/commands/DeployVm2Cmd.java index 5ec94a8d779..bc1e56edce3 100644 --- a/server/src/com/cloud/api/commands/DeployVm2Cmd.java +++ b/server/src/com/cloud/api/commands/DeployVm2Cmd.java @@ -25,8 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCreateCmd; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.CommandType; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.UserVmResponse; @@ -38,8 +36,9 @@ import com.cloud.user.User; import com.cloud.user.UserContext; import com.cloud.uservm.UserVm; import com.cloud.vm.InstanceGroupVO; +import com.cloud.vm.UserVmManager; -@Implementation(createMethod="createVirtualMachine", method="startVirtualMachine", manager=Manager.UserVmManager, description="Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.") +@Implementation(createMethod="createVirtualMachine", method="startVirtualMachine", manager=UserVmManager.class, description="Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.") public class DeployVm2Cmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(DeployVMCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java b/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java index ca077636dbb..4cbe03a4a98 100644 --- a/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java +++ b/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java @@ -21,15 +21,15 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.consoleproxy.ConsoleProxyManager; import com.cloud.event.EventTypes; import com.cloud.user.Account; import com.cloud.user.UserContext; -@Implementation(method="destroyConsoleProxy", manager=Manager.ConsoleProxyManager) +@Implementation(method="destroyConsoleProxy", manager=ConsoleProxyManager.class) public class DestroyConsoleProxyCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DestroyConsoleProxyCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/DestroyVMCmd.java b/server/src/com/cloud/api/commands/DestroyVMCmd.java index 02b31d2701b..a9985282830 100644 --- a/server/src/com/cloud/api/commands/DestroyVMCmd.java +++ b/server/src/com/cloud/api/commands/DestroyVMCmd.java @@ -22,7 +22,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.UserVmResponse; @@ -32,8 +31,9 @@ import com.cloud.storage.VMTemplateVO; import com.cloud.user.Account; import com.cloud.uservm.UserVm; import com.cloud.vm.InstanceGroupVO; +import com.cloud.vm.UserVmManager; -@Implementation(method="destroyVm", manager=Manager.UserVmManager, description="Destroys a virtual machine. Once destroyed, only the administrator can recover it.") +@Implementation(method="destroyVm", manager=UserVmManager.class, description="Destroys a virtual machine. Once destroyed, only the administrator can recover it.") public class DestroyVMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DestroyVMCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/DetachIsoCmd.java b/server/src/com/cloud/api/commands/DetachIsoCmd.java index 26ef17830ff..7538bac9de7 100644 --- a/server/src/com/cloud/api/commands/DetachIsoCmd.java +++ b/server/src/com/cloud/api/commands/DetachIsoCmd.java @@ -19,17 +19,17 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; -import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.ApiDBUtils; +import com.cloud.api.BaseAsyncCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; +import com.cloud.template.TemplateManager; import com.cloud.user.Account; import com.cloud.uservm.UserVm; -@Implementation(method="detachIso", manager=Manager.TemplateManager, description="Detaches any ISO file (if any) currently attached to a virtual machine.") +@Implementation(method="detachIso", manager=TemplateManager.class, description="Detaches any ISO file (if any) currently attached to a virtual machine.") public class DetachIsoCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DetachIsoCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/DetachVolumeCmd.java b/server/src/com/cloud/api/commands/DetachVolumeCmd.java index 8fc0b7cb0b8..4e239b588d2 100755 --- a/server/src/com/cloud/api/commands/DetachVolumeCmd.java +++ b/server/src/com/cloud/api/commands/DetachVolumeCmd.java @@ -21,17 +21,16 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.response.SuccessResponse; import com.cloud.api.response.VolumeResponse; import com.cloud.event.EventTypes; import com.cloud.storage.VolumeVO; import com.cloud.user.Account; import com.cloud.uservm.UserVm; +import com.cloud.vm.UserVmManager; -@Implementation(method="detachVolumeFromVM", manager=Manager.UserVmManager, description="Detaches a disk volume from a virtual machine.") +@Implementation(method="detachVolumeFromVM", manager=UserVmManager.class, description="Detaches a disk volume from a virtual machine.") public class DetachVolumeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DetachVolumeCmd.class.getName()); private static final String s_name = "detachvolumeresponse"; diff --git a/server/src/com/cloud/api/commands/DisableAccountCmd.java b/server/src/com/cloud/api/commands/DisableAccountCmd.java index d46320e639c..cdc1d3c6c23 100644 --- a/server/src/com/cloud/api/commands/DisableAccountCmd.java +++ b/server/src/com/cloud/api/commands/DisableAccountCmd.java @@ -20,15 +20,15 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; +import com.cloud.server.ManagementServer; import com.cloud.user.Account; import com.cloud.user.UserContext; -@Implementation(method="disableAccount", manager=Manager.ManagementServer, description="Disables an account") +@Implementation(method="disableAccount", manager=ManagementServer.class, description="Disables an account") public class DisableAccountCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DisableAccountCmd.class.getName()); private static final String s_name = "disableaccountresponse"; diff --git a/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java b/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java index 14d36e3d768..931becaa4eb 100644 --- a/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java +++ b/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java @@ -20,12 +20,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.network.NetworkManager; -@Implementation(method="disassociateIpAddress", manager=Manager.NetworkManager, description="Disassociates an ip address from the account.") +@Implementation(method="disassociateIpAddress", manager=NetworkManager.class, description="Disassociates an ip address from the account.") public class DisassociateIPAddrCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DisassociateIPAddrCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/EnableAccountCmd.java b/server/src/com/cloud/api/commands/EnableAccountCmd.java index bca9d6f0daa..ee67753df67 100644 --- a/server/src/com/cloud/api/commands/EnableAccountCmd.java +++ b/server/src/com/cloud/api/commands/EnableAccountCmd.java @@ -20,13 +20,13 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; +import com.cloud.server.ManagementServer; -@Implementation(method="enableAccount", manager=Manager.ManagementServer, description="Enables an account") +@Implementation(method="enableAccount", manager=ManagementServer.class, description="Enables an account") public class EnableAccountCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(EnableAccountCmd.class.getName()); private static final String s_name = "enableaccountresponse"; diff --git a/server/src/com/cloud/api/commands/EnableUserCmd.java b/server/src/com/cloud/api/commands/EnableUserCmd.java index e2c07ca0790..810d0b41a03 100644 --- a/server/src/com/cloud/api/commands/EnableUserCmd.java +++ b/server/src/com/cloud/api/commands/EnableUserCmd.java @@ -21,13 +21,13 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; +import com.cloud.server.ManagementServer; -@Implementation(method="enableUser", manager=Manager.ManagementServer, description="Enables a user account") +@Implementation(method="enableUser", manager=ManagementServer.class, description="Enables a user account") public class EnableUserCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(EnableUserCmd.class.getName()); private static final String s_name = "enableuserresponse"; diff --git a/server/src/com/cloud/api/commands/ExtractIsoCmd.java b/server/src/com/cloud/api/commands/ExtractIsoCmd.java index 27eff84cbfc..f35ca5354e2 100755 --- a/server/src/com/cloud/api/commands/ExtractIsoCmd.java +++ b/server/src/com/cloud/api/commands/ExtractIsoCmd.java @@ -18,20 +18,19 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; -import org.junit.runners.Parameterized.Parameters; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.ExtractResponse; import com.cloud.event.EventTypes; import com.cloud.storage.UploadVO; import com.cloud.storage.VMTemplateVO; +import com.cloud.template.TemplateManager; import com.cloud.user.Account; -@Implementation(method="extract", manager=Manager.TemplateManager) +@Implementation(method="extract", manager=TemplateManager.class) public class ExtractIsoCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ExtractIsoCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/ExtractTemplateCmd.java b/server/src/com/cloud/api/commands/ExtractTemplateCmd.java index 506cb3e9894..7a745421b50 100755 --- a/server/src/com/cloud/api/commands/ExtractTemplateCmd.java +++ b/server/src/com/cloud/api/commands/ExtractTemplateCmd.java @@ -19,19 +19,18 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; -import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.CommandType; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.ApiDBUtils; +import com.cloud.api.BaseAsyncCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.ExtractResponse; import com.cloud.event.EventTypes; import com.cloud.storage.UploadVO; import com.cloud.storage.VMTemplateVO; +import com.cloud.template.TemplateManager; import com.cloud.user.Account; -@Implementation(method="extract", manager=Manager.TemplateManager) +@Implementation(method="extract", manager=TemplateManager.class) public class ExtractTemplateCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ExtractTemplateCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/ExtractVolumeCmd.java b/server/src/com/cloud/api/commands/ExtractVolumeCmd.java index b849f6415dd..f19aa843e43 100755 --- a/server/src/com/cloud/api/commands/ExtractVolumeCmd.java +++ b/server/src/com/cloud/api/commands/ExtractVolumeCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.BaseCmd.CommandType; import com.cloud.api.response.ExtractResponse; import com.cloud.event.EventTypes; import com.cloud.storage.UploadVO; diff --git a/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java b/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java index 28f7bea69ba..9803d7422b1 100644 --- a/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java +++ b/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java @@ -23,13 +23,13 @@ import java.util.ArrayList; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.CloudIdentifierResponse; +import com.cloud.server.ManagementServer; -@Implementation(method="getCloudIdentifierResponse", manager=Manager.ManagementServer, description="Retrieves a cloud identifier.") +@Implementation(method="getCloudIdentifierResponse", manager=ManagementServer.class, description="Retrieves a cloud identifier.") public class GetCloudIdentifierCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(GetCloudIdentifierCmd.class.getName()); private static final String s_name = "getcloudidentifierresponse"; diff --git a/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java b/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java index 98ac3e1381a..9f3e9daf22c 100644 --- a/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java +++ b/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java @@ -84,7 +84,7 @@ public class ListDiskOfferingsCmd extends BaseListCmd { for (DiskOfferingVO offering : offerings) { DiskOfferingResponse diskOffResp = new DiskOfferingResponse(); diskOffResp.setCreated(offering.getCreated()); - diskOffResp.setDiskSize(offering.getDiskSize()); + diskOffResp.setDiskSize(offering.getDiskSizeInBytes()); diskOffResp.setDisplayText(offering.getDisplayText()); diskOffResp.setDomainId(offering.getDomainId()); diskOffResp.setId(offering.getId()); diff --git a/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java b/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java index 3e489e0e54f..179a993f469 100644 --- a/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java +++ b/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java @@ -23,7 +23,6 @@ import java.util.List; import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -32,9 +31,10 @@ import com.cloud.api.response.ListResponse; import com.cloud.api.response.NetworkGroupResponse; import com.cloud.async.executor.IngressRuleResultObject; import com.cloud.async.executor.NetworkGroupResultObject; +import com.cloud.network.security.NetworkGroupManager; import com.cloud.network.security.NetworkGroupRulesVO; -@Implementation(method="searchForNetworkGroupRules", manager=Manager.NetworkGroupManager) +@Implementation(method="searchForNetworkGroupRules", manager=NetworkGroupManager.class) public class ListNetworkGroupsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListNetworkGroupsCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java b/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java index 15d0cfafe81..b72b42d8e29 100644 --- a/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java +++ b/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java @@ -25,7 +25,6 @@ import java.util.Map; import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -33,10 +32,11 @@ import com.cloud.api.response.FirewallRuleResponse; import com.cloud.api.response.ListResponse; import com.cloud.network.FirewallRuleVO; import com.cloud.network.IPAddressVO; +import com.cloud.network.NetworkManager; import com.cloud.server.Criteria; import com.cloud.vm.UserVmVO; -@Implementation(method="listPortForwardingRules", manager=Manager.NetworkManager, description="Lists all port forwarding rules for an IP address.") +@Implementation(method="listPortForwardingRules", manager=NetworkManager.class, description="Lists all port forwarding rules for an IP address.") public class ListPortForwardingRulesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListPortForwardingRulesCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java b/server/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java index 3107012855c..e1df0b828c4 100644 --- a/server/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java +++ b/server/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java @@ -20,7 +20,6 @@ package com.cloud.api.commands; import java.util.ArrayList; import java.util.List; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -28,8 +27,9 @@ import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.SnapshotScheduleResponse; import com.cloud.storage.SnapshotScheduleVO; +import com.cloud.storage.snapshot.SnapshotManager; -@Implementation(method="findRecurringSnapshotSchedule", manager=Manager.SnapshotManager) +@Implementation(method="findRecurringSnapshotSchedule", manager=SnapshotManager.class) public class ListRecurringSnapshotScheduleCmd extends BaseListCmd { private static final String s_name = "listrecurringsnapshotscheduleresponse"; diff --git a/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java b/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java index bf69e45aa47..db40786ee29 100644 --- a/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java +++ b/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java @@ -24,7 +24,6 @@ import java.util.List; import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -32,8 +31,9 @@ import com.cloud.api.response.ListResponse; import com.cloud.api.response.ResourceLimitResponse; import com.cloud.configuration.ResourceLimitVO; import com.cloud.user.Account; +import com.cloud.user.AccountManager; -@Implementation(method="searchForLimits", manager=Manager.AccountManager, description="Lists resource limits.") +@Implementation(method="searchForLimits", manager=AccountManager.class, description="Lists resource limits.") public class ListResourceLimitsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListResourceLimitsCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java b/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java index 99a4a18ff87..0cfd41ee658 100644 --- a/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java +++ b/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java @@ -23,15 +23,15 @@ import java.util.List; import org.apache.log4j.Logger; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.ListResponse; import com.cloud.api.response.SnapshotPolicyResponse; import com.cloud.storage.SnapshotPolicyVO; +import com.cloud.storage.snapshot.SnapshotManager; -@Implementation(method="listPoliciesforVolume", manager=Manager.SnapshotManager, description="Lists snapshot policies.") +@Implementation(method="listPoliciesforVolume", manager=SnapshotManager.class, description="Lists snapshot policies.") public class ListSnapshotPoliciesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListSnapshotPoliciesCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/LockAccountCmd.java b/server/src/com/cloud/api/commands/LockAccountCmd.java index fc88cd1e8bd..995e95ed081 100644 --- a/server/src/com/cloud/api/commands/LockAccountCmd.java +++ b/server/src/com/cloud/api/commands/LockAccountCmd.java @@ -20,12 +20,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.server.ManagementServer; -@Implementation(method="lockAccount", manager=Manager.ManagementServer, description="Locks an account") +@Implementation(method="lockAccount", manager=ManagementServer.class, description="Locks an account") public class LockAccountCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(LockAccountCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/LockUserCmd.java b/server/src/com/cloud/api/commands/LockUserCmd.java index 9bd5b4ef65b..72f27a255f6 100644 --- a/server/src/com/cloud/api/commands/LockUserCmd.java +++ b/server/src/com/cloud/api/commands/LockUserCmd.java @@ -20,12 +20,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.server.ManagementServer; -@Implementation(method="lockUser", manager=Manager.ManagementServer, description="Locks a user account") +@Implementation(method="lockUser", manager=ManagementServer.class, description="Locks a user account") public class LockUserCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(LockUserCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java b/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java index cf77ca6dc75..841fbecaab4 100644 --- a/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java @@ -19,8 +19,8 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; +import com.cloud.agent.AgentManager; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; @@ -28,7 +28,7 @@ import com.cloud.event.EventTypes; import com.cloud.user.Account; import com.cloud.user.UserContext; -@Implementation(method="maintain", manager=Manager.AgentManager, description="Prepares a host for maintenance.") +@Implementation(method="maintain", manager=AgentManager.class, description="Prepares a host for maintenance.") public class PrepareForMaintenanceCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(PrepareForMaintenanceCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java b/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java index 33579c81ed2..6b933414b58 100644 --- a/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java @@ -20,15 +20,15 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; +import com.cloud.storage.StorageManager; import com.cloud.user.Account; import com.cloud.user.UserContext; -@Implementation(method="preparePrimaryStorageForMaintenance", manager=Manager.StorageManager) +@Implementation(method="preparePrimaryStorageForMaintenance", manager=StorageManager.class) public class PreparePrimaryStorageForMaintenanceCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(PreparePrimaryStorageForMaintenanceCmd.class.getName()); private static final String s_name = "prepareprimarystorageformaintenanceresponse"; diff --git a/server/src/com/cloud/api/commands/RebootRouterCmd.java b/server/src/com/cloud/api/commands/RebootRouterCmd.java index 3a48cf809bd..7da5b37decd 100644 --- a/server/src/com/cloud/api/commands/RebootRouterCmd.java +++ b/server/src/com/cloud/api/commands/RebootRouterCmd.java @@ -22,15 +22,15 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.DomainRouterResponse; import com.cloud.event.EventTypes; +import com.cloud.network.NetworkManager; import com.cloud.user.Account; import com.cloud.vm.DomainRouterVO; -@Implementation(method="rebootRouter", manager=Manager.NetworkManager, description="Starts a router.") +@Implementation(method="rebootRouter", manager=NetworkManager.class, description="Starts a router.") public class RebootRouterCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RebootRouterCmd.class.getName()); private static final String s_name = "rebootrouterresponse"; diff --git a/server/src/com/cloud/api/commands/RebootSystemVmCmd.java b/server/src/com/cloud/api/commands/RebootSystemVmCmd.java index b8efada7f95..e937c4a88f4 100644 --- a/server/src/com/cloud/api/commands/RebootSystemVmCmd.java +++ b/server/src/com/cloud/api/commands/RebootSystemVmCmd.java @@ -22,18 +22,18 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SystemVmResponse; import com.cloud.event.EventTypes; +import com.cloud.server.ManagementServer; import com.cloud.user.Account; import com.cloud.user.UserContext; import com.cloud.vm.ConsoleProxyVO; import com.cloud.vm.SecondaryStorageVmVO; import com.cloud.vm.VMInstanceVO; -@Implementation(method="rebootSystemVM", manager=Manager.ManagementServer, description="Reboots a system VM.") +@Implementation(method="rebootSystemVM", manager=ManagementServer.class, description="Reboots a system VM.") public class RebootSystemVmCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RebootSystemVmCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/RebootVMCmd.java b/server/src/com/cloud/api/commands/RebootVMCmd.java index 25f537db263..d1d7ad61c02 100644 --- a/server/src/com/cloud/api/commands/RebootVMCmd.java +++ b/server/src/com/cloud/api/commands/RebootVMCmd.java @@ -22,7 +22,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.UserVmResponse; @@ -34,8 +33,9 @@ import com.cloud.storage.VolumeVO; import com.cloud.user.Account; import com.cloud.uservm.UserVm; import com.cloud.vm.InstanceGroupVO; +import com.cloud.vm.UserVmManager; -@Implementation(method="rebootVirtualMachine", manager=Manager.UserVmManager, description="Reboots a virtual machine.") +@Implementation(method="rebootVirtualMachine", manager=UserVmManager.class, description="Reboots a virtual machine.") public class RebootVMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RebootVMCmd.class.getName()); private static final String s_name = "rebootvirtualmachineresponse"; diff --git a/server/src/com/cloud/api/commands/ReconnectHostCmd.java b/server/src/com/cloud/api/commands/ReconnectHostCmd.java index 85c29fa1175..c9c25694fbe 100644 --- a/server/src/com/cloud/api/commands/ReconnectHostCmd.java +++ b/server/src/com/cloud/api/commands/ReconnectHostCmd.java @@ -26,9 +26,9 @@ import java.util.Set; import org.apache.log4j.Logger; +import com.cloud.agent.AgentManager; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.HostResponse; @@ -44,7 +44,7 @@ import com.cloud.user.Account; import com.cloud.user.UserContext; import com.cloud.vm.UserVmVO; -@Implementation(method="reconnectHost", manager=Manager.AgentManager, description="Reconnects a host.") +@Implementation(method="reconnectHost", manager=AgentManager.class, description="Reconnects a host.") public class ReconnectHostCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ReconnectHostCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/RecoverVMCmd.java b/server/src/com/cloud/api/commands/RecoverVMCmd.java index 25ed4f690bb..0408adb3021 100644 --- a/server/src/com/cloud/api/commands/RecoverVMCmd.java +++ b/server/src/com/cloud/api/commands/RecoverVMCmd.java @@ -24,15 +24,15 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.response.UserVmResponse; import com.cloud.offering.ServiceOffering; import com.cloud.storage.VMTemplateVO; import com.cloud.user.Account; import com.cloud.uservm.UserVm; import com.cloud.vm.InstanceGroupVO; +import com.cloud.vm.UserVmManager; -@Implementation(method="recoverVirtualMachine", manager=Manager.UserVmManager, description="Recovers a virtual machine.") +@Implementation(method="recoverVirtualMachine", manager=UserVmManager.class, description="Recovers a virtual machine.") public class RecoverVMCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RecoverVMCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/RegisterCmd.java b/server/src/com/cloud/api/commands/RegisterCmd.java index 1b2a25e3c04..f1fc99a0a41 100644 --- a/server/src/com/cloud/api/commands/RegisterCmd.java +++ b/server/src/com/cloud/api/commands/RegisterCmd.java @@ -21,12 +21,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.RegisterResponse; +import com.cloud.server.ManagementServer; -@Implementation(method="createApiKeyAndSecretKey", manager=Manager.ManagementServer, description="This command allows a user to register for the developer API, returning a secret key and an API key. This request is made through the integration API port, so it is a privileged command and must be made on behalf of a user. It is up to the implementer just how the username and password are entered, and then how that translates to an integration API request. Both secret key and API key should be returned to the user") +@Implementation(method="createApiKeyAndSecretKey", manager=ManagementServer.class, description="This command allows a user to register for the developer API, returning a secret key and an API key. This request is made through the integration API port, so it is a privileged command and must be made on behalf of a user. It is up to the implementer just how the username and password are entered, and then how that translates to an integration API request. Both secret key and API key should be returned to the user") public class RegisterCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RegisterCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/RegisterIsoCmd.java b/server/src/com/cloud/api/commands/RegisterIsoCmd.java index 1cb60106513..5fe8693e6eb 100755 --- a/server/src/com/cloud/api/commands/RegisterIsoCmd.java +++ b/server/src/com/cloud/api/commands/RegisterIsoCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.ListResponse; @@ -33,9 +32,10 @@ import com.cloud.dc.DataCenterVO; import com.cloud.storage.VMTemplateHostVO; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; import com.cloud.storage.VMTemplateVO; +import com.cloud.template.TemplateManager; import com.cloud.user.Account; -@Implementation(method="registerIso", manager=Manager.TemplateManager, description="Registers an existing ISO into the Cloud.com Cloud.") +@Implementation(method="registerIso", manager=TemplateManager.class, description="Registers an existing ISO into the Cloud.com Cloud.") public class RegisterIsoCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RegisterIsoCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java index 9055656bb26..37247ae8916 100755 --- a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java +++ b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.ListResponse; @@ -34,9 +33,10 @@ import com.cloud.storage.GuestOS; import com.cloud.storage.VMTemplateHostVO; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; import com.cloud.storage.VMTemplateVO; +import com.cloud.template.TemplateManager; import com.cloud.user.Account; -@Implementation(method="registerTemplate", manager=Manager.TemplateManager, description="Registers an existing template into the Cloud.com cloud. ") +@Implementation(method="registerTemplate", manager=TemplateManager.class, description="Registers an existing template into the Cloud.com cloud. ") public class RegisterTemplateCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RegisterTemplateCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java index 81357209ab6..cae3a92dfdb 100644 --- a/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java @@ -22,18 +22,18 @@ import java.util.List; import org.apache.log4j.Logger; -import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.ApiDBUtils; +import com.cloud.api.BaseAsyncCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.network.LoadBalancerVO; +import com.cloud.network.NetworkManager; import com.cloud.user.Account; import com.cloud.utils.StringUtils; -@Implementation(method="removeFromLoadBalancer", manager=Manager.NetworkManager, description="Removes a virtual machine or a list of virtual machines from a load balancer rule.") +@Implementation(method="removeFromLoadBalancer", manager=NetworkManager.class, description="Removes a virtual machine or a list of virtual machines from a load balancer rule.") public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RemoveFromLoadBalancerRuleCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/RemovePortForwardingServiceCmd.java b/server/src/com/cloud/api/commands/RemovePortForwardingServiceCmd.java index 5c4105b26e6..0279c7f895f 100644 --- a/server/src/com/cloud/api/commands/RemovePortForwardingServiceCmd.java +++ b/server/src/com/cloud/api/commands/RemovePortForwardingServiceCmd.java @@ -19,17 +19,17 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; -import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.ApiDBUtils; +import com.cloud.api.BaseAsyncCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.network.SecurityGroupVO; +import com.cloud.server.ManagementServer; import com.cloud.user.Account; -@Implementation(method="removeSecurityGroup", manager=Manager.ManagementServer, description="Removes a port forwarding service from a virtual machine") +@Implementation(method="removeSecurityGroup", manager=ManagementServer.class, description="Removes a port forwarding service from a virtual machine") public class RemovePortForwardingServiceCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RemovePortForwardingServiceCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java b/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java index b81f0dbd989..b475ef7dbda 100644 --- a/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java +++ b/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java @@ -22,7 +22,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.UserVmResponse; @@ -34,8 +33,9 @@ import com.cloud.user.User; import com.cloud.user.UserContext; import com.cloud.uservm.UserVm; import com.cloud.vm.InstanceGroupVO; +import com.cloud.vm.UserVmManager; -@Implementation(method="resetVMPassword", manager=Manager.UserVmManager, description="Resets the password for virtual machine. " + +@Implementation(method="resetVMPassword", manager=UserVmManager.class, description="Resets the password for virtual machine. " + "The virtual machine must be in a \"Stopped\" state and the template must already " + "support this feature for this command to take effect. [async]") public class ResetVMPasswordCmd extends BaseAsyncCmd { diff --git a/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java b/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java index d3a7ca6fc34..6fc6e434c3b 100644 --- a/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java +++ b/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java @@ -7,18 +7,18 @@ import java.util.Map; import org.apache.log4j.Logger; -import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.ApiDBUtils; +import com.cloud.api.BaseAsyncCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; +import com.cloud.network.security.NetworkGroupManager; import com.cloud.user.Account; import com.cloud.user.UserContext; @SuppressWarnings("rawtypes") -@Implementation(method="revokeNetworkGroupIngress", manager=Manager.NetworkGroupManager) +@Implementation(method="revokeNetworkGroupIngress", manager=NetworkGroupManager.class) public class RevokeNetworkGroupIngressCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RevokeNetworkGroupIngressCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/StartRouterCmd.java b/server/src/com/cloud/api/commands/StartRouterCmd.java index 9e0b7f389cd..0f6cd0a95cb 100644 --- a/server/src/com/cloud/api/commands/StartRouterCmd.java +++ b/server/src/com/cloud/api/commands/StartRouterCmd.java @@ -22,17 +22,17 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.DomainRouterResponse; import com.cloud.event.EventTypes; +import com.cloud.network.DomainRouterService; import com.cloud.user.Account; import com.cloud.uservm.UserVm; import com.cloud.vm.DomainRouterVO; -@Implementation(method="startRouter", manager=Manager.DomainRouterService, description="Starts a router.") +@Implementation(method="startRouter", manager=DomainRouterService.class, description="Starts a router.") public class StartRouterCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(StartRouterCmd.class.getName()); private static final String s_name = "startrouterresponse"; diff --git a/server/src/com/cloud/api/commands/StartSystemVMCmd.java b/server/src/com/cloud/api/commands/StartSystemVMCmd.java index a96e2203ff8..84f04962721 100644 --- a/server/src/com/cloud/api/commands/StartSystemVMCmd.java +++ b/server/src/com/cloud/api/commands/StartSystemVMCmd.java @@ -22,18 +22,18 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SystemVmResponse; import com.cloud.event.EventTypes; +import com.cloud.server.ManagementServer; import com.cloud.user.Account; import com.cloud.user.UserContext; import com.cloud.vm.ConsoleProxyVO; import com.cloud.vm.SecondaryStorageVmVO; import com.cloud.vm.VMInstanceVO; -@Implementation(method="startSystemVM", manager=Manager.ManagementServer, description="Starts a system virtual machine.") +@Implementation(method="startSystemVM", manager=ManagementServer.class, description="Starts a system virtual machine.") public class StartSystemVMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(StartSystemVMCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/StartVMCmd.java b/server/src/com/cloud/api/commands/StartVMCmd.java index 6526e9f9f9b..058b363c388 100644 --- a/server/src/com/cloud/api/commands/StartVMCmd.java +++ b/server/src/com/cloud/api/commands/StartVMCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.ApiConstants; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.UserVmResponse; @@ -35,8 +34,9 @@ import com.cloud.storage.VolumeVO; import com.cloud.user.Account; import com.cloud.uservm.UserVm; import com.cloud.vm.InstanceGroupVO; +import com.cloud.vm.UserVmManager; -@Implementation(method="startVirtualMachine", manager=Manager.UserVmManager, description="Starts a virtual machine.") +@Implementation(method="startVirtualMachine", manager=UserVmManager.class, description="Starts a virtual machine.") public class StartVMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(StartVMCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/StopRouterCmd.java b/server/src/com/cloud/api/commands/StopRouterCmd.java index 0213cdc819a..a531a5f3561 100644 --- a/server/src/com/cloud/api/commands/StopRouterCmd.java +++ b/server/src/com/cloud/api/commands/StopRouterCmd.java @@ -22,17 +22,17 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.DomainRouterResponse; import com.cloud.event.EventTypes; +import com.cloud.network.DomainRouterService; import com.cloud.user.Account; import com.cloud.uservm.UserVm; import com.cloud.vm.DomainRouterVO; -@Implementation(method="stopRouter", manager=Manager.DomainRouterService, description="Stops a router.") +@Implementation(method="stopRouter", manager=DomainRouterService.class, description="Stops a router.") public class StopRouterCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(StopRouterCmd.class.getName()); private static final String s_name = "stoprouterresponse"; diff --git a/server/src/com/cloud/api/commands/StopSystemVmCmd.java b/server/src/com/cloud/api/commands/StopSystemVmCmd.java index 42ea79ab2c3..a8f1a0bc70f 100644 --- a/server/src/com/cloud/api/commands/StopSystemVmCmd.java +++ b/server/src/com/cloud/api/commands/StopSystemVmCmd.java @@ -22,18 +22,18 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SystemVmResponse; import com.cloud.event.EventTypes; +import com.cloud.server.ManagementServer; import com.cloud.user.Account; import com.cloud.user.UserContext; import com.cloud.vm.ConsoleProxyVO; import com.cloud.vm.SecondaryStorageVmVO; import com.cloud.vm.VMInstanceVO; -@Implementation(method="stopSystemVM", manager=Manager.ManagementServer, description="Stops a system VM.") +@Implementation(method="stopSystemVM", manager=ManagementServer.class, description="Stops a system VM.") public class StopSystemVmCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(StopSystemVmCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/StopVMCmd.java b/server/src/com/cloud/api/commands/StopVMCmd.java index 77fb3fae096..774a64529fd 100644 --- a/server/src/com/cloud/api/commands/StopVMCmd.java +++ b/server/src/com/cloud/api/commands/StopVMCmd.java @@ -22,7 +22,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.UserVmResponse; @@ -34,8 +33,9 @@ import com.cloud.storage.VolumeVO; import com.cloud.user.Account; import com.cloud.uservm.UserVm; import com.cloud.vm.InstanceGroupVO; +import com.cloud.vm.UserVmManager; -@Implementation(method="stopVirtualMachine", manager=Manager.UserVmManager, description="Stops a virtual machine.") +@Implementation(method="stopVirtualMachine", manager=UserVmManager.class, description="Stops a virtual machine.") public class StopVMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(StopVMCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/UpdateAccountCmd.java b/server/src/com/cloud/api/commands/UpdateAccountCmd.java index a3e6998f52d..ec5f1ed6ec2 100644 --- a/server/src/com/cloud/api/commands/UpdateAccountCmd.java +++ b/server/src/com/cloud/api/commands/UpdateAccountCmd.java @@ -20,13 +20,13 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; +import com.cloud.server.ManagementServer; -@Implementation(method="updateAccount", manager=Manager.ManagementServer, description="Updates account information for the authenticated user") +@Implementation(method="updateAccount", manager=ManagementServer.class, description="Updates account information for the authenticated user") public class UpdateAccountCmd extends BaseCmd{ public static final Logger s_logger = Logger.getLogger(UpdateAccountCmd.class.getName()); private static final String s_name = "updateaccountresponse"; diff --git a/server/src/com/cloud/api/commands/UpdateCfgCmd.java b/server/src/com/cloud/api/commands/UpdateCfgCmd.java index 2c39f50ce87..b51a316f8ea 100644 --- a/server/src/com/cloud/api/commands/UpdateCfgCmd.java +++ b/server/src/com/cloud/api/commands/UpdateCfgCmd.java @@ -21,13 +21,13 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; +import com.cloud.configuration.ConfigurationManager; -@Implementation(method="updateConfiguration", manager=Manager.ConfigManager, description="Updates a configuration.") +@Implementation(method="updateConfiguration", manager=ConfigurationManager.class, description="Updates a configuration.") public class UpdateCfgCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateCfgCmd.class.getName()); private static final String s_name = "updateconfigurationresponse"; diff --git a/server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java b/server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java index 23dc4dbe00a..73b3aae0c84 100644 --- a/server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java +++ b/server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java @@ -20,14 +20,14 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; +import com.cloud.configuration.ConfigurationManager; import com.cloud.storage.DiskOfferingVO; -@Implementation(method="updateDiskOffering", manager=Manager.ConfigManager, description="Updates a disk offering.") +@Implementation(method="updateDiskOffering", manager=ConfigurationManager.class, description="Updates a disk offering.") public class UpdateDiskOfferingCmd extends BaseCmd{ public static final Logger s_logger = Logger.getLogger(UpdateDiskOfferingCmd.class.getName()); private static final String s_name = "updatediskofferingresponse"; diff --git a/server/src/com/cloud/api/commands/UpdateDomainCmd.java b/server/src/com/cloud/api/commands/UpdateDomainCmd.java index 21cdf7b125c..dcb790346b3 100644 --- a/server/src/com/cloud/api/commands/UpdateDomainCmd.java +++ b/server/src/com/cloud/api/commands/UpdateDomainCmd.java @@ -20,13 +20,13 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; +import com.cloud.server.ManagementServer; -@Implementation(method="updateDomain", manager=Manager.ManagementServer, description="Updates a domain with a new name") +@Implementation(method="updateDomain", manager=ManagementServer.class, description="Updates a domain with a new name") public class UpdateDomainCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateDomainCmd.class.getName()); private static final String s_name = "updatedomainresponse"; diff --git a/server/src/com/cloud/api/commands/UpdateHostCmd.java b/server/src/com/cloud/api/commands/UpdateHostCmd.java index a0ca873a87c..41086021e5b 100644 --- a/server/src/com/cloud/api/commands/UpdateHostCmd.java +++ b/server/src/com/cloud/api/commands/UpdateHostCmd.java @@ -26,9 +26,9 @@ import java.util.Set; import org.apache.log4j.Logger; +import com.cloud.agent.AgentManager; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; @@ -42,7 +42,7 @@ import com.cloud.offering.ServiceOffering; import com.cloud.storage.GuestOSCategoryVO; import com.cloud.vm.UserVmVO; -@Implementation(method="updateHost", manager=Manager.AgentManager, description="Updates a host.") +@Implementation(method="updateHost", manager=AgentManager.class, description="Updates a host.") public class UpdateHostCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateHostCmd.class.getName()); private static final String s_name = "updatehostresponse"; diff --git a/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java b/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java index 7f7b10ef76d..bed150d8af2 100644 --- a/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java @@ -4,17 +4,17 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.FirewallRuleResponse; import com.cloud.event.EventTypes; import com.cloud.network.FirewallRuleVO; import com.cloud.network.IPAddressVO; +import com.cloud.server.ManagementServer; import com.cloud.user.Account; import com.cloud.uservm.UserVm; -@Implementation(method="updatePortForwardingRule", manager=Manager.ManagementServer, description="Updates a port forwarding rule. Only the private port and the virtual machine can be updated.") +@Implementation(method="updatePortForwardingRule", manager=ManagementServer.class, description="Updates a port forwarding rule. Only the private port and the virtual machine can be updated.") public class UpdateIPForwardingRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateIPForwardingRuleCmd.class.getName()); private static final String s_name = "updateportforwardingruleresponse"; diff --git a/server/src/com/cloud/api/commands/UpdateIsoCmd.java b/server/src/com/cloud/api/commands/UpdateIsoCmd.java index 42143a51d7f..0acd5d809cc 100755 --- a/server/src/com/cloud/api/commands/UpdateIsoCmd.java +++ b/server/src/com/cloud/api/commands/UpdateIsoCmd.java @@ -20,13 +20,13 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.ServerApiException; import com.cloud.api.response.TemplateResponse; +import com.cloud.server.ManagementServer; import com.cloud.storage.VMTemplateVO; -@Implementation(method="updateTemplate", manager=Manager.ManagementServer, description="Updates an ISO file.") +@Implementation(method="updateTemplate", manager=ManagementServer.class, description="Updates an ISO file.") public class UpdateIsoCmd extends UpdateTemplateOrIsoCmd { public static final Logger s_logger = Logger.getLogger(UpdateIsoCmd.class.getName()); private static final String s_name = "updateisoresponse"; diff --git a/server/src/com/cloud/api/commands/UpdateIsoPermissionsCmd.java b/server/src/com/cloud/api/commands/UpdateIsoPermissionsCmd.java index c8ab2e02668..d0b6fa59f7e 100644 --- a/server/src/com/cloud/api/commands/UpdateIsoPermissionsCmd.java +++ b/server/src/com/cloud/api/commands/UpdateIsoPermissionsCmd.java @@ -2,10 +2,10 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; +import com.cloud.server.ManagementServer; -@Implementation(method="updateTemplatePermissions", manager=Manager.ManagementServer) +@Implementation(method="updateTemplatePermissions", manager=ManagementServer.class) public class UpdateIsoPermissionsCmd extends UpdateTemplateOrIsoPermissionsCmd { protected String getResponseName() { return "updateisopermissionsresponse"; diff --git a/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java index bae5b7f1fae..b1efdd95308 100644 --- a/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java @@ -21,15 +21,15 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.LoadBalancerResponse; import com.cloud.event.EventTypes; import com.cloud.network.LoadBalancerVO; +import com.cloud.network.NetworkManager; import com.cloud.user.Account; -@Implementation(method="updateLoadBalancerRule", manager=Manager.NetworkManager) +@Implementation(method="updateLoadBalancerRule", manager=NetworkManager.class) public class UpdateLoadBalancerRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateLoadBalancerRuleCmd.class.getName()); private static final String s_name = "updateloadbalancerruleresponse"; diff --git a/server/src/com/cloud/api/commands/UpdatePodCmd.java b/server/src/com/cloud/api/commands/UpdatePodCmd.java index 72a4f2c8791..81beba6b0a0 100644 --- a/server/src/com/cloud/api/commands/UpdatePodCmd.java +++ b/server/src/com/cloud/api/commands/UpdatePodCmd.java @@ -21,12 +21,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.configuration.ConfigurationManager; -@Implementation(method="editPod", manager=Manager.ConfigManager, description="Updates a Pod.") +@Implementation(method="editPod", manager=ConfigurationManager.class, description="Updates a Pod.") public class UpdatePodCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdatePodCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java b/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java index df7b12f75cc..1f6085186bd 100644 --- a/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java +++ b/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java @@ -22,14 +22,14 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.ResourceLimitResponse; import com.cloud.configuration.ResourceLimitVO; import com.cloud.user.Account; +import com.cloud.user.AccountManager; -@Implementation(method="updateResourceLimit", manager=Manager.AccountManager, description="Updates resource limits for an account or domain.") +@Implementation(method="updateResourceLimit", manager=AccountManager.class, description="Updates resource limits for an account or domain.") public class UpdateResourceLimitCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateResourceLimitCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java b/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java index 101a3073bae..c8821d6644f 100644 --- a/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java +++ b/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java @@ -20,14 +20,14 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.ServiceOfferingResponse; +import com.cloud.configuration.ConfigurationManager; import com.cloud.offering.NetworkOffering.GuestIpType; import com.cloud.service.ServiceOfferingVO; -@Implementation(method="updateServiceOffering", manager=Manager.ConfigManager, description="Updates a service offering.") +@Implementation(method="updateServiceOffering", manager=ConfigurationManager.class, description="Updates a service offering.") public class UpdateServiceOfferingCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateServiceOfferingCmd.class.getName()); private static final String s_name = "updateserviceofferingresponse"; diff --git a/server/src/com/cloud/api/commands/UpdateStoragePoolCmd.java b/server/src/com/cloud/api/commands/UpdateStoragePoolCmd.java index 8e9e898c95b..dde937e04c8 100644 --- a/server/src/com/cloud/api/commands/UpdateStoragePoolCmd.java +++ b/server/src/com/cloud/api/commands/UpdateStoragePoolCmd.java @@ -22,15 +22,15 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.StoragePoolResponse; import com.cloud.dc.ClusterVO; +import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePoolVO; import com.cloud.storage.StorageStats; -@Implementation(method="updateStoragePool", manager=Manager.StorageManager, description="Updates a storage pool.") +@Implementation(method="updateStoragePool", manager=StorageManager.class, description="Updates a storage pool.") public class UpdateStoragePoolCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateStoragePoolCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/UpdateTemplateCmd.java b/server/src/com/cloud/api/commands/UpdateTemplateCmd.java index 1a9db9ff2a9..66b5297786f 100644 --- a/server/src/com/cloud/api/commands/UpdateTemplateCmd.java +++ b/server/src/com/cloud/api/commands/UpdateTemplateCmd.java @@ -20,13 +20,13 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.ServerApiException; import com.cloud.api.response.TemplateResponse; +import com.cloud.server.ManagementServer; import com.cloud.storage.VMTemplateVO; -@Implementation(method="updateTemplate", manager=Manager.ManagementServer, description="Updates attributes of a template.") +@Implementation(method="updateTemplate", manager=ManagementServer.class, description="Updates attributes of a template.") public class UpdateTemplateCmd extends UpdateTemplateOrIsoCmd { public static final Logger s_logger = Logger.getLogger(UpdateTemplateCmd.class.getName()); private static final String s_name = "updatetemplateresponse"; diff --git a/server/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java b/server/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java index 2a368d458f2..c1f1fdab7ba 100644 --- a/server/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java +++ b/server/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java @@ -21,11 +21,11 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; +import com.cloud.server.ManagementServer; -@Implementation(method="updateTemplate", manager=Manager.ManagementServer) +@Implementation(method="updateTemplate", manager=ManagementServer.class) public abstract class UpdateTemplateOrIsoCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateIsoCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java b/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java index 9a35a674de0..4cae78a231b 100644 --- a/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java +++ b/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java @@ -5,12 +5,12 @@ import java.util.List; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.server.ManagementServer; -@Implementation(method="updateTemplatePermissions", manager=Manager.ManagementServer) +@Implementation(method="updateTemplatePermissions", manager=ManagementServer.class) public abstract class UpdateTemplateOrIsoPermissionsCmd extends BaseCmd { public Logger s_logger = getLogger(); protected String s_name = getResponseName(); diff --git a/server/src/com/cloud/api/commands/UpdateTemplatePermissionsCmd.java b/server/src/com/cloud/api/commands/UpdateTemplatePermissionsCmd.java index ef1789f4f52..aa5cd3ef3a2 100644 --- a/server/src/com/cloud/api/commands/UpdateTemplatePermissionsCmd.java +++ b/server/src/com/cloud/api/commands/UpdateTemplatePermissionsCmd.java @@ -20,10 +20,10 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; +import com.cloud.server.ManagementServer; -@Implementation(method="updateTemplatePermissions", manager=Manager.ManagementServer, description="Updates a template visibility permissions. " + +@Implementation(method="updateTemplatePermissions", manager=ManagementServer.class, description="Updates a template visibility permissions. " + "A public template is visible to all accounts within the same domain. " + "A private template is visible only to the owner of the template. " + "A priviledged template is a private template with account permissions added. " + diff --git a/server/src/com/cloud/api/commands/UpdateUserCmd.java b/server/src/com/cloud/api/commands/UpdateUserCmd.java index 3f4592f86a4..83a03388b22 100644 --- a/server/src/com/cloud/api/commands/UpdateUserCmd.java +++ b/server/src/com/cloud/api/commands/UpdateUserCmd.java @@ -21,12 +21,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.server.ManagementServer; -@Implementation(method="updateUser", manager=Manager.ManagementServer, description="Updates a user account") +@Implementation(method="updateUser", manager=ManagementServer.class, description="Updates a user account") public class UpdateUserCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateUserCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/UpdateVMCmd.java b/server/src/com/cloud/api/commands/UpdateVMCmd.java index bf1166293e6..94686651d1f 100644 --- a/server/src/com/cloud/api/commands/UpdateVMCmd.java +++ b/server/src/com/cloud/api/commands/UpdateVMCmd.java @@ -20,12 +20,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.vm.UserVmManager; -@Implementation(method="updateVirtualMachine", manager=Manager.UserVmManager, description="Updates parameters of a virtual machine.") +@Implementation(method="updateVirtualMachine", manager=UserVmManager.class, description="Updates parameters of a virtual machine.") public class UpdateVMCmd extends BaseCmd{ public static final Logger s_logger = Logger.getLogger(UpdateVMCmd.class.getName()); private static final String s_name = "updatevirtualmachineresponse"; diff --git a/server/src/com/cloud/api/commands/UpdateZoneCmd.java b/server/src/com/cloud/api/commands/UpdateZoneCmd.java index 543eeca94ec..4eb4d4f8a12 100644 --- a/server/src/com/cloud/api/commands/UpdateZoneCmd.java +++ b/server/src/com/cloud/api/commands/UpdateZoneCmd.java @@ -21,15 +21,14 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.CommandType; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.ZoneResponse; +import com.cloud.configuration.ConfigurationManager; import com.cloud.dc.DataCenterVO; -@Implementation(method="editZone", manager=Manager.ConfigManager, description="Updates a Zone.") +@Implementation(method="editZone", manager=ConfigurationManager.class, description="Updates a Zone.") public class UpdateZoneCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateZoneCmd.class.getName()); diff --git a/server/src/com/cloud/api/commands/UpgradeRouterCmd.java b/server/src/com/cloud/api/commands/UpgradeRouterCmd.java index c1235d09573..5e86eae1539 100644 --- a/server/src/com/cloud/api/commands/UpgradeRouterCmd.java +++ b/server/src/com/cloud/api/commands/UpgradeRouterCmd.java @@ -20,12 +20,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.SuccessResponse; +import com.cloud.network.NetworkManager; -@Implementation(method="upgradeRouter", manager=Manager.NetworkManager) +@Implementation(method="upgradeRouter", manager=NetworkManager.class) public class UpgradeRouterCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpgradeRouterCmd.class.getName()); private static final String s_name = "changeserviceforrouterresponse"; diff --git a/server/src/com/cloud/api/commands/UpgradeVMCmd.java b/server/src/com/cloud/api/commands/UpgradeVMCmd.java index cfb2b091b59..99b2d53e9a9 100644 --- a/server/src/com/cloud/api/commands/UpgradeVMCmd.java +++ b/server/src/com/cloud/api/commands/UpgradeVMCmd.java @@ -23,7 +23,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; -import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; @@ -32,10 +31,11 @@ import com.cloud.offering.ServiceOffering; import com.cloud.service.ServiceOfferingVO; import com.cloud.storage.VMTemplateVO; import com.cloud.user.Account; +import com.cloud.vm.UserVmManager; import com.cloud.vm.UserVmVO; import com.cloud.vm.VmStats; -@Implementation(method="upgradeVirtualMachine", manager=Manager.UserVmManager, description="Changes the service offering for a virtual machine. " + +@Implementation(method="upgradeVirtualMachine", manager=UserVmManager.class, description="Changes the service offering for a virtual machine. " + "The virtual machine must be in a \"Stopped\" state for " + "this command to take effect.") public class UpgradeVMCmd extends BaseCmd { diff --git a/ui/new/css/main.css b/ui/new/css/main.css index f401e040e10..0a024a9e72e 100644 --- a/ui/new/css/main.css +++ b/ui/new/css/main.css @@ -2340,36 +2340,40 @@ a:hover.search_button { width:100%; height:auto; float:left; - border-bottom:1px solid #CCC; + border-bottom:1px solid #efefef; margin:0; padding:0; } .content_tabs { width:101px; - height:13px; + height:15px; float:left; font-size:11px; margin:0 0 0 2px; text-align:center; - padding:4px 0 0 0; + padding:6px 0 0 0; display:inline; + } .content_tabs.on { - background:url(../images/contenttab_selected.gif) no-repeat top left; + background:url(../images/contenttab_selected.gif) no-repeat bottom left; color:#0d4861; + + } .content_tabs.off { - background:url(../images/contenttab_unselected.gif) no-repeat top left; + background:url(../images/contenttab_unselected.gif) no-repeat bottom left; color:#FFF; cursor:pointer; cursor:hand; + } .content_tabs.off:hover { - background:url(../images/contenttab_unselected_hover.gif) no-repeat top left; + background:url(../images/contenttab_unselected_hover.gif) no-repeat bottom left; color:#FFF; cursor:pointer; cursor:hand; diff --git a/ui/new/images/contenttab_selected.gif b/ui/new/images/contenttab_selected.gif index bc60b415d71..34c6fc18e11 100644 Binary files a/ui/new/images/contenttab_selected.gif and b/ui/new/images/contenttab_selected.gif differ diff --git a/ui/new/jsp/volume.jsp b/ui/new/jsp/volume.jsp index 965ea7e57c5..2046a559112 100644 --- a/ui/new/jsp/volume.jsp +++ b/ui/new/jsp/volume.jsp @@ -7,15 +7,8 @@ CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); %> - -
-
-
-
-
-

Loading …

-
-
+ +