From 1e985147ec16e594f6cab1c3cc76893b6085bd13 Mon Sep 17 00:00:00 2001
From: Frank <frank@cloud.com>
Date: Mon, 24 Jan 2011 15:10:03 -0800
Subject: [PATCH] Ovs tunnel manager -- unplug dom0 vif after network created

---
 .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 4 +++-
 1 file changed, 3 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 a940bb44c1d..e418f53974f 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -515,10 +515,12 @@ public abstract class CitrixResourceBase implements ServerResource {
         	vifr.network = nw;
         	dom0vif = VIF.create(conn, vifr);
         	dom0vif.plug(conn);
+        	dom0vif.unplug(conn);
         } else {
         	s_logger.debug("already have a vif on dom0 for " + networkDesc);
         	if (!dom0vif.getCurrentlyAttached(conn)) {
         		dom0vif.plug(conn);
+        		dom0vif.unplug(conn);
         	}
         }
     }
@@ -566,7 +568,7 @@ public abstract class CitrixResourceBase implements ServerResource {
                 nw = networks.iterator().next();
             }
             
-            enableXenServerNetwork(conn, nw, nwName, "tunnel network for account " + account);
+            enableXenServerNetwork(conn, nw, "OVSTunnel", "tunnel network for account " + account);
             return nw;
         } catch (Exception e) {
             s_logger.warn("create tunnel network failed", e);