ifstate 2.0.0rc4__py3-none-any.whl → 2.0.0rc5__py3-none-any.whl

ifstate/ifstate.py

@@ -130,7 +130,7 @@ def main():
     group = parser.add_mutually_exclusive_group()
     parser.add_argument('--version', action='version',
                         version='%(prog)s {version}'.format(version=__version__))
-    group.add_argument("-v", "--verbose", action="store_true",
+    group.add_argument("-v", "--verbose", action="count", default=0,
                        help="be more verbose")
     group.add_argument("-q", "--quiet", action="store_true",
                        help="be more quiet, print only warnings and errors")
@@ -139,7 +139,7 @@ def main():
     parser.add_argument("-S", "--show-secrets", action="store_true",
                         help="show secrets when dumping config")
     parser.add_argument("-c", "--config", type=str,
-                        default="/etc/ifstate/config.yml", help="configuration YaML filename")
+                        default="/etc/ifstate/ifstate.yaml", help="configuration YaML filename")
     subparsers = parser.add_subparsers(
         dest='action', required=True, help="specifies the action to perform")
 
@@ -166,10 +166,10 @@ def main():
         "name", type=str, help="name of the vrrp group or instance")
 
     args = parser.parse_args()
-    if args.verbose:
+    if args.verbose > 0:
         lvl = logging.DEBUG
     elif args.quiet:
-        lvl = logging.ERROR
+        lvl = logging.WARNING
     else:
         lvl = logging.INFO
 
@@ -182,7 +182,7 @@ def main():
         shell()
         exit(0)
 
-    ifslog = IfStateLogging(lvl, action=args.action)
+    ifslog = IfStateLogging(lvl, args.verbose > 1, action=args.action)
 
     if args.action in [Actions.IDENTIFY, Actions.SHOW, Actions.SHOWALL]:
         # preserve dict order on python 3.7+

{ifstate-2.0.0rc4.dist-info → ifstate-2.0.0rc5.dist-info}/METADATA

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

{ifstate-2.0.0rc4.dist-info → ifstate-2.0.0rc5.dist-info}/RECORD

@@ -1,22 +1,23 @@
-hooks/wrapper.sh,sha256=ipCmvcadJbXTT6oUR7BIhT5uglITnHfiAdm44vydZuw,1101
 ifstate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ifstate/ifstate.py,sha256=ioiM9xgVWdrpTpK_UxJdaJFlmpFM9R-2_d5pq9_Hepo,9272
+ifstate/ifstate.py,sha256=hmc_AWohcYVzWHU7vooWey0HDqZQOs6Yq8YZAMZBCgo,9304
 ifstate/shell.py,sha256=7_JFpi4icr9MijynDzbb0v5mxhFsng6PCC4m3uQ255A,2177
 ifstate/vrrp.py,sha256=FJ9b1eJseTtZFfknHU-xV68Qz7cPrRrc5PTcjUVj-fY,5953
-ifstate-2.0.0rc4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-libifstate/__init__.py,sha256=twHhETYpEtBxqnWKOGYwOyOV1Ahgqi_ybAk2rodpre4,33845
+ifstate-2.0.0rc5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+libifstate/__init__.py,sha256=43OxRa35lKLNpMIR3_jmDICD_R0DUZqpAvasIzfatew,34059
 libifstate/exception.py,sha256=NmKqD9O8dRWBgO__Pt0_wGSR5GWZ1RHXZZEUI3ArVLo,2360
-libifstate/log.py,sha256=XVoZdwdQoWsjuupFIuG6OP0OrBpXpx7oqyAaUhQ-nJk,4553
-libifstate/util.py,sha256=raYAaRy15JQNUbU3_4GchYV_PkaCvWR_8xjt7NTzMYw,11335
+libifstate/log.py,sha256=rG0ISWyeGGlC_jRREoSpkdySc5EmyhOQIgSfvRqlaZA,4651
+libifstate/util.py,sha256=DqYyFzNqRceJxxGqTg94gT8OTHQQ2gZxQOo5Gzx6-6s,11555
 libifstate/address/__init__.py,sha256=SobrZ9e2ItrmEidnKPBhUMitRDdTEajbkU9Rkmtx-gQ,3165
 libifstate/bpf/__init__.py,sha256=NVzaunTmJU2PbIQg9eWBMKpFgLh3EnD3ujNa7Yt6rNc,7699
 libifstate/bpf/ctypes.py,sha256=kLZJHZlba09Vc-tbsJAcKpDwdoNO2IjlYVLCopawHmA,4274
 libifstate/bpf/map.py,sha256=cLHNMvRBDNW2yVCEf3z242_oRdU0HqVbFEYVkKXng0w,10818
 libifstate/brport/__init__.py,sha256=NzdA8F4hr2se1bXKNnyKZbvOFlCWBq_cdjwsL1H0Y-o,2964
 libifstate/fdb/__init__.py,sha256=9dpL5n8ct3CaA-z8I6ZEkD3yL6yWJQeq3fpIe9pc2zw,6486
