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

VMSync: Separating jobs from api

This commit is contained in:
Alex Huang 2013-07-03 11:22:40 -07:00
parent d2739cde2e
commit bec53fb59a
127 changed files with 433 additions and 434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
api/src/com/cloud/async/AsyncJob.java
View File

@ -16,47 +16,13 @@
// under the License.
package com.cloud.async;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
import java.util.Date;
public interface AsyncJob extends Identity, InternalIdentity {
public enum Type {
None,
VirtualMachine,
DomainRouter,
Volume,
ConsoleProxy,
Snapshot,
Template,
Iso,
SystemVm,
Host,
StoragePool,
IpAddress,
PortableIpAddress,
SecurityGroup,
PhysicalNetwork,
TrafficType,
PhysicalNetworkServiceProvider,
FirewallRule,
Account,
User,
PrivateGateway,
StaticRoute,
Counter,
Condition,
AutoScalePolicy,
AutoScaleVmProfile,
AutoScaleVmGroup,
GlobalLoadBalancerRule,
LoadBalancerRule,
AffinityGroup,
InternalLbVm,
DedicatedGuestVlanRange
}
long getUserId();
long getAccountId();
@ -91,7 +57,7 @@ public interface AsyncJob extends Identity, InternalIdentity {
Date getRemoved();
Type getInstanceType();
ApiCommandJobType getInstanceType();
Long getInstanceId();

36
api/src/org/apache/cloudstack/api/ApiCommandJobType.java Normal file
View File

@ -0,0 +1,36 @@
package org.apache.cloudstack.api;
public enum ApiCommandJobType {
None,
VirtualMachine,
DomainRouter,
Volume,
ConsoleProxy,
Snapshot,
Template,
Iso,
SystemVm,
Host,
StoragePool,
IpAddress,
PortableIpAddress,
SecurityGroup,
PhysicalNetwork,
TrafficType,
PhysicalNetworkServiceProvider,
FirewallRule,
Account,
User,
PrivateGateway,
StaticRoute,
Counter,
Condition,
AutoScalePolicy,
AutoScaleVmProfile,
AutoScaleVmGroup,
GlobalLoadBalancerRule,
LoadBalancerRule,
AffinityGroup,
InternalLbVm,
DedicatedGuestVlanRange
}

4
api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
View File

@ -88,8 +88,8 @@ public abstract class BaseAsyncCmd extends BaseCmd {
return null;
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.None;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.None;
}
public String getSyncObjType() {

5
api/src/org/apache/cloudstack/api/BaseListCmd.java
View File

@ -16,7 +16,6 @@
// under the License.
package org.apache.cloudstack.api;
import com.cloud.async.AsyncJob;
import com.cloud.exception.InvalidParameterValueException;
public abstract class BaseListCmd extends BaseCmd {
@ -109,7 +108,7 @@ public abstract class BaseListCmd extends BaseCmd {
return startIndex;
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.None;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.None;
}
}

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.account;
import javax.inject.Inject;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -29,7 +30,6 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.region.RegionService;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.user.User;
@ -107,7 +107,7 @@ public class DeleteAccountCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Account;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Account;
}
}

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.account;
import javax.inject.Inject;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -29,7 +30,6 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.region.RegionService;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.ResourceUnavailableException;
@ -128,7 +128,7 @@ public class DisableAccountCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Account;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Account;
}
}

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

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.admin.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.CounterResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.as.Counter;
import com.cloud.user.Account;
@ -95,8 +95,8 @@ public class CreateCounterCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Counter;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Counter;
}
@Override

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

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.admin.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.CounterResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceInUseException;
import com.cloud.user.Account;
@ -82,8 +82,8 @@ public class DeleteCounterCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Counter;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Counter;
}
@Override

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.host;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.host.Host;
import com.cloud.user.Account;
@ -87,8 +87,8 @@ public class CancelMaintenanceCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Host;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Host;
}
@Override

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

