apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "find local storage based on name label"

Browse Source 
This reverts commit a95a9dc07c4edcfd1ef4c3ece955ce13f2223b79.
This commit is contained in:
Edison Su 2012-09-26 16:38:29 -07:00
parent 0c6dcb4772
commit de13b097ae
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
View File

@ -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");
}