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.

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index a9b62ff4f2b3ee4461eafa22439ad1f7f3e556cb..6905448fd7357f9ffe12647355b4e9190f045665 100755 (executable)
--- 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