From 16450c03439e6030dd2dc475c9744b8292852e57 Mon Sep 17 00:00:00 2001
From: Anthony Xu <anthony@cloud.com>
Date: Thu, 23 Aug 2012 10:30:46 -0700
Subject: [PATCH] CS-15542: UnPlugNicCommand return success if vif doesn't
 exist

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

diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 1e291b1c774..c53a61809cc 100755
--- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1466,7 +1466,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();