-libifstate/hook/__init__.py,sha256=OPUyhrr-eT1UNp8ryYoJyvi4WWqL2Ql33szir673Td4,7379
-libifstate/link/__init__.py,sha256=QZggoC-bIscqwVedqVycaSqS1CmXB3Bx3m2FZei8Q_4,115
+libifstate/hook/__init__.py,sha256=012SIm1aULlXG4SoOYFV46u9k-4pPgtIENaUlRWPpe8,7375
+libifstate/hook/wrapper.sh,sha256=ipCmvcadJbXTT6oUR7BIhT5uglITnHfiAdm44vydZuw,1101
+libifstate/link/__init__.py,sha256=epVw6jY8exNeJZUmmUas91yJoeupfgIY7rthq7SGIIw,142
 libifstate/link/base.py,sha256=zsitL1kSPLvjzZqyUIyEoCVlE_dhX2z5acNL1iZ2EAE,34508
+libifstate/link/dsa.py,sha256=zOdatHE9_TLVVqP2H87V3d_M6Y3fRke2FqHj0u_Su2c,260
 libifstate/link/physical.py,sha256=IG1OXG2q25QmvhxEDhyT-bf7guwIyXl0OzSJgQOqXzY,613
 libifstate/link/tun.py,sha256=Rzn3ysE0cVuQGi3naxs9QXYBrLwVQTaVrFv2dtR1D60,1012
 libifstate/link/veth.py,sha256=Sv5WZMMsefYFz9I0BQSZyKytCQYxv0vjwAnB7FYHR1A,2283
@@ -26,13 +27,13 @@ libifstate/parser/__init__.py,sha256=uzv5U-6RPy-SSIyxR6H_F0SvAOQQF8x5ygErpUhsa7Y
 libifstate/parser/base.py,sha256=PPUXWzZ1iMWseZzeV2uWmFIInmi8xxGDgul6afmVjd4,6584
 libifstate/parser/yaml.py,sha256=MC0kmwqt3P45z61fb_wfUqoj0iZyhFYkdPyr0UqMSZA,1415
 libifstate/routing/__init__.py,sha256=O4lbaCJvLgx-iQUa0WDgRmSPR4AKvveqPgxxb4HwYQ4,25305
+libifstate/schema/2/ifstate.conf.schema.json,sha256=hVf0fduVV09uw3ZphWWwGpeQ7nL5z1aLTHUEemn34wc,221185
 libifstate/sysctl/__init__.py,sha256=VLzz1YcNEclRMVvwZuJgkYxPTjErl-7-rwSOKiEG6_M,3544
 libifstate/tc/__init__.py,sha256=T8LEBxiHZH4sayPn9lK5hK8eB8dskuw6-kw81W_aMWU,12097
-libifstate/wireguard/__init__.py,sha256=dXILLIuahBCkX2ONhre28SzJrVNksbjOICs-cSGGaRg,8625
+libifstate/wireguard/__init__.py,sha256=VSn3PzQXwZeRV1qf5nOc_RbeePQlXu8FUh2Lg356-ZA,8869
 libifstate/xdp/__init__.py,sha256=X1xhEIGng7R5d5F4KsChykT2g6H-XBRWbWABijoYDQA,7208
-schema/2/ifstate.conf.schema.json,sha256=ukCafLPfHCXpk44u5RMMhWIh9JoIAt2j_3idysAVHaQ,218763
-ifstate-2.0.0rc4.dist-info/METADATA,sha256=l7BY5YH_qpCDHZnyMRjS8sa9p4dZn-TyxaVPqCtBpbM,1607
-ifstate-2.0.0rc4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ifstate-2.0.0rc4.dist-info/entry_points.txt,sha256=HF6jX7Uu_nF1Ly-J9uEPeiRapOxnM6LuHsb2y6Mt-k4,52
-ifstate-2.0.0rc4.dist-info/top_level.txt,sha256=A7peI7aKBaM69fsiSPvMbL3rzTKZZr5qDxKC-pHMGdE,19
-ifstate-2.0.0rc4.dist-info/RECORD,,
+ifstate-2.0.0rc5.dist-info/METADATA,sha256=u2yC0kTPo9uQx80fkxj5vp6XnKJh9-EWovvA8ShO9ZA,1607
+ifstate-2.0.0rc5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ifstate-2.0.0rc5.dist-info/entry_points.txt,sha256=HF6jX7Uu_nF1Ly-J9uEPeiRapOxnM6LuHsb2y6Mt-k4,52
+ifstate-2.0.0rc5.dist-info/top_level.txt,sha256=A7peI7aKBaM69fsiSPvMbL3rzTKZZr5qDxKC-pHMGdE,19
+ifstate-2.0.0rc5.dist-info/RECORD,,

libifstate/__init__.py

@@ -42,7 +42,7 @@ except ModuleNotFoundError:
     pass
 
 from libifstate.netns import NetNameSpace, prepare_netns, LinkRegistry, get_netns_instances
-from libifstate.util import logger, root_iw, IfStateLogging, LinkDependency, IDENTIFY_LOOKUPS
+from libifstate.util import logger, root_iw, kind_has_identify, IfStateLogging, LinkDependency, IDENTIFY_LOOKUPS
 from libifstate.exception import FeatureMissingError, LinkCircularLinked, LinkNoConfigFound, ParserValidationError
 from ipaddress import ip_network, ip_interface
 from copy import deepcopy
