Skip to content

Commit 4f32feb

Browse files
committed
Merge pull request #815 from priyankparihar/CS-43756
CLOUDSTACK-8841: Storage XenMotion from XS 6.2 to XS 6.5 fails.Removed Host version check in API. Because Case 1:(Lower to Higher Version) Migration from lower version to higher version is valid. Case 2:(Higher to Lower Version) In this case system(Host) will not allow. So no need to check version in API. Additionally, CLOUDSTACK User Interface(UI) does not allow migration between different version of hyper-visors. But sometimes user wants to do migration from Lower to Higher Version. Now he can do it via API. ACS Link ==> https://issues.apache.org/jira/browse/CLOUDSTACK-8841 * pr/815: CLOUDSTACK-8841: Storage XenMotion from XS 6.2 to XS 6.5 fails. Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2 parents 026ba02 + 69647b3 commit 4f32feb

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

server/src/com/cloud/vm/UserVmManagerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4946,8 +4946,8 @@ public VirtualMachine migrateVirtualMachineWithVolume(Long vmId, Host destinatio
49464946
}
49474947

49484948
// Check if the source and destination hosts are of the same type and support storage motion.
4949-
if (!(srcHost.getHypervisorType().equals(destinationHost.getHypervisorType()) && srcHost.getHypervisorVersion().equals(destinationHost.getHypervisorVersion()))) {
4950-
throw new CloudRuntimeException("The source and destination hosts are not of the same type and version. " + "Source hypervisor type and version: "
4949+
if (!(srcHost.getHypervisorType().equals(destinationHost.getHypervisorType()))) {
4950+
throw new CloudRuntimeException("The source and destination hosts are not of the same type. " + "Source hypervisor type and version: "
49514951
+ srcHost.getHypervisorType().toString() + " " + srcHost.getHypervisorVersion() + ", Destination hypervisor type and version: "
49524952
+ destinationHost.getHypervisorType().toString() + " " + destinationHost.getHypervisorVersion());
49534953
}

0 commit comments

Comments
 (0)