ifstate 1.13.0__tar.gz → 1.13.2__tar.gz

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

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

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

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

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

@@ -48,7 +48,7 @@ import json
 import errno
 import logging
 
-__version__ = "1.13.0"
+__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.0 → 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.0 → 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',
@@ -85,6 +90,7 @@ class Link(ABC):
     }
     attr_value_lookup = {
         'group': RTLookups.group,
+        'vrf_table': RTLookups.tables,
     }
     attr_bind_kinds = [
         'ip6tnl',
@@ -103,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__
@@ -207,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)
@@ -722,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()
 
@@ -737,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']})

{ifstate-1.13.0 → ifstate-1.13.2}/libifstate/routing/__init__.py

@@ -157,7 +157,21 @@ class Tables(collections.abc.Mapping):
             rt['oif'] = route['dev']
 
         if 'via' in route:
-            rt['gateway'] = str(ip_address(route['via']))
+            via = ip_address(route['via'])
+
+            if via.version == dst.version:
+                rt['gateway'] = str(via)
+            else:
+                if via.version == 4:
+                    rt['via'] = {
+                        'family': int(AF_INET),
+                        'addr': str(via),
+                    }
+                else:
+                    rt['via'] = {
+                        'family': int(AF_INET6),
+                        'addr': str(via),
+                    }
 
         if 'src' in route:
             rt['prefsrc'] = route['src']
@@ -219,6 +233,10 @@ class Tables(collections.abc.Mapping):
             via = route.get_attr('RTA_GATEWAY')
             if via:
                 rt['via'] = via
+            else:
+                via = route.get_attr('RTA_VIA')
+                if via and 'addr' in via:
+                    rt['via'] = via['addr']
 
             realm = route.get_attr('RTA_FLOW')
             if realm:
@@ -280,6 +298,10 @@ class Tables(collections.abc.Mapping):
             if not gateway is None:
                 rt['gateway'] = str(ip_address(gateway))
 
+            via = route.get_attr('RTA_VIA')
+            if not via is None:
+                rt['via'] = via
+
             metric = route.get_attr('RTA_PRIORITY')
             if not metric is None:
                 rt['metric'] = metric
@@ -307,7 +329,7 @@ class Tables(collections.abc.Mapping):
 
             kroutes = self.kernel_routes(table)
 
-            for route in sorted(croutes, key=lambda x: [x.get('via', ''), x['dst']]):
+            for route in sorted(croutes, key=lambda x: [str(x.get('gateway', x.get('via', ''))), x['dst']]):
                 if 'oif' in route and type(route['oif']) == str:
                     oif = next(
                         iter(self.netns.ipr.link_lookup(ifname=route['oif'])), None)

{ifstate-1.13.0 → ifstate-1.13.2}/schema/ifstate.conf.schema.json

@@ -2318,8 +2318,10 @@
                             {
                                 "description": "Virtual Routing and Forwarding device",
                                 "required": [
-                                    "kind"
+                                    "kind",
+                                    "vrf_table"
                                 ],
+                                "additionalProperties": false,
                                 "properties": {
                                     "kind": {
                                         "const": "vrf",
@@ -2343,6 +2345,15 @@
                                     "txqlen": {
                                         "$ref": "#/$defs/iface-link_txqlen"
                                     },
+                                    "vrf_table": {
+                                        "description": "routing table associated with the VRF device",
+                                        "type": [
+                                            "integer",
+                                            "string"
+                                        ],
+                                        "minimum": 1,
+                                        "maximum": 4294967295
+                                    },
                                     "ifalias": {
                                         "$ref": "#/$defs/iface-link_ifalias"
                                     }
@@ -3081,15 +3092,13 @@
                                     },
                                     "vxlan_local": {
                                         "type": "string",
-                                        "description": "tunnel source ip address",
-                                        "oneOf": [
-                                            {
-                                                "format": "ipv4"
-                                            },
-                                            {
-                                                "format": "ipv6"
-                                            }
-                                        ]
+                                        "description": "tunnel source IPv4 address",
+                                        "format": "ipv4"
+                                    },
+                                    "vxlan_local6": {
+                                        "type": "string",
+                                        "description": "tunnel source IPv6 address",
+                                        "format": "ipv6"
                                     },
                                     "vxlan_group": {
                                         "type": "string",
@@ -3129,10 +3138,32 @@
                                                     "vxlan_group"
                                                 ]
                                             },
+                                            {
+                                                "required": [
+                                                    "vxlan_local"
+                                                ]
+                                            },
+                                            {
+                                                "required": [
+                                                    "vxlan_local",
+                                                    "vxlan_group"
+                                                ]
+                                            },
                                             {
                                                 "required": [
                                                     "vxlan_group6"
                                                 ]
+                                            },
+                                            {
+                                                "required": [
+                                                    "vxlan_local6"
+                                                ]
+                                            },
+                                            {
+                                                "required": [
+                                                    "vxlan_group6",
+                                                    "vxlan_local6"
+                                                ]
                                             }
                                         ]
                                     },
@@ -3140,7 +3171,9 @@
                                         "not": {
                                             "required": [
                                                 "vxlan_group",
-                                                "vxlan_group6"
+                                                "vxlan_group6",
+                                                "vxlan_local",
+                                                "vxlan_local6"
                                             ]
                                         }
                                     }