etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Rohit Yadav 2013-01-06 15:36:59 -08:00
parent e51bc8b161
commit a9ab42d962
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/com/cloud/dc/DataCenter.java
View File

@ -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,

3
api/src/com/cloud/dc/Pod.java
View File

@ -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();

3
api/src/com/cloud/dc/StorageNetworkIpRange.java
View File

@ -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();

3
api/src/com/cloud/dc/Vlan.java
View File

@ -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

3
api/src/com/cloud/offering/DiskOffering.java
View File

@ -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();

3
api/src/com/cloud/offering/NetworkOffering.java
View File

@ -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,

3
api/src/com/cloud/offering/ServiceOffering.java
View File

@ -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";