From 96f900fac66ca11a89408fef7c5d159b0284e436 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 3 Feb 2012 15:39:59 -0800 Subject: [PATCH] xenserver: Remove dead code from ovs-xapi-sync. Nothing actually uses call_vsctl(), so remove it and its dependencies. Signed-off-by: Ben Pfaff --- xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync index 8392c61f..b10df6b8 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: -- 2.30.2