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

bug 13860: set entity type in a bunch of async api commands 

status 13860: resolved fixed
Reviewed-by: Prachi Damle
This commit is contained in:
Alena Prokharchyk 2012-02-17 14:04:26 -08:00
parent 80e4b5ef7c
commit cf28936b5f
10 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.FirewallResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.NetworkRuleConflictException;
@ -301,5 +302,10 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal
return FirewallRuleType.User;
}
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
}
}

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

@ -32,6 +32,7 @@ import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.FirewallRuleResponse;
import com.cloud.api.response.IpForwardingRuleResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.NetworkRuleConflictException;
@ -298,5 +299,10 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
public FirewallRuleType getType() {
return FirewallRuleType.User;
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
}
}

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

@ -31,6 +31,7 @@ import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.LoadBalancerResponse;
import com.cloud.async.AsyncJob;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.event.EventTypes;
@ -347,6 +348,11 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements
public void setSourceIpAddressId(Long ipId) {
this.publicIpId = ipId;
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
}
}

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

@ -31,6 +31,7 @@ import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.FirewallRuleResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.NetworkRuleConflictException;
@ -307,5 +308,10 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P
public FirewallRuleType getType() {
return FirewallRuleType.User;
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
}
}

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

@ -27,6 +27,7 @@ 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.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
@ -112,4 +113,9 @@ public class DeleteFirewallRuleCmd extends BaseAsyncCmd {
public Long getSyncObjId() {
return _firewallService.getFirewallRule(id).getNetworkId();
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
}
}

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

@ -28,6 +28,7 @@ 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.exception.InvalidParameterValueException;
import com.cloud.network.rules.FirewallRule;
@ -115,5 +116,10 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
public Long getSyncObjId() {
return _rulesService.getFirewallRule(id).getNetworkId();
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
}
}

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

@ -27,6 +27,7 @@ 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.exception.InvalidParameterValueException;
import com.cloud.network.rules.LoadBalancer;
@ -110,4 +111,9 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd {
}
return lb.getNetworkId();
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
}
}

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

@ -27,6 +27,7 @@ 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.exception.InvalidParameterValueException;
import com.cloud.network.rules.PortForwardingRule;
@ -114,4 +115,9 @@ public class DeletePortForwardingRuleCmd extends BaseAsyncCmd {
public Long getSyncObjId() {
return _rulesService.getPortForwardigRule(id).getNetworkId();
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.FirewallRule;
}
}

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

@ -119,7 +119,9 @@ public class AsyncJobResponse extends BaseResponse {
this.jobInstanceId.setTableName("security_group");
} else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.PhysicalNetwork.toString())) {
this.jobInstanceId.setTableName("physical_network");
}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.None.toString())){
// TODO : when we hit here, we need to add instanceType -> UUID entity table mapping
assert(false);
}

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

@ -36,7 +36,8 @@ public interface AsyncJob extends Identity {
StoragePool,
IpAddress,
SecurityGroup,
PhysicalNetwork
PhysicalNetwork,
FirewallRule
}
Long getId();