From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: net: move EXT_TC into vdsm.network.tc
......................................................................
net: move EXT_TC into vdsm.network.tc
The only users of EXT_TC is the tc package and its tests. There is no
need to exposed it in the global constants module.
Change-Id: I40238b99390e150445dfa3d38b8cddb7497045aa
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M configure.ac
M lib/vdsm/constants.py.in
M lib/vdsm/network/tc/__init__.py
M lib/vdsm/network/tc/_wrapper.py
M tests/network/nettestlib.py
M tests/network/tc_test.py
6 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/79295/1
diff --git a/configure.ac b/configure.ac
index ddfeb1d..b5e608b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -364,7 +364,6 @@
AC_PATH_PROG([SYSCTL_PATH], [sysctl], [/sbin/sysctl])
AC_PATH_PROG([TAR_PATH], [tar], [/bin/tar])
AC_PATH_PROG([TASKSET_PATH], [taskset], [/usr/bin/taskset])
-AC_PATH_PROG([TC_PATH], [tc], [/sbin/tc])
AC_PATH_PROG([TEE_PATH], [tee], [/usr/bin/tee])
AC_PATH_PROG([TOUCH_PATH], [touch], [/bin/touch])
AC_PATH_PROG([TUNE2FS_PATH], [tune2fs], [/sbin/tune2fs])
diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in
index d35093f..32c87d9 100644
--- a/lib/vdsm/constants.py.in
+++ b/lib/vdsm/constants.py.in
@@ -110,7 +110,6 @@
EXT_IONICE = '@IONICE_PATH@'
EXT_ISCSIADM = '@ISCSIADM_PATH@'
-EXT_TC = '@TC_PATH@'
EXT_KILL = '@KILL_PATH@'
diff --git a/lib/vdsm/network/tc/__init__.py b/lib/vdsm/network/tc/__init__.py
index bbdc5f7..6f73a30 100644
--- a/lib/vdsm/network/tc/__init__.py
+++ b/lib/vdsm/network/tc/__init__.py
@@ -32,6 +32,7 @@
from ._wrapper import TrafficControlException
QDISC_INGRESS = 'ffff:'
+EXT_TC = '/sbin/tc'
def _addTarget(network, parent, target):
diff --git a/lib/vdsm/network/tc/_wrapper.py b/lib/vdsm/network/tc/_wrapper.py
index 218d5a3..dd2af65 100644
--- a/lib/vdsm/network/tc/_wrapper.py
+++ b/lib/vdsm/network/tc/_wrapper.py
@@ -20,7 +20,7 @@
import errno
import os
-from vdsm.constants import EXT_TC
+from .. import EXT_TC
from vdsm.network import cmd
_TC_ERR_PREFIX = 'RTNETLINK answers: '
diff --git a/tests/network/nettestlib.py b/tests/network/nettestlib.py
index b3d2927..54d9459 100644
--- a/tests/network/nettestlib.py
+++ b/tests/network/nettestlib.py
@@ -32,7 +32,6 @@
from nose.plugins.skip import SkipTest
-from vdsm.constants import EXT_TC
from vdsm import cpuarch
from vdsm.network import cmd as cmd
from vdsm.network.configurators.ifcfg import EXT_BRCTL
@@ -47,6 +46,7 @@
from vdsm.network.link.iface import random_iface_name
from vdsm.network.netinfo import routes
from vdsm.network.netlink import monitor
+from vdsm.network.tc import EXT_TC
from vdsm.common.cache import memoized
from vdsm.common.cmdutils import CommandPath
diff --git a/tests/network/tc_test.py b/tests/network/tc_test.py
index 568dae0..7fbf99f 100644
--- a/tests/network/tc_test.py
+++ b/tests/network/tc_test.py
@@ -43,12 +43,12 @@
from .nettestlib import running
from vdsm import libvirtconnection
-from vdsm.constants import EXT_TC
from vdsm.network import cmd
from vdsm.network import tc
from vdsm.network.configurators import qos
from vdsm.network.ipwrapper import addrAdd, linkSet, netns_exec, link_set_netns
from vdsm.network.netinfo.qos import DEFAULT_CLASSID
+from vdsm.network.tc import EXT_TC
class TestQdisc(TestCaseBase):
--
To view, visit
https://gerrit.ovirt.org/79295
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40238b99390e150445dfa3d38b8cddb7497045aa
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>