Nmstate for bridge options

lib/vdsm/network/link/setup.py

@@ -20,38 +20,75 @@
 from __future__ import absolute_import
 from __future__ import division
 
-from vdsm.network.link.bridge import Bridge
+
+class NmstateBridgeOpts:
+    def __init__(self):
+        self._types_dict = {
+            'mac-ageing-time': int,
+            'group-forward-mask': int,
+            'hash-max': int,
+            'multicast-snooping': self._str_to_bool,
+            'multicast-router': int,
+            'multicast-last-member-count': int,
+            'multicast-last-member-interval': int,
+            'multicast-membership-interval': int,
+            'multicast-querier': self._str_to_bool,
+            'multicast-querier-interval': int,
+            'multicast-query-use-ifaddr': self._str_to_bool,
+            'multicast-query-interval': int,
+            'multicast-query-response-interval': int,
+            'multicast-startup-query-count': int,
+            'multicast-startup-query-interval': int,
+        }
+
+    @property
+    def types_dict(self):
+        return self._types_dict
+
+    def convert_value(self, key, value):
+        conversion_func = self._types_dict[key]
+        return conversion_func(value)
+
+    @staticmethod
+    def _str_to_bool(str_value):
+        str_value = str_value.lower()
+        false_values = ['false', '0']
+        return str_value not in false_values
+
+
+class NmstateBridgeOptionNotSupported(Exception):
+    pass
 
 
 def parse_bond_options(options):
     """
     Parse bonding options into a dictionary.
     """
-
-    def _string_to_dict(str, div, eq):
-        if options == '':
-            return {}
-        return dict(
-            option.split(eq, 1) for option in str.strip(div).split(div)
-        )
-
     if options:
         d_options = _string_to_dict(options, ' ', '=')
         return d_options
     else:
         return {}
 
 
-def setup_custom_bridge_opts(nets):
-    for name, opts in parse_nets_bridge_opts(nets):
-        Bridge(name, opts)
+def parse_nets_bridge_opts(opts):
+
+    if not opts:
+        return {}
+    opts_str = opts.replace('_', '-')
+    bridge_opts = _string_to_dict(opts_str, ' ', '=')
+    try:
+        nmstate_bridge_opts = NmstateBridgeOpts()
+        for key, value in bridge_opts.items():
+            bridge_opts[key] = nmstate_bridge_opts.convert_value(key, value)
+    except KeyError:
+        raise NmstateBridgeOptionNotSupported(
+            f'{key} is not a valid nmstate bridge option'
+        )
+    return bridge_opts
 
 
-def parse_nets_bridge_opts(nets):
-    for name, opts in nets.items():
-        opts_str = opts.get('custom', {}).get('bridge_opts')
-        if opts_str:
-            bridge_opts = dict(
-                opt.split('=', 1) for opt in opts_str.split(' ')
-            )
-            yield name, bridge_opts
+def _string_to_dict(str, div, eq):
+    if str == '':
+        return {}
+    return dict(option.split(eq, 1) for option in str.strip(div).split(div))

lib/vdsm/network/netswitch/configurator.py

@@ -32,7 +32,6 @@
 from vdsm.network.configurators import qos
 from vdsm.network.dhcp_monitor import MonitoredItemPool
 from vdsm.network.link import nic
-from vdsm.network.link import setup as link_setup
 from vdsm.network.link.iface import iface as iface_obj
 from vdsm.network.netconfpersistence import RunningConfig, Transaction
 from vdsm.network.netlink import waitfor
@@ -107,7 +106,6 @@ def _setup_nmstate(networks, bondings, options, in_rollback):
             if not bond_attrs.get('remove'):
                 config.setBonding(bond_name, bond_attrs)
         config.save()
-        link_setup.setup_custom_bridge_opts(networks)
         connectivity.check(options)
 
 

lib/vdsm/network/nmstate/bridge_util.py

@@ -40,6 +40,7 @@ def __init__(self, name, attrs):
         self.bridged = attrs.get('bridged')
         self.stp = attrs.get('stp')
         self.mtu = attrs.get('mtu', DEFAULT_MTU)
+        self.bridge_opts = attrs.get('custom', {}).get('bridge_opts')
 
         self.ipv4addr = attrs.get('ipaddr')
         self.ipv4netmask = attrs.get('netmask')

lib/vdsm/network/nmstate/linux_bridge.py

@@ -19,6 +19,8 @@
 
 from collections import defaultdict
 
+from vdsm.network.link.setup import parse_nets_bridge_opts
+
 from .bridge_util import DEFAULT_MTU
 from .bridge_util import is_iface_up
 from .bridge_util import is_default_mtu
@@ -211,11 +213,14 @@ def _create_bridge_iface(self, port, options=None):
         return bridge_state
 
     def _create_bridge_options(self):
-        return {
+        opts = parse_nets_bridge_opts(self._netconf.bridge_opts)
+        birdge_opts_dict = {
             LinuxBridge.STP_SUBTREE: {
                 LinuxBridge.STP.ENABLED: self._netconf.stp
             }
         }
+        birdge_opts_dict.update(opts)
+        return birdge_opts_dict
 
     def _add_ip(self, sb_iface, vlan_iface, bridge_iface):
         ip_addr = IpAddress(self._netconf, self._auto_dns)

tests/network/functional/rollback_test.py

@@ -21,6 +21,7 @@
 import pytest
 
 from vdsm.network import errors as ne
+from vdsm.network.link.setup import NmstateBridgeOptionNotSupported
 
 from . import netfunctestlib as nftestlib
 from .netfunctestlib import SetupNetworksError
@@ -238,7 +239,7 @@ def test_setup_invalid_bridge_opts_fails(adapter, nic0):
         'custom': {'bridge_opts': 'foo=0'},
     }
 
-    with pytest.raises(SetupNetworksError):
+    with pytest.raises(NmstateBridgeOptionNotSupported):
         adapter.setupNetworks({NETWORK_NAME: net_attrs}, {}, NOCHK)
 
     adapter.update_netinfo()

tests/network/unit/link_setup_test.py

@@ -25,21 +25,14 @@
 
 def test_parse_nets_bridge_opts():
     nets = {
-        'br1': {
-            'custom': {
-                'bridge_opts': 'multicast_router=0 multicast_snooping=0'
-            }
-        },
-        'br2': {
-            'custom': {
-                'bridge_opts': 'multicast_router=1 multicast_snooping=1'
-            }
-        },
+        'br1': 'multicast_router=0 multicast_snooping=0',
+        'br2': 'multicast_router=1 multicast_snooping=1',
     }
     expected = {
-        'br1': {'multicast_router': '0', 'multicast_snooping': '0'},
-        'br2': {'multicast_router': '1', 'multicast_snooping': '1'},
+        'br1': {'multicast-router': 0, 'multicast-snooping': False},
+        'br2': {'multicast-router': 1, 'multicast-snooping': True},
     }
 
-    for name, opts in linksetup.parse_nets_bridge_opts(nets):
-        assert expected[name] == opts
+    for name, opts in nets.items():
+        parsed_opts = linksetup.parse_nets_bridge_opts(opts)
+        assert expected[name] == parsed_opts

vdsm.spec.in

@@ -377,7 +377,7 @@ Requires:       iproute-tc
 Requires:       ovirt-openvswitch >= 2.15
 # Workaround for BZ#1966143
 Requires:       ovirt-python-openvswitch >= 2.15
-Requires:       nmstate >= 1.0
+Requires:       nmstate >= 1.2.1-3
 %if 0%{?rhel} < 9
 Requires:       nmstate-plugin-ovsdb
 %endif