@@ -54,7 +54,7 @@ import json
 import errno
 import logging
 
-__version__ = "2.0.0rc4"
+__version__ = "2.0.0rc5"
 
 class IfState():
     def __init__(self):
@@ -659,7 +659,7 @@ class IfState():
                 else:
                     kind = info.get_attr('IFLA_INFO_KIND')
 
-                if kind is not None:
+                if not kind_has_identify(kind):
                     continue
 
                 ifs_link = {
@@ -725,12 +725,16 @@ class IfState():
                         if not any(ip in net for net in ipaddr_ignore):
                             ifs_link['addresses'].append(ip.with_prefixlen)
 
+                # drop empty ip addresses list, they are cleaned up by default
+                if not ifs_link['addresses']:
+                    del(ifs_link['addresses'])
+
                 info = ipr_link.get_attr('IFLA_LINKINFO')
                 if info is None:
                     kind = None
                 else:
                     kind = info.get_attr('IFLA_INFO_KIND')
-                if kind is not None:
+                if not kind_has_identify(kind):
                     ifs_link['link']['kind'] = kind
 
                     data = info.get_attr('IFLA_INFO_DATA')

libifstate/hook/__init__.py

@@ -13,7 +13,7 @@ import tempfile
 
 
 HOOK_DIR = '/etc/ifstate/hooks'
-HOOK_WRAPPER = Template(pkgutil.get_data("libifstate", "../hooks/wrapper.sh").decode("utf-8"))
+HOOK_WRAPPER = Template(pkgutil.get_data("libifstate", "hook/wrapper.sh").decode("utf-8"))
 
 RC_OK = 0
 RC_ERROR = 1

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

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

libifstate/log.py

@@ -73,13 +73,16 @@ class IfStateLogging:
             return IfStateLogging.ANSI_YELLOW
         return ""
 
-    def __init__(self, level, handlers=[], action=None, log_stderr=True):
+    def __init__(self, level, global_level, handlers=[], action=None, log_stderr=True):
         if level != logging.DEBUG:
             sys.tracebacklimit = 0
 
-        logging.basicConfig(
-            level=level,
-        )
+        if global_level:
+            logging.basicConfig(
+                level=level,
+            )
+        else:
+            logger.level = level
 
         if log_stderr:
             has_stderr = sys.stderr is not None

{schema → libifstate/schema}/2/ifstate.conf.schema.json

@@ -2851,6 +2851,49 @@
                                         }
                                     }
                                 },
+                                {
+                                    "description": "Distributed Switch Architecture (DSA) user interface",
+                                    "required": [
+                                        "kind"
+                                    ],
+                                    "additionalProperties": false,
+                                    "properties": {
+                                        "kind": {
+                                            "type": "string",
+                                            "description": "link type",
+                                            "enum": [
+                                                "dsa"
+                                            ]
+                                        },
+                                        "address": {
+                                            "$ref": "#/$defs/iface-link_address"
+                                        },
+                                        "group": {
+                                            "$ref": "#/$defs/iface-link_group"
+                                        },
+                                        "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": "Physical network interface",
                                     "required": [

libifstate/util.py

@@ -128,7 +128,7 @@ def get_netns_run_dir(function, netns, *args):
 
 def dump_yaml_file(fn, obj, opener=None):
     """
-    Dump obj to a YaML file, create directories if needed and catch file
+    Dump obj to a YAML file, create directories if needed and catch file
     I/O errors.
     """
     try:
@@ -144,7 +144,7 @@ def dump_yaml_file(fn, obj, opener=None):
 
 def slurp_yaml_file(fn, default=None):
     """
-    Read the content of a YaML file, returns *default* if the file could not be
+    Read the content of a YAML file, returns *default* if the file could not be
     found, read or parsed.
     """
     try:
@@ -157,6 +157,13 @@ def slurp_yaml_file(fn, default=None):
 
     return default
 
+def kind_has_identify(kind):
+    """
+    Return True if the interface kind can be identified by some unique
+    properties. These are all types of physical interfaces.
+    """
+    return kind is None or kind in ['dsa']
+
 class IPRouteExt(IPRoute):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

libifstate/wireguard/__init__.py

@@ -4,7 +4,9 @@ import wgnlpy
 import ipaddress
 import collections
 from copy import deepcopy
+import os
 import pyroute2.netns
+from pyroute2 import NetlinkError
 import socket
 
 SECRET_SETTINGS = ['private_key', 'preshared_key']
@@ -58,6 +60,9 @@ class WireGuard():
         try:
             state = self.wg.get_interface(
                 self.iface, spill_private_key=True, spill_preshared_keys=True)
+        except NetlinkError as err:
+            logger.warning('query wireguard details failed: {}'.format(os.strerror(err.code)), extra={'iface': self.iface, 'netns': self.netns})
+            return
         except TypeError as err:
             # wgnlpy 0.1.5 can triggger a TypeError exception
             # if the WGPEER_A_LAST_HANDSHAKE_TIME NLA does not