Change in vdsm[master]: fixed a key error in _delNetwork
danken at redhat.com
danken at redhat.com
Wed Jan 7 08:59:00 UTC 2015
Dan Kenigsberg has submitted this change and it was merged.
Change subject: fixed a key error in _delNetwork
......................................................................
fixed a key error in _delNetwork
When _delNetwork was called from _delBrokenNetwork its netinfo
is adapted so it would be able to remove the broken netwrok.
Without this patch, trying to remove a broken bridgeless network fails
With a KeyError due to a missing bootproto element.
Traceback (most recent call last):
File "/usr/share/vdsm/supervdsmServer", line 100, in wrapper
res = func(*args, **kwargs)
File "/usr/share/vdsm/supervdsmServer", line 200, in setupNetworks
return setupNetworks(networks, bondings, **options)
File "/usr/share/vdsm/network/api.py", line 798, in setupNetworks
configurator=configurator)
File "/usr/share/vdsm/network/api.py", line 404, in _delBrokenNetwork
implicitBonding=False, _netinfo=_netinfo)
File "/usr/share/vdsm/network/api.py", line 223, in wrapped
ret = func(**attrs)
File "/usr/share/vdsm/network/api.py", line 462, in _delNetwork
net_ent.ip.bootproto = _netinfo.networks[network]['bootproto4']
KeyError: 'bootproto4
This was introduced by commit 1886113ee096f2d414738be0c5b11ca5079a5a3c
and should/shouldnot be backported to the stable branch.
Change-Id: I09d32946cf2667b1888b1d84d0eab2d7118a42b0
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
Reviewed-on: http://gerrit.ovirt.org/36598
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
---
M tests/functional/networkTests.py
M vdsm/network/api.py
2 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
Ido Barkan: Verified
Dan Kenigsberg: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/36598
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I09d32946cf2667b1888b1d84d0eab2d7118a42b0
Gerrit-PatchSet: 3
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: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
More information about the vdsm-patches
mailing list