ifstate 1.13.1__tar.gz → 1.13.2__tar.gz

{ifstate-1.13.1 → ifstate-1.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ifstate
-Version: 1.13.1
+Version: 1.13.2
 Summary: Manage host interface settings in a declarative manner
 Home-page: https://ifstate.net/
 Author: Thomas Liske

{ifstate-1.13.1 → ifstate-1.13.2}/ifstate.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ifstate
-Version: 1.13.1
+Version: 1.13.2
 Summary: Manage host interface settings in a declarative manner
 Home-page: https://ifstate.net/
 Author: Thomas Liske

{ifstate-1.13.1 → ifstate-1.13.2}/libifstate/__init__.py

@@ -48,7 +48,7 @@ import json
 import errno
 import logging
 
-__version__ = "1.13.1"
+__version__ = "1.13.2"
 
 
 class IfState():
@@ -111,6 +111,9 @@ class IfState():
         self.ipaddr_ignore = set()
         for ip in self.ignore.get('ipaddr', []):
             self.ipaddr_ignore.add(ip_network(ip))
+        self.fdb_ignore = None
+        if self.ignore.get('fdb'):
+            self.fdb_ignore = re.compile('|'.join(self.ignore.get('fdb')))
 
         # save cshaper profiles
         self.cshaper_profiles = ifstates['cshaper']
@@ -598,7 +601,7 @@ class IfState():
                 'ipaddr_dynamic', True), do_apply)
 
         if ifname in netns.fdb:
-            netns.fdb[ifname].apply(do_apply)
+            netns.fdb[ifname].apply(self.fdb_ignore, do_apply)
 
         if ifname in netns.neighbours:
             netns.neighbours[ifname].apply(do_apply)

{ifstate-1.13.1 → ifstate-1.13.2}/libifstate/fdb/__init__.py

@@ -88,7 +88,7 @@ class FDB():
 
         return fdb
 
-    def apply(self, do_apply):
+    def apply(self, fdb_ignore_re, do_apply):
         logger.debug('getting fdb', extra={'iface': self.iface})
 
         # get ifindex and lladdr
@@ -108,41 +108,12 @@ class FDB():
         if linkinfo and linkinfo.get_attr('IFLA_INFO_KIND') in ['vxlan']:
             default_state |= NUD_NOARP
 
-        # configure fdb entries
-        ipr_entries = self.get_kernel_fdb()
+        # set default_state if missing
         for lladdr, entries in self.fdb.items():
             for entry in entries:
-                # set default_state if missing
                 if not 'state' in entry:
                     entry['state'] = default_state
 
-                # check if fdb entry is already present
-                if lladdr in ipr_entries:
-                    if entry in ipr_entries[lladdr]:
-                        logger.log_ok('fdb', '= {}'.format(lladdr))
-                        continue
-
-                # fdb entry needs to be added
-                logger.log_add('fdb', '+ {}'.format(lladdr))
-
-                # prepare arguments
-                args = {
-                    'ifindex': self.idx,
-                    'family': AF_BRIDGE
-                }
-                args.update(entry)
-                logger.debug("bridge fdb append: {}".format(
-                    " ".join("{}={}".format(k, v) for k, v in args.items())))
-
-                if do_apply:
-                    try:
-                        self.netns.ipr.fdb("append", **args)
-                    except Exception as err:
-                        if not isinstance(err, netlinkerror_classes):
-                            raise
-                        logger.warning('add {} to fdb failed: {}'.format(
-                            entry['lladdr'], err.args[1]))
-
         # cleanup orphan fdb entries
         ipr_entries = self.get_kernel_fdb()
         for lladdr, entries in ipr_entries.items():
@@ -150,6 +121,10 @@ class FDB():
             if lladdr == self.lladdr:
                 continue
 
+            # skip ignored lladdr
+            if fdb_ignore_re is not None and fdb_ignore_re.match(lladdr):
+                continue
+
             for entry in entries:
                 # check if fdb entry is already present
                 if lladdr not in self.fdb or entry not in self.fdb[lladdr]:
@@ -172,3 +147,34 @@ class FDB():
                                 raise
                             logger.warning('remove {} from fdb failed: {}'.format(
                                 entry['lladdr'], err.args[1]))
+
+        # configure fdb entries
+        ipr_entries = self.get_kernel_fdb()
+        for lladdr, entries in self.fdb.items():
+            for entry in entries:
+                # check if fdb entry is already present
+                if lladdr in ipr_entries:
+                    if entry in ipr_entries[lladdr]:
+                        logger.log_ok('fdb', '= {}'.format(lladdr))
+                        continue
+
+                # fdb entry needs to be added
+                logger.log_add('fdb', '+ {}'.format(lladdr))
+
+                # prepare arguments
+                args = {
+                    'ifindex': self.idx,
+                    'family': AF_BRIDGE
+                }
+                args.update(entry)
+                logger.debug("bridge fdb append: {}".format(
+                    " ".join("{}={}".format(k, v) for k, v in args.items())))
+
+                if do_apply:
+                    try:
+                        self.netns.ipr.fdb("append", **args)
+                    except Exception as err:
+                        if not isinstance(err, netlinkerror_classes):
+                            raise
+                        logger.warning('add {} to fdb failed: {}'.format(
+                            entry['lladdr'], err.args[1]))

{ifstate-1.13.1 → ifstate-1.13.2}/libifstate/link/base.py

@@ -66,6 +66,11 @@ class Link(ABC):
             1: "bandwidth",
             2: "count",
         },
+        # === bridge ===
+        'br_vlan_protocol': {
+            0x88a8: '802.1ad',
+            0x8100: '802.1q',
+        },
         # === tuntap ===
         'tun_type': {
             1: 'tun',
@@ -104,6 +109,12 @@ class Link(ABC):
         'wireguard',
         'xfrm',
     ]
+    # the attributes will be unset using an emptry string,
+    # if unset they are not return via netlink and handled
+    # as a `None` value in ifstate
+    attr_empty_unset = [
+        'ifalias',
+    ]
 
     def __new__(cls, *args, **kwargs):
         cname = cls.__name__
@@ -208,6 +219,10 @@ class Link(ABC):
         if 'bind_netns' in self.settings:
             del(self.settings['bind_netns'])
 
+        for attr in self.attr_empty_unset:
+            if attr in self.settings and self.settings[attr] == "":
+                self.settings[attr] = None
+
     def search_link_registry(self):
         for args in self.link_registry_search_args:
             item = self.ifstate.link_registry.get_link(**args)
@@ -723,6 +738,12 @@ class Link(ABC):
                     if setting in self.settings:
                         skipped_settings[setting] = self.settings.pop(setting)
 
+                # handle settings which are unset using empty strings (i.e. ifstate)
+                for setting in self.attr_empty_unset:
+                    if setting in self.settings and self.settings[setting] == None:
+                        skipped_settings[setting] = self.settings.pop(setting)
+                        self.settings[setting] = ""
+
                 if has_ifname_change:
                     self.prevent_altname_conflict()
 
@@ -738,6 +759,10 @@ class Link(ABC):
                                 # None index references are configuration via the invalid ifindex 0
                                 value = 0
 
+                            # these attributes are not returned if unset (i.e. ifstate)
+                            if setting in self.attr_empty_unset and value == None:
+                                value = ""
+
                             if value != self.settings[setting]:
                                 if self.cap_create:
                                     logger.debug('  %s: setting could not be changed', setting, extra={'iface': self.settings['ifname']})