You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2013/04/23 03:19:25 UTC
[1/2] More refactoring for decoupling
Updated Branches:
refs/heads/vmsync f640a416d -> 360a48bc7
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
----------------------------------------------------------------------
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 88fa400..ec31f16 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
----------------------------------------------------------------------
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 4cb5288..dfb99b9 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
----------------------------------------------------------------------
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 b736b03..04a5421 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
----------------------------------------------------------------------
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 2e30701..ac889c0 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
----------------------------------------------------------------------
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 2a2444b..59cd6bc 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
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 cd559d8..efc6407 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
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 424b107..032fd19 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
----------------------------------------------------------------------
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 74eb5c7..5a4ff94 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
----------------------------------------------------------------------
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 22e88c2..ff5d0f1 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java
----------------------------------------------------------------------
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 670124d..fb1aa20 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
----------------------------------------------------------------------
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 8e7f2ec..f24fc90 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
----------------------------------------------------------------------
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 1d45064..1a5cda4 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
----------------------------------------------------------------------
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 95d7659..53bd6a0 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java
----------------------------------------------------------------------
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 6f37af8..e7ae66a 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
----------------------------------------------------------------------
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 17f20ae..04e627c 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
----------------------------------------------------------------------
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 a4f0582..b21db21 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
----------------------------------------------------------------------
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 ba1f924..f7282ca 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
----------------------------------------------------------------------
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 1f030a5..d649443 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
----------------------------------------------------------------------
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 9a2dee3..b9553b9 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
----------------------------------------------------------------------
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 aeb76f5..6feb3e4 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
----------------------------------------------------------------------
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 c9da0c2..bca1e1d 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
----------------------------------------------------------------------
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 df6b399..b7c1412 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
----------------------------------------------------------------------
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 21a45f8..28a623a 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
----------------------------------------------------------------------
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 567768d..e9a62eb 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
----------------------------------------------------------------------
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 4c4e1f7..2641947 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
----------------------------------------------------------------------
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 30f03b8..c73e570 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
----------------------------------------------------------------------
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 6838b96..10cd228 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java
----------------------------------------------------------------------
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 21a9a0c..6adfc03 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
----------------------------------------------------------------------
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 80f3e85..e041129 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
----------------------------------------------------------------------
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 3d1da15..a29b0fd 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;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
----------------------------------------------------------------------
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 3012780..ba92a53 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
----------------------------------------------------------------------
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 d66c334..6cb75c7 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
----------------------------------------------------------------------
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 e577e35..43ce96e 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
----------------------------------------------------------------------
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 5db06bc..ba5e4f5 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
----------------------------------------------------------------------
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 9a5929e..c7f9621 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
----------------------------------------------------------------------
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 b86155b..6d07338 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
----------------------------------------------------------------------
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 4c78eed..2e29a55 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
----------------------------------------------------------------------
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 871bf45..f11727e 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
----------------------------------------------------------------------
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 76a76d6..ebdedf6 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java
----------------------------------------------------------------------
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 e43412a..45b543f 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/core/src/com/cloud/async/AsyncJobVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/async/AsyncJobVO.java b/core/src/com/cloud/async/AsyncJobVO.java
index 2b1d0be..73e7b8c 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;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java
----------------------------------------------------------------------
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 d79b10f..c267e55 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;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java
----------------------------------------------------------------------
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 efc6056..1f0bd4d 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<EngineClusterVO, Long>
}
@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());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java
----------------------------------------------------------------------
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 d03739b..f99bc6c 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<EngineDataCenterVO,
@Override
- public boolean updateState(State currentState, Event event, State nextState, DataCenterResourceEntity zoneEntity, String eventArgs, Object data) {
+ public boolean updateState(State currentState, Event event, State nextState, DataCenterResourceEntity zoneEntity, Object data) {
EngineDataCenterVO vo = findById(zoneEntity.getId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
index bb8bd4d..3c34023 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
@@ -645,7 +645,7 @@ public class EngineHostDaoImpl extends GenericDaoBase<EngineHostVO, Long> 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();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java
----------------------------------------------------------------------
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 c56d896..fee083a 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<EngineHostPodVO, Long>
@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());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
----------------------------------------------------------------------
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 d3db71a..b6c2004 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;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java
----------------------------------------------------------------------
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 b7abc7d..aa1cf68 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);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
----------------------------------------------------------------------
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 f4408af..87ba1d2 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;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java
----------------------------------------------------------------------
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 bebf150..9965d60 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<ObjectInDataStoreVO
}
@Override
public boolean updateState(State currentState, Event event,
- State nextState, DataObjectInStore dataObj, String eventArgs, Object data) {
+ State nextState, DataObjectInStore dataObj, Object data) {
ObjectInDataStoreVO vo = (ObjectInDataStoreVO)dataObj;
Long oldUpdated = vo.getUpdatedCount();
Date oldUpdatedTime = vo.getUpdated();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDaoImpl.java
index b4cfd77..ad56150 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDaoImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDaoImpl.java
@@ -63,7 +63,7 @@ public class TemplatePrimaryDataStoreDaoImpl extends GenericDaoBase<TemplatePrim
}
@Override
- public boolean updateState(State currentState, Event event, State nextState, TemplatePrimaryDataStoreVO vo, String eventArgs, Object data) {
+ public boolean updateState(State currentState, Event event, State nextState, TemplatePrimaryDataStoreVO vo, Object data) {
Long oldUpdated = vo.getUpdatedCount();
Date oldUpdatedTime = vo.getLastUpdated();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/engine/storage/src/org/apache/cloudstack/storage/volume/db/VolumeDao2Impl.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/db/VolumeDao2Impl.java b/engine/storage/src/org/apache/cloudstack/storage/volume/db/VolumeDao2Impl.java
index 7f40388..d8497e2 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/volume/db/VolumeDao2Impl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/volume/db/VolumeDao2Impl.java
@@ -338,7 +338,7 @@ public class VolumeDao2Impl extends GenericDaoBase<VolumeVO, Long> 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();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
----------------------------------------------------------------------
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 e0c50ff..ceadb25 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();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
----------------------------------------------------------------------
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 b5fdc9f..b41d6ca 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;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/server/src/com/cloud/api/ApiDBUtils.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java
index cdafa5a..49bb719 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index 42c5a73..ca5dfd6 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) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java b/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java
index 39bcb17..83066c7 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;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/server/src/com/cloud/async/AsyncJobManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/async/AsyncJobManager.java b/server/src/com/cloud/async/AsyncJobManager.java
index 0fbb785..76f5600 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<? extends AsyncJob> findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId);
+ public List<? extends AsyncJob> findInstancePendingAsyncJobs(String instanceType, Long accountId);
public long submitAsyncJob(AsyncJob job);
public long submitAsyncJob(AsyncJob job, boolean scheduleJobExecutionInContext);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/server/src/com/cloud/async/AsyncJobManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java
index 3fbad86..c69877e 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<AsyncJobVO> findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId) {
+ public List<AsyncJobVO> findInstancePendingAsyncJobs(String instanceType, Long accountId) {
return _jobDao.findInstancePendingAsyncJobs(instanceType, accountId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/server/src/com/cloud/async/dao/AsyncJobDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/async/dao/AsyncJobDao.java b/server/src/com/cloud/async/dao/AsyncJobDao.java
index 9d20759..1d68b79 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, Long> {
AsyncJobVO findInstancePendingAsyncJob(String instanceType, long instanceId);
- List<AsyncJobVO> findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId);
+ List<AsyncJobVO> findInstancePendingAsyncJobs(String instanceType, Long accountId);
List<AsyncJobVO> getExpiredJobs(Date cutTime, int limit);
void resetJobProcess(long msid, int jobResultCode, String jobResultMessage);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java b/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java
index 0eee76b..0e51b3a 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<AsyncJobVO, Long> implements
return null;
}
- public List<AsyncJobVO> findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId) {
+ public List<AsyncJobVO> findInstancePendingAsyncJobs(String instanceType, Long accountId) {
SearchCriteria<AsyncJobVO> sc = pendingAsyncJobsSearch.create();
sc.setParameters("instanceType", instanceType);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
index 5af0af0..7f3ac65 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);
[2/2] git commit: updated refs/heads/vmsync to 360a48b
Posted by ke...@apache.org.
More refactoring for decoupling
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/360a48bc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/360a48bc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/360a48bc
Branch: refs/heads/vmsync
Commit: 360a48bc7f9fcf3be0870236d2ed857d815e82dd
Parents: f640a41
Author: Kelven Yang <ke...@gmail.com>
Authored: Mon Apr 22 18:16:33 2013 -0700
Committer: Kelven Yang <ke...@gmail.com>
Committed: Mon Apr 22 18:16:33 2013 -0700
----------------------------------------------------------------------
api/src/com/cloud/async/AsyncJob.java | 5 +-
.../apache/cloudstack/api/ApiCommandJobType.java | 48 ++++++++++++++
.../org/apache/cloudstack/api/BaseAsyncCmd.java | 4 +-
api/src/org/apache/cloudstack/api/BaseListCmd.java | 4 +-
.../command/admin/account/DeleteAccountCmd.java | 5 +-
.../command/admin/account/DisableAccountCmd.java | 5 +-
.../command/admin/autoscale/CreateCounterCmd.java | 5 +-
.../command/admin/autoscale/DeleteCounterCmd.java | 5 +-
.../command/admin/host/CancelMaintenanceCmd.java | 5 +-
.../api/command/admin/host/ListHostsCmd.java | 5 +-
.../admin/host/PrepareForMaintenanceCmd.java | 5 +-
.../api/command/admin/host/ReconnectHostCmd.java | 5 +-
.../network/AddNetworkServiceProviderCmd.java | 5 +-
.../admin/network/CreatePhysicalNetworkCmd.java | 5 +-
.../network/DeleteNetworkServiceProviderCmd.java | 5 +-
.../admin/network/DeletePhysicalNetworkCmd.java | 5 +-
.../network/UpdateNetworkServiceProviderCmd.java | 5 +-
.../admin/network/UpdatePhysicalNetworkCmd.java | 5 +-
.../router/ConfigureVirtualRouterElementCmd.java | 5 +-
.../api/command/admin/router/DestroyRouterCmd.java | 5 +-
.../api/command/admin/router/ListRoutersCmd.java | 5 +-
.../api/command/admin/router/RebootRouterCmd.java | 5 +-
.../api/command/admin/router/StartRouterCmd.java | 5 +-
.../api/command/admin/router/StopRouterCmd.java | 5 +-
.../CancelPrimaryStorageMaintenanceCmd.java | 5 +-
.../command/admin/storage/ListStoragePoolsCmd.java | 5 +-
.../PreparePrimaryStorageForMaintenanceCmd.java | 5 +-
.../command/admin/systemvm/DestroySystemVmCmd.java | 5 +-
.../command/admin/systemvm/ListSystemVMsCmd.java | 5 +-
.../command/admin/systemvm/RebootSystemVmCmd.java | 5 +-
.../command/admin/systemvm/StartSystemVMCmd.java | 5 +-
.../command/admin/systemvm/StopSystemVmCmd.java | 5 +-
.../api/command/admin/usage/AddTrafficTypeCmd.java | 5 +-
.../command/admin/usage/DeleteTrafficTypeCmd.java | 5 +-
.../command/admin/usage/UpdateTrafficTypeCmd.java | 5 +-
.../api/command/admin/user/DisableUserCmd.java | 5 +-
.../command/admin/vpc/CreatePrivateGatewayCmd.java | 5 +-
.../command/admin/vpc/DeletePrivateGatewayCmd.java | 5 +-
.../admin/zone/MarkDefaultZoneForAccountCmd.java | 5 +-
.../command/user/address/AssociateIPAddrCmd.java | 5 +-
.../user/address/DisassociateIPAddrCmd.java | 5 +-
.../user/address/ListPublicIpAddressesCmd.java | 5 +-
.../user/autoscale/CreateAutoScalePolicyCmd.java | 5 +-
.../user/autoscale/CreateAutoScaleVmGroupCmd.java | 5 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 5 +-
.../command/user/autoscale/CreateConditionCmd.java | 5 +-
.../user/autoscale/DeleteAutoScalePolicyCmd.java | 5 +-
.../user/autoscale/DeleteAutoScaleVmGroupCmd.java | 5 +-
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 5 +-
.../command/user/autoscale/DeleteConditionCmd.java | 5 +-
.../user/autoscale/DisableAutoScaleVmGroupCmd.java | 5 +-
.../user/autoscale/EnableAutoScaleVmGroupCmd.java | 5 +-
.../user/autoscale/UpdateAutoScalePolicyCmd.java | 5 +-
.../user/autoscale/UpdateAutoScaleVmGroupCmd.java | 5 +-
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 5 +-
.../user/firewall/CreateEgressFirewallRuleCmd.java | 5 +-
.../user/firewall/CreateFirewallRuleCmd.java | 6 +-
.../user/firewall/CreatePortForwardingRuleCmd.java | 5 +-
.../user/firewall/DeleteEgressFirewallRuleCmd.java | 5 +-
.../user/firewall/DeleteFirewallRuleCmd.java | 5 +-
.../user/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 +-
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 5 +-
.../loadbalancer/DeleteLoadBalancerRuleCmd.java | 5 +-
.../user/nat/CreateIpForwardingRuleCmd.java | 5 +-
.../user/nat/DeleteIpForwardingRuleCmd.java | 5 +-
.../command/user/network/CreateNetworkACLCmd.java | 5 +-
.../command/user/network/DeleteNetworkACLCmd.java | 5 +-
.../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 4 +-
.../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java | 4 +-
.../AuthorizeSecurityGroupEgressCmd.java | 5 +-
.../AuthorizeSecurityGroupIngressCmd.java | 5 +-
.../user/securitygroup/ListSecurityGroupsCmd.java | 5 +-
.../RevokeSecurityGroupEgressCmd.java | 5 +-
.../RevokeSecurityGroupIngressCmd.java | 5 +-
.../command/user/snapshot/CreateSnapshotCmd.java | 5 +-
.../command/user/snapshot/DeleteSnapshotCmd.java | 5 +-
.../command/user/snapshot/ListSnapshotsCmd.java | 5 +-
.../api/command/user/template/CopyTemplateCmd.java | 5 +-
.../command/user/template/CreateTemplateCmd.java | 5 +-
.../command/user/template/DeleteTemplateCmd.java | 5 +-
.../command/user/template/ExtractTemplateCmd.java | 5 +-
.../command/user/template/ListTemplatesCmd.java | 5 +-
.../command/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 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 5 +-
.../api/command/user/vm/RebootVMCmd.java | 5 +-
.../api/command/user/vm/RemoveIpFromVmNicCmd.java | 5 +-
.../api/command/user/vm/ResetVMPasswordCmd.java | 5 +-
.../api/command/user/vm/ResetVMSSHKeyCmd.java | 5 +-
.../cloudstack/api/command/user/vm/StartVMCmd.java | 5 +-
.../cloudstack/api/command/user/vm/StopVMCmd.java | 5 +-
.../api/command/user/volume/AttachVolumeCmd.java | 5 +-
.../api/command/user/volume/CreateVolumeCmd.java | 5 +-
.../api/command/user/volume/DetachVolumeCmd.java | 5 +-
.../api/command/user/volume/ExtractVolumeCmd.java | 5 +-
.../api/command/user/volume/ListVolumesCmd.java | 5 +-
.../api/command/user/volume/ResizeVolumeCmd.java | 5 +-
.../api/command/user/vpc/CreateStaticRouteCmd.java | 5 +-
.../api/command/user/vpc/DeleteStaticRouteCmd.java | 5 +-
core/src/com/cloud/async/AsyncJobVO.java | 9 +--
.../entity/api/DataCenterResourceManagerImpl.java | 8 +-
.../entity/api/db/dao/EngineClusterDaoImpl.java | 2 +-
.../entity/api/db/dao/EngineDataCenterDaoImpl.java | 2 +-
.../entity/api/db/dao/EngineHostDaoImpl.java | 2 +-
.../entity/api/db/dao/EngineHostPodDaoImpl.java | 2 +-
.../storage/image/store/TemplateObject.java | 2 +-
.../snapshot/SnapshotStateMachineManagerImpl.java | 2 +-
.../datastore/ObjectInDataStoreManagerImpl.java | 4 +-
.../storage/db/ObjectInDataStoreDaoImpl.java | 2 +-
.../volume/db/TemplatePrimaryDataStoreDaoImpl.java | 2 +-
.../storage/volume/db/VolumeDao2Impl.java | 2 +-
.../cloudstack/storage/volume/VolumeObject.java | 2 +-
.../baremetal/manager/BaremetalManagerImpl.java | 4 +-
server/src/com/cloud/api/ApiDBUtils.java | 50 ++++++++-------
server/src/com/cloud/api/ApiServer.java | 7 +-
.../src/com/cloud/api/query/vo/AsyncJobJoinVO.java | 12 +---
server/src/com/cloud/async/AsyncJobManager.java | 2 +-
.../src/com/cloud/async/AsyncJobManagerImpl.java | 2 +-
server/src/com/cloud/async/dao/AsyncJobDao.java | 3 +-
.../src/com/cloud/async/dao/AsyncJobDaoImpl.java | 2 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 2 +-
127 files changed, 417 insertions(+), 273 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/com/cloud/async/AsyncJob.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/async/AsyncJob.java b/api/src/com/cloud/async/AsyncJob.java
index f503537..44d7339 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();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/ApiCommandJobType.java
----------------------------------------------------------------------
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 0000000..fbe22ef
--- /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
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java b/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
index f3b3170..022157a 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/BaseListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseListCmd.java b/api/src/org/apache/cloudstack/api/BaseListCmd.java
index bc0b2b8..5a57af2 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
----------------------------------------------------------------------
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 9895da1..7b7bc9a 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
----------------------------------------------------------------------
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 1f9b821..07abd21 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
----------------------------------------------------------------------
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 98ffc51..b94ff10 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
----------------------------------------------------------------------
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 35d99bb..81eaa9b 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
----------------------------------------------------------------------
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 d9e5934..431f961 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
----------------------------------------------------------------------
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 29844c3..a33407e 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
----------------------------------------------------------------------
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 c1a83fa..f198bea 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
----------------------------------------------------------------------
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 b151865..2633914 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
----------------------------------------------------------------------
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 2c6cc60..50ebd26 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
----------------------------------------------------------------------
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 fb6db61..5b1e530 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
----------------------------------------------------------------------
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 cbcf29b..ecaa075 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
----------------------------------------------------------------------
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 c7dd93c..04cc9a2 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
----------------------------------------------------------------------
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 4364b2d..67f9585 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
----------------------------------------------------------------------
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 06cf38d..4ef33ba 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
----------------------------------------------------------------------
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 f19e0fa..dd55969 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
----------------------------------------------------------------------
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 3efc865..20d8e97 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
----------------------------------------------------------------------
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 d2b26c0..94480e0 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
----------------------------------------------------------------------
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 c9b518f..508e56f 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
----------------------------------------------------------------------
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 1d3930b..0b30055 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
----------------------------------------------------------------------
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 60dd938..251f489 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java
----------------------------------------------------------------------
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 b50cb27..67f0a4b 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
----------------------------------------------------------------------
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 02b9803..ba20053 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java
----------------------------------------------------------------------
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 95a9214..b553748 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
----------------------------------------------------------------------
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 ef7af5c..962cec2 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
----------------------------------------------------------------------
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 f230a20..d290f19 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
----------------------------------------------------------------------
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 6e4c925..b7d97e2 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
----------------------------------------------------------------------
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 f97d899..622f7af 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
----------------------------------------------------------------------
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 5f9a3ef..fb87d02 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
----------------------------------------------------------------------
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 7211bae..a5333dd 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
----------------------------------------------------------------------
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 32e0512..007e01f 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
----------------------------------------------------------------------
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 d3cf3f8..b6b9a05 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
----------------------------------------------------------------------
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 6eaa46b..65569d0 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
----------------------------------------------------------------------
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 9fd736f..c9a29cc 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
----------------------------------------------------------------------
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 182a19e..035f499 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
----------------------------------------------------------------------
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 858457b..a76e7cf 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
----------------------------------------------------------------------
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 406f782..34c9c97 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
----------------------------------------------------------------------
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 8271119..22d07ce 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
----------------------------------------------------------------------
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 ac0f823..92a49b9 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;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
----------------------------------------------------------------------
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 f6e4f96..cf22647 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
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 135c877..af79091 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
----------------------------------------------------------------------
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 87d4466..5189b25 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
----------------------------------------------------------------------
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 3eff5d0..3b36f81 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
----------------------------------------------------------------------
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 f8b3595..b009085 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
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 d010736..035d073 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
----------------------------------------------------------------------
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 c55973c..c11bbdb 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
----------------------------------------------------------------------
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 57e38f9..fbc0683 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
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 5d2fb4b..04d9b8e 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
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 5cb7e56..b8b3a48 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
----------------------------------------------------------------------
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 fbe2be8..59afe39 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
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 5acfb94..ccff796 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
----------------------------------------------------------------------
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 34def9d..eff38b2 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
----------------------------------------------------------------------
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 097b2c5..f1a53b1 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
----------------------------------------------------------------------
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 b7cb471..b94ea17 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
----------------------------------------------------------------------
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 4012852..1a15561 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
----------------------------------------------------------------------
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 0e1d486..f738349 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
----------------------------------------------------------------------
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 b900828..d1b8afc 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
----------------------------------------------------------------------
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 8388595..f64db9f 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;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
----------------------------------------------------------------------
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 c821775..7f1c3bf 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
----------------------------------------------------------------------
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 08a15ee..69b7f61 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() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
----------------------------------------------------------------------
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 3219601..4ee5d24 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360a48bc/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
----------------------------------------------------------------------
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 5f1d97b..ea3eccc 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;
}
}