From 360a48bc7f9fcf3be0870236d2ed857d815e82dd Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Mon, 22 Apr 2013 18:16:33 -0700 Subject: [PATCH] More refactoring for decoupling --- api/src/com/cloud/async/AsyncJob.java | 5 +- .../cloudstack/api/ApiCommandJobType.java | 48 ++++++++++++++++++ .../apache/cloudstack/api/BaseAsyncCmd.java | 4 +- .../apache/cloudstack/api/BaseListCmd.java | 4 +- .../admin/account/DeleteAccountCmd.java | 5 +- .../admin/account/DisableAccountCmd.java | 5 +- .../admin/autoscale/CreateCounterCmd.java | 5 +- .../admin/autoscale/DeleteCounterCmd.java | 5 +- .../admin/host/CancelMaintenanceCmd.java | 5 +- .../api/command/admin/host/ListHostsCmd.java | 5 +- .../admin/host/PrepareForMaintenanceCmd.java | 5 +- .../command/admin/host/ReconnectHostCmd.java | 5 +- .../network/AddNetworkServiceProviderCmd.java | 5 +- .../network/CreatePhysicalNetworkCmd.java | 5 +- .../DeleteNetworkServiceProviderCmd.java | 5 +- .../network/DeletePhysicalNetworkCmd.java | 5 +- .../UpdateNetworkServiceProviderCmd.java | 5 +- .../network/UpdatePhysicalNetworkCmd.java | 5 +- .../ConfigureVirtualRouterElementCmd.java | 5 +- .../admin/router/DestroyRouterCmd.java | 5 +- .../command/admin/router/ListRoutersCmd.java | 5 +- .../command/admin/router/RebootRouterCmd.java | 5 +- .../command/admin/router/StartRouterCmd.java | 5 +- .../command/admin/router/StopRouterCmd.java | 5 +- .../CancelPrimaryStorageMaintenanceCmd.java | 5 +- .../admin/storage/ListStoragePoolsCmd.java | 5 +- ...reparePrimaryStorageForMaintenanceCmd.java | 5 +- .../admin/systemvm/DestroySystemVmCmd.java | 5 +- .../admin/systemvm/ListSystemVMsCmd.java | 5 +- .../admin/systemvm/RebootSystemVmCmd.java | 5 +- .../admin/systemvm/StartSystemVMCmd.java | 5 +- .../admin/systemvm/StopSystemVmCmd.java | 5 +- .../admin/usage/AddTrafficTypeCmd.java | 5 +- .../admin/usage/DeleteTrafficTypeCmd.java | 5 +- .../admin/usage/UpdateTrafficTypeCmd.java | 5 +- .../command/admin/user/DisableUserCmd.java | 5 +- .../admin/vpc/CreatePrivateGatewayCmd.java | 5 +- .../admin/vpc/DeletePrivateGatewayCmd.java | 5 +- .../zone/MarkDefaultZoneForAccountCmd.java | 5 +- .../user/address/AssociateIPAddrCmd.java | 5 +- .../user/address/DisassociateIPAddrCmd.java | 5 +- .../address/ListPublicIpAddressesCmd.java | 5 +- .../autoscale/CreateAutoScalePolicyCmd.java | 5 +- .../autoscale/CreateAutoScaleVmGroupCmd.java | 5 +- .../CreateAutoScaleVmProfileCmd.java | 5 +- .../user/autoscale/CreateConditionCmd.java | 5 +- .../autoscale/DeleteAutoScalePolicyCmd.java | 5 +- .../autoscale/DeleteAutoScaleVmGroupCmd.java | 5 +- .../DeleteAutoScaleVmProfileCmd.java | 5 +- .../user/autoscale/DeleteConditionCmd.java | 5 +- .../autoscale/DisableAutoScaleVmGroupCmd.java | 5 +- .../autoscale/EnableAutoScaleVmGroupCmd.java | 5 +- .../autoscale/UpdateAutoScalePolicyCmd.java | 5 +- .../autoscale/UpdateAutoScaleVmGroupCmd.java | 5 +- .../UpdateAutoScaleVmProfileCmd.java | 5 +- .../firewall/CreateEgressFirewallRuleCmd.java | 5 +- .../user/firewall/CreateFirewallRuleCmd.java | 6 +-- .../firewall/CreatePortForwardingRuleCmd.java | 5 +- .../firewall/DeleteEgressFirewallRuleCmd.java | 5 +- .../user/firewall/DeleteFirewallRuleCmd.java | 5 +- .../firewall/DeletePortForwardingRuleCmd.java | 5 +- .../api/command/user/iso/DeleteIsoCmd.java | 5 +- .../api/command/user/iso/ExtractIsoCmd.java | 5 +- .../api/command/user/iso/ListIsosCmd.java | 5 +- .../CreateLoadBalancerRuleCmd.java | 5 +- .../DeleteLoadBalancerRuleCmd.java | 5 +- .../user/nat/CreateIpForwardingRuleCmd.java | 5 +- .../user/nat/DeleteIpForwardingRuleCmd.java | 5 +- .../user/network/CreateNetworkACLCmd.java | 5 +- .../user/network/DeleteNetworkACLCmd.java | 5 +- .../gslb/CreateGlobalLoadBalancerRuleCmd.java | 4 +- .../gslb/DeleteGlobalLoadBalancerRuleCmd.java | 4 +- .../AuthorizeSecurityGroupEgressCmd.java | 5 +- .../AuthorizeSecurityGroupIngressCmd.java | 5 +- .../securitygroup/ListSecurityGroupsCmd.java | 5 +- .../RevokeSecurityGroupEgressCmd.java | 5 +- .../RevokeSecurityGroupIngressCmd.java | 5 +- .../user/snapshot/CreateSnapshotCmd.java | 5 +- .../user/snapshot/DeleteSnapshotCmd.java | 5 +- .../user/snapshot/ListSnapshotsCmd.java | 5 +- .../user/template/CopyTemplateCmd.java | 5 +- .../user/template/CreateTemplateCmd.java | 5 +- .../user/template/DeleteTemplateCmd.java | 5 +- .../user/template/ExtractTemplateCmd.java | 5 +- .../user/template/ListTemplatesCmd.java | 5 +- .../user/template/RegisterTemplateCmd.java | 5 +- .../api/command/user/vm/AddIpToVmNicCmd.java | 5 +- .../api/command/user/vm/DeployVMCmd.java | 5 +- .../api/command/user/vm/DestroyVMCmd.java | 5 +- .../api/command/user/vm/ListNicsCmd.java | 5 +- .../api/command/user/vm/ListVMsCmd.java | 5 +- .../api/command/user/vm/RebootVMCmd.java | 5 +- .../command/user/vm/RemoveIpFromVmNicCmd.java | 5 +- .../command/user/vm/ResetVMPasswordCmd.java | 5 +- .../api/command/user/vm/ResetVMSSHKeyCmd.java | 5 +- .../api/command/user/vm/StartVMCmd.java | 5 +- .../api/command/user/vm/StopVMCmd.java | 5 +- .../command/user/volume/AttachVolumeCmd.java | 5 +- .../command/user/volume/CreateVolumeCmd.java | 5 +- .../command/user/volume/DetachVolumeCmd.java | 5 +- .../command/user/volume/ExtractVolumeCmd.java | 5 +- .../command/user/volume/ListVolumesCmd.java | 5 +- .../command/user/volume/ResizeVolumeCmd.java | 5 +- .../user/vpc/CreateStaticRouteCmd.java | 5 +- .../user/vpc/DeleteStaticRouteCmd.java | 5 +- core/src/com/cloud/async/AsyncJobVO.java | 9 ++-- .../api/DataCenterResourceManagerImpl.java | 8 +-- .../api/db/dao/EngineClusterDaoImpl.java | 2 +- .../api/db/dao/EngineDataCenterDaoImpl.java | 2 +- .../entity/api/db/dao/EngineHostDaoImpl.java | 2 +- .../api/db/dao/EngineHostPodDaoImpl.java | 2 +- .../storage/image/store/TemplateObject.java | 2 +- .../SnapshotStateMachineManagerImpl.java | 2 +- .../ObjectInDataStoreManagerImpl.java | 4 +- .../storage/db/ObjectInDataStoreDaoImpl.java | 2 +- .../db/TemplatePrimaryDataStoreDaoImpl.java | 2 +- .../storage/volume/db/VolumeDao2Impl.java | 2 +- .../storage/volume/VolumeObject.java | 2 +- .../manager/BaremetalManagerImpl.java | 4 +- server/src/com/cloud/api/ApiDBUtils.java | 50 ++++++++++--------- server/src/com/cloud/api/ApiServer.java | 7 +-- .../cloud/api/query/vo/AsyncJobJoinVO.java | 12 ++--- .../src/com/cloud/async/AsyncJobManager.java | 2 +- .../com/cloud/async/AsyncJobManagerImpl.java | 2 +- .../src/com/cloud/async/dao/AsyncJobDao.java | 3 +- .../com/cloud/async/dao/AsyncJobDaoImpl.java | 2 +- .../snapshot/SnapshotSchedulerImpl.java | 2 +- 127 files changed, 417 insertions(+), 273 deletions(-) create mode 100644 api/src/org/apache/cloudstack/api/ApiCommandJobType.java diff --git a/api/src/com/cloud/async/AsyncJob.java b/api/src/com/cloud/async/AsyncJob.java index f5035374c42..44d7339e2fb 100644 --- a/api/src/com/cloud/async/AsyncJob.java +++ b/api/src/com/cloud/async/AsyncJob.java @@ -22,6 +22,7 @@ import org.apache.cloudstack.api.InternalIdentity; import java.util.Date; public interface AsyncJob extends Identity, InternalIdentity { +/* public enum Type { None, VirtualMachine, @@ -51,7 +52,7 @@ public interface AsyncJob extends Identity, InternalIdentity { AutoScaleVmGroup, GlobalLoadBalancerRule } - + */ Long getParentId(); String getType(); @@ -92,7 +93,7 @@ public interface AsyncJob extends Identity, InternalIdentity { Date getRemoved(); - Type getInstanceType(); + String 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..fbe22efd16a --- /dev/null +++ b/api/src/org/apache/cloudstack/api/ApiCommandJobType.java @@ -0,0 +1,48 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.cloudstack.api; + +public enum ApiCommandJobType { + None, + VirtualMachine, + DomainRouter, + Volume, + ConsoleProxy, + Snapshot, + Template, + Iso, + SystemVm, + Host, + StoragePool, + IpAddress, + SecurityGroup, + PhysicalNetwork, + TrafficType, + PhysicalNetworkServiceProvider, + FirewallRule, + Account, + User, + PrivateGateway, + StaticRoute, + Counter, + Condition, + AutoScalePolicy, + AutoScaleVmProfile, + AutoScaleVmGroup, + GlobalLoadBalancerRule +} 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..5a57af271ca 100644 --- a/api/src/org/apache/cloudstack/api/BaseListCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseListCmd.java @@ -109,7 +109,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..7b7bc9aa7be 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; @@ -107,7 +108,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..07abd21d32a 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; @@ -128,7 +129,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..b94ff108f53 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; @@ -95,8 +96,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..81eaa9b558c 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; @@ -82,8 +83,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..431f9615ecc 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; @@ -87,8 +88,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 29844c31113..a33407e68ae 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 @@ -21,6 +21,7 @@ import java.util.EnumSet; 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.ApiConstants.HostDetails; import org.apache.cloudstack.api.BaseListCmd; @@ -158,8 +159,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..f198bea15e6 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; @@ -87,8 +88,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..26339148025 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; @@ -86,8 +87,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/network/AddNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java index 2c6cc609ea7..50ebd26355c 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; @@ -129,7 +130,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..5b1e530f832 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; @@ -167,7 +168,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..ecaa075311e 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; @@ -100,7 +101,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..04cc9a28526 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; @@ -90,7 +91,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/UpdateNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java index 4364b2d7afb..67f9585ece3 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; @@ -103,8 +104,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 06cf38dba3f..4ef33baaf5c 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,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.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; @@ -112,7 +113,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/router/ConfigureVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java index f19e0fae7c6..dd559696799 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; @@ -106,8 +107,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..20d8e97fed0 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; @@ -84,8 +85,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 d2b26c0ac8f..94480e098f4 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; @@ -125,8 +126,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..508e56fe9d5 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; @@ -84,8 +85,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 1d3930b6b63..0b300556875 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; @@ -89,8 +90,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 60dd9386c75..251f489126e 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; @@ -87,8 +88,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..67f0a4bf7b5 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; @@ -70,8 +71,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/ListStoragePoolsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java index 02b98037b2e..ba20053e02f 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; @@ -105,8 +106,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..b5537487279 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; @@ -68,8 +69,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..962cec2b98e 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; @@ -81,8 +82,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..d290f19b4a8 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; @@ -119,8 +120,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..b7d97e23bde 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; @@ -88,8 +89,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..622f7afa919 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; @@ -92,8 +93,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..fb87d0289be 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; @@ -94,8 +95,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..a5333ddeef9 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; @@ -149,7 +150,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..007e01fe77d 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; @@ -88,8 +89,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..b6b9a05755b 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; @@ -110,7 +111,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..65569d0e071 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; @@ -104,7 +105,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 9fd736f8543..c9a29cc1b1f 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; @@ -174,7 +175,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..035f499d2bb 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; @@ -107,8 +108,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..a76e7cfe5f9 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; @@ -95,8 +96,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 406f782da51..34c9c97da36 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; @@ -265,8 +266,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 827111902ff..22d07ce3830 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; @@ -131,8 +132,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..92a49b95626 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; @@ -159,8 +160,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/autoscale/CreateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java index f6e4f96ddb1..cf226476971 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; @@ -142,8 +143,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..af790913a9a 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; @@ -152,8 +153,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..5189b257907 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; @@ -211,8 +212,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..3b36f818ff3 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; @@ -123,8 +124,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..b0090858fbe 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; @@ -97,7 +98,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..035d07352aa 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; @@ -97,7 +98,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..c11bbdbc11e 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; @@ -96,7 +97,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..fbc0683ddf1 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; @@ -77,8 +78,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..04d9b8e1fa4 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; @@ -94,8 +95,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..b8b3a48fa2c 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; @@ -94,8 +95,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..59afe391c77 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; @@ -120,7 +121,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..ccff7961c5f 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; @@ -137,7 +138,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..eff38b2c5a4 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; @@ -131,7 +132,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..f1a53b1a2ba 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; @@ -323,8 +324,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 40128526ce0..1a15561edcc 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; @@ -384,8 +385,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..f7383492207 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; @@ -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..d1b8afc6b4b 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; @@ -115,7 +116,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..f64db9fef2b 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; @@ -117,7 +118,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..7f1c3bf9e13 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; @@ -96,8 +97,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 08a15eece73..69b7f61d4c0 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; @@ -111,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 3219601156e..4ee5d24e4ac 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; @@ -142,8 +143,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/CreateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java index 5f1d97b2803..ea3eccc730c 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; @@ -374,8 +375,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/DeleteLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java index 88fa400bb35..ec31f16693b 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; @@ -112,7 +113,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..dfb99b9b382 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; @@ -304,8 +305,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..04a54210518 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; @@ -116,8 +117,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/network/CreateNetworkACLCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java index 2e307018eed..ac889c0fe58 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.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; @@ -325,8 +326,8 @@ public class CreateNetworkACLCmd extends BaseAsyncCreateCmd implements FirewallR } @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/network/DeleteNetworkACLCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java index 2a2444b3e1b..59cd6bc4695 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.command.user.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; @@ -115,8 +116,8 @@ public class DeleteNetworkACLCmd 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 cd559d8c470..efc64070510 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 @@ -160,8 +160,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 424b1072887..032fd195252 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 @@ -102,7 +102,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..5a4ff94387f 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; @@ -217,8 +218,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..ff5d0f1f034 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; @@ -224,8 +225,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..fb1aa20befa 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; @@ -78,7 +79,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 8e7f2ec1be9..f24fc90c351 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; @@ -97,8 +98,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 1d450647c8e..1a5cda4b2f3 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; @@ -97,8 +98,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 95d76599f70..53bd6a09fb2 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; @@ -146,8 +147,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..e7ae66a13c1 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; @@ -82,8 +83,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 17f20aeb0d0..04e627ccfda 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; @@ -92,8 +93,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 a4f05821244..b21db21022e 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; @@ -109,8 +110,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 ba1f924fe02..f7282ca7a93 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 @@ -21,6 +21,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.BaseAsyncCreateCmd; @@ -229,8 +230,8 @@ import com.cloud.user.UserContext; } @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..d649443878f 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; @@ -98,8 +99,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 9a2dee30bcb..b9553b90d9c 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; @@ -113,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 aeb76f507f3..6feb3e46721 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; @@ -113,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 c9da0c28cd6..bca1e1dce40 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; @@ -217,8 +218,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 df6b3999dba..b7c1412fa32 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 @@ -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; @@ -190,8 +191,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 21a45f8cc7f..28a623aa107 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 @@ -27,6 +27,7 @@ import java.util.Map; import org.apache.cloudstack.acl.SecurityChecker.AccessType; 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; @@ -365,8 +366,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..e9a62ebc7a8 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; @@ -85,8 +86,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..2641947aa0b 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; @@ -126,8 +127,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 30f03b88995..c73e5702b04 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 @@ -21,6 +21,7 @@ import java.util.EnumSet; 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.ApiConstants.VMDetails; import org.apache.cloudstack.api.BaseListTaggedResourcesCmd; @@ -203,8 +204,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..10cd22870e2 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; @@ -84,8 +85,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..6adfc03fbe5 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; @@ -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..e04112996ff 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; @@ -98,8 +99,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..a29b0fd15a7 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; @@ -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 3012780cb81..ba92a53f831 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; @@ -103,8 +104,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..6cb75c709da 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; @@ -96,8 +97,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..43ce96e7b83 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; @@ -89,8 +90,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 5db06bcd47f..ba5e4f523fd 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; @@ -126,8 +127,8 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd { return "volume"; } - 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..c7f962148b6 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; @@ -82,8 +83,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 b86155b2a6c..6d0733860aa 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; @@ -95,8 +96,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 4c78eedeb08..2e29a5554ef 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; @@ -110,8 +111,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/ResizeVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java index 871bf455529..f11727e813d 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; @@ -90,8 +91,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/vpc/CreateStaticRouteCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java index 76a76d6ddb0..ebdedf6a9be 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; @@ -140,7 +141,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..45b543f4d6f 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; @@ -119,7 +120,7 @@ public class DeleteStaticRouteCmd extends BaseAsyncCmd{ } @Override - public AsyncJob.Type getInstanceType() { - return AsyncJob.Type.StaticRoute; + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.StaticRoute; } } diff --git a/core/src/com/cloud/async/AsyncJobVO.java b/core/src/com/cloud/async/AsyncJobVO.java index 2b1d0be3da9..73e7b8c5346 100644 --- a/core/src/com/cloud/async/AsyncJobVO.java +++ b/core/src/com/cloud/async/AsyncJobVO.java @@ -84,9 +84,8 @@ public class AsyncJobVO implements AsyncJob { @Column(name="job_result", length=65535) private String result; - @Enumerated(value=EnumType.STRING) @Column(name="instance_type", length=64) - private Type instanceType; + private String instanceType; @Column(name="instance_id", length=64) private Long instanceId; @@ -124,7 +123,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, String instanceType) { this.userId = userId; this.accountId = accountId; this.cmd = cmd; @@ -319,11 +318,11 @@ public class AsyncJobVO implements AsyncJob { } @Override - public Type getInstanceType() { + public String getInstanceType() { return instanceType; } - public void setInstanceType(Type instanceType) { + public void setInstanceType(String instanceType) { this.instanceType = instanceType; } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java index d79b10f3ecb..c267e5515f1 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java @@ -72,13 +72,13 @@ public class DataCenterResourceManagerImpl implements DataCenterResourceManager public boolean changeState(DataCenterResourceEntity entity, Event event) throws NoTransitionException { if(entity instanceof ZoneEntity){ - return _stateMachine.transitTo(entity, event, null, null, _dataCenterDao); + return _stateMachine.transitTo(entity, event, null, _dataCenterDao); }else if(entity instanceof PodEntity){ - return _stateMachine.transitTo(entity, event, null, null, _podDao); + return _stateMachine.transitTo(entity, event, null, _podDao); }else if(entity instanceof ClusterEntity){ - return _stateMachine.transitTo(entity, event, null, null, _clusterDao); + return _stateMachine.transitTo(entity, event, null, _clusterDao); }else if(entity instanceof HostEntity){ - return _stateMachine.transitTo(entity, event, null, null, _hostDao); + return _stateMachine.transitTo(entity, event, null, _hostDao); } return false; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java index efc6056fc2a..1f0bd4d84af 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java @@ -253,7 +253,7 @@ public class EngineClusterDaoImpl extends GenericDaoBase } @Override - public boolean updateState(State currentState, Event event, State nextState, DataCenterResourceEntity clusterEntity, String eventArgs, Object data) { + public boolean updateState(State currentState, Event event, State nextState, DataCenterResourceEntity clusterEntity, Object data) { EngineClusterVO vo = findById(clusterEntity.getId()); diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java index d03739bbbf0..f99bc6c0c09 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java @@ -291,7 +291,7 @@ public class EngineDataCenterDaoImpl extends GenericDaoBase implem @Override - public boolean updateState(State currentState, DataCenterResourceEntity.State.Event event, State nextState, DataCenterResourceEntity hostEntity, String eventArgs, Object data) { + public boolean updateState(State currentState, DataCenterResourceEntity.State.Event event, State nextState, DataCenterResourceEntity hostEntity, Object data) { EngineHostVO vo = findById(hostEntity.getId()); Date oldUpdatedTime = vo.getLastUpdated(); diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java index c56d896582a..fee083a39a0 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java @@ -148,7 +148,7 @@ public class EngineHostPodDaoImpl extends GenericDaoBase @Override - public boolean updateState(State currentState, Event event, State nextState, DataCenterResourceEntity podEntity, String eventArgs, Object data) { + public boolean updateState(State currentState, Event event, State nextState, DataCenterResourceEntity podEntity, Object data) { EngineHostPodVO vo = findById(podEntity.getId()); diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java index d3db71a13dc..b6c20046c1c 100644 --- a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java +++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java @@ -165,7 +165,7 @@ public class TemplateObject implements TemplateInfo { } public boolean stateTransit(TemplateEvent e) throws NoTransitionException { - boolean result= imageMgr.getStateMachine().transitTo(this.imageVO, e, null, null, + boolean result= imageMgr.getStateMachine().transitTo(this.imageVO, e, null, imageDao); this.imageVO = imageDao.findById(this.imageVO.getId()); return result; diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java index b7abc7d0864..aa1cf684d7a 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java @@ -49,6 +49,6 @@ SnapshotStateMachineManager { } public void processEvent(SnapshotVO snapshot, Event event) throws NoTransitionException { - stateMachine.transitTo(snapshot, event, null, null, snapshotDao); + stateMachine.transitTo(snapshot, event, null, snapshotDao); } } diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java index f4408af2229..87ba1d216c5 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java @@ -135,7 +135,7 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager { if (data.getType() == DataObjectType.TEMPLATE && data.getDataStore().getRole() == DataStoreRole.Primary) { try { - this.stateMachines.transitTo(obj, event, null, null, + this.stateMachines.transitTo(obj, event, null, templatePoolDao); } catch (NoTransitionException e) { if (event == Event.CreateOnlyRequested || event == Event.OperationSuccessed) { @@ -145,7 +145,7 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager { } } } else { - this.stateMachines.transitTo(obj, event, null, null, objectDataStoreDao); + this.stateMachines.transitTo(obj, event, null, objectDataStoreDao); } return true; } diff --git a/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java index bebf15018d1..9965d60b23d 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java @@ -49,7 +49,7 @@ public class ObjectInDataStoreDaoImpl extends GenericDaoBase implements Vo } @Override - public boolean updateState(Volume.State currentState, Volume.Event event, Volume.State nextState, VolumeVO vo, String eventArgs, Object data) { + public boolean updateState(Volume.State currentState, Volume.Event event, Volume.State nextState, VolumeVO vo, Object data) { Long oldUpdated = vo.getUpdatedCount(); Date oldUpdatedTime = vo.getUpdated(); diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java index e0c50ff7d31..ceadb253976 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java @@ -99,7 +99,7 @@ public class VolumeObject implements VolumeInfo { public boolean stateTransit(Volume.Event event) { boolean result = false; try { - result = _volStateMachine.transitTo(volumeVO, event, null, null, volumeDao); + result = _volStateMachine.transitTo(volumeVO, event, null, volumeDao); volumeVO = volumeDao.findById(volumeVO.getId()); } catch (NoTransitionException e) { String errorMessage = "Failed to transit volume: " + this.getVolumeId() + ", due to: " + e.toString(); diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java index b5fdc9f5f5c..b41d6ca0426 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java @@ -77,12 +77,12 @@ public class BaremetalManagerImpl extends ManagerBase implements BaremetalManage } @Override - public boolean preStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, boolean status, String eventArgs, Object opaque) { + public boolean preStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, boolean status, Object opaque) { return false; } @Override - public boolean postStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, boolean status, String eventArgs, Object opaque) { + public boolean postStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, boolean status, Object opaque) { if (newState != State.Starting && newState != State.Error && newState != State.Expunging) { return true; } diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java index cdafa5a2737..49bb719b3f0 100755 --- a/server/src/com/cloud/api/ApiDBUtils.java +++ b/server/src/com/cloud/api/ApiDBUtils.java @@ -25,6 +25,7 @@ import java.util.Set; import javax.annotation.PostConstruct; import javax.inject.Inject; +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; @@ -249,6 +250,7 @@ import com.cloud.user.dao.SSHKeyPairDao; import com.cloud.user.dao.UserDao; import com.cloud.user.dao.UserStatisticsDao; import com.cloud.uservm.UserVm; +import com.cloud.utils.EnumUtils; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; import com.cloud.vm.ConsoleProxyVO; @@ -1257,113 +1259,115 @@ public class ApiDBUtils { if ( job == null ) return null; String jobInstanceId = null; - if (job.getInstanceType() == AsyncJob.Type.Volume) { + ApiCommandJobType jobInstanceType = EnumUtils.fromString(ApiCommandJobType.class, job.getInstanceType(), ApiCommandJobType.None); + + if (jobInstanceType == 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 (jobInstanceType == jobInstanceType.Template || jobInstanceType == jobInstanceType.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 (jobInstanceType == jobInstanceType.VirtualMachine || jobInstanceType == jobInstanceType.ConsoleProxy + || jobInstanceType == jobInstanceType.SystemVm || jobInstanceType == jobInstanceType.DomainRouter) { VMInstanceVO vm = ApiDBUtils.findVMInstanceById(job.getInstanceId()); if (vm != null) { jobInstanceId = vm.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.Snapshot) { + } else if (jobInstanceType == jobInstanceType.Snapshot) { Snapshot snapshot = ApiDBUtils.findSnapshotById(job.getInstanceId()); if (snapshot != null) { jobInstanceId = snapshot.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.Host) { + } else if (jobInstanceType == jobInstanceType.Host) { Host host = ApiDBUtils.findHostById(job.getInstanceId()); if (host != null) { jobInstanceId = host.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.StoragePool) { + } else if (jobInstanceType == jobInstanceType.StoragePool) { StoragePoolVO spool = ApiDBUtils.findStoragePoolById(job.getInstanceId()); if (spool != null) { jobInstanceId = spool.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.IpAddress) { + } else if (jobInstanceType == jobInstanceType.IpAddress) { IPAddressVO ip = ApiDBUtils.findIpAddressById(job.getInstanceId()); if (ip != null) { jobInstanceId = ip.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.SecurityGroup) { + } else if (jobInstanceType == jobInstanceType.SecurityGroup) { SecurityGroup sg = ApiDBUtils.findSecurityGroupById(job.getInstanceId()); if (sg != null) { jobInstanceId = sg.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.PhysicalNetwork) { + } else if (jobInstanceType == jobInstanceType.PhysicalNetwork) { PhysicalNetworkVO pnet = ApiDBUtils.findPhysicalNetworkById(job.getInstanceId()); if (pnet != null) { jobInstanceId = pnet.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.TrafficType) { + } else if (jobInstanceType == jobInstanceType.TrafficType) { PhysicalNetworkTrafficTypeVO trafficType = ApiDBUtils.findPhysicalNetworkTrafficTypeById(job.getInstanceId()); if (trafficType != null) { jobInstanceId = trafficType.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.PhysicalNetworkServiceProvider) { + } else if (jobInstanceType == jobInstanceType.PhysicalNetworkServiceProvider) { PhysicalNetworkServiceProvider sp = ApiDBUtils.findPhysicalNetworkServiceProviderById(job.getInstanceId()); if (sp != null) { jobInstanceId = sp.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.FirewallRule) { + } else if (jobInstanceType == jobInstanceType.FirewallRule) { FirewallRuleVO fw = ApiDBUtils.findFirewallRuleById(job.getInstanceId()); if (fw != null) { jobInstanceId = fw.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.Account) { + } else if (jobInstanceType == jobInstanceType.Account) { Account acct = ApiDBUtils.findAccountById(job.getInstanceId()); if (acct != null) { jobInstanceId = acct.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.User) { + } else if (jobInstanceType == jobInstanceType.User) { User usr = ApiDBUtils.findUserById(job.getInstanceId()); if (usr != null) { jobInstanceId = usr.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.StaticRoute) { + } else if (jobInstanceType == jobInstanceType.StaticRoute) { StaticRouteVO route = ApiDBUtils.findStaticRouteById(job.getInstanceId()); if (route != null) { jobInstanceId = route.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.PrivateGateway) { + } else if (jobInstanceType == jobInstanceType.PrivateGateway) { VpcGatewayVO gateway = ApiDBUtils.findVpcGatewayById(job.getInstanceId()); if (gateway != null) { jobInstanceId = gateway.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.Counter) { + } else if (jobInstanceType == jobInstanceType.Counter) { CounterVO counter = ApiDBUtils.getCounter(job.getInstanceId()); if (counter != null) { jobInstanceId = counter.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.Condition) { + } else if (jobInstanceType == jobInstanceType.Condition) { ConditionVO condition = ApiDBUtils.findConditionById(job.getInstanceId()); if (condition != null) { jobInstanceId = condition.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.AutoScalePolicy) { + } else if (jobInstanceType == jobInstanceType.AutoScalePolicy) { AutoScalePolicyVO policy = ApiDBUtils.findAutoScalePolicyById(job.getInstanceId()); if (policy != null) { jobInstanceId = policy.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.AutoScaleVmProfile) { + } else if (jobInstanceType == jobInstanceType.AutoScaleVmProfile) { AutoScaleVmProfileVO profile = ApiDBUtils.findAutoScaleVmProfileById(job.getInstanceId()); if (profile != null) { jobInstanceId = profile.getUuid(); } - } else if (job.getInstanceType() == AsyncJob.Type.AutoScaleVmGroup) { + } else if (jobInstanceType == jobInstanceType.AutoScaleVmGroup) { AutoScaleVmGroupVO group = ApiDBUtils.findAutoScaleVmGroupById(job.getInstanceId()); if (group != null) { jobInstanceId = group.getUuid(); } - } else if (job.getInstanceType() != AsyncJob.Type.None) { + } else if (jobInstanceType != jobInstanceType.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/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index 42c5a739b56..ca5dfd63571 100755 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -428,7 +428,8 @@ public class ApiServer implements HttpRequestHandler, ApiServerService { Long instanceId = (objectId == null) ? asyncCmd.getInstanceId() : objectId; AsyncJobVO job = new AsyncJobVO(callerUserId, caller.getId(), cmdObj.getClass().getName(), - ApiGsonHelper.getBuilder().create().toJson(params), instanceId, asyncCmd.getInstanceType()); + ApiGsonHelper.getBuilder().create().toJson(params), instanceId, + asyncCmd.getInstanceType() != null ? asyncCmd.getInstanceType().toString() : null); long jobId = _asyncMgr.submitAsyncJob(job); @@ -483,9 +484,9 @@ public class ApiServer implements HttpRequestHandler, ApiServerService { // list all jobs for ROOT admin if (account.getType() == Account.ACCOUNT_TYPE_ADMIN) { - jobs = _asyncMgr.findInstancePendingAsyncJobs(command.getInstanceType(), null); + jobs = _asyncMgr.findInstancePendingAsyncJobs(command.getInstanceType().toString(), null); } else { - jobs = _asyncMgr.findInstancePendingAsyncJobs(command.getInstanceType(), account.getId()); + jobs = _asyncMgr.findInstancePendingAsyncJobs(command.getInstanceType().toString(), account.getId()); } if (jobs.size() == 0) { diff --git a/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java b/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java index 39bcb1777e6..83066c7f312 100644 --- a/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java +++ b/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java @@ -19,12 +19,9 @@ package com.cloud.api.query.vo; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -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.Identity; import org.apache.cloudstack.api.InternalIdentity; @@ -52,7 +49,6 @@ public class AsyncJobJoinVO extends BaseViewVO implements InternalIdentity, Iden @Column(name="account_type") private short accountType; - @Column(name="domain_id") private long domainId; @@ -65,7 +61,6 @@ public class AsyncJobJoinVO extends BaseViewVO implements InternalIdentity, Iden @Column(name="domain_path") private String domainPath = null; - @Column(name="user_id") private long userId; @@ -93,9 +88,8 @@ public class AsyncJobJoinVO extends BaseViewVO implements InternalIdentity, Iden @Column(name=GenericDao.REMOVED_COLUMN) private Date removed; - @Enumerated(value=EnumType.STRING) @Column(name="instance_type", length=64) - private Type instanceType; + private String instanceType; @Column(name="instance_id", length=64) private Long instanceId; @@ -301,12 +295,12 @@ public class AsyncJobJoinVO extends BaseViewVO implements InternalIdentity, Iden } - public Type getInstanceType() { + public String getInstanceType() { return instanceType; } - public void setInstanceType(Type instanceType) { + public void setInstanceType(String instanceType) { this.instanceType = instanceType; } diff --git a/server/src/com/cloud/async/AsyncJobManager.java b/server/src/com/cloud/async/AsyncJobManager.java index 0fbb785e1fb..76f56009d83 100644 --- a/server/src/com/cloud/async/AsyncJobManager.java +++ b/server/src/com/cloud/async/AsyncJobManager.java @@ -25,7 +25,7 @@ public interface AsyncJobManager extends Manager { public AsyncJobVO getAsyncJob(long jobId); - public List findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId); + public List findInstancePendingAsyncJobs(String instanceType, Long accountId); public long submitAsyncJob(AsyncJob job); public long submitAsyncJob(AsyncJob job, boolean scheduleJobExecutionInContext); diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java index 3fbad86b352..c69877eec8b 100644 --- a/server/src/com/cloud/async/AsyncJobManagerImpl.java +++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java @@ -104,7 +104,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, } @Override - public List findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId) { + public List findInstancePendingAsyncJobs(String instanceType, Long accountId) { return _jobDao.findInstancePendingAsyncJobs(instanceType, accountId); } diff --git a/server/src/com/cloud/async/dao/AsyncJobDao.java b/server/src/com/cloud/async/dao/AsyncJobDao.java index 9d207593574..1d68b794533 100644 --- a/server/src/com/cloud/async/dao/AsyncJobDao.java +++ b/server/src/com/cloud/async/dao/AsyncJobDao.java @@ -19,13 +19,12 @@ package com.cloud.async.dao; import java.util.Date; import java.util.List; -import com.cloud.async.AsyncJob; 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(String instanceType, Long accountId); List getExpiredJobs(Date cutTime, int limit); void resetJobProcess(long msid, int jobResultCode, String jobResultMessage); } diff --git a/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java b/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java index 0eee76baec5..0e51b3af0eb 100644 --- a/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java +++ b/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java @@ -82,7 +82,7 @@ public class AsyncJobDaoImpl extends GenericDaoBase implements return null; } - public List findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId) { + public List findInstancePendingAsyncJobs(String instanceType, Long accountId) { SearchCriteria sc = pendingAsyncJobsSearch.create(); sc.setParameters("instanceType", instanceType); diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java index 5af0af00ae4..7f3ac65ab2c 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java @@ -252,7 +252,7 @@ public class SnapshotSchedulerImpl extends ManagerBase implements SnapshotSchedu AsyncJobVO job = new AsyncJobVO(User.UID_SYSTEM, volume.getAccountId(), CreateSnapshotCmd.class.getName(), ApiGsonHelper.getBuilder().create().toJson(params), cmd.getEntityId(), - cmd.getInstanceType()); + cmd.getInstanceType() != null ? cmd.getInstanceType().toString() : null); long jobId = _asyncMgr.submitAsyncJob(job);