diff --git a/deps/install-non-oss.sh b/deps/install-non-oss.sh index 940bd32ae59..7d38d537604 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 diff --git a/pom.xml b/pom.xml index f3463261379..d9a131c2a7f 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 2.5 1.2 1.0-20081010.060147 - 5.1 + 5.5 3.2.12.RELEASE 1.9.5 1.5.3 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 32f5c00a8dd..559018ed8f4 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)