Updated Branches: refs/heads/master 0c6dcb477 -> de13b097a
Revert "find local storage based on name label" This reverts commit a95a9dc07c4edcfd1ef4c3ece955ce13f2223b79. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/de13b097 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/de13b097 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/de13b097 Branch: refs/heads/master Commit: de13b097aeb000b046915ba7d3961974414f04cb Parents: 0c6dcb4 Author: Edison Su <[email protected]> Authored: Wed Sep 26 16:38:29 2012 -0700 Committer: Edison Su <[email protected]> Committed: Wed Sep 26 16:38:50 2012 -0700 ---------------------------------------------------------------------- .../hypervisor/xen/resource/XcpOssResource.java | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/de13b097/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java index d22c8b5..0a10647 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java @@ -20,7 +20,6 @@ package com.cloud.hypervisor.xen.resource; import java.io.File; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Set; import javax.ejb.Local; @@ -45,7 +44,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; import com.cloud.vm.VirtualMachine; import com.xensource.xenapi.Connection; -import com.xensource.xenapi.SR; import com.xensource.xenapi.Types; import com.xensource.xenapi.VBD; import com.xensource.xenapi.VDI; @@ -84,18 +82,9 @@ public class XcpOssResource extends CitrixResourceBase { } protected VBD createPatchVbd(Connection conn, String vmName, VM vm) throws XmlRpcException, XenAPIException { - String localStorageUuid = null; - Map<SR, SR.Record> map = SR.getAllRecords(conn); - for (Map.Entry<SR, SR.Record> entry : map.entrySet()) { - SR.Record srRec = entry.getValue(); - if (srRec.nameLabel.equalsIgnoreCase("local-storage")) { - localStorageUuid = srRec.uuid; - break; - } - } - if (localStorageUuid != null) { + if (_host.localSRuuid != null) { //create an iso vdi on it - String result = callHostPlugin(conn, "vmops", "createISOVHD", "uuid", localStorageUuid); + String result = callHostPlugin(conn, "vmops", "createISOVHD", "uuid", _host.localSRuuid); if (result == null || result.equalsIgnoreCase("Failed")) { throw new CloudRuntimeException("can not create systemvm vdi"); }
