From c39c2868e050922b440fdc9f0ef28b5e2e36fefb Mon Sep 17 00:00:00 2001
From: Justin Pettit <jpettit@nicira.com>
Date: Mon, 14 Dec 2009 17:44:17 -0800
Subject: [PATCH] xenserver: Actually destroy VIFs by using ovs-vsctl

When VIFs were destroyed, they were not actually being deleted in the
config database.  This commit makes the appropriate ovs-vsctl commands
in the 'vif' script to accomplish that.
---
 xenserver/etc_xensource_scripts_vif | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index a9b62ff4..6905448f 100755
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -121,11 +121,6 @@ remove)
 	xenstore-rm "${HOTPLUG}/hotplug"
 	vif=vif${DOMID}.${DEVID}
 	logger -t scripts-vif "${vif} has been removed"
-	$cfg_mod -vANY:console:emer -F /etc/ovs-vswitchd.conf \
-	    --del-match="bridge.*.port=${vif}" \
-	    --del-match="vlan.${vif}.trunks=*" \
-	    --del-match="vlan.${vif}.tag=*" \
-	    --del-match="port.${vif}.[!0-9]*" -c
-	$service vswitch reload
+	$vsctl del-port $bridge $vif
 	;;
 esac
-- 
2.30.2