Enforce InternalIdentity interface on all VO classes that impls long getId()

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>

api/src/com/cloud/agent/api/storage/DownloadCommand.java

@@ -21,9 +21,10 @@ import java.net.URI;
 import com.cloud.storage.Volume;
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.template.VirtualMachineTemplate;
+import org.apache.cloudstack.api.InternalIdentity;
 
 
-public class DownloadCommand extends AbstractDownloadCommand {
+public class DownloadCommand extends AbstractDownloadCommand implements InternalIdentity {
 	public static class PasswordAuth {
 		String userName;
 		String password;

api/src/com/cloud/agent/api/storage/UploadCommand.java

@@ -20,9 +20,10 @@ import com.cloud.agent.api.storage.DownloadCommand.PasswordAuth;
 import com.cloud.agent.api.to.TemplateTO;
 import com.cloud.storage.Upload.Type;
 import com.cloud.template.VirtualMachineTemplate;
+import org.apache.cloudstack.api.InternalIdentity;
 
 
-public class UploadCommand extends AbstractUploadCommand {
+public class UploadCommand extends AbstractUploadCommand implements InternalIdentity {
 
 	private TemplateTO template;
 	private String url;

api/src/com/cloud/agent/api/to/FirewallRuleTO.java

@@ -22,6 +22,7 @@ import java.util.List;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.FirewallRule.State;
 import com.cloud.utils.net.NetUtils;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * FirewallRuleTO transfers a port range for an ip to be opened.
@@ -37,7 +38,7 @@ import com.cloud.utils.net.NetUtils;
  *   - protocol: protocol to open for.  Usually tcp and udp.
  *
  */
-public class FirewallRuleTO {
+public class FirewallRuleTO implements InternalIdentity {
     long id;
     String srcVlanTag;
     String srcIp;

api/src/com/cloud/agent/api/to/NetworkACLTO.java

@@ -23,9 +23,10 @@ import java.util.List;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.FirewallRule.TrafficType;
 import com.cloud.utils.net.NetUtils;
+import org.apache.cloudstack.api.InternalIdentity;
 
 
-public class NetworkACLTO {
+public class NetworkACLTO implements InternalIdentity {
     long id;
     String vlanTag;
     String protocol;

api/src/com/cloud/agent/api/to/TemplateTO.java

@@ -18,8 +18,9 @@ package com.cloud.agent.api.to;
 
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.template.VirtualMachineTemplate;
+import org.apache.cloudstack.api.InternalIdentity;
 
-public class TemplateTO {
+public class TemplateTO implements InternalIdentity {
     private long id;
     private String uniqueName;
     private ImageFormat format;

api/src/com/cloud/agent/api/to/VolumeTO.java

@@ -19,8 +19,9 @@ package com.cloud.agent.api.to;
 import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.storage.StoragePool;
 import com.cloud.storage.Volume;
+import org.apache.cloudstack.api.InternalIdentity;
 
-public class VolumeTO {
+public class VolumeTO implements InternalIdentity {
     protected VolumeTO() {
     }
 

api/src/com/cloud/async/AsyncJob.java

@@ -19,8 +19,9 @@ package com.cloud.async;
 import java.util.Date;
 
 import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
 
-public interface AsyncJob extends Identity {
+public interface AsyncJob extends Identity, InternalIdentity {
     public enum Type {
         None,
         VirtualMachine,

api/src/com/cloud/configuration/ResourceCount.java

@@ -16,9 +16,11 @@
 // under the License.
 package com.cloud.configuration;
 
-public interface ResourceCount extends Resource {
+import org.apache.cloudstack.api.InternalIdentity;
 
-    public Long getId();
+public interface ResourceCount extends Resource, InternalIdentity {
+
+    public long getId();
 
     public long getCount();
 

api/src/com/cloud/configuration/ResourceLimit.java

@@ -16,9 +16,11 @@
 // under the License.
 package com.cloud.configuration;
 
-public interface ResourceLimit extends Resource {
+import org.apache.cloudstack.api.InternalIdentity;
 
-    public Long getId();
+public interface ResourceLimit extends Resource, InternalIdentity {
+
+    public long getId();
 
     public Long getMax();
 

api/src/com/cloud/dc/Pod.java

@@ -17,12 +17,13 @@
 package com.cloud.dc;
 
 import com.cloud.org.Grouping;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * Represents one pod in the cloud stack.
  *
  */
-public interface Pod extends Grouping {
+public interface Pod extends Grouping, InternalIdentity {
     /**
      * @return unique id mapped to the pod.
      */

api/src/com/cloud/network/NetworkProfile.java

@@ -21,8 +21,9 @@ import java.net.URI;
 import com.cloud.network.Networks.BroadcastDomainType;
 import com.cloud.network.Networks.Mode;
 import com.cloud.network.Networks.TrafficType;
+import org.apache.cloudstack.api.InternalIdentity;
 
-public class NetworkProfile implements Network {
+public class NetworkProfile implements Network, InternalIdentity {
     private long id;
     private String uuid;
     private long dataCenterId;

api/src/com/cloud/network/PhysicalNetworkServiceProvider.java

@@ -19,11 +19,12 @@ package com.cloud.network;
 import java.util.List;
 
 import com.cloud.network.Network.Service;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  *
  */
-public interface PhysicalNetworkServiceProvider {
+public interface PhysicalNetworkServiceProvider extends InternalIdentity {
 
     public enum State {
         Disabled,

api/src/com/cloud/network/PhysicalNetworkTrafficType.java

@@ -17,11 +17,12 @@
 package com.cloud.network;
 
 import com.cloud.network.Networks.TrafficType;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  *
  */
-public interface PhysicalNetworkTrafficType {
+public interface PhysicalNetworkTrafficType extends InternalIdentity {
 
     long getId();
 

api/src/com/cloud/network/VirtualRouterProvider.java

@@ -16,7 +16,9 @@
 // under the License.
 package com.cloud.network;
 
-public interface VirtualRouterProvider {
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface VirtualRouterProvider extends InternalIdentity {
     public enum VirtualRouterProviderType {
         VirtualRouter,
         ElasticLoadBalancerVm,

api/src/com/cloud/network/lb/LoadBalancingRule.java

@@ -26,8 +26,9 @@ import com.cloud.network.as.Counter;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.LoadBalancer;
 import com.cloud.utils.Pair;
+import org.apache.cloudstack.api.InternalIdentity;
 
-public class LoadBalancingRule implements FirewallRule, LoadBalancer {
+public class LoadBalancingRule implements FirewallRule, LoadBalancer, InternalIdentity {
     private LoadBalancer lb;
     private List<LbDestination> destinations;
     private List<LbStickinessPolicy> stickinessPolicies;

api/src/com/cloud/network/vpc/StaticRouteProfile.java

@@ -16,7 +16,9 @@
 // under the License.
 package com.cloud.network.vpc;
 
-public class StaticRouteProfile implements StaticRoute{
+import org.apache.cloudstack.api.InternalIdentity;
+
+public class StaticRouteProfile implements StaticRoute, InternalIdentity {
     private long id;
     private String uuid;
     private String targetCidr;

api/src/com/cloud/network/vpc/VpcOffering.java

@@ -16,7 +16,9 @@
 // under the License.
 package com.cloud.network.vpc;
 
-public interface VpcOffering {
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface VpcOffering extends InternalIdentity {
     public enum State {
         Disabled,
         Enabled

api/src/com/cloud/offering/NetworkOffering.java

@@ -18,12 +18,13 @@ package com.cloud.offering;
 
 import com.cloud.network.Network.GuestType;
 import com.cloud.network.Networks.TrafficType;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * Describes network offering
  *
  */
-public interface NetworkOffering {
+public interface NetworkOffering extends InternalIdentity {
 
     public enum Availability {
         Required,

api/src/com/cloud/storage/Swift.java

@@ -17,8 +17,9 @@
 package com.cloud.storage;
 
 import com.cloud.agent.api.to.SwiftTO;
+import org.apache.cloudstack.api.InternalIdentity;
 
-public interface Swift {
+public interface Swift extends InternalIdentity {
     public long getId();
 
     public String getUuid();

api/src/com/cloud/storage/Upload.java

@@ -16,9 +16,11 @@
 // under the License.
 package com.cloud.storage;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import java.util.Date;
 
-public interface Upload {
+public interface Upload extends InternalIdentity {
 
     public static enum Status {
         UNKNOWN, ABANDONED, UPLOADED, NOT_UPLOADED, UPLOAD_ERROR, UPLOAD_IN_PROGRESS, NOT_COPIED, COPY_IN_PROGRESS, COPY_ERROR, COPY_COMPLETE, DOWNLOAD_URL_CREATED, DOWNLOAD_URL_NOT_CREATED, ERROR

api/src/com/cloud/user/UserAccount.java

@@ -16,10 +16,12 @@
 // under the License.
 package com.cloud.user;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import java.util.Date;
 
-public interface UserAccount {
-    Long getId();
+public interface UserAccount extends InternalIdentity {
+    long getId();
 
     String getUsername();
 

api/src/com/cloud/vm/NicProfile.java

@@ -24,8 +24,9 @@ import com.cloud.network.Networks.BroadcastDomainType;
 import com.cloud.network.Networks.Mode;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.vm.Nic.ReservationStrategy;
+import org.apache.cloudstack.api.InternalIdentity;
 
-public class NicProfile {
+public class NicProfile implements InternalIdentity {
     long id;
     long networkId;
     BroadcastDomainType broadcastType;

core/src/com/cloud/alert/AlertVO.java

@@ -30,10 +30,11 @@ import javax.persistence.TemporalType;
 
 import org.apache.cloudstack.api.Identity;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="alert")
-public class AlertVO implements Alert, Identity {
+public class AlertVO implements Alert, Identity, InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/async/SyncQueueItemVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.async;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import java.util.Date;
 
 import javax.persistence.Column;
@@ -29,7 +31,7 @@ import javax.persistence.TemporalType;
 
 @Entity
 @Table(name="sync_queue_item")
-public class SyncQueueItemVO implements SyncQueueItem{
+public class SyncQueueItemVO implements SyncQueueItem, InternalIdentity {
 
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
@@ -58,7 +60,7 @@ public class SyncQueueItemVO implements SyncQueueItem{
     @Column(name="created")
     private Date created;
     
-    public Long getId() {
+    public long getId() {
         return id;
     }
 

core/src/com/cloud/async/SyncQueueVO.java

@@ -17,6 +17,8 @@
 
 package com.cloud.async;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import java.util.Date;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -29,7 +31,7 @@ import javax.persistence.TemporalType;
 
 @Entity
 @Table(name="sync_queue")
-public class SyncQueueVO {
+public class SyncQueueVO implements InternalIdentity {
 
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
@@ -60,7 +62,7 @@ public class SyncQueueVO {
     @Column(name="queue_size_limit")
     private long queueSizeLimit = 0;
 
-    public Long getId() {
+    public long getId() {
         return id;
     }
 

core/src/com/cloud/capacity/CapacityVO.java

@@ -29,10 +29,11 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="op_host_capacity")
-public class CapacityVO implements Capacity {
+public class CapacityVO implements Capacity, InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/certificate/CertificateVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.certificate;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,7 +27,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="certificate")
-public class CertificateVO {
+public class CertificateVO implements InternalIdentity {
 
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
@@ -40,7 +42,7 @@ public class CertificateVO {
 
     public CertificateVO() {}
 
-    public Long getId() {
+    public long getId() {
         return id;
     }
     

core/src/com/cloud/configuration/ResourceCountVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.configuration;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -27,7 +29,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="resource_count")
-public class ResourceCountVO implements ResourceCount {
+public class ResourceCountVO implements ResourceCount, InternalIdentity {
 	
 	@Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
@@ -62,7 +64,7 @@ public class ResourceCountVO implements ResourceCount {
 	}
 	
 	@Override
-	public Long getId() {
+	public long getId() {
 		return id;
 	}
 	

core/src/com/cloud/configuration/ResourceLimitVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.configuration;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -27,7 +29,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name = "resource_limit")
-public class ResourceLimitVO implements ResourceLimit {
+public class ResourceLimitVO implements ResourceLimit, InternalIdentity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -62,7 +64,7 @@ public class ResourceLimitVO implements ResourceLimit {
     }
 
     @Override
-    public Long getId() {
+    public long getId() {
         return id;
     }
 

core/src/com/cloud/event/EventVO.java

@@ -31,10 +31,11 @@ import javax.persistence.Transient;
 
 import org.apache.cloudstack.api.Identity;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="event")
-public class EventVO implements Event, Identity {
+public class EventVO implements Event, Identity, InternalIdentity {
 	@Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/event/UsageEvent.java

@@ -16,9 +16,11 @@
 // under the License.
 package com.cloud.event;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import java.util.Date;
 
-public interface UsageEvent {
+public interface UsageEvent extends InternalIdentity {
     long getId();
     String getType();
 

core/src/com/cloud/event/UsageEventVO.java

@@ -26,10 +26,11 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="usage_event")
-public class UsageEventVO implements UsageEvent {
+public class UsageEventVO implements UsageEvent, InternalIdentity {
 	@Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/host/DetailVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.host;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,7 +27,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="host_details")
-public class DetailVO {
+public class DetailVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/host/HostTagVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.host;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,7 +27,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="host_tags")
-public class HostTagVO {
+public class HostTagVO implements InternalIdentity {
 	@Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/host/HostVO.java

@@ -43,12 +43,13 @@ import com.cloud.resource.ResourceState;
 import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="host")
 @Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
 @DiscriminatorColumn(name="type", discriminatorType=DiscriminatorType.STRING, length=32)
-public class HostVO implements Host, Identity {
+public class HostVO implements Host, Identity, InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java

@@ -30,10 +30,11 @@ import javax.persistence.Table;
 import org.apache.cloudstack.api.Identity;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.utils.NumbersUtil;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="hypervisor_capabilities")
-public class HypervisorCapabilitiesVO implements HypervisorCapabilities, Identity {
+public class HypervisorCapabilitiesVO implements HypervisorCapabilities, Identity, InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/network/VpnUserVO.java

@@ -29,10 +29,11 @@ import javax.persistence.Table;
 
 import org.apache.cloudstack.api.Identity;
 import com.cloud.utils.db.Encrypt;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name=("vpn_users"))
-public class VpnUserVO implements VpnUser, Identity {
+public class VpnUserVO implements VpnUser, Identity, InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/network/security/SecurityGroupRuleVO.java

@@ -29,10 +29,11 @@ import javax.persistence.Table;
 
 import com.cloud.async.AsyncInstanceCreateStatus;
 import com.google.gson.annotations.Expose;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name = ("security_group_rule"))
-public class SecurityGroupRuleVO implements SecurityRule {
+public class SecurityGroupRuleVO implements SecurityRule, InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")

core/src/com/cloud/network/security/SecurityGroupRulesVO.java

@@ -27,12 +27,13 @@ import javax.persistence.Table;
 
 import com.cloud.network.security.SecurityRule.SecurityRuleType;
 import com.cloud.utils.db.JoinType;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name = ("security_group"))
 @JoinType(type = "left")
 @SecondaryTable(name = "security_group_rule", pkJoinColumns = { @PrimaryKeyJoinColumn(name = "id", referencedColumnName = "security_group_id") })
-public class SecurityGroupRulesVO implements SecurityGroupRules {
+public class SecurityGroupRulesVO implements SecurityGroupRules, InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")

core/src/com/cloud/network/security/SecurityGroupVMMapVO.java

@@ -27,13 +27,14 @@ import javax.persistence.SecondaryTables;
 import javax.persistence.Table;
 
 import com.cloud.vm.VirtualMachine.State;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name = ("security_group_vm_map"))
 @SecondaryTables({ @SecondaryTable(name = "nics", pkJoinColumns = { @PrimaryKeyJoinColumn(name = "instance_id", referencedColumnName = "instance_id") }),
         @SecondaryTable(name = "vm_instance", pkJoinColumns = { @PrimaryKeyJoinColumn(name = "instance_id", referencedColumnName = "id") }),
         @SecondaryTable(name = "security_group", pkJoinColumns = { @PrimaryKeyJoinColumn(name = "security_group_id", referencedColumnName = "id") }) })
-public class SecurityGroupVMMapVO {
+public class SecurityGroupVMMapVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
@@ -62,7 +63,7 @@ public class SecurityGroupVMMapVO {
         this.instanceId = instanceId;
     }
 
-    public Long getId() {
+    public long getId() {
         return id;
     }
 

core/src/com/cloud/network/security/SecurityGroupVO.java

@@ -26,10 +26,11 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name = ("security_group"))
-public class SecurityGroupVO implements SecurityGroup, Identity {
+public class SecurityGroupVO implements SecurityGroup, Identity, InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")

core/src/com/cloud/network/security/SecurityGroupWorkVO.java

@@ -30,10 +30,11 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="op_nwgrp_work")
-public class SecurityGroupWorkVO implements SecurityGroupWork{
+public class SecurityGroupWorkVO implements SecurityGroupWork, InternalIdentity {
 	
 	
     @Id
@@ -67,7 +68,7 @@ public class SecurityGroupWorkVO implements SecurityGroupWork{
     protected SecurityGroupWorkVO() {
     }
     
-    public Long getId() {
+    public long getId() {
         return id;
     }
     

core/src/com/cloud/network/security/VmRulesetLogVO.java

@@ -26,6 +26,7 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * Records the intent to update a VM's ingress ruleset
@@ -33,7 +34,7 @@ import com.cloud.utils.db.GenericDao;
  */
 @Entity
 @Table(name="op_vm_ruleset_log")
-public class VmRulesetLogVO {
+public class VmRulesetLogVO implements InternalIdentity {
 	@Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")
@@ -57,7 +58,7 @@ public class VmRulesetLogVO {
 		this.instanceId = instanceId;
 	}
 
-	public Long getId() {
+	public long getId() {
 		return id;
 	}
 

core/src/com/cloud/storage/DiskOfferingVO.java

@@ -37,12 +37,13 @@ import javax.persistence.Transient;
 import org.apache.cloudstack.api.Identity;
 import com.cloud.offering.DiskOffering;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="disk_offering")
 @Inheritance(strategy=InheritanceType.JOINED)
 @DiscriminatorColumn(name="type", discriminatorType=DiscriminatorType.STRING, length=32)
-public class DiskOfferingVO implements DiskOffering, Identity {
+public class DiskOfferingVO implements DiskOffering, Identity, InternalIdentity {
     public enum Type {
         Disk,
         Service

core/src/com/cloud/storage/GuestOSCategoryVO.java

@@ -26,10 +26,11 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="guest_os_category")
-public class GuestOSCategoryVO implements GuestOsCategory, Identity {
+public class GuestOSCategoryVO implements GuestOsCategory, Identity, InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/storage/GuestOSVO.java

@@ -26,10 +26,11 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="guest_os")
-public class GuestOSVO implements GuestOS, Identity {
+public class GuestOSVO implements GuestOS, Identity, InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/storage/LaunchPermissionVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.storage;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -23,7 +25,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="launch_permission")
-public class LaunchPermissionVO {
+public class LaunchPermissionVO implements InternalIdentity {
     @Id
     @Column(name="id")
     private Long id;
@@ -41,7 +43,7 @@ public class LaunchPermissionVO {
         this.accountId = accountId;
     }
 
-    public Long getId() {
+    public long getId() {
         return id;
     }
 

core/src/com/cloud/storage/S3VO.java

@@ -21,6 +21,7 @@ package com.cloud.storage;
 import com.cloud.agent.api.to.S3TO;
 import com.cloud.utils.db.GenericDao;
 import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -32,7 +33,7 @@ import java.util.Date;
 
 @Entity
 @Table(name = "s3")
-public class S3VO implements S3, Identity {
+public class S3VO implements S3, Identity, InternalIdentity {
 
     public static final String ID_COLUMN_NAME = "id";
 

core/src/com/cloud/storage/SnapshotPolicyVO.java

@@ -28,10 +28,11 @@ import javax.persistence.Table;
 import org.apache.cloudstack.api.Identity;
 import com.cloud.storage.snapshot.SnapshotPolicy;
 import com.cloud.utils.DateUtil.IntervalType;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="snapshot_policy")
-public class SnapshotPolicyVO implements SnapshotPolicy{
+public class SnapshotPolicyVO implements SnapshotPolicy, InternalIdentity {
 
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)

core/src/com/cloud/storage/SnapshotScheduleVO.java

@@ -30,10 +30,11 @@ import javax.persistence.TemporalType;
 
 import org.apache.cloudstack.api.Identity;
 import com.cloud.storage.snapshot.SnapshotSchedule;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="snapshot_schedule")
-public class SnapshotScheduleVO implements SnapshotSchedule {
+public class SnapshotScheduleVO implements SnapshotSchedule, InternalIdentity {
 
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)

core/src/com/cloud/storage/SnapshotVO.java

@@ -32,10 +32,11 @@ import org.apache.cloudstack.api.Identity;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.utils.db.GenericDao;
 import com.google.gson.annotations.Expose;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="snapshots")
-public class SnapshotVO implements Snapshot, Identity {
+public class SnapshotVO implements Snapshot, Identity, InternalIdentity {
 
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)

core/src/com/cloud/storage/StoragePoolDetailVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.storage;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,7 +27,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="storage_pool_details")
-public class StoragePoolDetailVO {
+public class StoragePoolDetailVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/storage/StoragePoolHostVO.java

@@ -28,6 +28,7 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
 import com.cloud.utils.db.GenericDaoBase;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * Join table for storage pools and hosts
@@ -35,7 +36,7 @@ import com.cloud.utils.db.GenericDaoBase;
  */
 @Entity
 @Table(name="storage_pool_host_ref")
-public class StoragePoolHostVO implements StoragePoolHostAssoc {
+public class StoragePoolHostVO implements StoragePoolHostAssoc, InternalIdentity {
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)
 	private Long id;
@@ -75,7 +76,7 @@ public class StoragePoolHostVO implements StoragePoolHostAssoc {
 	}
 
 
-    public Long getId() {
+    public long getId() {
         return id;
     }
 

core/src/com/cloud/storage/StoragePoolVO.java

@@ -33,10 +33,11 @@ import javax.persistence.Transient;
 import org.apache.cloudstack.api.Identity;
 import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="storage_pool")
-public class StoragePoolVO implements StoragePool, Identity {
+public class StoragePoolVO implements StoragePool, Identity, InternalIdentity {
     @Id
     @TableGenerator(name="storage_pool_sq", table="sequence", pkColumnName="name", valueColumnName="value", pkColumnValue="storage_pool_seq", allocationSize=1)
     @Column(name="id", updatable=false, nullable = false)

core/src/com/cloud/storage/StoragePoolWorkVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.storage;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 
@@ -26,9 +28,9 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="storage_pool_work")
-public class StoragePoolWorkVO {
+public class StoragePoolWorkVO implements InternalIdentity {
     
-    public Long getId() {
+    public long getId() {
         return id;
     }
 

core/src/com/cloud/storage/SwiftVO.java

@@ -29,10 +29,11 @@ import javax.persistence.Table;
 import com.cloud.agent.api.to.SwiftTO;
 import org.apache.cloudstack.api.Identity;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="swift")
-public class SwiftVO implements Swift {
+public class SwiftVO implements Swift, InternalIdentity {
 
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)

core/src/com/cloud/storage/UploadVO.java

@@ -32,10 +32,11 @@ import javax.persistence.TemporalType;
 
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.db.GenericDaoBase;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="upload")
-public class UploadVO implements Upload {
+public class UploadVO implements Upload, InternalIdentity {
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)
 	long id;

core/src/com/cloud/storage/VMTemplateDetailVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.storage;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,7 +27,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="vm_template_details")
-public class VMTemplateDetailVO {
+public class VMTemplateDetailVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/storage/VMTemplateHostVO.java

@@ -30,6 +30,7 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
 import com.cloud.utils.db.GenericDaoBase;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * Join table for storage hosts and templates
@@ -37,7 +38,7 @@ import com.cloud.utils.db.GenericDaoBase;
  */
 @Entity
 @Table(name="template_host_ref")
-public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc {
+public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc, InternalIdentity {
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)
 	Long id;

core/src/com/cloud/storage/VMTemplateS3VO.java

@@ -19,6 +19,7 @@
 package com.cloud.storage;
 
 import com.cloud.utils.db.GenericDaoBase;
+import org.apache.cloudstack.api.InternalIdentity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -32,7 +33,7 @@ import java.util.Date;
 
 @Entity
 @Table(name = "template_s3_ref")
-public class VMTemplateS3VO {
+public class VMTemplateS3VO implements InternalIdentity {
 
     public static final String S3_ID_COLUMN_NAME = "s3_id";
 

core/src/com/cloud/storage/VMTemplateStoragePoolVO.java

@@ -30,6 +30,7 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
 import com.cloud.utils.db.GenericDaoBase;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * Join table for storage pools and templates
@@ -37,7 +38,7 @@ import com.cloud.utils.db.GenericDaoBase;
  */
 @Entity
 @Table(name="template_spool_ref")
-public class VMTemplateStoragePoolVO implements VMTemplateStorageResourceAssoc{
+public class VMTemplateStoragePoolVO implements VMTemplateStorageResourceAssoc, InternalIdentity {
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)
 	long id;

core/src/com/cloud/storage/VMTemplateSwiftVO.java

@@ -26,6 +26,7 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.utils.db.GenericDaoBase;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * Join table for swift and templates
@@ -34,7 +35,7 @@ import com.cloud.utils.db.GenericDaoBase;
  */
 @Entity
 @Table(name = "template_swift_ref")
-public class VMTemplateSwiftVO {
+public class VMTemplateSwiftVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     Long id;

core/src/com/cloud/storage/VMTemplateVO.java

@@ -37,10 +37,11 @@ import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.Storage.TemplateType;
 import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="vm_template")
-public class VMTemplateVO implements VirtualMachineTemplate {
+public class VMTemplateVO implements VirtualMachineTemplate, InternalIdentity {
     @Id
     @TableGenerator(name="vm_template_sq", table="sequence", pkColumnName="name", valueColumnName="value", pkColumnValue="vm_template_seq", allocationSize=1)
     @Column(name="id", nullable = false)

core/src/com/cloud/storage/VMTemplateZoneVO.java

@@ -29,10 +29,11 @@ import javax.persistence.TemporalType;
 
 import com.cloud.utils.db.GenericDao;
 import com.cloud.utils.db.GenericDaoBase;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="template_zone_ref")
-public class VMTemplateZoneVO {
+public class VMTemplateZoneVO implements InternalIdentity {
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)
 	Long id;
@@ -64,7 +65,7 @@ public class VMTemplateZoneVO {
 		this.lastUpdated = lastUpdated;
 	}
 
-	public Long getId() {
+	public long getId() {
 		return id;
 	}
 

core/src/com/cloud/storage/VolumeHostVO.java

@@ -33,6 +33,7 @@ import javax.persistence.TemporalType;
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
 import com.cloud.utils.db.GenericDaoBase;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * Join table for storage hosts and volumes
@@ -40,7 +41,7 @@ import com.cloud.utils.db.GenericDaoBase;
  */
 @Entity
 @Table(name="volume_host_ref")
-public class VolumeHostVO {
+public class VolumeHostVO implements InternalIdentity {
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)
 	Long id;

core/src/com/cloud/storage/VolumeVO.java

@@ -35,10 +35,11 @@ import org.apache.cloudstack.api.Identity;
 import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name = "volumes")
-public class VolumeVO implements Volume, Identity {
+public class VolumeVO implements Volume, Identity, InternalIdentity {
     @Id
     @TableGenerator(name = "volume_sq", table = "sequence", pkColumnName = "name", valueColumnName = "value", pkColumnValue = "volume_seq", allocationSize = 1)
     @GeneratedValue(strategy = GenerationType.TABLE)

core/src/com/cloud/user/AccountVO.java

@@ -30,10 +30,11 @@ import javax.persistence.Table;
 
 import org.apache.cloudstack.api.Identity;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="account")
-public class AccountVO implements Account, Identity {
+public class AccountVO implements Account, Identity, InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/user/SSHKeyPairVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.user;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -26,7 +28,7 @@ import javax.persistence.Transient;
 
 @Entity
 @Table(name="ssh_keypairs")
-public class SSHKeyPairVO implements SSHKeyPair {
+public class SSHKeyPairVO implements SSHKeyPair, InternalIdentity {
 	
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)

core/src/com/cloud/user/UserAccountVO.java

@@ -29,12 +29,13 @@ import javax.persistence.Table;
 
 import com.cloud.utils.db.Encrypt;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="user")
 @SecondaryTable(name="account",
 pkJoinColumns={@PrimaryKeyJoinColumn(name="account_id", referencedColumnName="id")})
-public class UserAccountVO implements UserAccount {
+public class UserAccountVO implements UserAccount, InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")
@@ -101,7 +102,7 @@ public class UserAccountVO implements UserAccount {
     public UserAccountVO() {}
 
     @Override
-    public Long getId() {
+    public long getId() {
         return id;
     }
 

core/src/com/cloud/user/UserStatisticsVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.user;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,7 +27,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="user_statistics")
-public class UserStatisticsVO {
+public class UserStatisticsVO implements InternalIdentity {
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)
 	@Column(name="id")
@@ -88,7 +90,7 @@ public class UserStatisticsVO {
 		return accountId;
 	}
 
-	public Long getId() {
+	public long getId() {
         return id;
     }
 

core/src/com/cloud/user/UserVO.java

@@ -32,6 +32,7 @@ import org.apache.cloudstack.api.Identity;
 import com.cloud.user.Account.State;
 import com.cloud.utils.db.Encrypt;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * A bean representing a user
@@ -39,7 +40,7 @@ import com.cloud.utils.db.GenericDao;
  */
 @Entity
 @Table(name = "user")
-public class UserVO implements User, Identity {
+public class UserVO implements User, Identity, InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")

core/src/com/cloud/vm/InstanceGroupVMMapVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.vm;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -34,7 +36,7 @@ import javax.persistence.Table;
 @SecondaryTable(name="instance_group", 
 		pkJoinColumns={@PrimaryKeyJoinColumn(name="group_id", referencedColumnName="id")})
 		})
-public class InstanceGroupVMMapVO {
+public class InstanceGroupVMMapVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")
@@ -54,7 +56,7 @@ public class InstanceGroupVMMapVO {
         this.instanceId = instanceId;
     }
 
-    public Long getId() {
+    public long getId() {
         return id;
     }
 

core/src/com/cloud/vm/InstanceGroupVO.java

@@ -30,12 +30,13 @@ import javax.persistence.Table;
 
 import org.apache.cloudstack.api.Identity;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="instance_group")
 @SecondaryTable(name="account",
         pkJoinColumns={@PrimaryKeyJoinColumn(name="account_id", referencedColumnName="id")})
-public class InstanceGroupVO implements InstanceGroup, Identity {
+public class InstanceGroupVO implements InstanceGroup, Identity, InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/vm/UserVmDetailVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.vm;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,7 +27,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="user_vm_details")
-public class UserVmDetailVO {
+public class UserVmDetailVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

core/src/com/cloud/vm/VMInstanceVO.java

@@ -42,12 +42,13 @@ import com.cloud.utils.db.GenericDao;
 import com.cloud.utils.db.StateMachine;
 import com.cloud.utils.fsm.FiniteStateObject;
 import com.cloud.vm.VirtualMachine.State;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="vm_instance")
 @Inheritance(strategy=InheritanceType.JOINED)
 @DiscriminatorColumn(name="type", discriminatorType=DiscriminatorType.STRING, length=32)
-public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, VirtualMachine.Event> {
+public class VMInstanceVO implements VirtualMachine, InternalIdentity, FiniteStateObject<State, VirtualMachine.Event> {
 	@Id
     @TableGenerator(name="vm_instance_sq", table="sequence", pkColumnName="name", valueColumnName="value", pkColumnValue="vm_instance_seq", allocationSize=1)
     @Column(name="id", updatable=false, nullable = false)
@@ -470,5 +471,5 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, Vi
     public boolean canPlugNics() {
         return false;
     }
-
-}
+
+}

plugins/file-systems/netapp/src/com/cloud/netapp/LunVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.netapp;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,7 +27,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="netapp_lun")
-public class LunVO {
+public class LunVO implements InternalIdentity {
 		
 	@Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
@@ -85,7 +87,7 @@ public class LunVO {
 		this.targetIqn = targetIqn;
 	}
 
-	public Long getId() {
+	public long getId() {
 		return id;
 	}
 

plugins/file-systems/netapp/src/com/cloud/netapp/NetappVolumeVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.netapp;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,7 +27,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="netapp_volume")
-public class NetappVolumeVO {
+public class NetappVolumeVO implements InternalIdentity {
 	
 	@Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
@@ -132,7 +134,7 @@ public class NetappVolumeVO {
 		this.volumeSize = volumeSize;
 	}
 	
-    public Long getId() {
+    public long getId() {
 		return id;
 	}
 

plugins/file-systems/netapp/src/com/cloud/netapp/PoolVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.netapp;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,9 +27,9 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="netapp_pool")
-public class PoolVO {
+public class PoolVO implements InternalIdentity {
 	
-	public Long getId() {
+	public long getId() {
 		return id;
 	}
 

plugins/hypervisors/simulator/src/com/cloud/simulator/MockConfigurationVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.simulator;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -28,7 +30,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="mockconfiguration")
-public class MockConfigurationVO {
+public class MockConfigurationVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

plugins/hypervisors/simulator/src/com/cloud/simulator/MockHostVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.simulator;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -26,7 +28,7 @@ import javax.persistence.Table;
 @Entity
 @Table(name="mockhost")
 
-public class MockHostVO implements MockHost {
+public class MockHostVO implements MockHost, InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecStorageVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.simulator;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -26,7 +28,7 @@ import javax.persistence.Table;
 @Entity
 @Table(name="mocksecstorage")
 
-public class MockSecStorageVO {
+public class MockSecStorageVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecurityRulesVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.simulator;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -26,7 +28,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="mocksecurityrules")
-public class MockSecurityRulesVO {
+public class MockSecurityRulesVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

plugins/hypervisors/simulator/src/com/cloud/simulator/MockStoragePoolVO.java

@@ -26,11 +26,12 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.storage.Storage.StoragePoolType;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="mockstoragepool")
 
-public class MockStoragePoolVO {
+public class MockStoragePoolVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

plugins/hypervisors/simulator/src/com/cloud/simulator/MockVMVO.java

@@ -24,11 +24,12 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.vm.VirtualMachine.State;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="mockvm")
 
-public class MockVMVO implements MockVm{
+public class MockVMVO implements MockVm, InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

plugins/hypervisors/simulator/src/com/cloud/simulator/MockVolumeVO.java

@@ -27,12 +27,13 @@ import javax.persistence.Table;
 
 import com.cloud.storage.VMTemplateStorageResourceAssoc;
 import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
+import org.apache.cloudstack.api.InternalIdentity;
 
 
 @Entity
 @Table(name="mockvolume")
 
-public class MockVolumeVO {
+public class MockVolumeVO implements InternalIdentity {
     public enum MockVolumeType {
         VOLUME,
         TEMPLATE,

plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceVO.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 
 import org.apache.cloudstack.api.Identity;
 import com.cloud.utils.db.Encrypt;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * CiscoNexusVSMDeviceVO contains information on external Cisco Nexus 1000v VSM devices added into a deployment.
@@ -37,7 +38,7 @@ import com.cloud.utils.db.Encrypt;
 
 @Entity
 @Table(name="virtual_supervisor_module")
-public class CiscoNexusVSMDeviceVO implements CiscoNexusVSMDevice, Identity{
+public class CiscoNexusVSMDeviceVO implements CiscoNexusVSMDevice, Identity, InternalIdentity {
 
     // We need to know what properties a VSM has. Put them here.
 

plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/ElasticLbVmMapVO.java

@@ -29,13 +29,14 @@ import javax.persistence.SecondaryTables;
 import javax.persistence.Table;
 
 import com.cloud.utils.net.Ip;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name = ("elastic_lb_vm_map"))
 @SecondaryTables({ 
         @SecondaryTable(name = "user_ip_address", pkJoinColumns = { @PrimaryKeyJoinColumn(name = "ip_addr_id", referencedColumnName = "id") })
         })
-public class ElasticLbVmMapVO {
+public class ElasticLbVmMapVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
@@ -66,7 +67,7 @@ public class ElasticLbVmMapVO {
         this.lbId = lbId;
     }
 
-    public Long getId() {
+    public long getId() {
         return id;
     }
 

plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.network;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -31,7 +33,7 @@ import javax.persistence.Table;
  */
 @Entity
 @Table(name="netscaler_pod_ref")
-public class NetScalerPodVO {
+public class NetScalerPodVO implements InternalIdentity {
  
     @Column(name="external_load_balancer_device_id")
     private long netscalerDeviceId;

plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpNicMappingVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.network;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,7 +27,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="nicira_nvp_nic_map")
-public class NiciraNvpNicMappingVO {
+public class NiciraNvpNicMappingVO implements InternalIdentity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpRouterMappingVO.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.network;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,7 +27,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name="nicira_nvp_router_map")
-public class NiciraNvpRouterMappingVO {
+public class NiciraNvpRouterMappingVO implements InternalIdentity {
 	//FIXME the ddl for this table should be in one of the upgrade scripts
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)

plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java

@@ -17,6 +17,8 @@
 
 package com.cloud.network.ovs.dao;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -26,7 +28,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name=("ovs_tunnel_interface"))
-public class OvsTunnelInterfaceVO {
+public class OvsTunnelInterfaceVO implements InternalIdentity {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "id")

plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java

@@ -17,6 +17,8 @@
 
 package com.cloud.network.ovs.dao;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -26,7 +28,7 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name=("ovs_tunnel_network"))
-public class OvsTunnelNetworkVO {
+public class OvsTunnelNetworkVO implements InternalIdentity {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "id")

server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java

@@ -30,10 +30,11 @@ import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.router.VirtualRouter.RedundantState;
 import com.cloud.utils.db.GenericDao;
 import com.cloud.vm.VirtualMachine.State;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="domain_router_view")
-public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEntity {
+public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEntity, InternalIdentity {
 
     @Column(name="id", updatable=false, nullable = false)
     private long id;

server/src/com/cloud/api/query/vo/EventJoinVO.java

@@ -26,10 +26,11 @@ import javax.persistence.Table;
 
 import com.cloud.utils.db.GenericDao;
 import com.cloud.event.Event.State;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="event_view")
-public class EventJoinVO extends BaseViewVO implements ControlledViewEntity {
+public class EventJoinVO extends BaseViewVO implements ControlledViewEntity, InternalIdentity {
 
     @Column(name="id", updatable=false, nullable = false)
     private long id;

server/src/com/cloud/api/query/vo/HostJoinVO.java

@@ -32,6 +32,7 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.org.Cluster;
 import com.cloud.resource.ResourceState;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * Host DB view.
@@ -40,7 +41,7 @@ import com.cloud.utils.db.GenericDao;
  */
 @Entity
 @Table(name="host_view")
-public class HostJoinVO extends BaseViewVO {
+public class HostJoinVO extends BaseViewVO implements InternalIdentity {
 
     @Column(name="id")
     private long id;

server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java

@@ -23,10 +23,11 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="instance_group_view")
-public class InstanceGroupJoinVO extends BaseViewVO implements ControlledViewEntity {
+public class InstanceGroupJoinVO extends BaseViewVO implements ControlledViewEntity, InternalIdentity {
 
     @Column(name="id", updatable=false, nullable = false)
     private long id;

server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java

@@ -23,10 +23,11 @@ import javax.persistence.Enumerated;
 import javax.persistence.Table;
 
 import com.cloud.projects.ProjectAccount.Role;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="project_account_view")
-public class ProjectAccountJoinVO extends BaseViewVO {
+public class ProjectAccountJoinVO extends BaseViewVO implements InternalIdentity {
 
     @Column(name="id", updatable=false, nullable = false)
     private long id;

server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java

@@ -26,10 +26,11 @@ import javax.persistence.Table;
 
 import com.cloud.utils.db.GenericDao;
 import com.cloud.vm.VirtualMachine.State;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="project_invitation_view")
-public class ProjectInvitationJoinVO extends BaseViewVO implements ControlledViewEntity {
+public class ProjectInvitationJoinVO extends BaseViewVO implements ControlledViewEntity, InternalIdentity {
 
     @Column(name="id", updatable=false, nullable = false)
     private long id;

server/src/com/cloud/api/query/vo/ProjectJoinVO.java

@@ -27,10 +27,11 @@ import javax.persistence.Table;
 import com.cloud.server.ResourceTag.TaggedResourceType;
 import com.cloud.utils.db.GenericDao;
 import com.cloud.vm.VirtualMachine.State;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="project_view")
-public class ProjectJoinVO extends BaseViewVO {
+public class ProjectJoinVO extends BaseViewVO implements InternalIdentity {
 
     @Column(name="id", updatable=false, nullable = false)
     private long id;

server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java

@@ -23,10 +23,11 @@ import javax.persistence.Enumerated;
 import javax.persistence.Table;
 
 import com.cloud.server.ResourceTag.TaggedResourceType;
+import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
 @Table(name="resource_tag_view")
-public class ResourceTagJoinVO extends BaseViewVO implements ControlledViewEntity {
+public class ResourceTagJoinVO extends BaseViewVO implements ControlledViewEntity, InternalIdentity {
 
     @Column(name="id", updatable=false, nullable = false)
     private long id;