diff --git a/api/src/com/cloud/async/AsyncJob.java b/api/src/com/cloud/async/AsyncJob.java index 47f9b574e23..8d58af1c638 100644 --- a/api/src/com/cloud/async/AsyncJob.java +++ b/api/src/com/cloud/async/AsyncJob.java @@ -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(); diff --git a/api/src/org/apache/cloudstack/api/ApiCommandJobType.java b/api/src/org/apache/cloudstack/api/ApiCommandJobType.java new file mode 100644 index 00000000000..d42ca856a08 --- /dev/null +++ b/api/src/org/apache/cloudstack/api/ApiCommandJobType.java @@ -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 +} \ No newline at end of file diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java b/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java index f3b3170445d..022157a182e 100644 --- a/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/BaseListCmd.java b/api/src/org/apache/cloudstack/api/BaseListCmd.java index bc0b2b8f3b5..4d9b350dc2e 100644 --- a/api/src/org/apache/cloudstack/api/BaseListCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseListCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java index 9895da113f1..4a42fde9cac 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java index 1f9b8217dd3..6d25fde71a2 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java index 98ffc51f7a0..ebab8b5a066 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java index 35d99bbc985..c5fe8818c80 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java index d9e593462ea..ea85d129136 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java index 1e378fae464..95b9ac33799 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java index c1a83fabe28..fd3685ae54d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java index b151865bab3..8a1ef79a24c 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java index d09cf38cc50..b11bcd2f582 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java index 68370e8131e..21b3fc4e330 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java index 31d132b5c9c..256804ff8ba 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java index f40db49b417..fd6a7dd4de2 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java index 2c6cc609ea7..280369a5b64 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java index fb6db61f9a6..6c1100a1a0d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java index cbcf29b8f44..a69ffa4bfc6 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java index c7dd93c88f8..b5c015a5452 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java index 76cb42dab19..f9e96f62185 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java index 4364b2d7afb..74d1c7ccc3e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java index 6d37dd8a49b..333564e12b3 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java index 78e4c94ed4c..84e8753e791 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java index 856e8efa210..7c2fc81727c 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java index f19e0fae7c6..e28e9169c63 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java index 3efc865e4f2..d0dda29b1af 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java index a74eb897dba..d7f59b96e63 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java index c9b518f63da..504b715c1c4 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java index ad0461e0eb7..b575bf572a6 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java index 94473cf9ffc..10aebc0220a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java index b50cb277b8f..525e923a194 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java index ed6ca04c16f..33b696d4027 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java index f33b9877662..26351bb7755 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java index 95a92149da9..565ed075d7c 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java index ef7af5c0a6f..87c6696301e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java index f230a20d513..151f20709ed 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java index 6e4c925ffd5..8cb0718abb8 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java index f97d89992c9..1283d98eb02 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java index 5f9a3efbdf6..9954330db53 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java index 7211bae8dd4..f9f2b03676b 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java index 32e0512a20f..0a6da188c5b 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java index d3cf3f8434e..e54b87c0591 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java index 6eaa46bed30..a48755675f8 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java index 22dfb9e2acc..0bc905c49d5 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java index 182a19e0622..71dfba8380e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java index 858457bf4fc..5696bfd5b09 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java index c97a5e44179..6d7ec6acc95 100644 --- a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java index 3d431f4ac03..cbd802b3e62 100644 --- a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java index ac0f823c1f4..bc179b2de4e 100644 --- a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java @@ -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; } diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java index 96de4aa13c0..bc16310a485 100644 --- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java index f80e17626fd..a237cba8d04 100644 --- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java index d966a4c28b2..40ba715bb4e 100644 --- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java index 44d017b7d8b..8b0188cff65 100644 --- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java index f6e4f96ddb1..865dfc0a953 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java index 135c87717be..d08728a3ad5 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java index 87d4466e79a..f7ee2f5c96f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java index 3eff5d08e8b..44f1c86d96f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java index f8b3595660b..abf0ec096e6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java index d0107368e85..e9de4cb66bb 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java index c55973c91d6..0353c952fb7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java index 57e38f9ab1e..14ad3e1cbf2 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java index 5d2fb4bd18e..3810d387d15 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java index 5cb7e56058e..bcbbb90d482 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java index fbe2be840dc..dcd4aa6fd3a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java index 5acfb942f09..460803ece27 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java index 34def9daca3..d2fd213c394 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java index 097b2c55f80..3714c06947c 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java index b7cb4712047..b94ea17cb6d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java index 549de76f2c6..372e00f5a66 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java index 0e1d48640bc..ec824b78647 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java index b9008282978..3aeb7e216c3 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java index 838859585ad..e9caa053925 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java index c8217759944..ef154187446 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java index dd0fc360e45..4e6ff574d74 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java index b490ca9966a..09e2c1cb648 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java index 17ae959aa6e..f085f5a74a9 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java index f6cc1f130bd..8e15a6acf5d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java index bc6cd09526c..5c83df10fc1 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java index 88fa400bb35..0e72d67cb40 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java index 4cb5288ceeb..354f3e94fd9 100644 --- a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java index b736b03a62e..f2b0b9b7422 100644 --- a/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java index ac3349516df..d39e466df1d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java index 77ec4e7609f..35401e8a847 100644 --- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java index 74eb5c7cea5..321a5f631aa 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java index 22e88c23103..9ab0fb5c119 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java index 670124d5e30..1cd09c9b225 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java index c03d3e4ba5b..06473726832 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java index c2fdb8b000f..14c8ae74ae4 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java index 73a7fc47d1f..f5cb9003268 100644 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java index 6f37af8b4b8..6c26e81ce17 100644 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java index 8859ba53c53..b101bb3dc94 100644 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java index 34ee4bdc786..4921b5ee823 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java index 6aa60aca1fc..07aeb0af405 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java index 1f030a56591..b2be2f2278b 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java index f2dc5952386..595ba96089e 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java @@ -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() { diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java index 0b937be6d59..08a35d4998f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java index c1d3f59f974..b26d9203200 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java index ae5482b22de..41584d20bea 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java @@ -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; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java index 63198a420be..5c8fecd69c8 100755 --- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java index 567768dee13..4add4ce0c2e 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.command.user.vm; 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.UserVmResponse; 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; @@ -85,8 +85,8 @@ public class DestroyVMCmd extends BaseAsyncCmd { return "destroying vm: " + getId(); } - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.VirtualMachine; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.VirtualMachine; } public Long getInstanceId() { diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java index 4c4e1f71441..2aa6ffd50cd 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java @@ -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.BaseListCmd; @@ -31,7 +32,6 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NicResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import com.cloud.async.AsyncJob; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceAllocationException; @@ -126,8 +126,8 @@ public class ListNicsCmd extends BaseListCmd { } @Override - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.IpAddress; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.IpAddress; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java index d3b29db2801..6bd9290ff53 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java @@ -22,6 +22,7 @@ import java.util.List; 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.ApiConstants.VMDetails; import org.apache.cloudstack.api.BaseListTaggedResourcesCmd; @@ -39,7 +40,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.exception.InvalidParameterValueException; @@ -211,8 +211,8 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd { } @Override - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.VirtualMachine; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.VirtualMachine; } @Override diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java index 6838b9613db..794e1b5d3cd 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.command.user.vm; 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.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.ResourceUnavailableException; @@ -84,8 +84,8 @@ public class RebootVMCmd extends BaseAsyncCmd { return "rebooting user vm: " + getId(); } - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.VirtualMachine; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.VirtualMachine; } public Long getInstanceId() { diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java index 21a9a0c96b4..852f073a566 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java @@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.vm; 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; @@ -26,7 +27,7 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.NicSecondaryIpResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import com.cloud.async.AsyncJob; + import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; import com.cloud.event.EventTypes; @@ -165,8 +166,8 @@ public class RemoveIpFromVmNicCmd extends BaseAsyncCmd { } @Override - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.IpAddress; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.IpAddress; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java index 80f3e852ea6..271d37fd3f0 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.command.user.vm; 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.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.ResourceUnavailableException; @@ -98,8 +98,8 @@ public class ResetVMPasswordCmd extends BaseAsyncCmd { return "resetting password for vm: " + getId(); } - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.VirtualMachine; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.VirtualMachine; } public Long getInstanceId() { diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java index 3d1da155fcf..372f2bc8b76 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java @@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.vm; 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.UserVmResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ProjectResponse; -import com.cloud.async.AsyncJob; + import com.cloud.user.Account; import com.cloud.user.UserContext; import com.cloud.uservm.UserVm; @@ -107,8 +108,8 @@ public class ResetVMSSHKeyCmd extends BaseAsyncCmd { return "resetting SSHKey for vm: " + getId(); } - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.VirtualMachine; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.VirtualMachine; } diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java index 09b34d4af3c..2fc66467a08 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.command.user.vm; 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.UserVmResponse; 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; @@ -103,8 +103,8 @@ public class StartVMCmd extends BaseAsyncCmd { return "starting user vm: " + getId(); } - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.VirtualMachine; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.VirtualMachine; } public Long getInstanceId() { diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java index d66c33422bf..f06b0f54432 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java @@ -18,6 +18,7 @@ package org.apache.cloudstack.api.command.user.vm; 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; @@ -26,7 +27,6 @@ import org.apache.cloudstack.api.ServerApiException; 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.ConcurrentOperationException; import com.cloud.hypervisor.Hypervisor.HypervisorType; @@ -96,8 +96,8 @@ public class StopVMCmd extends BaseAsyncCmd { } @Override - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.VirtualMachine; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.VirtualMachine; } @Override diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java index e577e35795e..bd729ea9de7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.command.user.volume; 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.UserVmResponse; 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.storage.Volume; import com.cloud.user.Account; @@ -89,8 +89,8 @@ public class AttachVolumeCmd extends BaseAsyncCmd { return s_name; } - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.Volume; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.Volume; } public Long getInstanceId() { diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java index f293a03da91..6a5d4e556ec 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.command.user.volume; 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.VolumeResponse; 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.storage.Snapshot; @@ -147,8 +147,8 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd { } @Override - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.Volume; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.Volume; } @Override diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java index 9a5929eccca..24dd113bef2 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.command.user.volume; 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.UserVmResponse; 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.storage.Volume; import com.cloud.user.Account; @@ -82,8 +82,8 @@ public class DetachVolumeCmd extends BaseAsyncCmd { return "volume"; } - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.Volume; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.Volume; } public Long getInstanceId() { diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java index 5fbe106b334..8588153848d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java @@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.volume; import java.net.URISyntaxException; 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.VolumeResponse; 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.event.EventTypes; import com.cloud.storage.Upload; @@ -95,8 +95,8 @@ public class ExtractVolumeCmd extends BaseAsyncCmd { return s_name; } - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.Volume; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.Volume; } public Long getInstanceId() { diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java index 0bced56918b..e90643878ac 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.command.user.volume; 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; @@ -28,7 +29,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; @APICommand(name = "listVolumes", description="Lists all volumes.", responseObject=VolumeResponse.class) @@ -112,8 +112,8 @@ public class ListVolumesCmd extends BaseListTaggedResourcesCmd { } @Override - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.Volume; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.Volume; } @Override diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java index 3474996a52c..445f4353c74 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java @@ -18,6 +18,7 @@ package org.apache.cloudstack.api.command.user.volume; import com.cloud.server.ResourceTag; 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.UserVmResponse; 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.storage.Volume; import com.cloud.user.Account; @@ -81,8 +81,8 @@ public class RemoveResourceDetailCmd extends BaseAsyncCmd { return s_name; } - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.Volume; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.Volume; } diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java index 871bf455529..0b7ff0d8b03 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.command.user.volume; 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.DiskOfferingResponse; 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; @@ -90,8 +90,8 @@ public class ResizeVolumeCmd extends BaseAsyncCmd { } @Override - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.Volume; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.Volume; } public static String getResultObjectName() { diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java index 3453eef9187..f1e68e9372c 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.command.user.volume; 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.UserVmResponse; 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.storage.Volume; import com.cloud.user.Account; @@ -70,8 +70,8 @@ public class UpdateVolumeCmd extends BaseAsyncCmd { return s_name; } - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.Volume; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.Volume; } public Long getInstanceId() { diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java index 76a76d6ddb0..e0cfe000900 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.command.user.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; @@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.PrivateGatewayResponse; import org.apache.cloudstack.api.response.StaticRouteResponse; 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; @@ -140,7 +140,7 @@ public class CreateStaticRouteCmd extends BaseAsyncCreateCmd{ } @Override - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.StaticRoute; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.StaticRoute; } } diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java index e43412a19f8..87c1c9d1ef9 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.command.user.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; @@ -27,7 +28,6 @@ import org.apache.cloudstack.api.response.StaticRouteResponse; 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; @@ -119,7 +119,7 @@ public class DeleteStaticRouteCmd extends BaseAsyncCmd{ } @Override - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.StaticRoute; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.StaticRoute; } } diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java index 073e4c27618..552539dc239 100755 --- a/server/src/com/cloud/api/ApiDBUtils.java +++ b/server/src/com/cloud/api/ApiDBUtils.java @@ -43,6 +43,7 @@ import com.cloud.region.ha.GlobalLoadBalancingRulesService; import org.apache.cloudstack.affinity.AffinityGroup; import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.affinity.dao.AffinityGroupDao; +import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants.HostDetails; import org.apache.cloudstack.api.ApiConstants.VMDetails; import org.apache.cloudstack.api.response.AccountResponse; @@ -1282,113 +1283,113 @@ public class ApiDBUtils { if ( job == null ) return null; String jobInstanceId = null; - if (job.getInstanceType() == AsyncJob.Type.Volume) { + if (job.getInstanceType() == ApiCommandJobType.Volume) { VolumeVO volume = ApiDBUtils.findVolumeById(job.getInstanceId()); if (volume != null) { jobInstanceId = volume.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.Template || job.getInstanceType() == AsyncJob.Type.Iso) { + } else if (job.getInstanceType() == ApiCommandJobType.Template || job.getInstanceType() == ApiCommandJobType.Iso) { VMTemplateVO template = ApiDBUtils.findTemplateById(job.getInstanceId()); if (template != null) { jobInstanceId = template.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.VirtualMachine || job.getInstanceType() == AsyncJob.Type.ConsoleProxy - || job.getInstanceType() == AsyncJob.Type.SystemVm || job.getInstanceType() == AsyncJob.Type.DomainRouter) { + } else if (job.getInstanceType() == ApiCommandJobType.VirtualMachine || job.getInstanceType() == ApiCommandJobType.ConsoleProxy + || job.getInstanceType() == ApiCommandJobType.SystemVm || job.getInstanceType() == ApiCommandJobType.DomainRouter) { VMInstanceVO vm = ApiDBUtils.findVMInstanceById(job.getInstanceId()); if (vm != null) { jobInstanceId = vm.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.Snapshot) { + } else if (job.getInstanceType() == ApiCommandJobType.Snapshot) { Snapshot snapshot = ApiDBUtils.findSnapshotById(job.getInstanceId()); if (snapshot != null) { jobInstanceId = snapshot.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.Host) { + } else if (job.getInstanceType() == ApiCommandJobType.Host) { Host host = ApiDBUtils.findHostById(job.getInstanceId()); if (host != null) { jobInstanceId = host.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.StoragePool) { + } else if (job.getInstanceType() == ApiCommandJobType.StoragePool) { StoragePoolVO spool = ApiDBUtils.findStoragePoolById(job.getInstanceId()); if (spool != null) { jobInstanceId = spool.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.IpAddress) { + } else if (job.getInstanceType() == ApiCommandJobType.IpAddress) { IPAddressVO ip = ApiDBUtils.findIpAddressById(job.getInstanceId()); if (ip != null) { jobInstanceId = ip.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.SecurityGroup) { + } else if (job.getInstanceType() == ApiCommandJobType.SecurityGroup) { SecurityGroup sg = ApiDBUtils.findSecurityGroupById(job.getInstanceId()); if (sg != null) { jobInstanceId = sg.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.PhysicalNetwork) { + } else if (job.getInstanceType() == ApiCommandJobType.PhysicalNetwork) { PhysicalNetworkVO pnet = ApiDBUtils.findPhysicalNetworkById(job.getInstanceId()); if (pnet != null) { jobInstanceId = pnet.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.TrafficType) { + } else if (job.getInstanceType() == ApiCommandJobType.TrafficType) { PhysicalNetworkTrafficTypeVO trafficType = ApiDBUtils.findPhysicalNetworkTrafficTypeById(job.getInstanceId()); if (trafficType != null) { jobInstanceId = trafficType.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.PhysicalNetworkServiceProvider) { + } else if (job.getInstanceType() == ApiCommandJobType.PhysicalNetworkServiceProvider) { PhysicalNetworkServiceProvider sp = ApiDBUtils.findPhysicalNetworkServiceProviderById(job.getInstanceId()); if (sp != null) { jobInstanceId = sp.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.FirewallRule) { + } else if (job.getInstanceType() == ApiCommandJobType.FirewallRule) { FirewallRuleVO fw = ApiDBUtils.findFirewallRuleById(job.getInstanceId()); if (fw != null) { jobInstanceId = fw.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.Account) { + } else if (job.getInstanceType() == ApiCommandJobType.Account) { Account acct = ApiDBUtils.findAccountById(job.getInstanceId()); if (acct != null) { jobInstanceId = acct.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.User) { + } else if (job.getInstanceType() == ApiCommandJobType.User) { User usr = ApiDBUtils.findUserById(job.getInstanceId()); if (usr != null) { jobInstanceId = usr.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.StaticRoute) { + } else if (job.getInstanceType() == ApiCommandJobType.StaticRoute) { StaticRouteVO route = ApiDBUtils.findStaticRouteById(job.getInstanceId()); if (route != null) { jobInstanceId = route.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.PrivateGateway) { + } else if (job.getInstanceType() == ApiCommandJobType.PrivateGateway) { VpcGatewayVO gateway = ApiDBUtils.findVpcGatewayById(job.getInstanceId()); if (gateway != null) { jobInstanceId = gateway.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.Counter) { + } else if (job.getInstanceType() == ApiCommandJobType.Counter) { CounterVO counter = ApiDBUtils.getCounter(job.getInstanceId()); if (counter != null) { jobInstanceId = counter.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.Condition) { + } else if (job.getInstanceType() == ApiCommandJobType.Condition) { ConditionVO condition = ApiDBUtils.findConditionById(job.getInstanceId()); if (condition != null) { jobInstanceId = condition.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.AutoScalePolicy) { + } else if (job.getInstanceType() == ApiCommandJobType.AutoScalePolicy) { AutoScalePolicyVO policy = ApiDBUtils.findAutoScalePolicyById(job.getInstanceId()); if (policy != null) { jobInstanceId = policy.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.AutoScaleVmProfile) { + } else if (job.getInstanceType() == ApiCommandJobType.AutoScaleVmProfile) { AutoScaleVmProfileVO profile = ApiDBUtils.findAutoScaleVmProfileById(job.getInstanceId()); if (profile != null) { jobInstanceId = profile.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.AutoScaleVmGroup) { + } else if (job.getInstanceType() == ApiCommandJobType.AutoScaleVmGroup) { AutoScaleVmGroupVO group = ApiDBUtils.findAutoScaleVmGroupById(job.getInstanceId()); if (group != null) { jobInstanceId = group.getUuid(); } - } else if (job.getInstanceType() != AsyncJob.Type.None) { + } else if (job.getInstanceType() != ApiCommandJobType.None) { // TODO : when we hit here, we need to add instanceType -> UUID // entity table mapping assert (false); diff --git a/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java b/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java index 39bcb1777e6..c45be1cc642 100644 --- a/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java +++ b/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java @@ -24,8 +24,9 @@ import javax.persistence.Enumerated; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.async.AsyncJob.Type; import com.cloud.utils.db.GenericDao; + +import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; @@ -95,7 +96,7 @@ public class AsyncJobJoinVO extends BaseViewVO implements InternalIdentity, Iden @Enumerated(value=EnumType.STRING) @Column(name="instance_type", length=64) - private Type instanceType; + private ApiCommandJobType instanceType; @Column(name="instance_id", length=64) private Long instanceId; @@ -301,12 +302,12 @@ public class AsyncJobJoinVO extends BaseViewVO implements InternalIdentity, Iden } - public Type getInstanceType() { + public ApiCommandJobType getInstanceType() { return instanceType; } - public void setInstanceType(Type instanceType) { + public void setInstanceType(ApiCommandJobType instanceType) { this.instanceType = instanceType; } diff --git a/server/src/com/cloud/async/AsyncJobManager.java b/server/src/com/cloud/async/AsyncJobManager.java index 4cd67f3e39c..c9eee4008c0 100644 --- a/server/src/com/cloud/async/AsyncJobManager.java +++ b/server/src/com/cloud/async/AsyncJobManager.java @@ -18,6 +18,7 @@ package com.cloud.async; import java.util.List; +import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd; import com.cloud.utils.component.Manager; @@ -28,7 +29,7 @@ public interface AsyncJobManager extends Manager { public AsyncJobVO getAsyncJob(long jobId); public AsyncJobVO findInstancePendingAsyncJob(String instanceType, long instanceId); - public List findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId); + public List findInstancePendingAsyncJobs(ApiCommandJobType instanceType, Long accountId); public long submitAsyncJob(AsyncJobVO job); public long submitAsyncJob(AsyncJobVO job, boolean scheduleJobExecutionInContext); diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java index 0101a8a0abf..13dd73e52da 100644 --- a/server/src/com/cloud/async/AsyncJobManagerImpl.java +++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java @@ -35,6 +35,7 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.ServerApiException; @@ -118,7 +119,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, } @Override - public List findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId) { + public List findInstancePendingAsyncJobs(ApiCommandJobType instanceType, Long accountId) { return _jobDao.findInstancePendingAsyncJobs(instanceType, accountId); } diff --git a/server/src/com/cloud/async/AsyncJobVO.java b/server/src/com/cloud/async/AsyncJobVO.java index c40fc987a4a..41eccb44a05 100644 --- a/server/src/com/cloud/async/AsyncJobVO.java +++ b/server/src/com/cloud/async/AsyncJobVO.java @@ -32,6 +32,8 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; import com.cloud.utils.db.GenericDao; + +import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.InternalIdentity; @Entity @@ -86,7 +88,7 @@ public class AsyncJobVO implements AsyncJob { @Enumerated(value=EnumType.STRING) @Column(name="instance_type", length=64) - private Type instanceType; + private ApiCommandJobType instanceType; @Column(name="instance_id", length=64) private Long instanceId; @@ -125,7 +127,7 @@ public class AsyncJobVO implements AsyncJob { this.uuid = UUID.randomUUID().toString(); } - public AsyncJobVO(long userId, long accountId, String cmd, String cmdInfo, Long instanceId, Type instanceType) { + public AsyncJobVO(long userId, long accountId, String cmd, String cmdInfo, Long instanceId, ApiCommandJobType instanceType) { this.userId = userId; this.accountId = accountId; this.cmd = cmd; @@ -137,7 +139,7 @@ public class AsyncJobVO implements AsyncJob { } public AsyncJobVO(long userId, long accountId, String cmd, String cmdInfo, - int callbackType, String callbackAddress, Long instanceId, Type instanceType) { + int callbackType, String callbackAddress, Long instanceId, ApiCommandJobType instanceType) { this(userId, accountId, cmd, cmdInfo, instanceId, instanceType); this.callbackType = callbackType; @@ -309,11 +311,11 @@ public class AsyncJobVO implements AsyncJob { } @Override - public Type getInstanceType() { + public ApiCommandJobType getInstanceType() { return instanceType; } - public void setInstanceType(Type instanceType) { + public void setInstanceType(ApiCommandJobType instanceType) { this.instanceType = instanceType; } diff --git a/server/src/com/cloud/async/dao/AsyncJobDao.java b/server/src/com/cloud/async/dao/AsyncJobDao.java index 9ab9b224c10..104bd90a944 100644 --- a/server/src/com/cloud/async/dao/AsyncJobDao.java +++ b/server/src/com/cloud/async/dao/AsyncJobDao.java @@ -19,13 +19,14 @@ package com.cloud.async.dao; import java.util.Date; import java.util.List; -import com.cloud.async.AsyncJob; +import org.apache.cloudstack.api.ApiCommandJobType; + import com.cloud.async.AsyncJobVO; import com.cloud.utils.db.GenericDao; public interface AsyncJobDao extends GenericDao { AsyncJobVO findInstancePendingAsyncJob(String instanceType, long instanceId); - List findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId); + List findInstancePendingAsyncJobs(ApiCommandJobType instanceType, Long accountId); List getExpiredUnfinishedJobs(Date cutTime, int limit); void resetJobProcess(long msid, int jobResultCode, String jobResultMessage); List getExpiredCompletedJobs(Date cutTime, int limit); diff --git a/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java b/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java index b2c0d9cc4e0..69ffa10591b 100644 --- a/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java +++ b/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java @@ -26,7 +26,8 @@ import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.async.AsyncJob; +import org.apache.cloudstack.api.ApiCommandJobType; + import com.cloud.async.AsyncJobResult; import com.cloud.async.AsyncJobVO; import com.cloud.utils.db.DB; @@ -98,7 +99,7 @@ public class AsyncJobDaoImpl extends GenericDaoBase implements return null; } - public List findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId) { + public List findInstancePendingAsyncJobs(ApiCommandJobType instanceType, Long accountId) { SearchCriteria sc = pendingAsyncJobsSearch.create(); sc.setParameters("instanceType", instanceType); diff --git a/tools/apidoc/build-apidoc.sh b/tools/apidoc/build-apidoc.sh index d048a1b2d2a..03eb6874e12 100755 --- a/tools/apidoc/build-apidoc.sh +++ b/tools/apidoc/build-apidoc.sh @@ -47,16 +47,7 @@ fi CP=$PATHSEP/ -for file in $TARGETJARDIR/*.jar -do - CP=${CP}$PATHSEP$file -done - -for file in $DEPSDIR/*.jar; do - CP=${CP}$PATHSEP$file -done - -java -cp $CP com.cloud.api.doc.ApiXmlDocWriter -d "$DISTDIR" $* +java -cp $CP$PATHSEP$TARGETJARDIR/*$PATHSEP$DEPSDIR/* com.cloud.api.doc.ApiXmlDocWriter -d "$DISTDIR" $* if [ $? -ne 0 ] then