ifstate 1.13.2__py3-none-any.whl → 1.13.3__py3-none-any.whl

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/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.2.dist-info → ifstate-1.13.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ifstate
-Version: 1.13.2
+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.2.dist-info → ifstate-1.13.3.dist-info}/RECORD

@@ -1,8 +1,8 @@
 ifstate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ifstate/ifstate.py,sha256=jNWVc-XPZOKwD--xSJvAXZP-DEomljmGXtMf8SAdmmU,8770
+ifstate/ifstate.py,sha256=l6VxiAXWyoqj7T5J495gM5Nhn807f5pHmL8_kh1uJAc,8891
 ifstate/shell.py,sha256=7_JFpi4icr9MijynDzbb0v5mxhFsng6PCC4m3uQ255A,2177
-ifstate/vrrp.py,sha256=m-vkm_Yx82qx5RmTnouYceWpa1agziBUHr87yK9tBro,5542
-libifstate/__init__.py,sha256=huDCA228bd3MH4RnOD8_YishjW96RCO8R6QUQTBUe3Q,30950
+ifstate/vrrp.py,sha256=cXzQZ2v-QS56ZBS8raLM4GyCjPFtTV6tg_9Drkgul1k,5952
+libifstate/__init__.py,sha256=1sYuqDO01tGxGD-oJe5vwoFIC_1gVnlgN2CASdA7AzQ,30950
 libifstate/exception.py,sha256=5i59BZdl56J_sNJbyU9n6uHuUNJEyDOO4FJ-neDn9Ds,2608
 libifstate/log.py,sha256=XVoZdwdQoWsjuupFIuG6OP0OrBpXpx7oqyAaUhQ-nJk,4553
 libifstate/util.py,sha256=vqNaa67QZ2G07bQNAisTyUKbVmp0JGkvEGgbKVTtmYA,10579
@@ -13,13 +13,13 @@ 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/link/__init__.py,sha256=epVw6jY8exNeJZUmmUas91yJoeupfgIY7rthq7SGIIw,142
-libifstate/link/base.py,sha256=5LicOYnsB-F3-qGhx8znqScrOdCLD4RIDOXDpSN9rB4,34256
+libifstate/link/base.py,sha256=Si31tqRTRGnHusn1hRPLrfdEmeQqRyNP4aua1DlGc_Q,34319
 libifstate/link/dsa.py,sha256=Y3axTtcym6YL1voKblxctx4PoKDZHzpteKQNnEBUrS8,264
 libifstate/link/physical.py,sha256=cJiq-MCfy-3XQoU-OxzgfPZZtu_pJ8u2ioJgn9VYdGk,560
 libifstate/link/tun.py,sha256=m55o5cwO3h3DCLofUR-68fM4ggLoTKElp6ZJ2LrJSCc,959
-libifstate/link/veth.py,sha256=dEnkhg1AU-CFOFJN-U68G6FJ74CNW9G4RXsa5vLs-qY,2114
+libifstate/link/veth.py,sha256=V_jmQCizI5Vv8-pcsfldSfMRTn1knR11wZDZI_yXvks,2249
 libifstate/neighbour/__init__.py,sha256=FJJpbJvqnxvOEii6QDMYzW5jQDEbiEy71GQOEbqaS48,2463
-libifstate/netns/__init__.py,sha256=lKv43oEcpVUmL494MNOOG_Uh4ght50uu8n8nb9TIwsA,9077
+libifstate/netns/__init__.py,sha256=gh7WN-3ksL0jrrdZyMOIe3yV-VGrPqCqRvbJMKdHsoo,8909
 libifstate/parser/__init__.py,sha256=byz1W0G7UewVc5FFie-ti3UZjGK3-75wHIaOeq0oySQ,88
 libifstate/parser/base.py,sha256=VFAo05O3tiKtI381LVUMYfsDTseMKoQGTfkgnEkm3H4,4770
 libifstate/parser/yaml.py,sha256=MC0kmwqt3P45z61fb_wfUqoj0iZyhFYkdPyr0UqMSZA,1415
@@ -28,10 +28,10 @@ libifstate/sysctl/__init__.py,sha256=L2gkoLnac_HM6RbCaKmsEuDTNj2m7U4Rjw42TEti0kg
 libifstate/tc/__init__.py,sha256=inPdampCOIr_4oKNB3awqMkW0Eh4fpPh9jvSba6sPVg,12092
 libifstate/wireguard/__init__.py,sha256=vM7vxioV9vQ3gq9SE_URf97ZfGhLsxNiam16y_gXZ5E,6225
 libifstate/xdp/__init__.py,sha256=X1xhEIGng7R5d5F4KsChykT2g6H-XBRWbWABijoYDQA,7208
-schema/ifstate.conf.schema.json,sha256=oDCBqgOI5uFbSjWUz9RcVmK-3i_90m3AMKA2uzGclRg,201291
-ifstate-1.13.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ifstate-1.13.2.dist-info/METADATA,sha256=zAzGSLaKYExorE-9e2Y3bGmivS1tTar4exNN8AC7o8w,1383
-ifstate-1.13.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ifstate-1.13.2.dist-info/entry_points.txt,sha256=HF6jX7Uu_nF1Ly-J9uEPeiRapOxnM6LuHsb2y6Mt-k4,52
-ifstate-1.13.2.dist-info/top_level.txt,sha256=A7peI7aKBaM69fsiSPvMbL3rzTKZZr5qDxKC-pHMGdE,19
-ifstate-1.13.2.dist-info/RECORD,,
+schema/ifstate.conf.schema.json,sha256=NOPeI8_r1jXvgAAJeBqz92ZACNvxskId3qMykj-sG7M,201292
+ifstate-1.13.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ifstate-1.13.3.dist-info/METADATA,sha256=rsQ7HpwlR_NSsUJ6wcSANfyxp1HaR6FtNgaMkpcOU8Q,1576
+ifstate-1.13.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ifstate-1.13.3.dist-info/entry_points.txt,sha256=HF6jX7Uu_nF1Ly-J9uEPeiRapOxnM6LuHsb2y6Mt-k4,52
+ifstate-1.13.3.dist-info/top_level.txt,sha256=A7peI7aKBaM69fsiSPvMbL3rzTKZZr5qDxKC-pHMGdE,19
+ifstate-1.13.3.dist-info/RECORD,,

{ifstate-1.13.2.dist-info → ifstate-1.13.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

libifstate/__init__.py

@@ -48,7 +48,7 @@ import json
 import errno
 import logging
 
-__version__ = "1.13.2"
+__version__ = "1.13.3"
 
 
 class IfState():

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
@@ -643,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")
 

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

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:

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 @@
             }
         }
     }
-}
+}