@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiConstants.HostDetails;
import org.apache.cloudstack.api.BaseListCmd;
@ -34,7 +35,6 @@ import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.host.Host;
import com.cloud.utils.Pair;
@ -160,8 +160,8 @@ public class ListHostsCmd extends BaseListCmd {
return s_name;
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Host;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Host;
}
@Override

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.host;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.host.Host;
import com.cloud.user.Account;
@ -87,8 +87,8 @@ public class PrepareForMaintenanceCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Host;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Host;
}
@Override

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.host;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.host.Host;
import com.cloud.user.Account;
@ -86,8 +86,8 @@ public class ReconnectHostCmd extends BaseAsyncCmd {
return "reconnecting host: " + getId();
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Host;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Host;
}
public Long getInstanceId() {

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.host;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -83,8 +83,8 @@ public class ReleaseHostReservationCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Host;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Host;
}
@Override

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.internallb;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -30,7 +31,6 @@ import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.network.router.VirtualRouter.Role;
@APICommand(name = "listInternalLoadBalancerVMs", description="List internal LB VMs.", responseObject=DomainRouterResponse.class)
@ -132,8 +132,8 @@ public class ListInternalLBVMsCmd extends BaseListProjectAndAccountResourcesCmd
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.DomainRouter;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.DomainRouter;
}
@Override

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.internallb;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@ -90,8 +90,8 @@ public class StartInternalLBVMCmd extends BaseAsyncCmd {
return "starting internal lb vm: " + getId();
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.InternalLbVm;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.InternalLbVm;
}
public Long getInstanceId() {

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.internallb;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InvalidParameterValueException;
@ -88,8 +88,8 @@ public class StopInternalLBVMCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.InternalLbVm;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.InternalLbVm;
}
@Override

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -28,7 +29,6 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.ProviderResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.PhysicalNetworkServiceProvider;
@ -129,7 +129,7 @@ public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PhysicalNetworkServiceProvider;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PhysicalNetworkServiceProvider;
}
}

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -29,7 +30,6 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.PhysicalNetwork;
@ -167,7 +167,7 @@ public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PhysicalNetwork;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PhysicalNetwork;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.network;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.response.ProviderResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.ResourceUnavailableException;
@ -100,7 +100,7 @@ public class DeleteNetworkServiceProviderCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PhysicalNetworkServiceProvider;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PhysicalNetworkServiceProvider;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.network;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -90,7 +90,7 @@ public class DeletePhysicalNetworkCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PhysicalNetwork;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PhysicalNetwork;
}
}

5
api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
View File

@ -17,7 +17,6 @@
package org.apache.cloudstack.api.command.admin.network;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceInUseException;
import com.cloud.user.Account;
@ -55,8 +54,8 @@ public class ReleaseDedicatedGuestVlanRangeCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.DedicatedGuestVlanRange;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.DedicatedGuestVlanRange;
}
@Override

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ProviderResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.user.Account;
@ -103,8 +103,8 @@ public class UpdateNetworkServiceProviderCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PhysicalNetworkServiceProvider;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PhysicalNetworkServiceProvider;
}
}

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

@ -19,13 +19,13 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.PhysicalNetwork;
import com.cloud.user.Account;
@ -118,7 +118,7 @@ public class UpdatePhysicalNetworkCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PhysicalNetwork;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PhysicalNetwork;
}
}

6
api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
View File

@ -19,13 +19,13 @@ package org.apache.cloudstack.api.command.admin.region;
import javax.inject.Inject;
import com.cloud.async.AsyncJob;
import com.cloud.dc.Vlan;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceAllocationException;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -150,7 +150,7 @@ public class CreatePortableIpRangeCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PortableIpAddress;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PortableIpAddress;
}
}

5
api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java
View File

@ -19,7 +19,6 @@ package org.apache.cloudstack.api.command.admin.region;
import javax.inject.Inject;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.api.*;
import org.apache.cloudstack.api.response.PortableIpRangeResponse;
@ -87,7 +86,7 @@ public class DeletePortableIpRangeCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PortableIpAddress;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PortableIpAddress;
}
}

6
api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
View File

@ -21,6 +21,7 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -29,7 +30,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.VirtualRouterProviderResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@ -106,8 +106,8 @@ public class ConfigureVirtualRouterElementCmd extends BaseAsyncCmd {
return "configuring virtual router provider: " + id;
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.None;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.None;
}
public Long getInstanceId() {

6
api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.router;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.ResourceUnavailableException;
@ -84,8 +84,8 @@ public class DestroyRouterCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.DomainRouter;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.DomainRouter;
}
@Override

