From bee976b5f516dc54be4fb75c36b996d59eca2af6 Mon Sep 17 00:00:00 2001
From: root <root@aj-laptop.(none)>
Date: Mon, 1 Nov 2010 11:09:30 -0700
Subject: [PATCH] bug 6779: returning the deviceId wherever possible, in the
 xxxVolume() calls status 6779: resolved fixed

---
 server/src/com/cloud/api/commands/AttachVolumeCmd.java | 3 ++-
 server/src/com/cloud/api/commands/CreateVolumeCmd.java | 4 +++-
 server/src/com/cloud/api/commands/DetachVolumeCmd.java | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/api/commands/AttachVolumeCmd.java b/server/src/com/cloud/api/commands/AttachVolumeCmd.java
index 48f1c1a473f..d71fb7b3a81 100755
--- a/server/src/com/cloud/api/commands/AttachVolumeCmd.java
+++ b/server/src/com/cloud/api/commands/AttachVolumeCmd.java
@@ -120,7 +120,8 @@ public class AttachVolumeCmd extends BaseAsyncCmd {
 	    response.setName(volume.getName());
 	    response.setVolumeType(volume.getVolumeType().toString());
 	    response.setResponseName(getName());
-
+	    if(volume.getDeviceId() != null)
+	    	response.setDeviceId(volume.getDeviceId());
 		return response;
 	}
 }
diff --git a/server/src/com/cloud/api/commands/CreateVolumeCmd.java b/server/src/com/cloud/api/commands/CreateVolumeCmd.java
index 8d260258649..57b776d12ab 100644
--- a/server/src/com/cloud/api/commands/CreateVolumeCmd.java
+++ b/server/src/com/cloud/api/commands/CreateVolumeCmd.java
@@ -169,7 +169,9 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd {
         response.setSnapshotId(getSnapshotId());
         response.setZoneId(volume.getDataCenterId());
         response.setZoneName(ApiDBUtils.findZoneById(volume.getDataCenterId()).getName());
-
+        if(volume.getDeviceId() != null){
+        	response.setDeviceId(volume.getDeviceId());
+        }
         response.setResponseName(getName());
         return response;
     }
diff --git a/server/src/com/cloud/api/commands/DetachVolumeCmd.java b/server/src/com/cloud/api/commands/DetachVolumeCmd.java
index 6f58b7675ba..7e013467374 100755
--- a/server/src/com/cloud/api/commands/DetachVolumeCmd.java
+++ b/server/src/com/cloud/api/commands/DetachVolumeCmd.java
@@ -118,6 +118,8 @@ public class DetachVolumeCmd extends BaseAsyncCmd {
 	@Override @SuppressWarnings("unchecked")
 	public VolumeResponse getResponse() {
         VolumeResponse response = (VolumeResponse)getResponseObject();     
+        if(deviceId!=null)
+        	response.setDeviceId(deviceId);
         return response;
 	}
 }
\ No newline at end of file