Updated Branches: refs/heads/api_refactoring 38225a17f -> a5dddb4a8
api: Extend or Implement InternalIdentity's getId method on a lot of VOs and Interfaces Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a5dddb4a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a5dddb4a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a5dddb4a Branch: refs/heads/api_refactoring Commit: a5dddb4a838784c44a58b10c5874d6ca304e543d Parents: a157a4c Author: Rohit Yadav <[email protected]> Authored: Sun Dec 23 16:52:35 2012 -0800 Committer: Rohit Yadav <[email protected]> Committed: Sun Dec 23 16:52:35 2012 -0800 ---------------------------------------------------------------------- api/src/com/cloud/domain/Domain.java | 3 ++- api/src/com/cloud/event/Event.java | 3 ++- api/src/com/cloud/network/IpAddress.java | 3 ++- api/src/com/cloud/network/Network.java | 3 ++- api/src/com/cloud/network/PhysicalNetwork.java | 4 +++- api/src/com/cloud/network/PublicIpAddress.java | 3 ++- .../cloud/network/Site2SiteCustomerGateway.java | 3 ++- .../com/cloud/network/Site2SiteVpnConnection.java | 3 ++- api/src/com/cloud/network/Site2SiteVpnGateway.java | 3 ++- api/src/com/cloud/network/VpnUser.java | 3 ++- api/src/com/cloud/network/as/AutoScalePolicy.java | 3 ++- api/src/com/cloud/network/as/AutoScaleVmGroup.java | 3 ++- .../com/cloud/network/as/AutoScaleVmProfile.java | 3 ++- api/src/com/cloud/network/as/Condition.java | 3 ++- api/src/com/cloud/network/rules/FirewallRule.java | 7 ++++--- api/src/com/cloud/network/rules/StaticNatRule.java | 3 ++- .../com/cloud/network/security/SecurityGroup.java | 3 ++- api/src/com/cloud/network/vpc/StaticRoute.java | 3 ++- api/src/com/cloud/network/vpc/Vpc.java | 3 ++- api/src/com/cloud/network/vpc/VpcGateway.java | 3 ++- api/src/com/cloud/projects/ProjectInvitation.java | 3 ++- api/src/com/cloud/server/ResourceTag.java | 3 ++- api/src/com/cloud/storage/Snapshot.java | 3 ++- api/src/com/cloud/storage/Volume.java | 3 ++- .../com/cloud/template/VirtualMachineTemplate.java | 3 ++- api/src/com/cloud/user/Account.java | 3 ++- api/src/com/cloud/user/SSHKeyPair.java | 3 ++- api/src/com/cloud/user/User.java | 4 +++- api/src/com/cloud/vm/InstanceGroup.java | 3 ++- api/src/com/cloud/vm/VirtualMachine.java | 3 ++- api/src/org/apache/cloudstack/api/Identity.java | 1 - server/src/com/cloud/api/ApiDispatcher.java | 2 +- .../cloud/api/query/vo/ControlledViewEntity.java | 3 ++- .../api/response/SecurityGroupResultObject.java | 5 +++-- server/src/com/cloud/dc/AccountVlanMapVO.java | 7 ++++--- server/src/com/cloud/network/NetworkAccountVO.java | 10 ++++++++-- server/src/com/cloud/network/NetworkDomainVO.java | 10 ++++++++-- 37 files changed, 90 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/domain/Domain.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/domain/Domain.java b/api/src/com/cloud/domain/Domain.java index 94117d1..844974d 100644 --- a/api/src/com/cloud/domain/Domain.java +++ b/api/src/com/cloud/domain/Domain.java @@ -19,12 +19,13 @@ package com.cloud.domain; import java.util.Date; import com.cloud.user.OwnedBy; +import org.apache.cloudstack.api.InternalIdentity; /** * Domain defines the Domain object. */ -public interface Domain extends OwnedBy { +public interface Domain extends OwnedBy, InternalIdentity { public static final long ROOT_DOMAIN = 1L; enum State { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/event/Event.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/event/Event.java b/api/src/com/cloud/event/Event.java index 30115be..95c8b7f 100644 --- a/api/src/com/cloud/event/Event.java +++ b/api/src/com/cloud/event/Event.java @@ -19,8 +19,9 @@ package com.cloud.event; import java.util.Date; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface Event extends ControlledEntity{ +public interface Event extends ControlledEntity, InternalIdentity { public enum State { Created, Scheduled, http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/IpAddress.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/IpAddress.java b/api/src/com/cloud/network/IpAddress.java index bb9a7d5..8433da2 100644 --- a/api/src/com/cloud/network/IpAddress.java +++ b/api/src/com/cloud/network/IpAddress.java @@ -20,6 +20,7 @@ import java.util.Date; import com.cloud.acl.ControlledEntity; import com.cloud.utils.net.Ip; +import org.apache.cloudstack.api.InternalIdentity; /** * @@ -32,7 +33,7 @@ import com.cloud.utils.net.Ip; * - DomainId = domain of the account owner. * - Allocated = time it was allocated. */ -public interface IpAddress extends ControlledEntity { +public interface IpAddress extends ControlledEntity, InternalIdentity { enum State { Allocating, // The IP Address is being propagated to other network elements and is not ready for use yet. Allocated, // The IP address is in used. http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/Network.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java index f91dd66..c10ab6a 100644 --- a/api/src/com/cloud/network/Network.java +++ b/api/src/com/cloud/network/Network.java @@ -22,6 +22,7 @@ import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; import com.cloud.utils.fsm.FiniteState; import com.cloud.utils.fsm.StateMachine; +import org.apache.cloudstack.api.InternalIdentity; import java.net.URI; import java.util.ArrayList; @@ -31,7 +32,7 @@ import java.util.Set; /** * owned by an account. */ -public interface Network extends ControlledEntity { +public interface Network extends ControlledEntity, InternalIdentity { public enum GuestType { Shared, http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/PhysicalNetwork.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/PhysicalNetwork.java b/api/src/com/cloud/network/PhysicalNetwork.java index 03345d9..4884827 100644 --- a/api/src/com/cloud/network/PhysicalNetwork.java +++ b/api/src/com/cloud/network/PhysicalNetwork.java @@ -16,12 +16,14 @@ // under the License. package com.cloud.network; +import org.apache.cloudstack.api.InternalIdentity; + import java.util.List; /** * */ -public interface PhysicalNetwork { +public interface PhysicalNetwork extends InternalIdentity { public enum State { Disabled, http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/PublicIpAddress.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/PublicIpAddress.java b/api/src/com/cloud/network/PublicIpAddress.java index d8a10bc..3810766 100644 --- a/api/src/com/cloud/network/PublicIpAddress.java +++ b/api/src/com/cloud/network/PublicIpAddress.java @@ -18,10 +18,11 @@ package com.cloud.network; import com.cloud.acl.ControlledEntity; import com.cloud.dc.Vlan; +import org.apache.cloudstack.api.InternalIdentity; /** */ -public interface PublicIpAddress extends ControlledEntity, IpAddress, Vlan { +public interface PublicIpAddress extends ControlledEntity, IpAddress, Vlan, InternalIdentity { String getMacAddress(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/Site2SiteCustomerGateway.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/Site2SiteCustomerGateway.java b/api/src/com/cloud/network/Site2SiteCustomerGateway.java index 35ddb3b..2bf4368 100644 --- a/api/src/com/cloud/network/Site2SiteCustomerGateway.java +++ b/api/src/com/cloud/network/Site2SiteCustomerGateway.java @@ -19,8 +19,9 @@ package com.cloud.network; import java.util.Date; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface Site2SiteCustomerGateway extends ControlledEntity { +public interface Site2SiteCustomerGateway extends ControlledEntity, InternalIdentity { public long getId(); public String getUuid(); public String getGatewayIp(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/Site2SiteVpnConnection.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/Site2SiteVpnConnection.java b/api/src/com/cloud/network/Site2SiteVpnConnection.java index e6d722d..2eb73ff 100644 --- a/api/src/com/cloud/network/Site2SiteVpnConnection.java +++ b/api/src/com/cloud/network/Site2SiteVpnConnection.java @@ -19,8 +19,9 @@ package com.cloud.network; import java.util.Date; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface Site2SiteVpnConnection extends ControlledEntity { +public interface Site2SiteVpnConnection extends ControlledEntity, InternalIdentity { enum State { Pending, Connected, http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/Site2SiteVpnGateway.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/Site2SiteVpnGateway.java b/api/src/com/cloud/network/Site2SiteVpnGateway.java index 465ca53..5a20102 100644 --- a/api/src/com/cloud/network/Site2SiteVpnGateway.java +++ b/api/src/com/cloud/network/Site2SiteVpnGateway.java @@ -19,8 +19,9 @@ package com.cloud.network; import java.util.Date; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface Site2SiteVpnGateway extends ControlledEntity { +public interface Site2SiteVpnGateway extends ControlledEntity, InternalIdentity { public long getId(); public String getUuid(); public long getAddrId(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/VpnUser.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/VpnUser.java b/api/src/com/cloud/network/VpnUser.java index 28e4872..d0b6504 100644 --- a/api/src/com/cloud/network/VpnUser.java +++ b/api/src/com/cloud/network/VpnUser.java @@ -17,8 +17,9 @@ package com.cloud.network; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface VpnUser extends ControlledEntity { +public interface VpnUser extends ControlledEntity, InternalIdentity { enum State { Add, Revoke, http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/as/AutoScalePolicy.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/as/AutoScalePolicy.java b/api/src/com/cloud/network/as/AutoScalePolicy.java index 4ba2d15..8019036 100644 --- a/api/src/com/cloud/network/as/AutoScalePolicy.java +++ b/api/src/com/cloud/network/as/AutoScalePolicy.java @@ -18,8 +18,9 @@ package com.cloud.network.as; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface AutoScalePolicy extends ControlledEntity { +public interface AutoScalePolicy extends ControlledEntity, InternalIdentity { long getId(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/as/AutoScaleVmGroup.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/as/AutoScaleVmGroup.java b/api/src/com/cloud/network/as/AutoScaleVmGroup.java index 6d41ae3..7a32ebe 100644 --- a/api/src/com/cloud/network/as/AutoScaleVmGroup.java +++ b/api/src/com/cloud/network/as/AutoScaleVmGroup.java @@ -18,9 +18,10 @@ package com.cloud.network.as; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface AutoScaleVmGroup extends ControlledEntity { +public interface AutoScaleVmGroup extends ControlledEntity, InternalIdentity { String State_New = "new"; String State_Revoke = "revoke"; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/as/AutoScaleVmProfile.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/as/AutoScaleVmProfile.java b/api/src/com/cloud/network/as/AutoScaleVmProfile.java index b7002fd..f7dfb7c 100644 --- a/api/src/com/cloud/network/as/AutoScaleVmProfile.java +++ b/api/src/com/cloud/network/as/AutoScaleVmProfile.java @@ -21,11 +21,12 @@ import java.util.List; import com.cloud.acl.ControlledEntity; import com.cloud.utils.Pair; +import org.apache.cloudstack.api.InternalIdentity; /** * AutoScaleVmProfile */ -public interface AutoScaleVmProfile extends ControlledEntity { +public interface AutoScaleVmProfile extends ControlledEntity, InternalIdentity { public long getId(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/as/Condition.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/as/Condition.java b/api/src/com/cloud/network/as/Condition.java index b990731..424299d 100644 --- a/api/src/com/cloud/network/as/Condition.java +++ b/api/src/com/cloud/network/as/Condition.java @@ -18,8 +18,9 @@ package com.cloud.network.as; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface Condition extends ControlledEntity { +public interface Condition extends ControlledEntity, InternalIdentity { static enum Operator { EQ, GT, LT, GE, LE http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/rules/FirewallRule.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/rules/FirewallRule.java b/api/src/com/cloud/network/rules/FirewallRule.java index 6a967f8..7f0c5eb 100644 --- a/api/src/com/cloud/network/rules/FirewallRule.java +++ b/api/src/com/cloud/network/rules/FirewallRule.java @@ -19,8 +19,9 @@ package com.cloud.network.rules; import java.util.List; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface FirewallRule extends ControlledEntity { +public interface FirewallRule extends ControlledEntity, InternalIdentity { enum Purpose { Firewall, PortForwarding, @@ -31,8 +32,8 @@ public interface FirewallRule extends ControlledEntity { } enum FirewallRuleType { - System, // The pre-defined rules created by admin, in the system wide - User; // the rules created by user, to a specific ip + System, // The pre-defined rules created by admin, in the system wide + User // the rules created by user, to a specific ip } enum State { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/rules/StaticNatRule.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/rules/StaticNatRule.java b/api/src/com/cloud/network/rules/StaticNatRule.java index 601cd6a..af06ec1 100644 --- a/api/src/com/cloud/network/rules/StaticNatRule.java +++ b/api/src/com/cloud/network/rules/StaticNatRule.java @@ -17,8 +17,9 @@ package com.cloud.network.rules; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface StaticNatRule extends ControlledEntity, FirewallRule { +public interface StaticNatRule extends ControlledEntity, InternalIdentity, FirewallRule { long getId(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/security/SecurityGroup.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/security/SecurityGroup.java b/api/src/com/cloud/network/security/SecurityGroup.java index a496aa5..9cf885b 100644 --- a/api/src/com/cloud/network/security/SecurityGroup.java +++ b/api/src/com/cloud/network/security/SecurityGroup.java @@ -17,9 +17,10 @@ package com.cloud.network.security; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; //FIXME: Annotation @doc("") -public interface SecurityGroup extends ControlledEntity { +public interface SecurityGroup extends ControlledEntity, InternalIdentity { long getId(); String getUuid(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/vpc/StaticRoute.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/vpc/StaticRoute.java b/api/src/com/cloud/network/vpc/StaticRoute.java index 41ab4fb..f06df7d 100644 --- a/api/src/com/cloud/network/vpc/StaticRoute.java +++ b/api/src/com/cloud/network/vpc/StaticRoute.java @@ -17,8 +17,9 @@ package com.cloud.network.vpc; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface StaticRoute extends ControlledEntity{ +public interface StaticRoute extends ControlledEntity, InternalIdentity { enum State { Staged, // route been created but has never got through network rule conflict detection. Routes in this state can not be sent to VPC virtual router. Add, // Add means the route has been created and has gone through network rule conflict detection. http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/vpc/Vpc.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/vpc/Vpc.java b/api/src/com/cloud/network/vpc/Vpc.java index b9f3d6c..d3fc594 100644 --- a/api/src/com/cloud/network/vpc/Vpc.java +++ b/api/src/com/cloud/network/vpc/Vpc.java @@ -18,8 +18,9 @@ package com.cloud.network.vpc; import com.cloud.acl.ControlledEntity; import com.cloud.network.Network; +import org.apache.cloudstack.api.InternalIdentity; -public interface Vpc extends ControlledEntity{ +public interface Vpc extends ControlledEntity, InternalIdentity{ public enum State { Enabled, Inactive http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/network/vpc/VpcGateway.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/vpc/VpcGateway.java b/api/src/com/cloud/network/vpc/VpcGateway.java index 1ba28cc..7bed3e7 100644 --- a/api/src/com/cloud/network/vpc/VpcGateway.java +++ b/api/src/com/cloud/network/vpc/VpcGateway.java @@ -18,8 +18,9 @@ package com.cloud.network.vpc; import com.cloud.acl.ControlledEntity; import org.apache.cloudstack.api.Identity; +import org.apache.cloudstack.api.InternalIdentity; -public interface VpcGateway extends Identity, ControlledEntity { +public interface VpcGateway extends Identity, ControlledEntity, InternalIdentity { public enum Type { Private, Public, http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/projects/ProjectInvitation.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/projects/ProjectInvitation.java b/api/src/com/cloud/projects/ProjectInvitation.java index 6dca006..f4cac2e 100644 --- a/api/src/com/cloud/projects/ProjectInvitation.java +++ b/api/src/com/cloud/projects/ProjectInvitation.java @@ -19,8 +19,9 @@ package com.cloud.projects; import java.util.Date; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface ProjectInvitation extends ControlledEntity { +public interface ProjectInvitation extends ControlledEntity, InternalIdentity { public enum State { Pending, Completed, Expired, Declined } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/server/ResourceTag.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/server/ResourceTag.java b/api/src/com/cloud/server/ResourceTag.java index 0c160c4..e693569 100644 --- a/api/src/com/cloud/server/ResourceTag.java +++ b/api/src/com/cloud/server/ResourceTag.java @@ -17,8 +17,9 @@ package com.cloud.server; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface ResourceTag extends ControlledEntity{ +public interface ResourceTag extends ControlledEntity, InternalIdentity { public enum TaggedResourceType { UserVm, http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/storage/Snapshot.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/storage/Snapshot.java b/api/src/com/cloud/storage/Snapshot.java index a81234a..0ca05b7 100644 --- a/api/src/com/cloud/storage/Snapshot.java +++ b/api/src/com/cloud/storage/Snapshot.java @@ -20,8 +20,9 @@ import java.util.Date; import com.cloud.acl.ControlledEntity; import com.cloud.hypervisor.Hypervisor.HypervisorType; +import org.apache.cloudstack.api.InternalIdentity; -public interface Snapshot extends ControlledEntity { +public interface Snapshot extends ControlledEntity, InternalIdentity { public enum Type { MANUAL, RECURRING, http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/storage/Volume.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java index 1a92bd1..52b7a11 100755 --- a/api/src/com/cloud/storage/Volume.java +++ b/api/src/com/cloud/storage/Volume.java @@ -22,8 +22,9 @@ import com.cloud.acl.ControlledEntity; import com.cloud.template.BasedOn; import com.cloud.utils.fsm.StateMachine2; import com.cloud.utils.fsm.StateObject; +import org.apache.cloudstack.api.InternalIdentity; -public interface Volume extends ControlledEntity, BasedOn, StateObject<Volume.State> { +public interface Volume extends ControlledEntity, InternalIdentity, BasedOn, StateObject<Volume.State> { enum Type { UNKNOWN, ROOT, SWAP, DATADISK, ISO }; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/template/VirtualMachineTemplate.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/template/VirtualMachineTemplate.java b/api/src/com/cloud/template/VirtualMachineTemplate.java index 9caa290..7527e9a 100755 --- a/api/src/com/cloud/template/VirtualMachineTemplate.java +++ b/api/src/com/cloud/template/VirtualMachineTemplate.java @@ -23,8 +23,9 @@ import com.cloud.acl.ControlledEntity; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.Storage.TemplateType; +import org.apache.cloudstack.api.InternalIdentity; -public interface VirtualMachineTemplate extends ControlledEntity { +public interface VirtualMachineTemplate extends ControlledEntity, InternalIdentity { public static enum BootloaderType { PyGrub, HVM, External, CD http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/user/Account.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/user/Account.java b/api/src/com/cloud/user/Account.java index f28fbd1..2a1a8ea 100755 --- a/api/src/com/cloud/user/Account.java +++ b/api/src/com/cloud/user/Account.java @@ -19,8 +19,9 @@ package com.cloud.user; import java.util.Date; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface Account extends ControlledEntity { +public interface Account extends ControlledEntity, InternalIdentity { public enum Type { Normal, Admin, http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/user/SSHKeyPair.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/user/SSHKeyPair.java b/api/src/com/cloud/user/SSHKeyPair.java index 494f74f..117c472 100644 --- a/api/src/com/cloud/user/SSHKeyPair.java +++ b/api/src/com/cloud/user/SSHKeyPair.java @@ -17,8 +17,9 @@ package com.cloud.user; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface SSHKeyPair extends ControlledEntity { +public interface SSHKeyPair extends ControlledEntity, InternalIdentity { /** * @return The id of the key pair. http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/user/User.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/user/User.java b/api/src/com/cloud/user/User.java index e1b9f73..36a7c65 100644 --- a/api/src/com/cloud/user/User.java +++ b/api/src/com/cloud/user/User.java @@ -16,9 +16,11 @@ // under the License. package com.cloud.user; +import org.apache.cloudstack.api.InternalIdentity; + import java.util.Date; -public interface User extends OwnedBy { +public interface User extends OwnedBy, InternalIdentity { public static final long UID_SYSTEM = 1; public long getId(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/vm/InstanceGroup.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/vm/InstanceGroup.java b/api/src/com/cloud/vm/InstanceGroup.java index 98fac59..283e1e5 100644 --- a/api/src/com/cloud/vm/InstanceGroup.java +++ b/api/src/com/cloud/vm/InstanceGroup.java @@ -19,8 +19,9 @@ package com.cloud.vm; import java.util.Date; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; -public interface InstanceGroup extends ControlledEntity { +public interface InstanceGroup extends ControlledEntity, InternalIdentity { long getId(); String getName(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/com/cloud/vm/VirtualMachine.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/vm/VirtualMachine.java b/api/src/com/cloud/vm/VirtualMachine.java index 64ff9cd..87a903d 100755 --- a/api/src/com/cloud/vm/VirtualMachine.java +++ b/api/src/com/cloud/vm/VirtualMachine.java @@ -24,12 +24,13 @@ import org.apache.cloudstack.api.Identity; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.utils.fsm.StateMachine2; import com.cloud.utils.fsm.StateObject; +import org.apache.cloudstack.api.InternalIdentity; /** * VirtualMachine describes the properties held by a virtual machine * */ -public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, StateObject<VirtualMachine.State> { +public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, InternalIdentity, StateObject<VirtualMachine.State> { public enum State { Starting(true, "VM is being started. At this state, you should find host id filled which means it's being started on that host."), http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/api/src/org/apache/cloudstack/api/Identity.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/Identity.java b/api/src/org/apache/cloudstack/api/Identity.java index 3136729..22d23b7 100644 --- a/api/src/org/apache/cloudstack/api/Identity.java +++ b/api/src/org/apache/cloudstack/api/Identity.java @@ -18,5 +18,4 @@ package org.apache.cloudstack.api; public interface Identity { String getUuid(); - long getId(); } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/server/src/com/cloud/api/ApiDispatcher.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java index e9a7571..01b8363 100755 --- a/server/src/com/cloud/api/ApiDispatcher.java +++ b/server/src/com/cloud/api/ApiDispatcher.java @@ -557,7 +557,7 @@ public class ApiDispatcher { // Invoke the getId method, get the internal long ID // If that fails hide exceptions as the uuid may not exist try { - internalId = (Long) ((Identity)objVO).getId(); + internalId = (Long) ((InternalIdentity)objVO).getId(); } catch (IllegalArgumentException e) { } catch (NullPointerException e) { } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/server/src/com/cloud/api/query/vo/ControlledViewEntity.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/ControlledViewEntity.java b/server/src/com/cloud/api/query/vo/ControlledViewEntity.java index 8b36874..a21a6f5 100644 --- a/server/src/com/cloud/api/query/vo/ControlledViewEntity.java +++ b/server/src/com/cloud/api/query/vo/ControlledViewEntity.java @@ -17,6 +17,7 @@ package com.cloud.api.query.vo; import com.cloud.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; /** * This is the interface for all VO classes representing DB views created for previous ControlledEntity. @@ -24,7 +25,7 @@ import com.cloud.acl.ControlledEntity; * @author minc * */ -public interface ControlledViewEntity extends ControlledEntity { +public interface ControlledViewEntity extends ControlledEntity, InternalIdentity { public String getDomainPath(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/server/src/com/cloud/api/response/SecurityGroupResultObject.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/response/SecurityGroupResultObject.java b/server/src/com/cloud/api/response/SecurityGroupResultObject.java index 5c3b763..6fa59b8 100644 --- a/server/src/com/cloud/api/response/SecurityGroupResultObject.java +++ b/server/src/com/cloud/api/response/SecurityGroupResultObject.java @@ -27,8 +27,9 @@ import com.cloud.network.security.SecurityGroup; import com.cloud.network.security.SecurityGroupRules; import com.cloud.serializer.Param; import com.cloud.user.Account; +import org.apache.cloudstack.api.InternalIdentity; -public class SecurityGroupResultObject implements ControlledEntity{ +public class SecurityGroupResultObject implements ControlledEntity, InternalIdentity { @Param(name = "id") private Long id; @@ -63,7 +64,7 @@ public class SecurityGroupResultObject implements ControlledEntity{ this.securityGroupRules = ingressRules; } - public Long getId() { + public long getId() { return id; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/server/src/com/cloud/dc/AccountVlanMapVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/dc/AccountVlanMapVO.java b/server/src/com/cloud/dc/AccountVlanMapVO.java index f8cb900..b1bf919 100644 --- a/server/src/com/cloud/dc/AccountVlanMapVO.java +++ b/server/src/com/cloud/dc/AccountVlanMapVO.java @@ -24,15 +24,16 @@ import javax.persistence.Id; import javax.persistence.Table; import com.cloud.user.OwnedBy; +import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name="account_vlan_map") -public class AccountVlanMapVO implements OwnedBy { +public class AccountVlanMapVO implements OwnedBy, InternalIdentity { @Id @GeneratedValue(strategy=GenerationType.IDENTITY) @Column(name="id") - private Long id; + private long id; @Column(name="account_id") private long accountId; @@ -49,7 +50,7 @@ public class AccountVlanMapVO implements OwnedBy { } - public Long getId() { + public long getId() { return id; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/server/src/com/cloud/network/NetworkAccountVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkAccountVO.java b/server/src/com/cloud/network/NetworkAccountVO.java index b04da8d..b51e78c 100644 --- a/server/src/com/cloud/network/NetworkAccountVO.java +++ b/server/src/com/cloud/network/NetworkAccountVO.java @@ -24,10 +24,11 @@ import javax.persistence.Id; import javax.persistence.Table; import com.cloud.user.OwnedBy; +import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name="account_network_ref") -public class NetworkAccountVO implements OwnedBy { +public class NetworkAccountVO implements OwnedBy, InternalIdentity { @Id @GeneratedValue(strategy=GenerationType.IDENTITY) long id; @@ -49,7 +50,12 @@ public class NetworkAccountVO implements OwnedBy { this.accountId = accountId; this.owner = owner; } - + + @Override + public long getId() { + return id; + } + @Override public long getAccountId() { return accountId; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5dddb4a/server/src/com/cloud/network/NetworkDomainVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkDomainVO.java b/server/src/com/cloud/network/NetworkDomainVO.java index bf32d1a..9b79887 100644 --- a/server/src/com/cloud/network/NetworkDomainVO.java +++ b/server/src/com/cloud/network/NetworkDomainVO.java @@ -24,10 +24,11 @@ import javax.persistence.Id; import javax.persistence.Table; import com.cloud.domain.PartOf; +import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name="domain_network_ref") -public class NetworkDomainVO implements PartOf { +public class NetworkDomainVO implements PartOf, InternalIdentity { @Id @GeneratedValue(strategy=GenerationType.IDENTITY) long id; @@ -49,7 +50,12 @@ public class NetworkDomainVO implements PartOf { this.domainId = domainId; this.subdomainAccess = subdomainAccess; } - + + @Override + public long getId() { + return id; + } + @Override public long getDomainId() { return domainId;
