Updated Branches:
refs/heads/master 5c4564593 -> 3962f117a
CLOUDSTACK-3733: fixed migrateVm - no need to cast vm to user vm to retrieve
the iso information. Extract iso information from VirtualMachineProfile object
passed to the method.
Conflicts:
server/src/com/cloud/storage/VolumeManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3962f117
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3962f117
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3962f117
Branch: refs/heads/master
Commit: 3962f117ac09b02740fad4b89b87dc9fd9df5bb2
Parents: 5c45645
Author: Alena Prokharchyk <[email protected]>
Authored: Tue Jul 23 10:54:28 2013 -0700
Committer: Alena Prokharchyk <[email protected]>
Committed: Tue Jul 23 11:04:39 2013 -0700
----------------------------------------------------------------------
.../src/com/cloud/storage/VolumeManagerImpl.java | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3962f117/server/src/com/cloud/storage/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java
b/server/src/com/cloud/storage/VolumeManagerImpl.java
index fa7a33a..e8957b4 100644
--- a/server/src/com/cloud/storage/VolumeManagerImpl.java
+++ b/server/src/com/cloud/storage/VolumeManagerImpl.java
@@ -31,10 +31,6 @@ import java.util.concurrent.ExecutionException;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
@@ -73,7 +69,9 @@ import
org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO;
import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
-
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.storage.CreateVolumeOVAAnswer;
@@ -2320,13 +2318,10 @@ public class VolumeManagerImpl extends ManagerBase
implements VolumeManager {
vm.addDisk(disk);
}
- if (vm.getType() == VirtualMachine.Type.User) {
- UserVmVO userVM = (UserVmVO) vm.getVirtualMachine();
- if (userVM.getIsoId() != null) {
- DataTO dataTO = tmplFactory.getTemplate(userVM.getIsoId(),
DataStoreRole.Image, userVM.getDataCenterId()).getTO();
- DiskTO iso = new DiskTO(dataTO, 3L, null, Volume.Type.ISO);
- vm.addDisk(iso);
- }
+ if (vm.getType() == VirtualMachine.Type.User &&
vm.getTemplate().getFormat() == ImageFormat.ISO) {
+ DataTO dataTO = tmplFactory.getTemplate(vm.getTemplate().getId(),
DataStoreRole.Image, vm.getVirtualMachine().getDataCenterId()).getTO();
+ DiskTO iso = new DiskTO(dataTO, 3L, null, Volume.Type.ISO);
+ vm.addDisk(iso);
}
}
