Petr Horáček has uploaded a new change for review. Change subject: net: report OVS netinfo in caps ......................................................................
net: report OVS netinfo in caps Change-Id: Ib53200891e292a0d9c8a347cc14344281d3ace65 Bug-Url: https://bugzilla.redhat.com/1195208 Signed-off-by: Petr Horáček <phora...@redhat.com> --- M lib/vdsm/network/api.py M vdsm/caps.py 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/57102/1 diff --git a/lib/vdsm/network/api.py b/lib/vdsm/network/api.py index a2388ba..90bcd71 100644 --- a/lib/vdsm/network/api.py +++ b/lib/vdsm/network/api.py @@ -37,6 +37,7 @@ from . canonicalize import canonicalize_networks, canonicalize_bondings from . errors import RollbackIncomplete +from . ovs import info as ovs_info from . import netconfpersistence from . import netswitch @@ -45,7 +46,7 @@ def caps_networks(): """Complement existing non-root caps""" - return {} + return ovs_info.get_netinfo(fake_bridgeless=True) def _wait_for_udev_events(): diff --git a/vdsm/caps.py b/vdsm/caps.py index 66eb245..2d39196 100644 --- a/vdsm/caps.py +++ b/vdsm/caps.py @@ -25,6 +25,7 @@ import xml.etree.ElementTree as ET import libvirt +import six from vdsm.config import config from vdsm.netinfo import cache as netinfo_cache @@ -166,7 +167,8 @@ caps.update(netinfo_data) super_caps_networks = supervdsm.getProxy().caps_networks() - caps.update(super_caps_networks) + for key, value in six.iteritems(super_caps_networks): + caps[key].update(super_caps_networks[key]) try: caps['hooks'] = hooks.installed() -- To view, visit https://gerrit.ovirt.org/57102 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib53200891e292a0d9c8a347cc14344281d3ace65 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <phora...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
