From 625ecc306b4e61d9bb4d559a1e17ce497cd33823 Mon Sep 17 00:00:00 2001
From: Anthony Xu <anthony@cloud.com>
Date: Fri, 7 Sep 2012 17:21:14 -0700
Subject: [PATCH]  CS-15542: UnPlugNicCommand return success if vif doesn't
 exist

---
 .../com/cloud/hypervisor/vmware/resource/VmwareResource.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index ba71fafcfef..da7f901cf39 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1295,7 +1295,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
             }
 
             VirtualDevice nic = findVirtualNicDevice(vmMo, cmd.getNic().getMac());
-
+            if ( nic == null ) {
+                return new UnPlugNicAnswer(cmd, true, "success");
+            }
             VirtualMachineConfigSpec vmConfigSpec = new VirtualMachineConfigSpec();
             VirtualDeviceConfigSpec[] deviceConfigSpecArray = new VirtualDeviceConfigSpec[1];
             deviceConfigSpecArray[0] = new VirtualDeviceConfigSpec();