Change in vdsm[master]: disconnecting a port from a bridge should not consider el6 a...
ibarkan at redhat.com
ibarkan at redhat.com
Sun Apr 5 13:02:09 UTC 2015
Ido Barkan has uploaded a new change for review.
Change subject: disconnecting a port from a bridge should not consider el6 anymore
......................................................................
disconnecting a port from a bridge should not consider el6 anymore
Change-Id: I4e126b4986d81d8b3bb831f7d6145cde83645d2a
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
---
M vdsm/network/api.py
1 file changed, 3 insertions(+), 15 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/39544/1
diff --git a/vdsm/network/api.py b/vdsm/network/api.py
index de92fbf..41a3b9a 100755
--- a/vdsm/network/api.py
+++ b/vdsm/network/api.py
@@ -433,20 +433,8 @@
network)
-def _disconnect_bridge_port(bridge, port):
- try:
- ipwrapper.linkSet(port, ['nomaster'])
- except ipwrapper.IPRoute2Error:
- # REQUIRED_FOR: el6
- # rhel6 ip link command does not support 'nomaster'
- rc, _, err = utils.execCmd(
- [constants.EXT_BRCTL, 'delif', bridge, port])
- if rc != 0:
- raise ConfigNetworkError(
- ne.ERR_FAILED_IFDOWN,
- 'Failed to disconnect {0} from {1}. error: {2}'.format(
- port, bridge, err
- ))
+def _disconnect_bridge_port(port):
+ ipwrapper.linkSet(port, ['nomaster'])
@_alterRunningConfig
@@ -492,7 +480,7 @@
# we are interested to leave the bridge here, we have to disconnect
# it from the device so that the configurator will allow its
# removal.
- _disconnect_bridge_port(net_ent.name, net_ent_to_remove.name)
+ _disconnect_bridge_port(net_ent_to_remove.name)
else:
net_ent_to_remove = net_ent
--
To view, visit https://gerrit.ovirt.org/39544
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e126b4986d81d8b3bb831f7d6145cde83645d2a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>
More information about the vdsm-patches
mailing list