api: Extend to infra. interface entities that are not associated with any account

yadvr · yadvr · commit a9ab42d962d2 · 2013-01-06T15:36:59.000-08:00
Includes, datacenter, pod, sotragenetworkiprange,vlan,diskoffering,networkoffering,
serviceoffering.

Signed-off-by: Rohit Yadav &lt;bhaisaab@apache.org&gt;
diff --git a/api/src/com/cloud/dc/DataCenter.java b/api/src/com/cloud/dc/DataCenter.java
@@ -19,13 +19,14 @@
 import java.util.Map;
 
 import com.cloud.org.Grouping;
+import org.apache.cloudstack.acl.InfrastructureEntity;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  *
  */
-public interface DataCenter extends Grouping, Identity, InternalIdentity {
+public interface DataCenter extends InfrastructureEntity, Grouping, Identity, InternalIdentity {
     public enum NetworkType {
         Basic,
         Advanced,
diff --git a/api/src/com/cloud/dc/Pod.java b/api/src/com/cloud/dc/Pod.java
@@ -17,14 +17,15 @@
 package com.cloud.dc;
 
 import com.cloud.org.Grouping;
+import org.apache.cloudstack.acl.InfrastructureEntity;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * Represents one pod in the cloud stack.
  *
  */
-public interface Pod extends Grouping, Identity, InternalIdentity {
+public interface Pod extends InfrastructureEntity, Grouping, Identity, InternalIdentity {
 
     String getCidrAddress();
 
diff --git a/api/src/com/cloud/dc/StorageNetworkIpRange.java b/api/src/com/cloud/dc/StorageNetworkIpRange.java
@@ -16,10 +16,11 @@
 // under the License.
 package com.cloud.dc;
 
+import org.apache.cloudstack.acl.InfrastructureEntity;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
-public interface StorageNetworkIpRange extends InternalIdentity, Identity {
+public interface StorageNetworkIpRange extends InfrastructureEntity, InternalIdentity, Identity {
 
     Integer getVlan();
 
diff --git a/api/src/com/cloud/dc/Vlan.java b/api/src/com/cloud/dc/Vlan.java
@@ -16,10 +16,11 @@
 // under the License.
 package com.cloud.dc;
 
+import org.apache.cloudstack.acl.InfrastructureEntity;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
-public interface Vlan extends InternalIdentity, Identity {
+public interface Vlan extends InfrastructureEntity, InternalIdentity, Identity {
     public enum VlanType {
         DirectAttached,
         VirtualNetwork
diff --git a/api/src/com/cloud/offering/DiskOffering.java b/api/src/com/cloud/offering/DiskOffering.java
@@ -16,6 +16,7 @@
 // under the License.
 package com.cloud.offering;
 
+import org.apache.cloudstack.acl.InfrastructureEntity;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
@@ -26,7 +27,7 @@
  * the disk offering.
  *
  */
-public interface DiskOffering extends Identity, InternalIdentity {
+public interface DiskOffering extends InfrastructureEntity, Identity, InternalIdentity {
 
     String getUniqueName();
 
diff --git a/api/src/com/cloud/offering/NetworkOffering.java b/api/src/com/cloud/offering/NetworkOffering.java
@@ -18,14 +18,15 @@
 
 import com.cloud.network.Network.GuestType;
 import com.cloud.network.Networks.TrafficType;
+import org.apache.cloudstack.acl.InfrastructureEntity;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * Describes network offering
  *
  */
-public interface NetworkOffering extends InternalIdentity, Identity {
+public interface NetworkOffering extends InfrastructureEntity, InternalIdentity, Identity {
 
     public enum Availability {
         Required,
diff --git a/api/src/com/cloud/offering/ServiceOffering.java b/api/src/com/cloud/offering/ServiceOffering.java
@@ -16,6 +16,7 @@
 // under the License.
 package com.cloud.offering;
 
+import org.apache.cloudstack.acl.InfrastructureEntity;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
@@ -24,7 +25,7 @@
 /**
  * offered.
  */
-public interface ServiceOffering extends InternalIdentity, Identity {
+public interface ServiceOffering extends InfrastructureEntity, InternalIdentity, Identity {
     public static final String consoleProxyDefaultOffUniqueName = "Cloud.com-ConsoleProxy";
     public static final String ssvmDefaultOffUniqueName = "Cloud.com-SecondaryStorage";
     public static final String routerDefaultOffUniqueName = "Cloud.Com-SoftwareRouter";
