CLOUDSTACK-6170 (VMware root-disk support for managed storage)

Mike Tutkowski · Mike Tutkowski · commit 06c0486d0b41 · 2014-04-01T00:09:53.000-06:00
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -1585,7 +1585,13 @@ public Answer deleteVolume(DeleteCommand cmd) {
 
                         // let vmMo.destroy to delete volume for us
                         // vmMo.tearDownDevices(new Class<?>[] { VirtualDisk.class, VirtualEthernetCard.class });
-                        vmMo.destroy();
+
+                        if (isManaged) {
+                            vmMo.unregisterVm();
+                        }
+                        else {
+                            vmMo.destroy();
+                        }
 
                         // this.hostService.handleDatastoreAndVmdkDetach(iScsiName, storageHost, storagePort);
                         if (managedIqns != null && !managedIqns.isEmpty()) {
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/BaseMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/BaseMO.java
@@ -70,6 +70,10 @@ public String getName() throws Exception {
         return _name;
     }
 
+    public void unregisterVm() throws Exception {
+        _context.getService().unregisterVM(_mor);
+    }
+
     public boolean destroy() throws Exception {
         ManagedObjectReference morTask = _context.getService().destroyTask(_mor);
 

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,10 @@ public String getName() throws Exception {`
`70`	`70`	`return _name;`
`71`	`71`	`}`
`72`	`72`
	`73`	`+ public void unregisterVm() throws Exception {`
	`74`	`+ _context.getService().unregisterVM(_mor);`
	`75`	`+ }`
	`76`	`+`
`73`	`77`	`public boolean destroy() throws Exception {`
`74`	`78`	`ManagedObjectReference morTask = _context.getService().destroyTask(_mor);`
`75`	`79`