Change in vdsm[master]: net: keep our own BRCTL constant

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has uploaded a new change for review.

Change subject: net: keep our own BRCTL constant
......................................................................

net: keep our own BRCTL constant

BRCTL has two usages: in vdsm-tool, and in the ifcfg network
configurator. It resolves to /usr/sbin/brctl on all platforms.

In order to facilitate future separation of the network subpackage, this
patch defines network's own copy of BRCTL.

Change-Id: Id49fc16232787c905ce9bda5731c08b2f568849f
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M lib/vdsm/network/configurators/ifcfg.py
M tests/functional/networkTests.py
M tests/network/nettestlib.py
3 files changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/79277/1

diff --git a/lib/vdsm/network/configurators/ifcfg.py
b/lib/vdsm/network/configurators/ifcfg.py
index dd35b26..92dbcf5 100644
--- a/lib/vdsm/network/configurators/ifcfg.py
+++ b/lib/vdsm/network/configurators/ifcfg.py
@@ -68,6 +68,7 @@
 
 CONFFILE_HEADER_SIGNATURE = '# Generated by VDSM version'
 
+EXT_BRCTL = '/usr/sbin/brctl'
 EXT_IFDOWN = '/sbin/ifdown'
 EXT_IFUP = '/sbin/ifup'
 
@@ -209,7 +210,7 @@
             ifacetracking.add(bridge.name)
         ifdown(bridge.name)
         self._removeSourceRoute(bridge)
-        cmd.exec_sync([constants.EXT_BRCTL, 'delbr', bridge.name])
+        cmd.exec_sync([EXT_BRCTL, 'delbr', bridge.name])
         self.configApplier.removeBridge(bridge.name)
         self.net_info.del_bridge(bridge.name)
         if bridge.port:
@@ -774,7 +775,7 @@
         ifdown(dev)
         if os.path.exists('/sys/class/net/%s/bridge' % dev):
             # ifdown is not enough to remove nicless bridges
-            cmd.exec_sync([constants.EXT_BRCTL, 'delbr', dev])
+            cmd.exec_sync([EXT_BRCTL, 'delbr', dev])
         if _is_bond_name(dev):
             if _is_running_bond(dev):
                 with open(BONDING_MASTERS, 'w') as f:
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 7ec22ef..a47e4cd 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -29,8 +29,7 @@
 import six
 
 import vdsm.config
-from vdsm.constants import EXT_BRCTL
-from vdsm.network.configurators.ifcfg import EXT_IFDOWN, EXT_IFUP
+from vdsm.network.configurators.ifcfg import EXT_BRCTL, EXT_IFDOWN, EXT_IFUP
 from vdsm.network import ipwrapper
 from vdsm.network import netswitch
 from vdsm.network.ip import dhclient
diff --git a/tests/network/nettestlib.py b/tests/network/nettestlib.py
index 4122ad4..b3d2927 100644
--- a/tests/network/nettestlib.py
+++ b/tests/network/nettestlib.py
@@ -32,9 +32,10 @@
 
 from nose.plugins.skip import SkipTest
 
-from vdsm.constants import EXT_BRCTL, EXT_TC
+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
 from vdsm.network.ip import address
 from vdsm.network.ip import dhclient
 from vdsm.network.ipwrapper import (


-- 
To view, visit https://gerrit.ovirt.org/79277
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id49fc16232787c905ce9bda5731c08b2f568849f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;