ifstate 1.11.9__tar.gz → 1.12.0__tar.gz

{ifstate-1.11.9 → ifstate-1.12.0}/PKG-INFO

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

{ifstate-1.11.9 → ifstate-1.12.0}/ifstate.egg-info/PKG-INFO

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

{ifstate-1.11.9 → ifstate-1.12.0}/ifstate.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ libifstate/brport/__init__.py
 libifstate/fdb/__init__.py
 libifstate/link/__init__.py
 libifstate/link/base.py
+libifstate/link/dsa.py
 libifstate/link/physical.py
 libifstate/link/tun.py
 libifstate/link/veth.py

{ifstate-1.11.9 → ifstate-1.12.0}/libifstate/__init__.py

@@ -1,4 +1,4 @@
-from libifstate.exception import LinkDuplicate
+from libifstate.exception import LinkDuplicate, NetnsUnknown
 from libifstate.link.base import ethtool_path, Link
 from libifstate.address import Addresses
 from libifstate.fdb import FDB
@@ -48,7 +48,7 @@ import json
 import errno
 import logging
 
-__version__ = "1.11.9"
+__version__ = "1.12.0"
 
 
 class IfState():
@@ -519,7 +519,11 @@ class IfState():
                 if link_dep.netns is None:
                     self._apply_iface(do_apply, self.root_netns, link_dep, by_vrrp, vrrp_type, vrrp_name, vrrp_state)
                 else:
-                    self._apply_iface(do_apply, self.namespaces[link_dep.netns], link_dep, by_vrrp, vrrp_type, vrrp_name, vrrp_state)
+                    if link_dep.netns not in self.namespaces:
+                        logger.warning("add link {} failed: netns '{}' is unknown".format(link_dep.ifname, link_dep.netns))
+                        return
+                    else:
+                        self._apply_iface(do_apply, self.namespaces[link_dep.netns], link_dep, by_vrrp, vrrp_type, vrrp_name, vrrp_state)
 
         # configure routing
         logger.info("")

{ifstate-1.11.9 → ifstate-1.12.0}/libifstate/address/__init__.py

@@ -25,25 +25,29 @@ class Addresses():
         # get active ip addresses
         ipr_addr = {}
         addr_add = []
-        addr_dad = []
+        addr_renew = []
         for addr in self.netns.ipr.get_addr(index=idx):
             flags = addr.get_attr('IFA_FLAGS', 0)
             ip = ip_interface(addr.get_attr('IFA_ADDRESS') +
                               '/' + str(addr['prefixlen']))
             if flags & IFA_F_DADFAILED == IFA_F_DADFAILED:
                 logger.debug('{} has failed dad'.format(ip), extra={'iface': self.iface, 'netns': self.netns})
-                addr_dad.append(ip)
+                addr_renew.append(ip)
             ipr_addr[ip] = addr
 
         for addr in self.addresses:
-            if addr in ipr_addr and addr not in addr_dad:
+            if addr in ipr_addr and addr not in addr_renew:
                 logger.log_ok('addresses', '= {}'.format(addr.with_prefixlen))
                 del ipr_addr[addr]
             else:
                 addr_add.append(addr)
+                for ip in ipr_addr.keys():
+                    if addr.ip == ip.ip:
+                        addr_renew.append(ip)
+                        break
 
         for ip, addr in ipr_addr.items():
-            if addr in addr_dad or not any(ip in net for net in ignore):
+            if ip in addr_renew or not any(ip in net for net in ignore):
                 if not ign_dynamic or ipr_addr[ip]['flags'] & IFA_F_PERMANENT == IFA_F_PERMANENT:
                     logger.log_del('addresses', '- {}'.format(ip.with_prefixlen))
                     try:

{ifstate-1.11.9 → ifstate-1.12.0}/libifstate/exception.py

@@ -104,5 +104,9 @@ class ParserParseError(Exception):
     def exit_code(self):
         return 2
 
-class RouteDupblicate(Exception):
+class RouteDuplicate(Exception):
     pass
+
+class NetnsUnknown(Exception):
+    def __init__(self, netns):
+        self.args = (None, "netns '{}' is unknown".format(netns))

{ifstate-1.11.9 → ifstate-1.12.0}/libifstate/link/__init__.py

@@ -1,4 +1,5 @@
 import libifstate.link.base
+import libifstate.link.dsa
 import libifstate.link.physical
 import libifstate.link.tun
 import libifstate.link.veth

{ifstate-1.11.9 → ifstate-1.12.0}/libifstate/link/base.py

@@ -1,5 +1,5 @@
 from libifstate.util import logger, IfStateLogging, LinkDependency
