CLOUDSTACK-8956: Add VMware Api v5.5 and change pom.xml to use VMware…

… Api v5.5
cloudtrends · Nov 16, 2015 · d05c1f4 · d05c1f4
1 parent ea7c2d9
commit d05c1f4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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>

diff --git 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 void zeroFillVirtualDisk(String name, ManagedObjectReference morDc) throw
 
  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)