From 96ac136b8cc18352936bf023a0c42e6f47c703f0 Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Fri, 3 Dec 2010 11:59:25 -0800 Subject: [PATCH] changed getAccountId to getEntityOwnerId --- api/src/com/cloud/api/BaseAsyncCmd.java | 2 +- .../com/cloud/api/commands/AddVpnUserCmd.java | 4 +-- .../commands/AssignToLoadBalancerRuleCmd.java | 2 +- .../com/cloud/api/commands/AttachIsoCmd.java | 2 +- .../cloud/api/commands/AttachVolumeCmd.java | 2 +- .../AuthorizeNetworkGroupIngressCmd.java | 2 +- .../api/commands/CancelMaintenanceCmd.java | 2 +- .../CancelPrimaryStorageMaintenanceCmd.java | 2 +- .../com/cloud/api/commands/CopyIsoCmd.java | 2 +- .../cloud/api/commands/CopyTemplateCmd.java | 2 +- .../commands/CreateIpForwardingRuleCmd.java | 10 +++++--- .../commands/CreateLoadBalancerRuleCmd.java | 25 ++++++++++++++++++- .../commands/CreatePortForwardingRuleCmd.java | 11 +++++--- .../commands/CreateRemoteAccessVpnCmd.java | 4 +-- .../cloud/api/commands/CreateSnapshotCmd.java | 2 +- .../cloud/api/commands/CreateTemplateCmd.java | 2 +- .../cloud/api/commands/CreateVolumeCmd.java | 2 +- .../cloud/api/commands/DeleteDomainCmd.java | 2 +- .../commands/DeleteIpForwardingRuleCmd.java | 2 +- .../com/cloud/api/commands/DeleteIsoCmd.java | 2 +- .../commands/DeleteLoadBalancerRuleCmd.java | 2 +- .../commands/DeleteRemoteAccessVpnCmd.java | 4 +-- .../cloud/api/commands/DeleteSnapshotCmd.java | 2 +- .../cloud/api/commands/DeleteTemplateCmd.java | 2 +- .../com/cloud/api/commands/DeleteUserCmd.java | 2 +- .../com/cloud/api/commands/DeployVMCmd.java | 2 +- .../com/cloud/api/commands/DeployVm2Cmd.java | 2 +- .../api/commands/DestroyConsoleProxyCmd.java | 2 +- .../com/cloud/api/commands/DestroyVMCmd.java | 2 +- .../com/cloud/api/commands/DetachIsoCmd.java | 2 +- .../cloud/api/commands/DetachVolumeCmd.java | 2 +- .../cloud/api/commands/DisableAccountCmd.java | 2 +- .../cloud/api/commands/DisableUserCmd.java | 2 +- .../com/cloud/api/commands/ExtractIsoCmd.java | 4 +-- .../api/commands/ExtractTemplateCmd.java | 4 +-- .../cloud/api/commands/ExtractVolumeCmd.java | 4 +-- .../commands/PrepareForMaintenanceCmd.java | 2 +- ...reparePrimaryStorageForMaintenanceCmd.java | 2 +- .../cloud/api/commands/RebootRouterCmd.java | 2 +- .../cloud/api/commands/RebootSystemVmCmd.java | 2 +- .../com/cloud/api/commands/RebootVMCmd.java | 2 +- .../cloud/api/commands/ReconnectHostCmd.java | 2 +- .../RemoveFromLoadBalancerRuleCmd.java | 2 +- .../cloud/api/commands/RemoveVpnUserCmd.java | 4 +-- .../api/commands/ResetVMPasswordCmd.java | 2 +- .../RevokeNetworkGroupIngressCmd.java | 2 +- .../cloud/api/commands/StartRouterCmd.java | 2 +- .../cloud/api/commands/StartSystemVMCmd.java | 2 +- .../com/cloud/api/commands/StartVMCmd.java | 2 +- .../com/cloud/api/commands/StopRouterCmd.java | 2 +- .../cloud/api/commands/StopSystemVmCmd.java | 2 +- api/src/com/cloud/api/commands/StopVMCmd.java | 2 +- .../commands/UpdateLoadBalancerRuleCmd.java | 2 +- .../commands/UpdatePortForwardingRuleCmd.java | 2 +- .../commands/UploadCustomCertificateCmd.java | 2 +- server/src/com/cloud/api/ApiServer.java | 2 +- .../src/com/cloud/vm/UserVmManagerImpl.java | 4 +-- 57 files changed, 101 insertions(+), 69 deletions(-) diff --git a/api/src/com/cloud/api/BaseAsyncCmd.java b/api/src/com/cloud/api/BaseAsyncCmd.java index 2354ead5345..3502700ffc9 100644 --- a/api/src/com/cloud/api/BaseAsyncCmd.java +++ b/api/src/com/cloud/api/BaseAsyncCmd.java @@ -37,7 +37,7 @@ public abstract class BaseAsyncCmd extends BaseCmd { * used to determine that information. * @return the id of the account that owns the object being acted upon */ - public abstract long getAccountId(); + public abstract long getEntityOwnerId(); /** * For proper tracking of async commands through the system, events must be generated when the command is diff --git a/api/src/com/cloud/api/commands/AddVpnUserCmd.java b/api/src/com/cloud/api/commands/AddVpnUserCmd.java index 2d24473cefc..ca7a326e426 100644 --- a/api/src/com/cloud/api/commands/AddVpnUserCmd.java +++ b/api/src/com/cloud/api/commands/AddVpnUserCmd.java @@ -93,7 +93,7 @@ public class AddVpnUserCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if ((account == null) || isAdmin(account.getType())) { if ((domainId != null) && (accountName != null)) { @@ -113,7 +113,7 @@ public class AddVpnUserCmd extends BaseAsyncCmd { @Override public String getEventDescription() { - return "Add Remote Access VPN user for account " + getAccountId() + " username= " + getUserName(); + return "Add Remote Access VPN user for account " + getEntityOwnerId() + " username= " + getUserName(); } diff --git a/api/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java b/api/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java index 405cda1d635..9a002104536 100644 --- a/api/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java +++ b/api/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java @@ -79,7 +79,7 @@ public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { LoadBalancer lb = _entityMgr.findById(LoadBalancer.class, getLoadBalancerId()); if (lb == null) { return Account.ACCOUNT_ID_SYSTEM; // bad id given, parent this command to SYSTEM so ERROR events are tracked diff --git a/api/src/com/cloud/api/commands/AttachIsoCmd.java b/api/src/com/cloud/api/commands/AttachIsoCmd.java index 919f027910c..d2b58e4feeb 100755 --- a/api/src/com/cloud/api/commands/AttachIsoCmd.java +++ b/api/src/com/cloud/api/commands/AttachIsoCmd.java @@ -71,7 +71,7 @@ public class AttachIsoCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { VirtualMachineTemplate iso = _responseGenerator.findTemplateById(getId()); if (iso == null) { return Account.ACCOUNT_ID_SYSTEM; // bad id given, parent this command to SYSTEM so ERROR events are tracked diff --git a/api/src/com/cloud/api/commands/AttachVolumeCmd.java b/api/src/com/cloud/api/commands/AttachVolumeCmd.java index 3639e33cdad..a753a8e455f 100755 --- a/api/src/com/cloud/api/commands/AttachVolumeCmd.java +++ b/api/src/com/cloud/api/commands/AttachVolumeCmd.java @@ -96,7 +96,7 @@ public class AttachVolumeCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Volume volume = _responseGenerator.findVolumeById(getId()); if (volume == null) { return Account.ACCOUNT_ID_SYSTEM; // bad id given, parent this command to SYSTEM so ERROR events are tracked diff --git a/api/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java b/api/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java index b0ca0389c4f..2f29bffdccc 100644 --- a/api/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java +++ b/api/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java @@ -153,7 +153,7 @@ public class AuthorizeNetworkGroupIngressCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if ((account == null) || isAdmin(account.getType())) { if ((domainId != null) && (accountName != null)) { diff --git a/api/src/com/cloud/api/commands/CancelMaintenanceCmd.java b/api/src/com/cloud/api/commands/CancelMaintenanceCmd.java index 7603756d331..cd38eb3bd94 100644 --- a/api/src/com/cloud/api/commands/CancelMaintenanceCmd.java +++ b/api/src/com/cloud/api/commands/CancelMaintenanceCmd.java @@ -70,7 +70,7 @@ public class CancelMaintenanceCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if (account != null) { return account.getId(); diff --git a/api/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java b/api/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java index 4e409bcfc31..d7e62720f39 100644 --- a/api/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java +++ b/api/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java @@ -69,7 +69,7 @@ public class CancelPrimaryStorageMaintenanceCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if (account != null) { return account.getId(); diff --git a/api/src/com/cloud/api/commands/CopyIsoCmd.java b/api/src/com/cloud/api/commands/CopyIsoCmd.java index 3b5f3b747e7..68a28934dd8 100644 --- a/api/src/com/cloud/api/commands/CopyIsoCmd.java +++ b/api/src/com/cloud/api/commands/CopyIsoCmd.java @@ -81,7 +81,7 @@ public class CopyIsoCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { VirtualMachineTemplate iso = _entityMgr.findById(VirtualMachineTemplate.class, getId()); if (iso != null) { return iso.getAccountId(); diff --git a/api/src/com/cloud/api/commands/CopyTemplateCmd.java b/api/src/com/cloud/api/commands/CopyTemplateCmd.java index 451a2e0a9c2..d347ce01a87 100644 --- a/api/src/com/cloud/api/commands/CopyTemplateCmd.java +++ b/api/src/com/cloud/api/commands/CopyTemplateCmd.java @@ -82,7 +82,7 @@ public class CopyTemplateCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { VirtualMachineTemplate template = _entityMgr.findById(VirtualMachineTemplate.class, getId()); if (template != null) { return template.getAccountId(); diff --git a/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java b/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java index f5e85180f51..78f3094def5 100644 --- a/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java +++ b/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java @@ -30,7 +30,6 @@ import com.cloud.api.response.FirewallRuleResponse; import com.cloud.event.EventTypes; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.network.rules.PortForwardingRule; -import com.cloud.user.Account; import com.cloud.user.UserContext; import com.cloud.utils.net.Ip; import com.cloud.utils.net.NetUtils; @@ -109,8 +108,8 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Por } @Override - public long getAccountId() { - return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked + public long getEntityOwnerId() { + return _entityMgr.findById(PortForwardingRule.class, getEntityId()).getAccountId(); } @Override @@ -188,4 +187,9 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Por return -1; } + @Override + public long getAccountId() { + throw new UnsupportedOperationException("Get the account id from network"); + } + } diff --git a/api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java b/api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java index 65a5cd3c93a..678398533f4 100644 --- a/api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java +++ b/api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java @@ -23,18 +23,20 @@ import java.util.List; import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; +import com.cloud.api.BaseAsyncCreateCmd; import com.cloud.api.BaseCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; import com.cloud.api.response.LoadBalancerResponse; +import com.cloud.event.EventTypes; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.network.rules.LoadBalancer; import com.cloud.utils.net.Ip; import com.cloud.utils.net.NetUtils; @Implementation(description="Creates a load balancer rule", responseObject=LoadBalancerResponse.class) -public class CreateLoadBalancerRuleCmd extends BaseCmd implements LoadBalancer { +public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd implements LoadBalancer { public static final Logger s_logger = Logger.getLogger(CreateLoadBalancerRuleCmd.class.getName()); private static final String s_name = "createloadbalancerruleresponse"; @@ -184,5 +186,26 @@ public class CreateLoadBalancerRuleCmd extends BaseCmd implements LoadBalancer { @Override public List getDestinations() { throw new UnsupportedOperationException("not supported"); + } + + @Override + public void callCreate() { + // TODO Auto-generated method stub + + } + + @Override + public long getEntityOwnerId() { + return _entityMgr.findById(LoadBalancer.class, getEntityId()).getAccountId(); + } + + @Override + public String getEventType() { + return EventTypes.EVENT_LOAD_BALANCER_CREATE; + } + + @Override + public String getEventDescription() { + return "Create load balancer"; } } diff --git a/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java b/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java index bd8c6fba8ef..6d347cc6a72 100644 --- a/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java +++ b/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java @@ -35,7 +35,7 @@ import com.cloud.user.UserContext; import com.cloud.utils.net.Ip; @Implementation(description="Creates a port forwarding rule", responseObject=FirewallRuleResponse.class) -public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements PortForwardingRule { +public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements PortForwardingRule { public static final Logger s_logger = Logger.getLogger(CreatePortForwardingRuleCmd.class.getName()); private static final String s_name = "createportforwardingruleresponse"; @@ -162,8 +162,8 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P } @Override - public long getAccountId() { - throw new UnsupportedOperationException("Get the account id from network"); + public long getEntityOwnerId() { + return _entityMgr.findById(PortForwardingRule.class, getEntityId()).getAccountId(); } @Override @@ -207,4 +207,9 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P return ("Creating an port forwarding rule for "+ipAddress+" with virtual machine:"+virtualMachineId); } + @Override + public long getAccountId() { + throw new UnsupportedOperationException("Get the account id from network"); + } + } diff --git a/api/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java b/api/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java index 0e8aa294853..334250156f0 100644 --- a/api/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java +++ b/api/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java @@ -105,7 +105,7 @@ public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if ((account == null) || isAdmin(account.getType())) { if ((domainId != null) && (accountName != null)) { @@ -125,7 +125,7 @@ public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd { @Override public String getEventDescription() { - return "Create Remote Access VPN for account " + getAccountId() + " in zone " + getZoneId(); + return "Create Remote Access VPN for account " + getEntityOwnerId() + " in zone " + getZoneId(); } @Override diff --git a/api/src/com/cloud/api/commands/CreateSnapshotCmd.java b/api/src/com/cloud/api/commands/CreateSnapshotCmd.java index d394d63fc2f..64b583faf5a 100644 --- a/api/src/com/cloud/api/commands/CreateSnapshotCmd.java +++ b/api/src/com/cloud/api/commands/CreateSnapshotCmd.java @@ -93,7 +93,7 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Volume volume = _entityMgr.findById(Volume.class, getVolumeId()); if (volume != null) { return volume.getAccountId(); diff --git a/api/src/com/cloud/api/commands/CreateTemplateCmd.java b/api/src/com/cloud/api/commands/CreateTemplateCmd.java index 5bdac90fd08..71d8cbae877 100644 --- a/api/src/com/cloud/api/commands/CreateTemplateCmd.java +++ b/api/src/com/cloud/api/commands/CreateTemplateCmd.java @@ -134,7 +134,7 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Long volumeId = getVolumeId(); Long snapshotId = getSnapshotId(); if (volumeId != null) { diff --git a/api/src/com/cloud/api/commands/CreateVolumeCmd.java b/api/src/com/cloud/api/commands/CreateVolumeCmd.java index 585dbbbbd5d..ebbbfcad779 100644 --- a/api/src/com/cloud/api/commands/CreateVolumeCmd.java +++ b/api/src/com/cloud/api/commands/CreateVolumeCmd.java @@ -115,7 +115,7 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if ((account == null) || isAdmin(account.getType())) { if ((domainId != null) && (accountName != null)) { diff --git a/api/src/com/cloud/api/commands/DeleteDomainCmd.java b/api/src/com/cloud/api/commands/DeleteDomainCmd.java index 93a5ef82d97..335de83503c 100644 --- a/api/src/com/cloud/api/commands/DeleteDomainCmd.java +++ b/api/src/com/cloud/api/commands/DeleteDomainCmd.java @@ -68,7 +68,7 @@ public class DeleteDomainCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Domain domain = _entityMgr.findById(Domain.class, getId()); if (domain != null) { return domain.getAccountId(); diff --git a/api/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java b/api/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java index 9d4cc3f897f..8ecadb467b1 100644 --- a/api/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java +++ b/api/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java @@ -73,7 +73,7 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked } diff --git a/api/src/com/cloud/api/commands/DeleteIsoCmd.java b/api/src/com/cloud/api/commands/DeleteIsoCmd.java index d73c1c0aa8d..01d746d3b2d 100644 --- a/api/src/com/cloud/api/commands/DeleteIsoCmd.java +++ b/api/src/com/cloud/api/commands/DeleteIsoCmd.java @@ -73,7 +73,7 @@ public class DeleteIsoCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { VirtualMachineTemplate iso = _entityMgr.findById(VirtualMachineTemplate.class, getId()); if (iso != null) { return iso.getAccountId(); diff --git a/api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java b/api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java index 356e9c0398b..8f3b583596b 100644 --- a/api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java +++ b/api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java @@ -60,7 +60,7 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { LoadBalancer lb = _entityMgr.findById(LoadBalancer.class, getId()); if (lb != null) { return lb.getAccountId(); diff --git a/api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java b/api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java index c57a8010855..dd3ded9a509 100644 --- a/api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java +++ b/api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java @@ -79,7 +79,7 @@ public class DeleteRemoteAccessVpnCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if ((account == null) || isAdmin(account.getType())) { if ((domainId != null) && (accountName != null)) { @@ -99,7 +99,7 @@ public class DeleteRemoteAccessVpnCmd extends BaseAsyncCmd { @Override public String getEventDescription() { - return "Delete Remote Access VPN for account " + getAccountId() + " in zone " + getZoneId(); + return "Delete Remote Access VPN for account " + getEntityOwnerId() + " in zone " + getZoneId(); } @Override diff --git a/api/src/com/cloud/api/commands/DeleteSnapshotCmd.java b/api/src/com/cloud/api/commands/DeleteSnapshotCmd.java index ad1b9d0f7aa..5f43f588199 100644 --- a/api/src/com/cloud/api/commands/DeleteSnapshotCmd.java +++ b/api/src/com/cloud/api/commands/DeleteSnapshotCmd.java @@ -63,7 +63,7 @@ public class DeleteSnapshotCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Snapshot snapshot = _entityMgr.findById(Snapshot.class, getId()); if (snapshot != null) { return snapshot.getAccountId(); diff --git a/api/src/com/cloud/api/commands/DeleteTemplateCmd.java b/api/src/com/cloud/api/commands/DeleteTemplateCmd.java index 7b9c25e565c..e913a7ffc6c 100644 --- a/api/src/com/cloud/api/commands/DeleteTemplateCmd.java +++ b/api/src/com/cloud/api/commands/DeleteTemplateCmd.java @@ -75,7 +75,7 @@ public class DeleteTemplateCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { VirtualMachineTemplate template = _entityMgr.findById(VirtualMachineTemplate.class, getId()); if (template != null) { return template.getAccountId(); diff --git a/api/src/com/cloud/api/commands/DeleteUserCmd.java b/api/src/com/cloud/api/commands/DeleteUserCmd.java index 31f43c9cb72..22a95a284fc 100644 --- a/api/src/com/cloud/api/commands/DeleteUserCmd.java +++ b/api/src/com/cloud/api/commands/DeleteUserCmd.java @@ -68,7 +68,7 @@ public class DeleteUserCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if (account != null) { return account.getId(); diff --git a/api/src/com/cloud/api/commands/DeployVMCmd.java b/api/src/com/cloud/api/commands/DeployVMCmd.java index c1b4221c664..7ccd75d3db7 100644 --- a/api/src/com/cloud/api/commands/DeployVMCmd.java +++ b/api/src/com/cloud/api/commands/DeployVMCmd.java @@ -175,7 +175,7 @@ public class DeployVMCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if ((account == null) || isAdmin(account.getType())) { if ((domainId != null) && (accountName != null)) { diff --git a/api/src/com/cloud/api/commands/DeployVm2Cmd.java b/api/src/com/cloud/api/commands/DeployVm2Cmd.java index 91f3de0c93c..a42bbe159e0 100644 --- a/api/src/com/cloud/api/commands/DeployVm2Cmd.java +++ b/api/src/com/cloud/api/commands/DeployVm2Cmd.java @@ -202,7 +202,7 @@ public class DeployVm2Cmd extends BaseAsyncCreateCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if ((account == null) || isAdmin(account.getType())) { if ((domainId != null) && (accountName != null)) { diff --git a/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java b/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java index beec58f76fa..a325c5d5082 100644 --- a/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java +++ b/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java @@ -64,7 +64,7 @@ public class DestroyConsoleProxyCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = (Account)UserContext.current().getAccount(); if (account != null) { return account.getId(); diff --git a/api/src/com/cloud/api/commands/DestroyVMCmd.java b/api/src/com/cloud/api/commands/DestroyVMCmd.java index 08de8039a1e..2a877d0317b 100644 --- a/api/src/com/cloud/api/commands/DestroyVMCmd.java +++ b/api/src/com/cloud/api/commands/DestroyVMCmd.java @@ -64,7 +64,7 @@ public class DestroyVMCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { UserVm vm = _responseGenerator.findUserVmById(getId()); if (vm != null) { return vm.getAccountId(); diff --git a/api/src/com/cloud/api/commands/DetachIsoCmd.java b/api/src/com/cloud/api/commands/DetachIsoCmd.java index 44b78ff4e8e..4e1bf6a9454 100755 --- a/api/src/com/cloud/api/commands/DetachIsoCmd.java +++ b/api/src/com/cloud/api/commands/DetachIsoCmd.java @@ -61,7 +61,7 @@ public class DetachIsoCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { UserVm vm = _entityMgr.findById(UserVm.class, getVirtualMachineId()); if (vm != null) { return vm.getAccountId(); diff --git a/api/src/com/cloud/api/commands/DetachVolumeCmd.java b/api/src/com/cloud/api/commands/DetachVolumeCmd.java index 2509bc5ad27..0460dcfd82c 100755 --- a/api/src/com/cloud/api/commands/DetachVolumeCmd.java +++ b/api/src/com/cloud/api/commands/DetachVolumeCmd.java @@ -88,7 +88,7 @@ public class DetachVolumeCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Long volumeId = getId(); if (volumeId != null) { Volume volume = _responseGenerator.findVolumeById(volumeId); diff --git a/api/src/com/cloud/api/commands/DisableAccountCmd.java b/api/src/com/cloud/api/commands/DisableAccountCmd.java index 2c2d669774b..6c4dca88a59 100644 --- a/api/src/com/cloud/api/commands/DisableAccountCmd.java +++ b/api/src/com/cloud/api/commands/DisableAccountCmd.java @@ -72,7 +72,7 @@ public class DisableAccountCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if (account != null) { return account.getId(); diff --git a/api/src/com/cloud/api/commands/DisableUserCmd.java b/api/src/com/cloud/api/commands/DisableUserCmd.java index 5139250af69..9e76f6f085c 100644 --- a/api/src/com/cloud/api/commands/DisableUserCmd.java +++ b/api/src/com/cloud/api/commands/DisableUserCmd.java @@ -66,7 +66,7 @@ public class DisableUserCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if (account != null) { return account.getId(); diff --git a/api/src/com/cloud/api/commands/ExtractIsoCmd.java b/api/src/com/cloud/api/commands/ExtractIsoCmd.java index 7e335357002..9c82c801e99 100755 --- a/api/src/com/cloud/api/commands/ExtractIsoCmd.java +++ b/api/src/com/cloud/api/commands/ExtractIsoCmd.java @@ -88,7 +88,7 @@ public class ExtractIsoCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { VirtualMachineTemplate iso = _entityMgr.findById(VirtualMachineTemplate.class, getId()); if (iso != null) { return iso.getAccountId(); @@ -120,7 +120,7 @@ public class ExtractIsoCmd extends BaseAsyncCmd { try { Long uploadId = _templateService.extract(this); if (uploadId != null){ - ExtractResponse response = _responseGenerator.createExtractResponse(uploadId, id, zoneId, getAccountId(), mode); + ExtractResponse response = _responseGenerator.createExtractResponse(uploadId, id, zoneId, getEntityOwnerId(), mode); response.setResponseName(getName()); response.setObjectName("iso"); this.setResponseObject(response); diff --git a/api/src/com/cloud/api/commands/ExtractTemplateCmd.java b/api/src/com/cloud/api/commands/ExtractTemplateCmd.java index 0c3f14ae143..211faba1abf 100755 --- a/api/src/com/cloud/api/commands/ExtractTemplateCmd.java +++ b/api/src/com/cloud/api/commands/ExtractTemplateCmd.java @@ -88,7 +88,7 @@ public class ExtractTemplateCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { VirtualMachineTemplate template = _entityMgr.findById(VirtualMachineTemplate.class, getId()); if (template != null) { return template.getAccountId(); @@ -121,7 +121,7 @@ public class ExtractTemplateCmd extends BaseAsyncCmd { try { Long uploadId = _templateService.extract(this); if (uploadId != null){ - ExtractResponse response = _responseGenerator.createExtractResponse(uploadId, id, zoneId, getAccountId(), mode); + ExtractResponse response = _responseGenerator.createExtractResponse(uploadId, id, zoneId, getEntityOwnerId(), mode); response.setResponseName(getName()); this.setResponseObject(response); } else { diff --git a/api/src/com/cloud/api/commands/ExtractVolumeCmd.java b/api/src/com/cloud/api/commands/ExtractVolumeCmd.java index 7d116f6964a..6fc46176cb1 100755 --- a/api/src/com/cloud/api/commands/ExtractVolumeCmd.java +++ b/api/src/com/cloud/api/commands/ExtractVolumeCmd.java @@ -102,7 +102,7 @@ public class ExtractVolumeCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Volume volume = _entityMgr.findById(Volume.class, getId()); if (volume != null) { return volume.getAccountId(); @@ -138,7 +138,7 @@ public class ExtractVolumeCmd extends BaseAsyncCmd { response.setMode(mode); response.setUploadId(uploadId); response.setState(uploadInfo.getUploadState().toString()); - response.setAccountId(getAccountId()); + response.setAccountId(getEntityOwnerId()); //FIX ME - Need to set the url once the gson jar is upgraded since it is throwing an error right now. response.setUrl(uploadInfo.getUploadUrl().replaceAll("/", "%2F")); this.setResponseObject(response); diff --git a/api/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java b/api/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java index 01a3d472b5c..36626f0a310 100644 --- a/api/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java +++ b/api/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java @@ -67,7 +67,7 @@ public class PrepareForMaintenanceCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if (account != null) { return account.getId(); diff --git a/api/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java b/api/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java index 04e040e4d40..08321e7d502 100644 --- a/api/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java +++ b/api/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java @@ -65,7 +65,7 @@ public class PreparePrimaryStorageForMaintenanceCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if (account != null) { return account.getId(); diff --git a/api/src/com/cloud/api/commands/RebootRouterCmd.java b/api/src/com/cloud/api/commands/RebootRouterCmd.java index ba74ae086a7..8d3230993db 100644 --- a/api/src/com/cloud/api/commands/RebootRouterCmd.java +++ b/api/src/com/cloud/api/commands/RebootRouterCmd.java @@ -62,7 +62,7 @@ public class RebootRouterCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { VirtualRouter router = _entityMgr.findById(VirtualRouter.class, getId()); if (router != null) { return router.getAccountId(); diff --git a/api/src/com/cloud/api/commands/RebootSystemVmCmd.java b/api/src/com/cloud/api/commands/RebootSystemVmCmd.java index 815fdd024bf..b4ba6667a16 100644 --- a/api/src/com/cloud/api/commands/RebootSystemVmCmd.java +++ b/api/src/com/cloud/api/commands/RebootSystemVmCmd.java @@ -64,7 +64,7 @@ public class RebootSystemVmCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if (account != null) { return account.getId(); diff --git a/api/src/com/cloud/api/commands/RebootVMCmd.java b/api/src/com/cloud/api/commands/RebootVMCmd.java index 1a08cb92047..1205634ed1d 100644 --- a/api/src/com/cloud/api/commands/RebootVMCmd.java +++ b/api/src/com/cloud/api/commands/RebootVMCmd.java @@ -61,7 +61,7 @@ public class RebootVMCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { UserVm vm = _responseGenerator.findUserVmById(getId()); if (vm != null) { return vm.getAccountId(); diff --git a/api/src/com/cloud/api/commands/ReconnectHostCmd.java b/api/src/com/cloud/api/commands/ReconnectHostCmd.java index b6189d7286d..124670e6b09 100644 --- a/api/src/com/cloud/api/commands/ReconnectHostCmd.java +++ b/api/src/com/cloud/api/commands/ReconnectHostCmd.java @@ -69,7 +69,7 @@ public class ReconnectHostCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if (account != null) { return account.getId(); diff --git a/api/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java b/api/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java index 5c08fc4ba8a..7fc4dd8a890 100644 --- a/api/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java +++ b/api/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java @@ -80,7 +80,7 @@ public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { LoadBalancer lb = _entityMgr.findById(LoadBalancer.class, getId()); if (lb == null) { return Account.ACCOUNT_ID_SYSTEM; // bad id given, parent this command to SYSTEM so ERROR events are tracked diff --git a/api/src/com/cloud/api/commands/RemoveVpnUserCmd.java b/api/src/com/cloud/api/commands/RemoveVpnUserCmd.java index b9c71639e76..125ce75ff8f 100644 --- a/api/src/com/cloud/api/commands/RemoveVpnUserCmd.java +++ b/api/src/com/cloud/api/commands/RemoveVpnUserCmd.java @@ -81,7 +81,7 @@ public class RemoveVpnUserCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if ((account == null) || isAdmin(account.getType())) { if ((domainId != null) && (accountName != null)) { @@ -101,7 +101,7 @@ public class RemoveVpnUserCmd extends BaseAsyncCmd { @Override public String getEventDescription() { - return "Remove Remote Access VPN user for account " + getAccountId() + " username= " + getUserName(); + return "Remove Remote Access VPN user for account " + getEntityOwnerId() + " username= " + getUserName(); } diff --git a/api/src/com/cloud/api/commands/ResetVMPasswordCmd.java b/api/src/com/cloud/api/commands/ResetVMPasswordCmd.java index c84e045b658..32e73d726e0 100644 --- a/api/src/com/cloud/api/commands/ResetVMPasswordCmd.java +++ b/api/src/com/cloud/api/commands/ResetVMPasswordCmd.java @@ -78,7 +78,7 @@ public class ResetVMPasswordCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { UserVm vm = _responseGenerator.findUserVmById(getId()); if (vm != null) { return vm.getAccountId(); diff --git a/api/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java b/api/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java index 28def4b8c33..c105f3ade59 100644 --- a/api/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java +++ b/api/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java @@ -127,7 +127,7 @@ public class RevokeNetworkGroupIngressCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if ((account == null) || isAdmin(account.getType())) { if ((domainId != null) && (accountName != null)) { diff --git a/api/src/com/cloud/api/commands/StartRouterCmd.java b/api/src/com/cloud/api/commands/StartRouterCmd.java index e30d6d16a2a..0d09f76c6ed 100644 --- a/api/src/com/cloud/api/commands/StartRouterCmd.java +++ b/api/src/com/cloud/api/commands/StartRouterCmd.java @@ -72,7 +72,7 @@ public class StartRouterCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { UserVm vm = _entityMgr.findById(UserVm.class, getId()); if (vm != null) { return vm.getAccountId(); diff --git a/api/src/com/cloud/api/commands/StartSystemVMCmd.java b/api/src/com/cloud/api/commands/StartSystemVMCmd.java index 11b5fb5f8f7..456db974442 100644 --- a/api/src/com/cloud/api/commands/StartSystemVMCmd.java +++ b/api/src/com/cloud/api/commands/StartSystemVMCmd.java @@ -68,7 +68,7 @@ public class StartSystemVMCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if (account != null) { return account.getId(); diff --git a/api/src/com/cloud/api/commands/StartVMCmd.java b/api/src/com/cloud/api/commands/StartVMCmd.java index e1ea9c54649..cacef59582f 100644 --- a/api/src/com/cloud/api/commands/StartVMCmd.java +++ b/api/src/com/cloud/api/commands/StartVMCmd.java @@ -71,7 +71,7 @@ public class StartVMCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { UserVm vm = _responseGenerator.findUserVmById(getId()); if (vm != null) { return vm.getAccountId(); diff --git a/api/src/com/cloud/api/commands/StopRouterCmd.java b/api/src/com/cloud/api/commands/StopRouterCmd.java index cba1afa0166..ade73cd4607 100644 --- a/api/src/com/cloud/api/commands/StopRouterCmd.java +++ b/api/src/com/cloud/api/commands/StopRouterCmd.java @@ -66,7 +66,7 @@ public class StopRouterCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { UserVm vm = _entityMgr.findById(UserVm.class, getId()); if (vm != null) { return vm.getAccountId(); diff --git a/api/src/com/cloud/api/commands/StopSystemVmCmd.java b/api/src/com/cloud/api/commands/StopSystemVmCmd.java index d7544a9e847..b2869b538ad 100644 --- a/api/src/com/cloud/api/commands/StopSystemVmCmd.java +++ b/api/src/com/cloud/api/commands/StopSystemVmCmd.java @@ -64,7 +64,7 @@ public class StopSystemVmCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { Account account = UserContext.current().getAccount(); if (account != null) { return account.getId(); diff --git a/api/src/com/cloud/api/commands/StopVMCmd.java b/api/src/com/cloud/api/commands/StopVMCmd.java index 58ea501311f..7493384d815 100644 --- a/api/src/com/cloud/api/commands/StopVMCmd.java +++ b/api/src/com/cloud/api/commands/StopVMCmd.java @@ -67,7 +67,7 @@ public class StopVMCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { UserVm vm = _responseGenerator.findUserVmById(getId()); if (vm != null) { return vm.getAccountId(); diff --git a/api/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java b/api/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java index 4481fcfb37f..ef8575095a7 100644 --- a/api/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java +++ b/api/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java @@ -88,7 +88,7 @@ public class UpdateLoadBalancerRuleCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { LoadBalancer lb = _entityMgr.findById(LoadBalancer.class, getId()); if (lb == null) { return Account.ACCOUNT_ID_SYSTEM; // bad id given, parent this command to SYSTEM so ERROR events are tracked diff --git a/api/src/com/cloud/api/commands/UpdatePortForwardingRuleCmd.java b/api/src/com/cloud/api/commands/UpdatePortForwardingRuleCmd.java index bf786930fdd..dffbd2b1891 100644 --- a/api/src/com/cloud/api/commands/UpdatePortForwardingRuleCmd.java +++ b/api/src/com/cloud/api/commands/UpdatePortForwardingRuleCmd.java @@ -76,7 +76,7 @@ public class UpdatePortForwardingRuleCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { IpAddress addr = _entityMgr.findById(IpAddress.class, getPublicIp()); if (addr != null) { return addr.getAccountId(); diff --git a/api/src/com/cloud/api/commands/UploadCustomCertificateCmd.java b/api/src/com/cloud/api/commands/UploadCustomCertificateCmd.java index a968f6735cd..37cf90186e2 100644 --- a/api/src/com/cloud/api/commands/UploadCustomCertificateCmd.java +++ b/api/src/com/cloud/api/commands/UploadCustomCertificateCmd.java @@ -62,7 +62,7 @@ public class UploadCustomCertificateCmd extends BaseAsyncCmd { } @Override - public long getAccountId() { + public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked } diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index fad2f3405ef..b820290ee69 100755 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -389,7 +389,7 @@ public class ApiServer implements HttpRequestHandler { } // save the scheduled event - Long eventId = EventUtils.saveScheduledEvent((userId == null) ? User.UID_SYSTEM : userId, asyncCmd.getAccountId(), + Long eventId = EventUtils.saveScheduledEvent((userId == null) ? User.UID_SYSTEM : userId, asyncCmd.getEntityOwnerId(), asyncCmd.getEventType(), asyncCmd.getEventDescription()); if (eventId != null) { diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index d419919b62b..6cef007d250 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -3579,9 +3579,9 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, VirtualM throw new InvalidParameterValueException("No valid account specified for deploying a virtual machine."); } - AccountVO owner = _accountDao.findById(cmd.getAccountId()); + AccountVO owner = _accountDao.findById(cmd.getEntityOwnerId()); if (owner == null || owner.getRemoved() != null) { - throw new InvalidParameterValueException("Unable to find account: " + cmd.getAccountId()); + throw new InvalidParameterValueException("Unable to find account: " + cmd.getEntityOwnerId()); } Domain domain = _domainDao.findById(owner.getDomainId());