From c73fec87d6464b8271b7dc492140d37c6cd810e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Constantino=20V=C3=A1zquez=20Blanco?= Date: Tue, 28 Apr 2009 17:25:33 +0000 Subject: [PATCH] Completing VMM driver for VMWare (added DEPLOY, SHUTDOWN, CANCEL, SAVE). git-svn-id: http://svn.opennebula.org/one/trunk@494 3034c82b-c49b-4eb3-8279-a7acafdc01c0 --- src/vmm_mad/vmware/DeployVM.java | 38 +++-- src/vmm_mad/vmware/OneVmmVmware.java | 193 ++++++++++++++++++++--- src/vmm_mad/vmware/OperationsOverVM.java | 141 +++++++++++++++++ src/vmm_mad/vmware/ParseXML.java | 54 +++---- src/vmm_mad/vmware/one_vmm_vmware | 5 + 5 files changed, 361 insertions(+), 70 deletions(-) create mode 100644 src/vmm_mad/vmware/OperationsOverVM.java mode change 100644 => 100755 src/vmm_mad/vmware/one_vmm_vmware diff --git a/src/vmm_mad/vmware/DeployVM.java b/src/vmm_mad/vmware/DeployVM.java index f851b96e5e..45ae9c7e66 100644 --- a/src/vmm_mad/vmware/DeployVM.java +++ b/src/vmm_mad/vmware/DeployVM.java @@ -36,7 +36,7 @@ public class DeployVM { // Helpers from VI samples private static ServiceContent content; - private static AppUtil cb = null; + static AppUtil cb = null; private static VimPortType service; private String datacenterName =""; @@ -53,7 +53,7 @@ public class DeployVM com.vmware.vim.ManagedObjectReference hostMor; public boolean registerVirtualMachine() throws Exception - { + { boolean registered = false; ManagedObjectReference host = null; @@ -121,13 +121,13 @@ public class DeployVM vmFolderMor,vmxPath,getVmName(),false,resourcePool,host); String result = cb.getServiceUtil().waitForTask(taskmor); - if (result.equalsIgnoreCase("Sucess")) + if (result.equalsIgnoreCase("Sucess")) // sic { registered = true; } else { - System.out.println("Some Exception While Registering The VM"); + System.out.println("Exception registering the VM"); registered = false; } return registered; @@ -247,6 +247,11 @@ public class DeployVM { String[] disks = pXML.getDisk(); + if(disks.length==1 && disks[0].equals("")) + { + return; + } + VirtualDeviceConfigSpec [] vdiskSpecArray = new VirtualDeviceConfigSpec[disks.length]; for(int i=0;i