You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/18 13:13:34 UTC
[3/5] git commit: updated refs/heads/master to 219da64
CLOUDSTACK-8956: Add VMware Api v5.5 and change pom.xml to use VMware Api v5.5
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d05c1f47
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d05c1f47
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d05c1f47
Branch: refs/heads/master
Commit: d05c1f47ba7248dc2c24bf5e6e01b300fe418f6f
Parents: ea7c2d9
Author: nvazquez <ni...@gmail.com>
Authored: Mon Oct 19 16:16:33 2015 -0200
Committer: nvazquez <ni...@gmail.com>
Committed: Mon Nov 16 11:29:30 2015 -0800
----------------------------------------------------------------------
deps/install-non-oss.sh | 3 +++
pom.xml | 2 +-
.../src/com/cloud/hypervisor/vmware/mo/VirtualDiskManagerMO.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d05c1f47/deps/install-non-oss.sh
----------------------------------------------------------------------
diff --git a/deps/install-non-oss.sh b/deps/install-non-oss.sh
index 940bd32..7d38d53 100755
--- a/deps/install-non-oss.sh
+++ b/deps/install-non-oss.sh
@@ -32,3 +32,6 @@ mvn install:install-file -Dfile=manageontap.jar -DgroupId=com.cloud.com.netapp
# From https://my.vmware.com/group/vmware/get-download?downloadGroup=VSP510-WEBSDK-510
# Version: 5.1, Release-date: 2012-09-10, Build: 774886
mvn install:install-file -Dfile=vim25_51.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim25 -Dversion=5.1 -Dpackaging=jar
+
+# From https://my.vmware.com/group/vmware/get-download?downloadGroup=WEBSDK550
+mvn install:install-file -Dfile=vim25_55.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim25 -Dversion=5.5 -Dpackaging=jar
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d05c1f47/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f346326..d9a131c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
<cs.servlet.version>2.5</cs.servlet.version>
<cs.jstl.version>1.2</cs.jstl.version>
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
- <cs.vmware.api.version>5.1</cs.vmware.api.version>
+ <cs.vmware.api.version>5.5</cs.vmware.api.version>
<org.springframework.version>3.2.12.RELEASE</org.springframework.version>
<cs.mockito.version>1.9.5</cs.mockito.version>
<cs.powermock.version>1.5.3</cs.powermock.version>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d05c1f47/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualDiskManagerMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualDiskManagerMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualDiskManagerMO.java
index 32f5c00..559018e 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualDiskManagerMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualDiskManagerMO.java
@@ -131,7 +131,7 @@ public class VirtualDiskManagerMO extends BaseMO {
public void moveVirtualDisk(String srcName, ManagedObjectReference morSrcDc, String destName, ManagedObjectReference morDestDc, boolean force) throws Exception {
- ManagedObjectReference morTask = _context.getService().moveVirtualDiskTask(_mor, srcName, morSrcDc, destName, morDestDc, force);
+ ManagedObjectReference morTask = _context.getService().moveVirtualDiskTask(_mor, srcName, morSrcDc, destName, morDestDc, force, null);
boolean result = _context.getVimClient().waitForTask(morTask);
if (!result)