From 6ae72df46a86b797d0562230c76cbbf1a62b2082 Mon Sep 17 00:00:00 2001
From: nit <nitin@cloud.com>
Date: Wed, 25 Aug 2010 11:44:54 +0530
Subject: [PATCH] bug 5905: Adding deviceId tag to the ListVolumes command when
 the volume is attached. status 5905: closed fixed

---
 server/src/com/cloud/api/commands/ListVolumesCmd.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 server/src/com/cloud/api/commands/ListVolumesCmd.java

diff --git a/server/src/com/cloud/api/commands/ListVolumesCmd.java b/server/src/com/cloud/api/commands/ListVolumesCmd.java
old mode 100644
new mode 100755
index b856e4eae2f..1eee0aad45a
--- a/server/src/com/cloud/api/commands/ListVolumesCmd.java
+++ b/server/src/com/cloud/api/commands/ListVolumesCmd.java
@@ -185,8 +185,9 @@ public class ListVolumesCmd extends BaseCmd{
                 volumeData.add(new Pair<String, Object>(BaseCmd.Properties.VIRTUAL_MACHINE_ID.getName(), vm.getId()));
                 volumeData.add(new Pair<String, Object>(BaseCmd.Properties.VIRTUAL_MACHINE_NAME.getName(), vm.getName()));
                 volumeData.add(new Pair<String, Object>(BaseCmd.Properties.VIRTUAL_MACHINE_DISPLAYNAME.getName(), vm.getName()));
-                volumeData.add(new Pair<String, Object>(BaseCmd.Properties.VIRTUAL_MACHINE_STATE.getName(), vm.getState()));
-            }             
+                volumeData.add(new Pair<String, Object>(BaseCmd.Properties.VIRTUAL_MACHINE_STATE.getName(), vm.getState()));
+                volumeData.add(new Pair<String, Object>(BaseCmd.Properties.DEVICE_ID.getName(), volume.getDeviceId()));
+            }
 
             // Show the virtual size of the volume
             long virtualSizeInBytes = volume.getSize();