6
api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.router;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -30,7 +31,6 @@ import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.network.router.VirtualRouter.Role;
@APICommand(name = "listRouters", description="List routers.", responseObject=DomainRouterResponse.class)
@ -130,8 +130,8 @@ public class ListRoutersCmd extends BaseListProjectAndAccountResourcesCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.DomainRouter;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.DomainRouter;
}
@Override

6
api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.router;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@ -84,8 +84,8 @@ public class RebootRouterCmd extends BaseAsyncCmd {
return "rebooting router: " + getId();
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.DomainRouter;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.DomainRouter;
}
public Long getInstanceId() {

6
api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.router;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@ -91,8 +91,8 @@ public class StartRouterCmd extends BaseAsyncCmd {
return "starting router: " + getId();
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.DomainRouter;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.DomainRouter;
}
public Long getInstanceId() {

6
api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.router;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InvalidParameterValueException;
@ -89,8 +89,8 @@ public class StopRouterCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.DomainRouter;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.DomainRouter;
}
@Override

6
api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.storage;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.storage.StoragePool;
@ -70,8 +70,8 @@ public class CancelPrimaryStorageMaintenanceCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.StoragePool;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.StoragePool;
}
@Override

6
api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
View File

@ -16,10 +16,10 @@
// under the License.
package org.apache.cloudstack.api.command.admin.storage;
import com.cloud.async.AsyncJob;
import com.cloud.storage.StoragePool;
import com.cloud.utils.Pair;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
@ -63,8 +63,8 @@ public class FindStoragePoolsForMigrationCmd extends BaseListCmd {
return s_name;
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.StoragePool;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.StoragePool;
}
@Override

6
api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.storage;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
@APICommand(name = "listStoragePools", description="Lists storage pools.", responseObject=StoragePoolResponse.class)
public class ListStoragePoolsCmd extends BaseListCmd {
@ -109,8 +109,8 @@ public class ListStoragePoolsCmd extends BaseListCmd {
return s_name;
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.StoragePool;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.StoragePool;
}
@Override

6
api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.storage;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
@ -68,8 +68,8 @@ public class PreparePrimaryStorageForMaintenanceCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.StoragePool;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.StoragePool;
}
@Override

6
api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.systemvm;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -81,8 +81,8 @@ public class DestroySystemVmCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.SystemVm;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SystemVm;
}
@Override

6
api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
View File

@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
@ -31,7 +32,6 @@ import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.utils.Pair;
import com.cloud.vm.VirtualMachine;
@ -119,8 +119,8 @@ public class ListSystemVMsCmd extends BaseListCmd {
return s_name;
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.SystemVm;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SystemVm;
}
@Override

6
api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.systemvm;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -88,8 +88,8 @@ public class RebootSystemVmCmd extends BaseAsyncCmd {
return "rebooting system vm: " + getId();
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.SystemVm;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SystemVm;
}
public Long getInstanceId() {

6
api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.systemvm;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -92,8 +92,8 @@ public class StartSystemVMCmd extends BaseAsyncCmd {
return "starting system vm: " + getId();
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.SystemVm;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SystemVm;
}
public Long getInstanceId() {

6
api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.systemvm;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.ResourceUnavailableException;
@ -94,8 +94,8 @@ public class StopSystemVmCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.SystemVm;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SystemVm;
}
@Override

6
api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.usage;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.TrafficTypeResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.PhysicalNetworkTrafficType;
@ -149,7 +149,7 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.TrafficType;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.TrafficType;
}
}

6
api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.usage;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.TrafficTypeResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
@ -88,8 +88,8 @@ public class DeleteTrafficTypeCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.TrafficType;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.TrafficType;
}
}

6
api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.usage;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.TrafficTypeResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.PhysicalNetworkTrafficType;
import com.cloud.user.Account;
@ -110,7 +110,7 @@ public class UpdateTrafficTypeCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.TrafficType;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.TrafficType;
}
}

6
api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.user;
import javax.inject.Inject;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -29,7 +30,6 @@ import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.region.RegionService;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.user.User;
@ -104,7 +104,7 @@ public class DisableUserCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.User;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.User;
}
}

