From 7eef78b6448ac470897ceaeb3d1a366dbfbf75a2 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Wed, 11 Jul 2012 13:48:12 -0700
Subject: [PATCH] VPC : CS-15542, on ipdeassoc, if vif does not exist, return
 success.

---
 .../cloud/hypervisor/xen/resource/CitrixResourceBase.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 2dc8c1b89bb..678e896a094 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -1929,7 +1929,12 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
             
             VIF correctVif = getCorrectVif(conn, router, ip);
             if (correctVif == null) {
-                throw new InternalErrorException("Failed to find DomR VIF to associate/disassociate IP with.");
+                if (ip.isAdd()) {
+                    throw new InternalErrorException("Failed to find DomR VIF to associate IP with.");
+                } else {
+                    s_logger.debug("VIF to deassociate IP with does not exist, return success");
+                    return;
+                }
             }           
            
             String args = "vpc_ipassoc.sh " + routerIp;