apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Started an object model for the orchestration platform

Browse Source
This commit is contained in:
Alex Huang 2012-08-30 15:54:33 -07:00
parent 49c9f1f0ab
commit b9ddcf8cfe
4 changed files with 62 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/com/cloud/storage/Snapshot.java
View File

@ -40,6 +40,7 @@ public interface Snapshot extends ControlledEntity {
return max; return max;
} }
@Override
public String toString() { public String toString() {
return this.name(); return this.name();
} }
@ -56,6 +57,7 @@ public interface Snapshot extends ControlledEntity {
BackedUp, BackedUp,
Error; Error;
@Override
public String toString() { public String toString() {
return this.name(); return this.name();
} }
@ -67,8 +69,9 @@ public interface Snapshot extends ControlledEntity {
public static final long MANUAL_POLICY_ID = 0L; public static final long MANUAL_POLICY_ID = 0L;
Long getId(); long getId();
@Override
long getAccountId(); long getAccountId();
long getVolumeId(); long getVolumeId();

52
core/src/com/cloud/storage/SnapshotVO.java
View File

@ -40,7 +40,7 @@ public class SnapshotVO implements Snapshot, Identity {
@Id @Id
@GeneratedValue(strategy=GenerationType.IDENTITY) @GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name="id") @Column(name="id")
private long id = -1; private final long id = -1;
@Column(name="data_center_id") @Column(name="data_center_id")
long dataCenterId; long dataCenterId;
@ -109,7 +109,7 @@ public class SnapshotVO implements Snapshot, Identity {
String uuid; String uuid;
public SnapshotVO() { public SnapshotVO() {
this.uuid = UUID.randomUUID().toString(); this.uuid = UUID.randomUUID().toString();
} }
public SnapshotVO(long dcId, long accountId, long domainId, Long volumeId, Long diskOfferingId, String path, String name, short snapshotType, String typeDescription, long size, HypervisorType hypervisorType ) { public SnapshotVO(long dcId, long accountId, long domainId, Long volumeId, Long diskOfferingId, String path, String name, short snapshotType, String typeDescription, long size, HypervisorType hypervisorType ) {
@ -127,11 +127,11 @@ public class SnapshotVO implements Snapshot, Identity {
this.prevSnapshotId = 0; this.prevSnapshotId = 0;
this.hypervisorType = hypervisorType; this.hypervisorType = hypervisorType;
this.version = "2.2"; this.version = "2.2";
this.uuid = UUID.randomUUID().toString(); this.uuid = UUID.randomUUID().toString();
} }
@Override @Override
public Long getId() { public long getId() {
return id; return id;
} }
@ -144,6 +144,7 @@ public class SnapshotVO implements Snapshot, Identity {
return accountId; return accountId;
} }
@Override
public long getDomainId() { public long getDomainId() {
return domainId; return domainId;
} }
@ -167,7 +168,7 @@ public class SnapshotVO implements Snapshot, Identity {
} }
public void setPath(String path) { public void setPath(String path) {
this.path = path; this.path = path;
} }
@Override @Override
@ -205,7 +206,7 @@ public class SnapshotVO implements Snapshot, Identity {
@Override @Override
public HypervisorType getHypervisorType() { public HypervisorType getHypervisorType() {
return hypervisorType; return hypervisorType;
} }
public void setSnapshotType(short snapshotType) { public void setSnapshotType(short snapshotType) {
@ -239,6 +240,7 @@ public class SnapshotVO implements Snapshot, Identity {
this.version = version; this.version = version;
} }
@Override
public Date getCreated() { public Date getCreated() {
return created; return created;
} }
@ -247,30 +249,30 @@ public class SnapshotVO implements Snapshot, Identity {
return removed; return removed;
} }
@Override @Override
public Status getStatus() { public Status getStatus() {
return status; return status;
} }
public void setStatus(Status status) { public void setStatus(Status status) {
this.status = status; this.status = status;
} }
public String getBackupSnapshotId(){ public String getBackupSnapshotId(){
return backupSnapshotId; return backupSnapshotId;
} }
public long getPrevSnapshotId(){ public long getPrevSnapshotId(){
return prevSnapshotId; return prevSnapshotId;
} }
public void setBackupSnapshotId(String backUpSnapshotId){ public void setBackupSnapshotId(String backUpSnapshotId){
this.backupSnapshotId = backUpSnapshotId; this.backupSnapshotId = backUpSnapshotId;
} }
public void setPrevSnapshotId(long prevSnapshotId){ public void setPrevSnapshotId(long prevSnapshotId){
this.prevSnapshotId = prevSnapshotId; this.prevSnapshotId = prevSnapshotId;
} }
public static Type getSnapshotType(String snapshotType) { public static Type getSnapshotType(String snapshotType) {
for ( Type type : Type.values()) { for ( Type type : Type.values()) {
@ -283,10 +285,10 @@ public class SnapshotVO implements Snapshot, Identity {
@Override @Override
public String getUuid() { public String getUuid() {
return this.uuid; return this.uuid;
} }
public void setUuid(String uuid) { public void setUuid(String uuid) {
this.uuid = uuid; this.uuid = uuid;
} }
} }

2
platform/api/src/org/apache/cloudstack/platform/subsystem/api/storage/StorageSubSystem.java
View File

@ -8,8 +8,6 @@ public interface StorageSubSystem {
String getType(); String getType();
Class<? extends Grouping> getScope(); Class<? extends Grouping> getScope();
create();
URI grantAccess(String vol, String reservationId); URI grantAccess(String vol, String reservationId);
URI RemoveAccess(String vol, String reservationId); URI RemoveAccess(String vol, String reservationId);
} }

1
utils/src/com/cloud/utils/fsm/FiniteState.java
View File

@ -50,5 +50,6 @@ public interface FiniteState<S, E> {
* @return array of events. * @return array of events.
*/ */
Set<E> getPossibleEvents(); Set<E> getPossibleEvents();
String getDescription(); String getDescription();
} }