6
api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.vpc;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -29,7 +30,6 @@ import org.apache.cloudstack.api.response.PrivateGatewayResponse;
import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@ -197,7 +197,7 @@ public class CreatePrivateGatewayCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PrivateGateway;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PrivateGateway;
}
}

6
api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.vpc;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.response.PrivateGatewayResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InvalidParameterValueException;
@ -107,8 +107,8 @@ public class DeletePrivateGatewayCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PrivateGateway;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PrivateGateway;
}
}

6
api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
View File

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.admin.zone;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -28,7 +29,6 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
@ -95,8 +95,8 @@ public class MarkDefaultZoneForAccountCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Account;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Account;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.address;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -35,7 +36,6 @@ import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.event.EventTypes;
@ -311,8 +311,8 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.IpAddress;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.IpAddress;
}
}

6
api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.address;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InvalidParameterValueException;
@ -140,8 +140,8 @@ public class DisassociateIPAddrCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.IpAddress;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.IpAddress;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
View File

@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -32,7 +33,6 @@ import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.network.IpAddress;
import com.cloud.utils.Pair;
@ -159,8 +159,8 @@ public class ListPublicIpAddressesCmd extends BaseListTaggedResourcesCmd {
this.setResponseObject(response);
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.IpAddress;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.IpAddress;
}

6
api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.affinitygroup;
import org.apache.cloudstack.affinity.AffinityGroup;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.user.Account;
@ -160,8 +160,8 @@ public class CreateAffinityGroupCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AffinityGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AffinityGroup;
}
}

6
api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
View File

@ -18,6 +18,7 @@ package org.apache.cloudstack.api.command.user.affinitygroup;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
@ -142,7 +142,7 @@ public class DeleteAffinityGroupCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AffinityGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AffinityGroup;
}
}

6
api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
View File

@ -18,6 +18,7 @@ package org.apache.cloudstack.api.command.user.affinitygroup;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
@APICommand(name = "listAffinityGroups", description = "Lists affinity groups", responseObject = AffinityGroupResponse.class)
public class ListAffinityGroupsCmd extends BaseListAccountResourcesCmd {
@ -85,7 +85,7 @@ public class ListAffinityGroupsCmd extends BaseListAccountResourcesCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AffinityGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AffinityGroup;
}
}

6
api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
View File

@ -23,6 +23,7 @@ import java.util.List;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -32,7 +33,6 @@ import org.apache.cloudstack.api.ApiConstants.VMDetails;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
@ -157,8 +157,8 @@ public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AffinityGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AffinityGroup;
}
}

6
api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -28,7 +29,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.ConditionResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.domain.Domain;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
@ -142,8 +142,8 @@ public class CreateAutoScalePolicyCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScalePolicy;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScalePolicy;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -30,7 +31,6 @@ import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
@ -152,8 +152,8 @@ public class CreateAutoScaleVmGroupCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmGroup;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
View File

@ -20,6 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -32,7 +33,6 @@ import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
@ -211,8 +211,8 @@ public class CreateAutoScaleVmProfileCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmProfile;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmProfile;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
View File

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -28,7 +29,6 @@ import org.apache.cloudstack.api.response.CounterResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.as.Condition;
@ -123,8 +123,8 @@ public class CreateConditionCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Condition;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Condition;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScalePolicy;
import com.cloud.user.Account;
@ -97,7 +97,7 @@ public class DeleteAutoScalePolicyCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScalePolicy;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScalePolicy;
}
}

6
api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmGroup;
import com.cloud.user.Account;
@ -97,7 +97,7 @@ public class DeleteAutoScaleVmGroupCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmGroup;
}
}

6
api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmProfile;
import com.cloud.user.Account;
@ -96,7 +96,7 @@ public class DeleteAutoScaleVmProfileCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmProfile;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmProfile;
}
}

6
api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
View File

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.ConditionResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceInUseException;
import com.cloud.network.as.Condition;
@ -77,8 +77,8 @@ public class DeleteConditionCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Condition;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Condition;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
View File

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmGroup;
import com.cloud.user.Account;
@ -94,8 +94,8 @@ public class DisableAutoScaleVmGroupCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmGroup;
}
}

6
api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
View File

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmGroup;
import com.cloud.user.Account;
@ -94,8 +94,8 @@ public class EnableAutoScaleVmGroupCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmGroup;
}
}

