From 39b06a6393eb7c7ef356848e96a25cad4a3b4de7 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Mon, 9 Jul 2012 13:17:59 -0700
Subject: [PATCH] VPC : CS-15479, try detroy vlan in unplug vif

---
 .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 0002b737cc7..99227b7da2c 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -7209,7 +7209,11 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
                 String lmac = vif.getMAC(conn);
                 if ( lmac.equals(mac) ) {
                     vif.unplug(conn);
+                    Network network = vif.getNetwork(conn);
                     vif.destroy(conn);
+                    if (network.getNameLabel(conn).startsWith("VLAN")) {
+                        disableVlanNetwork(conn, network);
+                    }
                     break;
                 }
             }