Change in vdsm[master]: teach delNetworks to remove a network entity under a bridge

ibarkan at redhat.com ibarkan at redhat.com
Mon Dec 15 06:37:36 UTC 2014


Ido Barkan has posted comments on this change.

Change subject: teach delNetworks to remove a network entity under a bridge
......................................................................


Patch Set 8:

(3 comments)

http://gerrit.ovirt.org/#/c/35921/8/tests/functional/networkTests.py
File tests/functional/networkTests.py:

Line 1160:             link = ipwrapper.getLink(NETWORK_NAME)
Line 1161:             return link.index
Line 1162: 
Line 1163:         with dummyIf(2) as nics:
Line 1164:             first, second = nics
> Calling this STANDARD would hint that this is not expected to ever chang
Done
Line 1165:             standard = 1500
Line 1166:             first_net = {NETWORK_NAME: dict(bridged=True, nic=first,
Line 1167:                                             mtu=standard)}
Line 1168:             status, msg = self.vdsm_net.setupNetworks(first_net, {}, NOCHK)


http://gerrit.ovirt.org/#/c/35921/8/vdsm/network/api.py
File vdsm/network/api.py:

Line 407:                                  network)
Line 408: 
Line 409: 
Line 410: def _delete_bridge_interface(bridge, interface):
Line 411:     logging.info('Deleting interface %s from bridge %s' % (interface, bridge))
> fix logging method
Done
Line 412:     rc, out, err = utils.execCmd(
Line 413:         [constants.EXT_BRCTL, 'delif', bridge, interface])
Line 414:     if rc != 0:
Line 415:         raise Exception("could not disconnect interface from bridge. "


Line 454:         net_ent_to_remove = net_ent.port
Line 455:         if net_ent_to_remove is not None:
Line 456:             # this is a hack.
Line 457:             # we disconnect the underlying device (bond/vlan/nic) from the
Line 458:             # bridge so that the configurator will allow it to be removed
> I'm not sure that a FIXME is in place - as I don't know of a cleaner fix fo
edited the comment
Line 459:             _delete_bridge_interface(network, net_ent_to_remove.name)
Line 460:     else:
Line 461:         net_ent_to_remove = net_ent
Line 462: 


-- 
To view, visit http://gerrit.ovirt.org/35921
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia6bb891f23ef4550f90c6c7b057aef6302cf435c
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Ido Barkan <ibarkan at redhat.com>
Gerrit-Reviewer: Ondřej Svoboda <osvoboda at redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes


More information about the vdsm-patches mailing list