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

fix compile

Browse Source
This commit is contained in:
Edison Su 2013-05-10 09:47:09 -07:00
parent 42e25a22fc
commit e444867e61
4 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java
View File

@ -91,17 +91,6 @@ public class TemplateDataFactoryImpl implements TemplateDataFactory {
return this.getTemplate(templateId, store); return this.getTemplate(templateId, store);
} }
@Override
public TemplateInfo getTemplate(long templateId, long zoneId) {
TemplateDataStoreVO tmplStore = templateStoreDao.findByTemplateZoneDownloadStatus(templateId, zoneId, VMTemplateStorageResourceAssoc.Status.DOWNLOADED);
if (tmplStore != null) {
DataStore store = this.storeMgr.getDataStore(tmplStore.getDataStoreId(), DataStoreRole.Image);
return this.getTemplate(templateId, store);
}
return null;
}
@Override @Override
public TemplateInfo getTemplate(long templateId, DataStoreRole storeRole, Long zoneId) { public TemplateInfo getTemplate(long templateId, DataStoreRole storeRole, Long zoneId) {
VMTemplateVO templ = imageDataDao.findById(templateId); VMTemplateVO templ = imageDataDao.findById(templateId);

26
plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java
View File

@ -29,6 +29,8 @@ import java.util.concurrent.ConcurrentHashMap;
import javax.naming.ConfigurationException; import javax.naming.ConfigurationException;
import org.apache.cloudstack.storage.to.TemplateObjectTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.XmlRpcException;
@ -90,6 +92,10 @@ import com.cloud.agent.api.storage.CreatePrivateTemplateAnswer;
import com.cloud.agent.api.storage.DestroyCommand; import com.cloud.agent.api.storage.DestroyCommand;
import com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer; import com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer;
import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand; import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand;
import com.cloud.agent.api.to.DataStoreTO;
import com.cloud.agent.api.to.DataTO;
import com.cloud.agent.api.to.DiskTO;
import com.cloud.agent.api.to.NfsTO;
import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.NicTO;
import com.cloud.agent.api.to.StorageFilerTO; import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.api.to.VirtualMachineTO;
@ -527,25 +533,35 @@ public class OvmResourceBase implements ServerResource, HypervisorResource {
} }
protected void createVbds(OvmVm.Details vm, VirtualMachineTO spec) throws URISyntaxException { protected void createVbds(OvmVm.Details vm, VirtualMachineTO spec) throws URISyntaxException {
for (VolumeTO volume : spec.getDisks()) { for (DiskTO volume : spec.getDisks()) {
if (volume.getType() == Volume.Type.ROOT) { if (volume.getType() == Volume.Type.ROOT) {
VolumeObjectTO vol = (VolumeObjectTO)volume.getData();
OvmDisk.Details root = new OvmDisk.Details(); OvmDisk.Details root = new OvmDisk.Details();
root.path = volume.getPath(); root.path = vol.getPath();
root.type = OvmDisk.WRITE; root.type = OvmDisk.WRITE;
root.isIso = false; root.isIso = false;
vm.rootDisk = root; vm.rootDisk = root;
} else if (volume.getType() == Volume.Type.ISO) { } else if (volume.getType() == Volume.Type.ISO) {
if (volume.getPath() != null) { DataTO isoTO = volume.getData();
if (isoTO.getPath() != null) {
TemplateObjectTO template = (TemplateObjectTO)isoTO;
DataStoreTO store = template.getDataStore();
if (!(store instanceof NfsTO)) {
throw new CloudRuntimeException("unsupported protocol");
}
NfsTO nfsStore = (NfsTO)store;
String isoPath = nfsStore.getUrl() + File.separator + template.getPath();
OvmDisk.Details iso = new OvmDisk.Details(); OvmDisk.Details iso = new OvmDisk.Details();
URI path = new URI(volume.getPath()); URI path = new URI(isoPath);
iso.path = path.getHost() + ":" + path.getPath(); iso.path = path.getHost() + ":" + path.getPath();
iso.type = OvmDisk.READ; iso.type = OvmDisk.READ;
iso.isIso = true; iso.isIso = true;
vm.disks.add(iso); vm.disks.add(iso);
} }
} else if (volume.getType() == Volume.Type.DATADISK){ } else if (volume.getType() == Volume.Type.DATADISK){
OvmDisk.Details data = new OvmDisk.Details(); OvmDisk.Details data = new OvmDisk.Details();
data.path = volume.getPath(); data.path = volume.getData().getPath();
data.type = OvmDisk.SHAREDWRITE; data.type = OvmDisk.SHAREDWRITE;
data.isIso = false; data.isIso = false;
vm.disks.add(data); vm.disks.add(data);

3
server/src/com/cloud/hypervisor/HypervisorGuruBase.java
View File

@ -23,6 +23,7 @@ import javax.inject.Inject;
import com.cloud.agent.api.Command; import com.cloud.agent.api.Command;
import com.cloud.agent.api.to.DataTO; import com.cloud.agent.api.to.DataTO;
import com.cloud.agent.api.to.DiskTO;
import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.NicTO;
import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.agent.api.to.VolumeTO; import com.cloud.agent.api.to.VolumeTO;
@ -102,7 +103,7 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis
} }
to.setNics(nics); to.setNics(nics);
to.setDisks(vmProfile.getDisks().toArray(new DataTO[vmProfile.getDisks().size()])); to.setDisks(vmProfile.getDisks().toArray(new DiskTO[vmProfile.getDisks().size()]));
if(vmProfile.getTemplate().getBits() == 32) { if(vmProfile.getTemplate().getBits() == 32) {
to.setArch("i686"); to.setArch("i686");

1
tools/marvin/marvin/deployDataCenter.py
View File

@ -142,6 +142,7 @@ class deployDataCenters():
secondarycmd.url = secondary.url secondarycmd.url = secondary.url
secondarycmd.provider = secondary.providerName secondarycmd.provider = secondary.providerName
secondarycmd.details = [] secondarycmd.details = []
if secondary.providerName != "NFS":
for item in secondary.details: for item in secondary.details:
secondarycmd.details.append(item.__dict__) secondarycmd.details.append(item.__dict__)
if secondarycmd.provider == "NFS": if secondarycmd.provider == "NFS":