You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/07/17 10:11:12 UTC
[28/39] git commit: updated refs/heads/vpc-toolkit-hugo to 34bed5f
CLOUDSTACK-7114. [EC2 QueryAPI] Inconsistency in mapping the "Allocated" state of a Volume to "Available".
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/56e37243
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/56e37243
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/56e37243
Branch: refs/heads/vpc-toolkit-hugo
Commit: 56e37243b83371c46dddeee18e48d82e16f87d9e
Parents: 5ccd904
Author: Likitha Shetty <li...@citrix.com>
Authored: Tue Jul 15 12:55:48 2014 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Wed Jul 16 15:22:40 2014 +0530
----------------------------------------------------------------------
awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/56e37243/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
index 4879a4b..41fe56e 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
@@ -1231,7 +1231,9 @@ public class EC2Engine extends ManagerBase {
resp.setInstanceId(vol.getVirtualMachineId());
resp.setSize(vol.getSize());
resp.setSnapshotId(vol.getSnapshotId());
- resp.setState(vol.getState());
+ if (vol.getState() != null) {
+ resp.setState(mapToAmazonVolState(vol.getState()));
+ }
resp.setType(vol.getVolumeType());
resp.setVMState(vol.getVirtualMachineState());
resp.setAttachmentState("detached");