ifstate 1.13.1__tar.gz → 1.13.3__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ifstate
-Version: 1.13.1
+Version: 1.13.3
 Summary: Manage host interface settings in a declarative manner
 Home-page: https://ifstate.net/
 Author: Thomas Liske
@@ -16,6 +16,15 @@ Provides-Extra: shell
 Requires-Dist: pygments; extra == "shell"
 Provides-Extra: wireguard
 Requires-Dist: wgnlpy; extra == "wireguard"
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 # IfState
 

{ifstate-1.13.1 → ifstate-1.13.3}/ifstate/ifstate.py

@@ -4,6 +4,7 @@ from libifstate.parser import YamlParser
 from libifstate import __version__, IfState
 from libifstate.exception import FeatureMissingError, LinkNoConfigFound, LinkCircularLinked, NetNSNotRoot, ParserValidationError, ParserOpenError, ParserParseError, ParserIncludeError
 from libifstate.util import logger, IfStateLogging
+from ifstate.vrrp import KEEPALIVED_STATES, KEEPALIVED_IGNORE_STATES
 from setproctitle import setproctitle
 
 import argparse
@@ -148,7 +149,7 @@ def main():
     action_parsers[Actions.VRRP].add_argument(
         "name", type=str, help="name of the vrrp group or instance")
     action_parsers[Actions.VRRP].add_argument(
-        "state", type=str.lower, choices=["unknown", "fault", "backup", "master"], help="the new state for the vrrp group or instance")
+        "state", type=str.lower, choices=KEEPALIVED_STATES, help="the new state for the vrrp group or instance")
 
     # Parameters for the vrrp-fifo action
     action_parsers[Actions.VRRP_FIFO].add_argument(
@@ -226,8 +227,9 @@ def main():
                     ifs_config.ifs.apply()
                     sighup_vrrp_fifo()
                 elif args.action == Actions.VRRP:
-                    ifs_config.ifs.apply(
-                        args.type, args.name, args.state)
+                    if not args.state in KEEPALIVED_IGNORE_STATES:
+                        ifs_config.ifs.apply(
+                            args.type, args.name, args.state)
             except LinkNoConfigFound:
                 pass
             except LinkCircularLinked as ex:

{ifstate-1.13.1 → ifstate-1.13.3}/ifstate/vrrp.py

@@ -12,6 +12,10 @@ import signal
 import subprocess
 import sys
 
+KEEPALIVED_HANDLE_STATES = ['backup', 'fault', 'master', 'stop', 'unknown']
+KEEPALIVED_IGNORE_STATES = ['backup_priority', 'master_priority', 'master_rx_lower_pri']
+KEEPALIVED_STATES = KEEPALIVED_HANDLE_STATES + KEEPALIVED_IGNORE_STATES
+
 class VrrpFifoProcess():
     '''
     Process for vrrp group/instance configuration.
@@ -135,7 +139,7 @@ def vrrp_fifo(args_fifo, ifs_config):
 
     try:
         status_pattern = re.compile(
-            r'(group|instance) "([^"]+)" (unknown|fault|backup|master|stop)( \d+)?$', re.IGNORECASE)
+            r'(group|instance) "([^"]+)" (' + '|'.join(KEEPALIVED_STATES) + ')( \d+)?$', re.IGNORECASE)
 
         with open(args_fifo) as fifo:
             logger.debug("entering fifo loop...")
@@ -146,6 +150,10 @@ def vrrp_fifo(args_fifo, ifs_config):
                     vrrp_name = m.group(2)
                     vrrp_state = m.group(3)
 
+                    # ignore priority changes w/o state changes
+                    if vrrp_state.lower() in KEEPALIVED_IGNORE_STATES:
+                        continue
+
                     vrrp_states.update(vrrp_type, vrrp_name, vrrp_state)
                 else:
                     logger.warning(f'failed to parse fifo input: {line.strip()}')

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ifstate
-Version: 1.13.1
+Version: 1.13.3
 Summary: Manage host interface settings in a declarative manner
 Home-page: https://ifstate.net/
 Author: Thomas Liske
@@ -16,6 +16,15 @@ Provides-Extra: shell
 Requires-Dist: pygments; extra == "shell"
 Provides-Extra: wireguard
 Requires-Dist: wgnlpy; extra == "wireguard"
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 # IfState
 

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

@@ -48,7 +48,7 @@ import json
 import errno
 import logging
 
-__version__ = "1.13.1"
+__version__ = "1.13.3"
 
 
 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.3}/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.3}/libifstate/link/base.py

@@ -3,6 +3,7 @@ from libifstate.exception import ExceptionCollector, LinkTypeUnknown, NetnsUnkno
 from libifstate.brport import BRPort
 from libifstate.routing import RTLookups
 from abc import ABC, abstractmethod
+import errno
 import os
 import subprocess
 import yaml
@@ -66,6 +67,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 +110,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 +220,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)
@@ -628,7 +644,9 @@ class Link(ABC):
             except Exception as err:
                 if not isinstance(err, netlinkerror_classes):
                     raise
-                excpts.add('del', err)
+
+                if err.code != errno.ENODEV:
+                    excpts.add('del', err)
         self.idx = None
         self.create(do_apply, sysctl, excpts, "replace")
 
@@ -723,6 +741,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 +762,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']})

{ifstate-1.13.1 → ifstate-1.13.3}/libifstate/link/veth.py

@@ -23,7 +23,12 @@ class VethLink(Link):
         except NetnsUnknown as ex:
             excpts.add(oper, ex)
             return excpts
+
         peer_link = next(iter(bind_netns.ipr.get_links(ifname=self.settings['peer'])), None)
+        if peer_link is None:
+            excpts.add(oper, LinkCannotAdd(-1,"Failed to get peer ifIndex"))
+            return excpts
+
         self.ifstate.link_registry.add_link(bind_netns, peer_link)
 
         return result

{ifstate-1.13.1 → ifstate-1.13.3}/libifstate/netns/__init__.py

@@ -13,10 +13,6 @@ import subprocess
 netns_name_map = {}
 netns_name_root = None
 netns_nsid_map = {}
-findmnt_cmd = shutil.which('findmnt')
-
-if findmnt_cmd is None:
-    logger.debug("findmnt binary is not available, netns binding of links might not be correct")
 
 @atexit.register
 def close_netns():
@@ -52,10 +48,7 @@ class NetNameSpace():
         else:
             self.ipr = NetNSExt(name)
             netns_name_map[name] = self.ipr
-            if findmnt_cmd is None:
-                self.mount = name.encode("utf-8")
-            else:
-                self.mount = subprocess.check_output([findmnt_cmd, '-f', '-J', "/run/netns/{}".format(name)])
+            self.mount = name.encode("utf-8")
 
     def __deepcopy__(self, memo):
         '''
@@ -217,14 +210,14 @@ class LinkRegistry():
 
 class LinkRegistryItem():
     def __init__(self, registry, netns, link):
-        self.registry = registry
-        self.netns = netns
-        self.link = None
         self.attributes = {
             'index': link['index'],
             'ifname': link.get_attr('IFLA_IFNAME'),
             'address': link.get_attr('IFLA_ADDRESS'),
         }
+        self.registry = registry
+        self.netns = netns
+        self.link = None
         self.state = link['state']
 
         linkinfo = link.get_attr('IFLA_LINKINFO')
@@ -235,8 +228,6 @@ class LinkRegistryItem():
             self.attributes['businfo'] = self.netns.ipr.get_businfo(self.attributes['ifname'])
             self.attributes['permaddr'] = link.get_attr('IFLA_PERM_ADDRESS')
 
-        self.attributes['netns'] =self.netns.netns
-
     def __ipr_link(self, command, **kwargs):
         logger.debug("ip link set netns={} {}".format(
             self.netns.netns,
@@ -249,6 +240,16 @@ class LinkRegistryItem():
     def index(self):
         return self.attributes['index']
 
+    @property
+    def netns(self):
+        return self._netns
+
+    @netns.setter
+    def netns(self, value):
+        self._netns = value
+        self.attributes['netns'] = value.netns
+        return self._netns
+
     def match(self, **kwargs):
         for attr, value in kwargs.items():
             if self.attributes.get(attr) != value:

{ifstate-1.13.1 → ifstate-1.13.3}/schema/ifstate.conf.schema.json

@@ -3363,10 +3363,10 @@
                                         "$ref": "#/$defs/iface-link_ifalias"
                                     },
                                     "ip6gre_remote": {
-                                        "$ref": "#/$defs/iface-link_tun-remote4"
+                                        "$ref": "#/$defs/iface-link_tun-remote6"
                                     },
                                     "ip6gre_local": {
-                                        "$ref": "#/$defs/iface-link_tun-local4"
+                                        "$ref": "#/$defs/iface-link_tun-local6"
                                     },
                                     "ip6gre_link": {
                                         "$ref": "#/$defs/iface-link_tun-dev"
@@ -4256,4 +4256,4 @@
             }
         }
     }
-}
+}