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

Revert "bug 13860: Added async job types to Account/User Async api commands and more logging." 

This reverts commit 9dc78942fe2183bcd6e552e23cef185c377104a4.
Reviewed-by: Will Chan
This commit is contained in:
Alena Prokharchyk 2012-02-27 13:56:43 -08:00
parent 92c8a1d4d4
commit 8124a084e4
5 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/com/cloud/api/commands/DeleteAccountCmd.java
View File

@ -28,7 +28,6 @@ import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.SuccessResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.user.User;
@ -103,9 +102,4 @@ public class DeleteAccountCmd extends BaseAsyncCmd {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete user account and all corresponding users");
}
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Account;
}
}

6
api/src/com/cloud/api/commands/DisableAccountCmd.java
View File

@ -27,7 +27,6 @@ import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.AccountResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.ResourceUnavailableException;
@ -121,10 +120,5 @@ public class DisableAccountCmd extends BaseAsyncCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, lockRequested == true ? "Failed to lock account" : "Failed to disable account" );
}
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Account;
}
}

6
api/src/com/cloud/api/commands/DisableUserCmd.java
View File

@ -27,7 +27,6 @@ import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.UserResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.user.User;
@ -96,10 +95,5 @@ public class DisableUserCmd extends BaseAsyncCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to disable user");
}
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.User;
}
}

12
api/src/com/cloud/api/response/AsyncJobResponse.java
View File

@ -19,8 +19,6 @@ package com.cloud.api.response;
import java.util.Date;
import org.apache.log4j.Logger;
import com.cloud.api.ApiConstants;
import com.cloud.api.IdentityProxy;
import com.cloud.api.ResponseObject;
@ -30,8 +28,6 @@ import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
public class AsyncJobResponse extends BaseResponse {
private static final Logger s_logger = Logger.getLogger(AsyncJobResponse.class.getName());
@SerializedName("accountid") @Param(description="the account that executed the async command")
private IdentityProxy accountId = new IdentityProxy("account");
@ -125,14 +121,10 @@ public class AsyncJobResponse extends BaseResponse {
this.jobInstanceId.setTableName("physical_network_traffic_types");
} else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.PhysicalNetworkServiceProvider.toString())) {
this.jobInstanceId.setTableName("physical_network_service_providers");
} else if (!jobInstanceType.equalsIgnoreCase(AsyncJob.Type.None.toString())){
} else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.FirewallRule.toString())) {
this.jobInstanceId.setTableName("firewall_rules");
} else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Account.toString())) {
this.jobInstanceId.setTableName("account");
} else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.User.toString())) {
this.jobInstanceId.setTableName("user");
} else if (!jobInstanceType.equalsIgnoreCase(AsyncJob.Type.None.toString())){
s_logger.warn("Failed to get async job instanceId for job instance type " + jobInstanceType);
} else if (!jobInstanceType.equalsIgnoreCase(AsyncJob.Type.None.toString())){
// TODO : when we hit here, we need to add instanceType -> UUID entity table mapping
assert(false);
}

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

@ -39,9 +39,7 @@ public interface AsyncJob extends Identity {
PhysicalNetwork,
TrafficType,
PhysicalNetworkServiceProvider,
FirewallRule,
Account,
User
FirewallRule
}
Long getId();