X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=blobdiff_plain;f=xenserver%2Fusr_share_openvswitch_scripts_ovs-xapi-sync;h=b10df6b8789c907348444c57acc43f181ea35267;hp=8392c61f0145289a4ee95a4e13cb4147a3887840;hb=96f900fac66ca11a89408fef7c5d159b0284e436;hpb=b4b6a39ae688b88b2d17c0b47b105fed86f6c29d diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync index 8392c61f0..b10df6b87 100755 --- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync +++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync @@ -25,7 +25,6 @@ import argparse import os import signal -import subprocess import sys import time @@ -34,13 +33,11 @@ import XenAPI import ovs.dirs from ovs.db import error from ovs.db import types -import ovs.util import ovs.daemon import ovs.db.idl root_prefix = '' # Prefix for absolute file names, for testing. vlog = ovs.vlog.Vlog("ovs-xapi-sync") -vsctl = "/usr/bin/ovs-vsctl" session = None force_run = False @@ -116,13 +113,6 @@ def get_iface_id(if_name, xs_vif_uuid): return xs_vif_uuid -def call_vsctl(args): - cmd = [vsctl, "--timeout=30", "-vANY:console:off"] + args - exitcode = subprocess.call(cmd) - if exitcode != 0: - vlog.warn("Couldn't call ovs-vsctl") - - def set_or_delete(d, key, value): if value is None: if key in d: