incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [30/50] [abbrv] git commit: api: Extend to infra. interface entities that are not associated with any account
Date Wed, 09 Jan 2013 04:37:24 GMT
api: Extend to infra. interface entities that are not associated with any account

Includes, datacenter, pod, sotragenetworkiprange,vlan,diskoffering,networkoffering,
serviceoffering.

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


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a9ab42d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a9ab42d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a9ab42d9

Branch: refs/heads/master
Commit: a9ab42d962d2f76119266c367dc4fa26046fcfc7
Parents: e51bc8b
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Sun Jan 6 15:36:59 2013 -0800
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Sun Jan 6 15:36:59 2013 -0800

----------------------------------------------------------------------
 api/src/com/cloud/dc/DataCenter.java            |    3 ++-
 api/src/com/cloud/dc/Pod.java                   |    3 ++-
 api/src/com/cloud/dc/StorageNetworkIpRange.java |    3 ++-
 api/src/com/cloud/dc/Vlan.java                  |    3 ++-
 api/src/com/cloud/offering/DiskOffering.java    |    3 ++-
 api/src/com/cloud/offering/NetworkOffering.java |    3 ++-
 api/src/com/cloud/offering/ServiceOffering.java |    3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a9ab42d9/api/src/com/cloud/dc/DataCenter.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/dc/DataCenter.java b/api/src/com/cloud/dc/DataCenter.java
index 081cd55..946e9cc 100644
--- a/api/src/com/cloud/dc/DataCenter.java
+++ b/api/src/com/cloud/dc/DataCenter.java
@@ -19,13 +19,14 @@ package com.cloud.dc;
 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,

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a9ab42d9/api/src/com/cloud/dc/Pod.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/dc/Pod.java b/api/src/com/cloud/dc/Pod.java
index 8c89316..9da5b7e 100644
--- a/api/src/com/cloud/dc/Pod.java
+++ b/api/src/com/cloud/dc/Pod.java
@@ -17,6 +17,7 @@
 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;
 
@@ -24,7 +25,7 @@ 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();
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a9ab42d9/api/src/com/cloud/dc/StorageNetworkIpRange.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/dc/StorageNetworkIpRange.java b/api/src/com/cloud/dc/StorageNetworkIpRange.java
index 7f15d61..2b50ca1 100755
--- 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();
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a9ab42d9/api/src/com/cloud/dc/Vlan.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/dc/Vlan.java b/api/src/com/cloud/dc/Vlan.java
index 8d4ae3a..0f629ef 100644
--- 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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a9ab42d9/api/src/com/cloud/offering/DiskOffering.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/offering/DiskOffering.java b/api/src/com/cloud/offering/DiskOffering.java
index 8e9b54c..9a48f4b 100644
--- 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 @@ import java.util.Date;
  * the disk offering.
  *
  */
-public interface DiskOffering extends Identity, InternalIdentity {
+public interface DiskOffering extends InfrastructureEntity, Identity, InternalIdentity {
 
     String getUniqueName();
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a9ab42d9/api/src/com/cloud/offering/NetworkOffering.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/offering/NetworkOffering.java b/api/src/com/cloud/offering/NetworkOffering.java
index 5978edc..b69ad88 100644
--- a/api/src/com/cloud/offering/NetworkOffering.java
+++ b/api/src/com/cloud/offering/NetworkOffering.java
@@ -18,6 +18,7 @@ package com.cloud.offering;
 
 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;
 
@@ -25,7 +26,7 @@ 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,

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a9ab42d9/api/src/com/cloud/offering/ServiceOffering.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/offering/ServiceOffering.java b/api/src/com/cloud/offering/ServiceOffering.java
index d9393be..b13346c 100755
--- 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 @@ import java.util.Date;
 /**
  * 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";


Mime
View raw message