Add back Identity interface to most VO class to avoid cast error in

ApiDispatcher.setupParameter call.

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

@@ -67,7 +67,7 @@ public interface Snapshot extends ControlledEntity {
 
     public static final long MANUAL_POLICY_ID = 0L;
 
-    Long getId();
+    long getId();
 
     String getUuid();
 

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

@@ -48,7 +48,7 @@ import com.cloud.utils.db.GenericDao;
 @Table(name="host")
 @Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
 @DiscriminatorColumn(name="type", discriminatorType=DiscriminatorType.STRING, length=32)
-public class HostVO implements Host {
+public class HostVO implements Host, Identity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

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

@@ -32,7 +32,7 @@ import com.cloud.utils.db.Encrypt;
 
 @Entity
 @Table(name=("vpn_users"))
-public class VpnUserVO implements VpnUser {
+public class VpnUserVO implements VpnUser, Identity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

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

@@ -42,7 +42,7 @@ import com.cloud.utils.db.GenericDao;
 @Table(name="disk_offering")
 @Inheritance(strategy=InheritanceType.JOINED)
 @DiscriminatorColumn(name="type", discriminatorType=DiscriminatorType.STRING, length=32)
-public class DiskOfferingVO implements DiskOffering {
+public class DiskOfferingVO implements DiskOffering, Identity {
     public enum Type {
         Disk,
         Service

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

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

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

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

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

@@ -35,7 +35,7 @@ import com.google.gson.annotations.Expose;
 
 @Entity
 @Table(name="snapshots")
-public class SnapshotVO implements Snapshot {
+public class SnapshotVO implements Snapshot, Identity {
 
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
@@ -131,7 +131,7 @@ public class SnapshotVO implements Snapshot {
     }
 
     @Override
-    public Long getId() {
+    public long getId() {
         return id;
     }
 

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

@@ -33,7 +33,7 @@ import com.cloud.utils.db.GenericDao;
 
 @Entity
 @Table(name="account")
-public class AccountVO implements Account {
+public class AccountVO implements Account, Identity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

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

@@ -37,7 +37,7 @@ import com.cloud.utils.db.Encrypt;
 
 @Entity
 @Table(name="virtual_supervisor_module")
-public class CiscoNexusVSMDeviceVO implements CiscoNexusVSMDevice{
+public class CiscoNexusVSMDeviceVO implements CiscoNexusVSMDevice, Identity{
 
     // We need to know what properties a VSM has. Put them here.
 

server/src/com/cloud/dc/ClusterVO.java

@@ -38,7 +38,7 @@ import com.cloud.utils.db.GenericDao;
 
 @Entity
 @Table(name="cluster")
-public class ClusterVO implements Cluster {
+public class ClusterVO implements Cluster, Identity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

server/src/com/cloud/dc/DataCenterVO.java

@@ -39,7 +39,7 @@ import com.cloud.utils.db.GenericDao;
 
 @Entity
 @Table(name="data_center")
-public class DataCenterVO implements DataCenter {
+public class DataCenterVO implements DataCenter, Identity {
 
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)

server/src/com/cloud/dc/VlanVO.java

@@ -31,7 +31,7 @@ import org.apache.cloudstack.api.Identity;
 
 @Entity
 @Table(name="vlan")
-public class VlanVO implements Vlan {
+public class VlanVO implements Vlan, Identity {
 
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)

server/src/com/cloud/domain/DomainVO.java

@@ -33,7 +33,7 @@ import com.cloud.utils.db.GenericDao;
 
 @Entity
 @Table(name="domain")
-public class DomainVO implements Domain {
+public class DomainVO implements Domain, Identity {
 	public static final Logger s_logger = Logger.getLogger(DomainVO.class.getName());
 
     @Id

server/src/com/cloud/network/IPAddressVO.java

@@ -40,7 +40,7 @@ import com.cloud.utils.net.Ip;
  */
 @Entity
 @Table(name=("user_ip_address"))
-public class IPAddressVO implements IpAddress {
+public class IPAddressVO implements IpAddress, Identity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="id")

server/src/com/cloud/network/NetworkVO.java

@@ -44,7 +44,7 @@ import com.cloud.utils.net.NetUtils;
  */
 @Entity
 @Table(name="networks")
-public class NetworkVO implements Network {
+public class NetworkVO implements Network, Identity {
     @Id
     @TableGenerator(name="networks_sq", table="sequence", pkColumnName="name", valueColumnName="value", pkColumnValue="networks_seq", allocationSize=1)
     @Column(name="id")

server/src/com/cloud/network/as/AutoScaleVmProfileVO.java

@@ -41,7 +41,7 @@ import com.cloud.utils.net.NetUtils;
 @Entity
 @Table(name = "autoscale_vmprofiles")
 @Inheritance(strategy = InheritanceType.JOINED)
-public class AutoScaleVmProfileVO implements AutoScaleVmProfile{
+public class AutoScaleVmProfileVO implements AutoScaleVmProfile, Identity{
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

server/src/com/cloud/network/rules/FirewallRuleVO.java

@@ -44,7 +44,7 @@ import com.cloud.utils.net.NetUtils;
 @Table(name="firewall_rules")
 @Inheritance(strategy=InheritanceType.JOINED)
 @DiscriminatorColumn(name="purpose", discriminatorType=DiscriminatorType.STRING, length=32)
-public class FirewallRuleVO implements FirewallRule {
+public class FirewallRuleVO implements FirewallRule, Identity {
     protected final FirewallRulesCidrsDaoImpl _firewallRulesCidrsDao = ComponentLocator.inject(FirewallRulesCidrsDaoImpl.class);
 
     @Id