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

More refactoring for decoupling

This commit is contained in:
Kelven Yang 2013-04-22 18:16:33 -07:00
parent f640a416d1
commit 360a48bc7f
127 changed files with 417 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();

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

@ -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
}

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

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

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

@ -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;
}
}

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.account;
import javax.inject.Inject;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -107,7 +108,7 @@ public class DeleteAccountCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Account;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Account;
}
}

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.account;
import javax.inject.Inject;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -128,7 +129,7 @@ public class DisableAccountCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Account;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Account;
}
}

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

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.admin.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -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

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

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.admin.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.host;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.host;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.host;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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() {

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -129,7 +130,7 @@ public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PhysicalNetworkServiceProvider;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PhysicalNetworkServiceProvider;
}
}

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -167,7 +168,7 @@ public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PhysicalNetwork;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PhysicalNetwork;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.network;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -100,7 +101,7 @@ public class DeleteNetworkServiceProviderCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PhysicalNetworkServiceProvider;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PhysicalNetworkServiceProvider;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.network;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -90,7 +91,7 @@ public class DeletePhysicalNetworkCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PhysicalNetwork;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PhysicalNetwork;
}
}

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -103,8 +104,8 @@ public class UpdateNetworkServiceProviderCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PhysicalNetworkServiceProvider;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PhysicalNetworkServiceProvider;
}
}

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.network;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.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;
}
}

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

@ -21,6 +21,7 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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() {

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.router;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.router;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.router;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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() {

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.router;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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() {

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.router;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.storage;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.storage;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.storage;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.systemvm;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.systemvm;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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() {

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.systemvm;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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() {

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.systemvm;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.usage;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -149,7 +150,7 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.TrafficType;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.TrafficType;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.usage;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -88,8 +89,8 @@ public class DeleteTrafficTypeCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.TrafficType;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.TrafficType;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.usage;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -110,7 +111,7 @@ public class UpdateTrafficTypeCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.TrafficType;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.TrafficType;
}
}

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.user;
import javax.inject.Inject;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -104,7 +105,7 @@ public class DisableUserCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.User;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.User;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.vpc;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -174,7 +175,7 @@ public class CreatePrivateGatewayCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PrivateGateway;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PrivateGateway;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.admin.vpc;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -107,8 +108,8 @@ public class DeletePrivateGatewayCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.PrivateGateway;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.PrivateGateway;
}
}

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

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.admin.zone;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.address;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -265,8 +266,8 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.IpAddress;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.IpAddress;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.address;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -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;
}

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -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

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -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

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

@ -20,6 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -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

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

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -97,7 +98,7 @@ public class DeleteAutoScalePolicyCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScalePolicy;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScalePolicy;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -97,7 +98,7 @@ public class DeleteAutoScaleVmGroupCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmGroup;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -96,7 +97,7 @@ public class DeleteAutoScaleVmProfileCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmProfile;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmProfile;
}
}

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

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -94,8 +95,8 @@ public class DisableAutoScaleVmGroupCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmGroup;
}
}

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

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.user.autoscale;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -94,8 +95,8 @@ public class EnableAutoScaleVmGroupCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmGroup;
}
}

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

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -120,7 +121,7 @@ public class UpdateAutoScalePolicyCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScalePolicy;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScalePolicy;
}
}

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

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -137,7 +138,7 @@ public class UpdateAutoScaleVmGroupCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmGroup;
}
}

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

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.Map;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -131,7 +132,7 @@ public class UpdateAutoScaleVmProfileCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.AutoScaleVmProfile;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.AutoScaleVmProfile;
}
}

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

@ -22,6 +22,7 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

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

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.firewall;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.user.firewall;
import org.apache.cloudstack.api.APICommand;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -116,7 +117,7 @@ public class DeleteEgressFirewallRuleCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.firewall;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -115,7 +116,7 @@ public class DeleteFirewallRuleCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.firewall;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -117,7 +118,7 @@ public class DeletePortForwardingRuleCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.iso;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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() {

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.iso;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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() {

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

@ -21,6 +21,7 @@ import java.util.List;
import java.util.Set;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -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

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.loadbalancer;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@ -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;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.loadbalancer;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -112,7 +113,7 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
}

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.nat;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.nat;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -116,8 +117,8 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.FirewallRule;
}
}

5
api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
View File

@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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;
}
}

5
api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
View File

@ -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;
}
}

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

@ -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

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

@ -102,7 +102,7 @@ public class DeleteGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.GlobalLoadBalancerRule;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.GlobalLoadBalancerRule;
}
}

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

@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.securitygroup;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -78,7 +79,7 @@ public class ListSecurityGroupsCmd extends BaseListTaggedResourcesCmd {
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.SecurityGroup;
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.SecurityGroup;
}
}

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.securitygroup;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.securitygroup;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.snapshot;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.snapshot;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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() {

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

@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -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

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

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.template;
import java.util.List;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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() {

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

@ -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() {

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.template;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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() {

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

@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.template;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
@ -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() {

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

@ -21,6 +21,7 @@ import java.util.List;
import java.util.Set;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
@ -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

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

@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
@ -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

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

@ -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;
}
}

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

@ -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

5
api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
View File

@ -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() {

5
api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
View File

@ -22,6 +22,7 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.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;
}
}

5
api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
View File

@ -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

5
api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
View File

@ -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() {

5
api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java
View File

@ -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;
}
}

5
api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
View File

@ -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() {

5
api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
View File

@ -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;
}

5
api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
View File

@ -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() {

5
api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
View File

@ -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

5
api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
View File

@ -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() {

5
api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
View File

@ -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

5
api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
View File

@ -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() {

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