http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java index 21e4f03..f1db7f4 100644 --- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java +++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java @@ -25,7 +25,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.network.MonitoringService; @@ -120,8 +120,8 @@ public class MonitoringServiceVO implements MonitoringService { } @Override - public AclEntityType getEntityType() { - return AclEntityType.MonitorService; + public IAMEntityType getEntityType() { + return IAMEntityType.MonitorService; } }
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/network/dao/NetworkVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/com/cloud/network/dao/NetworkVO.java index cc5535a..c97a522 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkVO.java @@ -29,7 +29,7 @@ import javax.persistence.Table; import javax.persistence.TableGenerator; import javax.persistence.Transient; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.acl.ControlledEntity; import com.cloud.network.Network; @@ -586,7 +586,7 @@ public class NetworkVO implements Network { } @Override - public AclEntityType getEntityType() { - return AclEntityType.Network; + public IAMEntityType getEntityType() { + return IAMEntityType.Network; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnVO.java b/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnVO.java index f546bb7..c882d5d 100644 --- a/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnVO.java +++ b/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnVO.java @@ -25,7 +25,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.network.RemoteAccessVpn; @@ -156,7 +156,7 @@ public class RemoteAccessVpnVO implements RemoteAccessVpn { } @Override - public AclEntityType getEntityType() { - return AclEntityType.RemoteAccessVpn; + public IAMEntityType getEntityType() { + return IAMEntityType.RemoteAccessVpn; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java index ab04eea..6de4d42 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java @@ -26,7 +26,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.utils.db.Encrypt; @@ -211,7 +211,7 @@ public class Site2SiteCustomerGatewayVO implements Site2SiteCustomerGateway { } @Override - public AclEntityType getEntityType() { - return AclEntityType.Site2SiteCustomerGateway; + public IAMEntityType getEntityType() { + return IAMEntityType.Site2SiteCustomerGateway; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java index b092a4a..19309c3 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java @@ -28,7 +28,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.api.InternalIdentity; import com.cloud.network.Site2SiteVpnConnection; @@ -163,7 +163,7 @@ public class Site2SiteVpnConnectionVO implements Site2SiteVpnConnection, Interna } @Override - public AclEntityType getEntityType() { - return AclEntityType.Site2SiteVpnConnection; + public IAMEntityType getEntityType() { + return IAMEntityType.Site2SiteVpnConnection; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java index c3ad360..842912e 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java @@ -26,7 +26,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.network.Site2SiteVpnGateway; import com.cloud.utils.db.GenericDao; @@ -121,7 +121,7 @@ public class Site2SiteVpnGatewayVO implements Site2SiteVpnGateway { } @Override - public AclEntityType getEntityType() { - return AclEntityType.Site2SiteVpnGateway; + public IAMEntityType getEntityType() { + return IAMEntityType.Site2SiteVpnGateway; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/network/dao/SslCertVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/SslCertVO.java b/engine/schema/src/com/cloud/network/dao/SslCertVO.java index 52123a1..6ef7afd 100644 --- a/engine/schema/src/com/cloud/network/dao/SslCertVO.java +++ b/engine/schema/src/com/cloud/network/dao/SslCertVO.java @@ -23,7 +23,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.network.lb.SslCert; import com.cloud.utils.db.Encrypt; @@ -124,8 +124,8 @@ public class SslCertVO implements SslCert { } @Override - public AclEntityType getEntityType() { - return AclEntityType.SSLCert; + public IAMEntityType getEntityType() { + return IAMEntityType.SSLCert; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java b/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java index 553812f..7d0ca79 100644 --- a/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java +++ b/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java @@ -34,7 +34,7 @@ import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.utils.db.GenericDao; import com.cloud.utils.net.NetUtils; @@ -272,7 +272,7 @@ public class FirewallRuleVO implements FirewallRule { } @Override - public AclEntityType getEntityType() { - return AclEntityType.FirewallRule; + public IAMEntityType getEntityType() { + return IAMEntityType.FirewallRule; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java index d2e0bde..26859f7 100644 --- a/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java +++ b/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java @@ -25,7 +25,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; @Entity @Table(name = ("security_group")) @@ -97,7 +97,7 @@ public class SecurityGroupVO implements SecurityGroup { } @Override - public AclEntityType getEntityType() { - return AclEntityType.SecurityGroup; + public IAMEntityType getEntityType() { + return IAMEntityType.SecurityGroup; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java b/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java index b0e1123..a9ba051 100644 --- a/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java +++ b/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java @@ -28,7 +28,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.utils.db.GenericDao; @@ -139,7 +139,7 @@ public class StaticRouteVO implements StaticRoute { } @Override - public AclEntityType getEntityType() { - return AclEntityType.StaticRoute; + public IAMEntityType getEntityType() { + return IAMEntityType.StaticRoute; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java b/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java index f0a0e9c..723ec3b 100644 --- a/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java +++ b/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java @@ -28,7 +28,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.utils.db.GenericDao; @@ -219,7 +219,7 @@ public class VpcGatewayVO implements VpcGateway { } @Override - public AclEntityType getEntityType() { - return AclEntityType.VpcGateway; + public IAMEntityType getEntityType() { + return IAMEntityType.VpcGateway; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/network/vpc/VpcVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/vpc/VpcVO.java b/engine/schema/src/com/cloud/network/vpc/VpcVO.java index dc4f80e..edd984a 100644 --- a/engine/schema/src/com/cloud/network/vpc/VpcVO.java +++ b/engine/schema/src/com/cloud/network/vpc/VpcVO.java @@ -26,7 +26,7 @@ import javax.persistence.Enumerated; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.utils.db.GenericDao; @@ -186,7 +186,7 @@ public class VpcVO implements Vpc { } @Override - public AclEntityType getEntityType() { - return AclEntityType.Vpc; + public IAMEntityType getEntityType() { + return IAMEntityType.Vpc; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java b/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java index faa33d1..885c148 100644 --- a/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java +++ b/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java @@ -28,7 +28,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.utils.db.GenericDao; @@ -149,7 +149,7 @@ public class ProjectInvitationVO implements ProjectInvitation { } @Override - public AclEntityType getEntityType() { - return AclEntityType.ProjectInvitation; + public IAMEntityType getEntityType() { + return IAMEntityType.ProjectInvitation; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/storage/SnapshotVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/SnapshotVO.java b/engine/schema/src/com/cloud/storage/SnapshotVO.java index 3925708..4c8ceb7 100644 --- a/engine/schema/src/com/cloud/storage/SnapshotVO.java +++ b/engine/schema/src/com/cloud/storage/SnapshotVO.java @@ -30,7 +30,7 @@ import javax.persistence.Table; import com.google.gson.annotations.Expose; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.utils.db.GenericDao; @@ -239,7 +239,7 @@ public class SnapshotVO implements Snapshot { } @Override - public AclEntityType getEntityType() { - return AclEntityType.Snapshot; + public IAMEntityType getEntityType() { + return IAMEntityType.Snapshot; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/storage/VMTemplateVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/VMTemplateVO.java b/engine/schema/src/com/cloud/storage/VMTemplateVO.java index 1e19937..6501730 100755 --- a/engine/schema/src/com/cloud/storage/VMTemplateVO.java +++ b/engine/schema/src/com/cloud/storage/VMTemplateVO.java @@ -31,7 +31,7 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.Storage.ImageFormat; @@ -635,8 +635,8 @@ public class VMTemplateVO implements VirtualMachineTemplate { } @Override - public AclEntityType getEntityType() { - return AclEntityType.VirtualMachineTemplate; + public IAMEntityType getEntityType() { + return IAMEntityType.VirtualMachineTemplate; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/storage/VolumeVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/VolumeVO.java b/engine/schema/src/com/cloud/storage/VolumeVO.java index 69c9fa5..af80af8 100755 --- a/engine/schema/src/com/cloud/storage/VolumeVO.java +++ b/engine/schema/src/com/cloud/storage/VolumeVO.java @@ -32,7 +32,7 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.utils.NumbersUtil; @@ -590,8 +590,8 @@ public class VolumeVO implements Volume { } @Override - public AclEntityType getEntityType() { - return AclEntityType.Volume; + public IAMEntityType getEntityType() { + return IAMEntityType.Volume; } public void setHypervisorSnapshotReserve(Integer hypervisorSnapshotReserve) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/tags/ResourceTagVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/tags/ResourceTagVO.java b/engine/schema/src/com/cloud/tags/ResourceTagVO.java index add8f50..6b743ff 100644 --- a/engine/schema/src/com/cloud/tags/ResourceTagVO.java +++ b/engine/schema/src/com/cloud/tags/ResourceTagVO.java @@ -27,7 +27,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.server.ResourceTag; @@ -166,7 +166,7 @@ public class ResourceTagVO implements ResourceTag { } @Override - public AclEntityType getEntityType() { - return AclEntityType.ResourceTag; + public IAMEntityType getEntityType() { + return IAMEntityType.ResourceTag; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/user/AccountVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/user/AccountVO.java b/engine/schema/src/com/cloud/user/AccountVO.java index 3a29ecd..674cdb9 100644 --- a/engine/schema/src/com/cloud/user/AccountVO.java +++ b/engine/schema/src/com/cloud/user/AccountVO.java @@ -28,7 +28,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.utils.db.GenericDao; @@ -190,7 +190,7 @@ public class AccountVO implements Account { } @Override - public AclEntityType getEntityType() { - return AclEntityType.Account; + public IAMEntityType getEntityType() { + return IAMEntityType.Account; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/user/SSHKeyPairVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/user/SSHKeyPairVO.java b/engine/schema/src/com/cloud/user/SSHKeyPairVO.java index d30060c..1f64911 100644 --- a/engine/schema/src/com/cloud/user/SSHKeyPairVO.java +++ b/engine/schema/src/com/cloud/user/SSHKeyPairVO.java @@ -24,7 +24,7 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; @Entity @Table(name = "ssh_keypairs") @@ -117,8 +117,8 @@ public class SSHKeyPairVO implements SSHKeyPair { } @Override - public AclEntityType getEntityType() { - return AclEntityType.SSHKeyPair; + public IAMEntityType getEntityType() { + return IAMEntityType.SSHKeyPair; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/vm/InstanceGroupVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/vm/InstanceGroupVO.java b/engine/schema/src/com/cloud/vm/InstanceGroupVO.java index 9a5a7ba..9b463d3 100644 --- a/engine/schema/src/com/cloud/vm/InstanceGroupVO.java +++ b/engine/schema/src/com/cloud/vm/InstanceGroupVO.java @@ -28,7 +28,7 @@ import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.SecondaryTable; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.utils.db.GenericDao; @@ -120,7 +120,7 @@ public class InstanceGroupVO implements InstanceGroup { } @Override - public AclEntityType getEntityType() { - return AclEntityType.InstanceGroup; + public IAMEntityType getEntityType() { + return IAMEntityType.InstanceGroup; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/vm/VMInstanceVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/vm/VMInstanceVO.java b/engine/schema/src/com/cloud/vm/VMInstanceVO.java index 9e771c7..a09c34f 100644 --- a/engine/schema/src/com/cloud/vm/VMInstanceVO.java +++ b/engine/schema/src/com/cloud/vm/VMInstanceVO.java @@ -36,7 +36,7 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.utils.db.Encrypt; @@ -502,8 +502,8 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, Vi } @Override - public AclEntityType getEntityType() { - return AclEntityType.VirtualMachine; + public IAMEntityType getEntityType() { + return IAMEntityType.VirtualMachine; } public VirtualMachine.PowerState getPowerState() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java b/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java index 91cd5a8..9517b7f 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java +++ b/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java @@ -28,7 +28,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.utils.db.GenericDao; import com.cloud.utils.net.NetUtils; @@ -235,8 +235,8 @@ public class NicIpAliasVO implements NicIpAlias { } @Override - public AclEntityType getEntityType() { - return AclEntityType.NicIpAlias; + public IAMEntityType getEntityType() { + return IAMEntityType.NicIpAlias; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java b/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java index 3510642..584f189 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java +++ b/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java @@ -26,7 +26,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.utils.db.GenericDao; import com.cloud.vm.NicSecondaryIp; @@ -132,7 +132,7 @@ public class NicSecondaryIpVO implements NicSecondaryIp { } @Override - public AclEntityType getEntityType() { - return AclEntityType.NicSecondaryIp; + public IAMEntityType getEntityType() { + return IAMEntityType.NicSecondaryIp; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java b/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java index 5254e38..042b276 100644 --- a/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java +++ b/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java @@ -33,7 +33,7 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotOptions; import com.cloud.utils.db.GenericDao; @@ -246,7 +246,7 @@ public class VMSnapshotVO implements VMSnapshot { } @Override - public AclEntityType getEntityType() { - return AclEntityType.VMSnapshot; + public IAMEntityType getEntityType() { + return IAMEntityType.VMSnapshot; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVO.java b/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVO.java index 7630a01..ec267ee 100644 --- a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVO.java +++ b/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVO.java @@ -27,7 +27,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.acl.ControlledEntity; @Entity @@ -126,8 +126,8 @@ public class AffinityGroupVO implements AffinityGroup { } @Override - public AclEntityType getEntityType() { - return AclEntityType.AffinityGroup; + public IAMEntityType getEntityType() { + return IAMEntityType.AffinityGroup; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java index 16d98d5..4a4fd47 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java @@ -37,7 +37,7 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.utils.db.Encrypt; @@ -538,8 +538,8 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject<State, Virt } @Override - public AclEntityType getEntityType() { - return AclEntityType.VirtualMachine; + public IAMEntityType getEntityType() { + return IAMEntityType.VirtualMachine; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java index 326fb31..a37fec2 100644 --- a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java +++ b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java @@ -28,7 +28,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.region.ha.GlobalLoadBalancerRule; @@ -191,7 +191,7 @@ public class GlobalLoadBalancerRuleVO implements GlobalLoadBalancerRule { } @Override - public AclEntityType getEntityType() { - return AclEntityType.GlobalLoadBalancerRule; + public IAMEntityType getEntityType() { + return IAMEntityType.GlobalLoadBalancerRule; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java ---------------------------------------------------------------------- diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java index f7d068e..2b77ac9 100644 --- a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java +++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java @@ -25,7 +25,7 @@ import javax.inject.Inject; import org.apache.log4j.Logger; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; @@ -438,8 +438,8 @@ public class TemplateObject implements TemplateInfo { } @Override - public AclEntityType getEntityType() { - return AclEntityType.VirtualMachineTemplate; + public IAMEntityType getEntityType() { + return IAMEntityType.VirtualMachineTemplate; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java ---------------------------------------------------------------------- diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java index b5573dd..a8f1a56 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java @@ -24,7 +24,7 @@ import javax.inject.Inject; import org.apache.log4j.Logger; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; @@ -383,7 +383,7 @@ public class SnapshotObject implements SnapshotInfo { } @Override - public AclEntityType getEntityType() { - return AclEntityType.Snapshot; + public IAMEntityType getEntityType() { + return IAMEntityType.Snapshot; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java index 4ddf053..da7677c 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.engine.cloud.entity.api.TemplateEntity; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; import org.apache.cloudstack.storage.image.datastore.ImageStoreInfo; @@ -287,7 +287,7 @@ public class TemplateEntityImpl implements TemplateEntity { } @Override - public AclEntityType getEntityType() { + public IAMEntityType getEntityType() { // TODO Auto-generated method stub return null; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/storage/src/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java b/engine/storage/src/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java index 05ee9f6..103c0db 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java @@ -21,7 +21,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.engine.cloud.entity.api.SnapshotEntity; import com.cloud.hypervisor.Hypervisor.HypervisorType; @@ -185,8 +185,8 @@ public class SnapshotEntityImpl implements SnapshotEntity { } @Override - public AclEntityType getEntityType() { - return AclEntityType.Snapshot; + public IAMEntityType getEntityType() { + return IAMEntityType.Snapshot; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java ---------------------------------------------------------------------- diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java index eb08b3d..dc05278 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java @@ -22,7 +22,7 @@ import javax.inject.Inject; import org.apache.log4j.Logger; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; @@ -665,7 +665,7 @@ public class VolumeObject implements VolumeInfo { } @Override - public AclEntityType getEntityType() { - return AclEntityType.Volume; + public IAMEntityType getEntityType() { + return IAMEntityType.Volume; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java b/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java index d556c5c..8a213e2 100644 --- a/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java +++ b/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java @@ -23,7 +23,7 @@ import javax.persistence.Enumerated; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.acl.ControlledEntity; import com.cloud.vm.VirtualMachine; @@ -194,8 +194,8 @@ public class AffinityGroupJoinVO extends BaseViewVO implements ControlledViewEnt } @Override - public AclEntityType getEntityType() { - return AclEntityType.AffinityGroup; + public IAMEntityType getEntityType() { + return IAMEntityType.AffinityGroup; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java b/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java index d657bd4..7889b76 100644 --- a/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java +++ b/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java @@ -25,7 +25,7 @@ import javax.persistence.Enumerated; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.api.ApiCommandJobType; import com.cloud.utils.db.GenericDao; @@ -203,8 +203,8 @@ public class AsyncJobJoinVO extends BaseViewVO implements ControlledViewEntity { } @Override - public AclEntityType getEntityType() { - return AclEntityType.AsyncJob; + public IAMEntityType getEntityType() { + return IAMEntityType.AsyncJob; } @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java index 4889b3d..ac32859 100644 --- a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java +++ b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java @@ -26,7 +26,7 @@ import javax.persistence.Enumerated; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.network.Network.GuestType; import com.cloud.network.Networks.TrafficType; @@ -514,7 +514,7 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti } @Override - public AclEntityType getEntityType() { - return AclEntityType.VirtualMachine; + public IAMEntityType getEntityType() { + return IAMEntityType.VirtualMachine; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/api/query/vo/EventJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/EventJoinVO.java b/server/src/com/cloud/api/query/vo/EventJoinVO.java index 7312d64..757f0a7 100644 --- a/server/src/com/cloud/api/query/vo/EventJoinVO.java +++ b/server/src/com/cloud/api/query/vo/EventJoinVO.java @@ -25,7 +25,7 @@ import javax.persistence.Enumerated; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.event.Event.State; import com.cloud.utils.db.GenericDao; @@ -220,7 +220,7 @@ public class EventJoinVO extends BaseViewVO implements ControlledViewEntity { } @Override - public AclEntityType getEntityType() { - return AclEntityType.Event; + public IAMEntityType getEntityType() { + return IAMEntityType.Event; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java b/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java index a05cc6e..98d1a52 100644 --- a/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java +++ b/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java @@ -23,7 +23,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.utils.db.GenericDao; @@ -160,7 +160,7 @@ public class InstanceGroupJoinVO extends BaseViewVO implements ControlledViewEnt } @Override - public AclEntityType getEntityType() { - return AclEntityType.InstanceGroup; + public IAMEntityType getEntityType() { + return IAMEntityType.InstanceGroup; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java b/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java index 6eed676..ba619a9 100644 --- a/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java +++ b/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java @@ -25,7 +25,7 @@ import javax.persistence.Enumerated; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.projects.ProjectInvitation.State; import com.cloud.utils.db.GenericDao; @@ -164,7 +164,7 @@ public class ProjectInvitationJoinVO extends BaseViewVO implements ControlledVie } @Override - public AclEntityType getEntityType() { - return AclEntityType.ProjectInvitation; + public IAMEntityType getEntityType() { + return IAMEntityType.ProjectInvitation; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java b/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java index b395e34..e1b8b81 100644 --- a/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java +++ b/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java @@ -23,7 +23,7 @@ import javax.persistence.Enumerated; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.server.ResourceTag.ResourceObjectType; @@ -182,7 +182,7 @@ public class ResourceTagJoinVO extends BaseViewVO implements ControlledViewEntit } @Override - public AclEntityType getEntityType() { - return AclEntityType.ResourceTag; + public IAMEntityType getEntityType() { + return IAMEntityType.ResourceTag; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java b/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java index d613ac6..3c9e3bf 100644 --- a/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java +++ b/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java @@ -23,7 +23,7 @@ import javax.persistence.Enumerated; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.network.security.SecurityRule.SecurityRuleType; import com.cloud.server.ResourceTag.ResourceObjectType; @@ -306,7 +306,7 @@ public class SecurityGroupJoinVO extends BaseViewVO implements ControlledViewEnt } @Override - public AclEntityType getEntityType() { - return AclEntityType.SecurityGroup; + public IAMEntityType getEntityType() { + return IAMEntityType.SecurityGroup; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/api/query/vo/TemplateJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/TemplateJoinVO.java b/server/src/com/cloud/api/query/vo/TemplateJoinVO.java index e395b18..de0da2f 100644 --- a/server/src/com/cloud/api/query/vo/TemplateJoinVO.java +++ b/server/src/com/cloud/api/query/vo/TemplateJoinVO.java @@ -27,7 +27,7 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; import com.cloud.hypervisor.Hypervisor.HypervisorType; @@ -544,7 +544,7 @@ public class TemplateJoinVO extends BaseViewVO implements ControlledViewEntity { } @Override - public AclEntityType getEntityType() { - return AclEntityType.VirtualMachineTemplate; + public IAMEntityType getEntityType() { + return IAMEntityType.VirtualMachineTemplate; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/api/query/vo/UserVmJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java index 4201ba5..fcee393 100644 --- a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java +++ b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java @@ -28,7 +28,7 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.Network.GuestType; @@ -913,7 +913,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity { } @Override - public AclEntityType getEntityType() { - return AclEntityType.VirtualMachine; + public IAMEntityType getEntityType() { + return IAMEntityType.VirtualMachine; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/api/query/vo/VolumeJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java index 405a959..9685d02 100644 --- a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java +++ b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java @@ -27,7 +27,7 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.server.ResourceTag.ResourceObjectType; @@ -570,7 +570,7 @@ public class VolumeJoinVO extends BaseViewVO implements ControlledViewEntity { } @Override - public AclEntityType getEntityType() { - return AclEntityType.Volume; + public IAMEntityType getEntityType() { + return IAMEntityType.Volume; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/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 e618da5..98ed415 100644 --- a/server/src/com/cloud/api/response/SecurityGroupResultObject.java +++ b/server/src/com/cloud/api/response/SecurityGroupResultObject.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.api.InternalIdentity; @@ -212,7 +212,7 @@ public class SecurityGroupResultObject implements ControlledEntity, InternalIden } @Override - public AclEntityType getEntityType() { - return AclEntityType.SecurityGroup; + public IAMEntityType getEntityType() { + return IAMEntityType.SecurityGroup; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java b/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java index 9ca5482..b912e22 100644 --- a/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java +++ b/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.network.vpc; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; public class PrivateGatewayProfile implements PrivateGateway { VpcGateway vpcGateway; @@ -113,7 +113,7 @@ public class PrivateGatewayProfile implements PrivateGateway { } @Override - public AclEntityType getEntityType() { - return AclEntityType.VpcGateway; + public IAMEntityType getEntityType() { + return IAMEntityType.VpcGateway; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/template/HypervisorTemplateAdapter.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/com/cloud/template/HypervisorTemplateAdapter.java index 3615c7a..d6a1ab5 100755 --- a/server/src/com/cloud/template/HypervisorTemplateAdapter.java +++ b/server/src/com/cloud/template/HypervisorTemplateAdapter.java @@ -27,7 +27,7 @@ import javax.inject.Inject; import org.apache.log4j.Logger; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd; import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd; import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd; @@ -406,7 +406,7 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase { } // remove its related ACL permission - Pair<AclEntityType, Long> tmplt = new Pair<AclEntityType, Long>(AclEntityType.VirtualMachineTemplate, template.getId()); + Pair<IAMEntityType, Long> tmplt = new Pair<IAMEntityType, Long>(IAMEntityType.VirtualMachineTemplate, template.getId()); _messageBus.publish(_name, EntityManager.MESSAGE_REMOVE_ENTITY_EVENT, PublishScope.LOCAL, tmplt); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/com/cloud/template/TemplateManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index 6b72139..a8aa785 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -33,7 +33,7 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListTemplateOrIsoPermissionsCmd; @@ -1270,7 +1270,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, // add ACL permission in IAM Map<String, Object> permit = new HashMap<String, Object>(); - permit.put(ApiConstants.ENTITY_TYPE, AclEntityType.VirtualMachineTemplate.toString()); + permit.put(ApiConstants.ENTITY_TYPE, IAMEntityType.VirtualMachineTemplate.toString()); permit.put(ApiConstants.ENTITY_ID, id); permit.put(ApiConstants.ACCESS_TYPE, AccessType.UseEntry); permit.put(ApiConstants.ACL_ACTION, "listTemplates"); @@ -1287,7 +1287,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, _launchPermissionDao.removePermissions(id, accountIds); // remove ACL permission in IAM Map<String, Object> permit = new HashMap<String, Object>(); - permit.put(ApiConstants.ENTITY_TYPE, AclEntityType.VirtualMachineTemplate.toString()); + permit.put(ApiConstants.ENTITY_TYPE, IAMEntityType.VirtualMachineTemplate.toString()); permit.put(ApiConstants.ENTITY_ID, id); permit.put(ApiConstants.ACCESS_TYPE, AccessType.UseEntry); permit.put(ApiConstants.ACL_ACTION, "listTemplates"); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41604fc/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java index 559d5ac..f375fde 100644 --- a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java +++ b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java @@ -28,7 +28,7 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.apache.cloudstack.acl.AclEntityType; +import org.apache.cloudstack.acl.IAMEntityType; import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.acl.SecurityChecker.AccessType; @@ -218,7 +218,7 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro _affinityGroupDomainMapDao.persist(domainMap); //send event for storing the domain wide resource access Map<String, Object> params = new HashMap<String, Object>(); - params.put(ApiConstants.ENTITY_TYPE, AclEntityType.AffinityGroup); + params.put(ApiConstants.ENTITY_TYPE, IAMEntityType.AffinityGroup); params.put(ApiConstants.ENTITY_ID, group.getId()); params.put(ApiConstants.DOMAIN_ID, domainId); params.put(ApiConstants.SUBDOMAIN_ACCESS, subDomainAccess); @@ -300,7 +300,7 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro _affinityGroupDomainMapDao.remove(groupDomain.getId()); } // remove its related ACL permission - Pair<AclEntityType, Long> params = new Pair<AclEntityType, Long>(AclEntityType.AffinityGroup, affinityGroupIdFinal); + Pair<IAMEntityType, Long> params = new Pair<IAMEntityType, Long>(IAMEntityType.AffinityGroup, affinityGroupIdFinal); _messageBus.publish(_name, EntityManager.MESSAGE_REMOVE_ENTITY_EVENT, PublishScope.LOCAL, params); } }
