You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/28 00:41:25 UTC
[1/2] git commit: updated refs/heads/master to 4f32feb
Repository: cloudstack
Updated Branches:
refs/heads/master 026ba02d5 -> 4f32febfe
CLOUDSTACK-8841: Storage XenMotion from XS 6.2 to XS 6.5 fails.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/69647b38
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/69647b38
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/69647b38
Branch: refs/heads/master
Commit: 69647b38ce96fb40131ad480a59f034701da5369
Parents: b4ad38d
Author: Priyank Parihar <pr...@citrix.com>
Authored: Fri Dec 11 11:05:46 2015 +0530
Committer: Priyank Parihar <pr...@accelerite.com>
Committed: Tue May 17 12:13:34 2016 +0530
----------------------------------------------------------------------
server/src/com/cloud/vm/UserVmManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/69647b38/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index cc007d9..f1a523b 100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -4717,8 +4717,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
}
// Check if the source and destination hosts are of the same type and support storage motion.
- if (!(srcHost.getHypervisorType().equals(destinationHost.getHypervisorType()) && srcHost.getHypervisorVersion().equals(destinationHost.getHypervisorVersion()))) {
- throw new CloudRuntimeException("The source and destination hosts are not of the same type and version. " + "Source hypervisor type and version: "
+ if (!(srcHost.getHypervisorType().equals(destinationHost.getHypervisorType()))) {
+ throw new CloudRuntimeException("The source and destination hosts are not of the same type. " + "Source hypervisor type and version: "
+ srcHost.getHypervisorType().toString() + " " + srcHost.getHypervisorVersion() + ", Destination hypervisor type and version: "
+ destinationHost.getHypervisorType().toString() + " " + destinationHost.getHypervisorVersion());
}
[2/2] git commit: updated refs/heads/master to 4f32feb
Posted by ra...@apache.org.
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 <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f32febf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f32febf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f32febf
Branch: refs/heads/master
Commit: 4f32febfed6603098d2e6699501007d1738efb41
Parents: 026ba02 69647b3
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Tue Feb 28 06:11:14 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Tue Feb 28 06:11:15 2017 +0530
----------------------------------------------------------------------
server/src/com/cloud/vm/UserVmManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f32febf/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/vm/UserVmManagerImpl.java
index fcd2d8c,f1a523b..176c7e94
mode 100755,100644..100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java