CLOUDSTACK-8127. VM name not displayed after attaching data disk to a VM. If user hasn't supplied a display name for a VM, default it to VM name in listVolume response. This behaviour is identical to listVirtualMachine response.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ff7997a2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ff7997a2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ff7997a2 Branch: refs/heads/reporter Commit: ff7997a2b139ed25f301ed1b8ad388864fcb9980 Parents: 974b018 Author: Likitha Shetty <[email protected]> Authored: Mon Dec 15 15:58:23 2014 +0530 Committer: Likitha Shetty <[email protected]> Committed: Wed Dec 24 15:21:34 2014 +0530 ---------------------------------------------------------------------- server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff7997a2/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java index 97a1ff2..68a578f 100644 --- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java @@ -91,7 +91,11 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO, Long> implem volResponse.setVirtualMachineId(volume.getVmUuid()); volResponse.setVirtualMachineName(volume.getVmName()); volResponse.setVirtualMachineState(volume.getVmState().toString()); - volResponse.setVirtualMachineDisplayName(volume.getVmDisplayName()); + if (volume.getVmDisplayName() != null) { + volResponse.setVirtualMachineDisplayName(volume.getVmDisplayName()); + } else { + volResponse.setVirtualMachineDisplayName(volume.getVmName()); + } } volResponse.setProvisioningType(volume.getProvisioningType().toString());
