Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 39F4E105D1 for ; Wed, 22 Jan 2014 18:11:06 +0000 (UTC) Received: (qmail 51704 invoked by uid 500); 22 Jan 2014 18:11:05 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 51663 invoked by uid 500); 22 Jan 2014 18:11:05 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 51656 invoked by uid 99); 22 Jan 2014 18:11:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jan 2014 18:11:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 446F58A01C6; Wed, 22 Jan 2014 18:11:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mtutkowski@apache.org To: commits@cloudstack.apache.org Message-Id: <743004459a7b4e4cb200dd3c21da8611@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.3-forward to 0679af3 Date: Wed, 22 Jan 2014 18:11:05 +0000 (UTC) Updated Branches: refs/heads/4.3-forward 78f62c634 -> 0679af343 CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0679af34 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0679af34 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0679af34 Branch: refs/heads/4.3-forward Commit: 0679af343453bf888f0ddefdd36937713aacbc28 Parents: 78f62c6 Author: Mike Tutkowski Authored: Wed Jan 22 11:08:34 2014 -0700 Committer: Mike Tutkowski Committed: Wed Jan 22 11:08:57 2014 -0700 ---------------------------------------------------------------------- .../src/com/cloud/vm/VirtualMachineManagerImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0679af34/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index df51a3c..6dc5894 100755 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -1121,6 +1121,13 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac VolumeVO volume = _volsDao.findById(volumeId); disk.setPath(volume.get_iScsiName()); + + if (disk.getData() instanceof VolumeObjectTO) { + VolumeObjectTO volTo = (VolumeObjectTO)disk.getData(); + + volTo.setPath(volume.get_iScsiName()); + } + volume.setPath(volume.get_iScsiName()); _volsDao.update(volumeId, volume);