rebase to master

sudison · sudison · commit 0b86b33c56b9 · 2013-02-21T11:22:48.000-08:00
diff --git a/core/src/com/cloud/storage/SnapshotVO.java b/core/src/com/cloud/storage/SnapshotVO.java
@@ -248,6 +248,7 @@ public State getState() {
         return state;
     }
 
+
 	public void setState(State state) {
         this.state = state;
     }
diff --git a/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java b/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java
diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java
@@ -893,9 +893,9 @@ public VolumeVO allocVolume(CreateVolumeCmd cmd)
                         "unable to find a snapshot with id " + snapshotId);
             }
 
-            if (snapshotCheck.getStatus() != Snapshot.Status.BackedUp) {
+            if (snapshotCheck.getState() != Snapshot.State.BackedUp) {
                 throw new InvalidParameterValueException("Snapshot id="
-                        + snapshotId + " is not in " + Snapshot.Status.BackedUp
+                        + snapshotId + " is not in " + Snapshot.State.BackedUp
                         + " state yet and can't be used for volume creation");
             }
 

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,7 @@ public State getState() {`
`248`	`248`	`return state;`
`249`	`249`	`}`
`250`	`250`
	`251`	`+`
`251`	`252`	`public void setState(State state) {`
`252`	`253`	`this.state = state;`
`253`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -893,9 +893,9 @@ public VolumeVO allocVolume(CreateVolumeCmd cmd)`
`893`	`893`	`"unable to find a snapshot with id " + snapshotId);`
`894`	`894`	`}`
`895`	`895`
`896`		`- if (snapshotCheck.getStatus() != Snapshot.Status.BackedUp) {`
	`896`	`+ if (snapshotCheck.getState() != Snapshot.State.BackedUp) {`
`897`	`897`	`throw new InvalidParameterValueException("Snapshot id="`
`898`		`- + snapshotId + " is not in " + Snapshot.Status.BackedUp`
	`898`	`+ + snapshotId + " is not in " + Snapshot.State.BackedUp`
`899`	`899`	`+ " state yet and can't be used for volume creation");`
`900`	`900`	`}`
`901`	`901`