-from libifstate.exception import ExceptionCollector, LinkTypeUnknown, netlinkerror_classes
+from libifstate.exception import ExceptionCollector, LinkTypeUnknown, NetnsUnknown, netlinkerror_classes
 from libifstate.brport import BRPort
 from libifstate.routing import RTLookups
 from abc import ABC, abstractmethod
@@ -99,6 +99,7 @@ class Link(ABC):
         'ip6gre',
         'ip6gretap',
         'geneve',
+        'sit',
         'wireguard',
         'xfrm',
     ]
@@ -246,14 +247,16 @@ class Link(ABC):
             return ret
 
         info = self.iface.get_attr('IFLA_LINKINFO')
-        if not info is None:
-            ret = info.get_attr(nla)
+        op = getattr(info, 'get_attr', None)
+        if callable(op):
+            ret = op(nla)
             if not ret is None:
                 return ret
 
-            info = info.get_attr('IFLA_INFO_DATA')
-            if not info is None:
-                ret = info.get_attr(nla)
+            info = op('IFLA_INFO_DATA')
+            op = getattr(info, 'get_attr', None)
+            if callable(op):
+                ret = op(nla)
                 if not ret is None:
                     return ret
 
@@ -388,6 +391,9 @@ class Link(ABC):
         if self.bind_netns is None:
             return self.ifstate.root_netns
 
+        if not self.bind_netns in self.ifstate.namespaces:
+            raise NetnsUnknown(self.bind_netns)
+
         return self.ifstate.namespaces.get(self.bind_netns)
 
     def bind_needs_recreate(self, item):
@@ -395,13 +401,6 @@ class Link(ABC):
             return False
 
         bind_netns = self.get_bind_netns()
-        if bind_netns is None:
-            logger.warning('bind_netns "%s" is unknown',
-                        self.bind_netns,
-                        extra={
-                            'iface': self.settings['ifname'],
-                            'netns': self.netns})
-            return False
 
         fn = self.get_bind_fn(item.netns.netns, item.index)
         try:
@@ -468,11 +467,15 @@ class Link(ABC):
         item = self.search_link_registry()
 
         # check if bind_netns option requires a recreate
-        if item is not None and self.bind_needs_recreate(item):
-            self.idx = item.index
-            self.recreate(do_apply, sysctl, excpts)
+        try:
+            if item is not None and self.bind_needs_recreate(item):
+                self.idx = item.index
+                self.recreate(do_apply, sysctl, excpts)
 
-            self.settings = osettings
+                self.settings = osettings
+                return excpts
+        except NetnsUnknown as ex:
+            excpts.add('apply', ex)
             return excpts
 
         # move interface into netns if required
@@ -534,7 +537,12 @@ class Link(ABC):
         logger.log_add('link', oper)
 
         settings = copy.deepcopy(self.settings)