6
api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
View File

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -29,7 +30,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.ConditionResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScalePolicy;
import com.cloud.user.Account;
@ -120,7 +120,7 @@ public class UpdateAutoScalePolicyCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScalePolicy;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScalePolicy;
}
}

6
api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
View File

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -29,7 +30,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmGroup;
import com.cloud.user.Account;
@ -137,7 +137,7 @@ public class UpdateAutoScaleVmGroupCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmGroup;
}
}

6
api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
View File

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.Map;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -30,7 +31,6 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.UserResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmProfile;
import com.cloud.user.Account;
@ -131,7 +131,7 @@ public class UpdateAutoScaleVmProfileCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmProfile;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmProfile;
}
}

6
api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
View File

@ -22,6 +22,7 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -32,7 +33,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.FirewallResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.NetworkRuleConflictException;
@ -323,8 +323,8 @@ public class CreateEgressFirewallRuleCmd extends BaseAsyncCreateCmd implements F
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
View File

@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -30,7 +31,6 @@ import org.apache.cloudstack.api.response.FirewallResponse;
import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.NetworkRuleConflictException;
@ -318,8 +318,8 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.firewall;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -31,7 +32,6 @@ import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.NetworkRuleConflictException;
@ -388,8 +388,8 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
@Override

7
api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
View File

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.user.firewall;
import org.apache.cloudstack.api.APICommand;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -29,7 +30,7 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
@ -116,7 +117,7 @@ public class DeleteEgressFirewallRuleCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
}

6
api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.firewall;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
@ -115,7 +115,7 @@ public class DeleteFirewallRuleCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
}

6
api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.firewall;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.PortForwardingRule;
@ -117,7 +117,7 @@ public class DeletePortForwardingRuleCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
}

6
api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.iso;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
@ -96,8 +96,8 @@ public class DeleteIsoCmd extends BaseAsyncCmd {
return "Deleting iso " + getId();
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Iso;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Iso;
}
public Long getInstanceId() {

6
api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.iso;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InternalErrorException;
import com.cloud.template.VirtualMachineTemplate;
@ -112,8 +112,8 @@ public class ExtractIsoCmd extends BaseAsyncCmd {
return s_name;
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Iso;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Iso;
}
public Long getInstanceId() {

6
api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
View File

@ -21,6 +21,7 @@ import java.util.List;
import java.util.Set;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -29,7 +30,6 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -142,8 +142,8 @@ public class ListIsosCmd extends BaseListTaggedResourcesCmd {
return s_name;
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Iso;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Iso;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.loadbalancer;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
@ -143,8 +143,8 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.LoadBalancerRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.LoadBalancerRule;
}
public String getSourceIp() {

6
api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.loadbalancer;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -31,7 +32,6 @@ import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.event.EventTypes;
@ -376,8 +376,8 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
}

6
api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.loadbalancer;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.UserContext;
@ -110,7 +110,7 @@ public class DeleteApplicationLoadBalancerCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
}

6
api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.loadbalancer;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.LoadBalancer;
@ -112,7 +112,7 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
}

6
api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.nat;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -30,7 +31,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.IpForwardingRuleResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.NetworkRuleConflictException;
@ -304,8 +304,8 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.nat;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.FirewallRule;
@ -116,8 +116,8 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
}

5
api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
View File

@ -17,7 +17,6 @@
package org.apache.cloudstack.api.command.user.region.ha.gslb;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
@ -167,8 +166,8 @@ public class CreateGlobalLoadBalancerRuleCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.GlobalLoadBalancerRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.GlobalLoadBalancerRule;
}
@Override

5
api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java
View File

@ -17,7 +17,6 @@
package org.apache.cloudstack.api.command.user.region.ha.gslb;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.region.ha.GlobalLoadBalancerRule;
import com.cloud.region.ha.GlobalLoadBalancingRulesService;
@ -108,7 +107,7 @@ public class DeleteGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.GlobalLoadBalancerRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.GlobalLoadBalancerRule;
}
}

6
api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
View File

@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -34,7 +35,6 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.security.SecurityRule;
@ -217,8 +217,8 @@ public class AuthorizeSecurityGroupEgressCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.SecurityGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SecurityGroup;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
View File