-        bind_netns = self.get_bind_netns()
+        try:
+            bind_netns = self.get_bind_netns()
+        except NetnsUnknown as ex:
+            excpts.add(oper, ex)
+            return excpts
+
         if bind_netns is not None and bind_netns.netns != self.netns.netns:
             logger.debug("handle link binding", extra={
                 'iface': self.settings['ifname'],

ifstate-1.12.0/libifstate/link/dsa.py

@@ -0,0 +1,10 @@
+from libifstate.util import logger
+from libifstate.link.physical import PhysicalLink
+
+class DsaLink(PhysicalLink):
+    """
+    Distributed Switch Architecture (DSA) user interface
+    
+    https://docs.kernel.org/networking/dsa/configuration.html
+    """
+    pass

{ifstate-1.11.9 → ifstate-1.12.0}/libifstate/link/veth.py

@@ -1,6 +1,6 @@
 from libifstate.util import logger
 from libifstate.link.base import Link
-from libifstate.exception import LinkCannotAdd
+from libifstate.exception import LinkCannotAdd, NetnsUnknown
 
 class VethLink(Link):
     def __init__(self, ifstate, netns, name, link, ethtool, vrrp, brport):
@@ -18,7 +18,11 @@ class VethLink(Link):
         '''
         result = super().create(do_apply, sysctl, excpts, oper)
 
-        bind_netns = self.get_bind_netns()
+        try:
+            bind_netns = self.get_bind_netns()
+        except NetnsUnknown as ex:
+            excpts.add(oper, ex)
+            return excpts
         peer_link = next(iter(bind_netns.ipr.get_links(ifname=self.settings['peer'])), None)
         self.ifstate.link_registry.add_link(bind_netns, peer_link)
 

{ifstate-1.11.9 → ifstate-1.12.0}/libifstate/log.py

@@ -2,6 +2,7 @@ import logging
 from logging.handlers import QueueHandler, QueueListener
 import os
 import queue
+import stat
 import sys
 
 logger = logging.getLogger('ifstate')
@@ -98,14 +99,25 @@ class IfStateLogging:
                 handlers.append(stream)
 
             # log to syslog
-            syslog = logging.handlers.SysLogHandler('/dev/log', facility=logging.handlers.SysLogHandler.LOG_DAEMON)
-            if action is None:
-                syslog.ident = 'ifstate[{}] '.format(os.getpid())
-            else:
-                syslog.ident = 'ifstate-{}[{}] '.format(action, os.getpid())
-            syslog.addFilter(IfStateLogFilter(False))
-            syslog.setFormatter(formatter)
-            handlers.append(syslog)
+            socket_filename = '/dev/log'
+            try:
+                if not stat.S_ISSOCK(os.stat(socket_filename).st_mode):
+                    socket_filename = None
+            except OSError:
+                socket_filename = None
+
+            if socket_filename is not None:
+                syslog = logging.handlers.SysLogHandler(socket_filename, facility=logging.handlers.SysLogHandler.LOG_DAEMON)
+                if action is None:
+                    syslog.ident = 'ifstate[{}] '.format(os.getpid())
+                else:
+                    syslog.ident = 'ifstate-{}[{}] '.format(action, os.getpid())
+                syslog.addFilter(IfStateLogFilter(False))
+                syslog.setFormatter(formatter)
+                handlers.append(syslog)
+
+        if len(handlers) == 0:
+            handlers.append(logging.NullHandler())
 
         qu = queue.SimpleQueue()
         queue_handler = QueueHandler(qu)

{ifstate-1.11.9 → ifstate-1.12.0}/libifstate/routing/__init__.py

@@ -1,5 +1,5 @@
 from libifstate.util import logger, IfStateLogging
-from libifstate.exception import RouteDupblicate, netlinkerror_classes
+from libifstate.exception import RouteDuplicate, netlinkerror_classes
 from ipaddress import ip_address, ip_network, IPv6Network
 from pyroute2.netlink.rtnl.fibmsg import FR_ACT_VALUES
 from pyroute2.netlink.rtnl import rt_type
@@ -90,7 +90,7 @@ class RTLookup():
         return self.str2id[key]
 
     def lookup_str(self, key):
-        return self.id2str.get(key, key)
+        return self.id2str.get(key, str(key))
 
 
 class RTLookups():

{ifstate-1.11.9 → ifstate-1.12.0}/schema/ifstate.conf.schema.json

@@ -2743,6 +2743,51 @@
                                     }
                                 }
                             },
+                            {
+                                "description": "DSA interface",
+                                "required": [
+                                    "kind",
+                                    "link"
+                                ],
+                                "additionalProperties": false,
+                                "properties": {
+                                    "kind": {
+                                        "const": "dsa",
+                                        "description": "link type"
+                                    },
+                                    "address": {
+                                        "$ref": "#/$defs/iface-link_address"
+                                    },
+                                    "group": {
+                                        "$ref": "#/$defs/iface-link_group"
+                                    },
+                                    "permaddr": {
+                                        "description": "select interface by permanent address [ethtool -P]",
+                                        "$ref": "#/$defs/iface-link_address"
+                                    },
+                                    "state": {
+                                        "$ref": "#/$defs/iface-link_state"
+                                    },
+                                    "master": {
+                                        "$ref": "#/$defs/iface-link_master"
+                                    },
+                                    "mtu": {
+                                        "$ref": "#/$defs/iface-link_mtu"
+                                    },
+                                    "txqlen": {
+                                        "$ref": "#/$defs/iface-link_txqlen"
+                                    },
+                                    "ifalias": {
+                                        "$ref": "#/$defs/iface-link_ifalias"
+                                    },
+                                    "link": {
+                                        "$ref": "#/$defs/iface-link_link"
+                                    },
+                                    "link_netns": {
+                                        "$ref": "#/$defs/iface-link_link-netns"
+                                    }
+                                }
+                            },
                             {
                                 "description": "Dummy network interface",
                                 "required": [
@@ -3136,6 +3181,9 @@
                                     "address": {
                                         "$ref": "#/$defs/iface-link_address"
                                     },
+                                    "bind_netns": {
+                                        "$ref": "#/$defs/iface-link_bind-netns"
+                                    },
                                     "group": {
                                         "$ref": "#/$defs/iface-link_group"
                                     },