@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -34,7 +35,6 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.security.SecurityRule;
@ -224,8 +224,8 @@ public class AuthorizeSecurityGroupIngressCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.SecurityGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SecurityGroup;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.securitygroup;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -25,7 +26,6 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
@APICommand(name = "listSecurityGroups", description="Lists security groups", responseObject=SecurityGroupResponse.class)
public class ListSecurityGroupsCmd extends BaseListTaggedResourcesCmd {
@ -78,7 +78,7 @@ public class ListSecurityGroupsCmd extends BaseListTaggedResourcesCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.SecurityGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SecurityGroup;
}
}

6
api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.securitygroup;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.security.SecurityGroup;
import com.cloud.user.Account;
@ -97,8 +97,8 @@ public class RevokeSecurityGroupEgressCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.SecurityGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SecurityGroup;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.securitygroup;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.network.security.SecurityGroup;
import com.cloud.user.Account;
@ -97,8 +97,8 @@ public class RevokeSecurityGroupIngressCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.SecurityGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SecurityGroup;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.snapshot;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -29,7 +30,6 @@ import org.apache.cloudstack.api.response.SnapshotResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
@ -146,8 +146,8 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Snapshot;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Snapshot;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.snapshot;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -26,7 +27,6 @@ import org.apache.cloudstack.api.response.SnapshotResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.storage.Snapshot;
import com.cloud.user.Account;
@ -82,8 +82,8 @@ public class DeleteSnapshotCmd extends BaseAsyncCmd {
return "deleting snapshot: " + getId();
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Snapshot;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Snapshot;
}
public Long getInstanceId() {

6
api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
View File

@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -29,7 +30,6 @@ import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.storage.Snapshot;
import com.cloud.utils.Pair;
@ -101,8 +101,8 @@ public class ListSnapshotsCmd extends BaseListTaggedResourcesCmd {
return s_name;
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Snapshot;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Snapshot;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.template;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -29,7 +30,6 @@ import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.StorageUnavailableException;
@ -109,8 +109,8 @@ public class CopyTemplateCmd extends BaseAsyncCmd {
return "copying template: " + getId() + " from zone: " + getSourceZoneId() + " to zone: " + getDestinationZoneId();
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Template;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Template;
}
public Long getInstanceId() {

6
api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
View File

@ -16,7 +16,6 @@
// under the License.
package org.apache.cloudstack.api.command.user.template;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
@ -28,6 +27,7 @@ import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -227,8 +227,8 @@ import java.util.Map;
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Template;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Template;
}
private boolean isBareMetal() {

6
api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.template;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -28,7 +29,6 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
@ -98,8 +98,8 @@ public class DeleteTemplateCmd extends BaseAsyncCmd {
return "Deleting template " + getId();
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Template;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Template;
}
public Long getInstanceId() {

6
api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.template;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -28,7 +29,6 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InternalErrorException;
import com.cloud.template.VirtualMachineTemplate;
@ -114,8 +114,8 @@ public class ExtractTemplateCmd extends BaseAsyncCmd {
return "extracting template: " + getId() + " from zone: " + getZoneId();
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Template;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Template;
}
public Long getInstanceId() {

6
api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
View File

@ -21,6 +21,7 @@ import java.util.List;
import java.util.Set;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -30,7 +31,6 @@ import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -114,8 +114,8 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd {
return s_name;
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Template;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Template;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
View File

@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
@ -35,7 +36,6 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.UserContext;
@ -224,8 +224,8 @@ public class RegisterTemplateCmd extends BaseCmd {
return s_name;
}
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Template;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Template;
}
@Override

6
api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
View File

@ -20,6 +20,7 @@ import com.cloud.vm.NicSecondaryIp;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -28,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.NicResponse;
import org.apache.cloudstack.api.response.NicSecondaryIpResponse;
import com.cloud.async.AsyncJob;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.event.EventTypes;
@ -193,8 +193,8 @@ public class AddIpToVmNicCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.IpAddress;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.IpAddress;
}
}

6
api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
View File

@ -28,6 +28,7 @@ import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -45,7 +46,6 @@ import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import com.cloud.async.AsyncJob;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.event.EventTypes;
@ -406,8 +406,8 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.VirtualMachine;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.VirtualMachine;
}
@Override

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