ifstate 2.0.0rc6__py3-none-any.whl → 2.0.2__py3-none-any.whl

ifstate/ifstate.py

@@ -131,7 +131,7 @@ def main():
     parser.add_argument('--version', action='version',
                         version='%(prog)s {version}'.format(version=__version__))
     group.add_argument("-v", "--verbose", action="count", default=0,
-                       help="be more verbose")
+                       help="be more verbose (twice for very verbose)")
     group.add_argument("-q", "--quiet", action="store_true",
                        help="be more quiet, print only warnings and errors")
     parser.add_argument("-s", "--soft-schema", action="store_true",

{ifstate-2.0.0rc6.dist-info → ifstate-2.0.2.dist-info}/METADATA

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: ifstate
-Version: 2.0.0rc6
+Version: 2.0.2
 Summary: Manage host interface settings in a declarative manner
 Home-page: https://ifstate.net/
 Author: Thomas Liske
 Author-email: thomas@fiasko-nw.net
 License: GPL3+
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: jsonschema
@@ -25,6 +26,7 @@ Dynamic: license
 Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
+Dynamic: requires-python
 Dynamic: summary
 
 # IfState

{ifstate-2.0.0rc6.dist-info → ifstate-2.0.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 ifstate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ifstate/ifstate.py,sha256=hmc_AWohcYVzWHU7vooWey0HDqZQOs6Yq8YZAMZBCgo,9304
+ifstate/ifstate.py,sha256=Vot_Bo0MGT_5MUKD5-pt2xB-fLLkjwvJo24KgtETtR8,9329
 ifstate/shell.py,sha256=7_JFpi4icr9MijynDzbb0v5mxhFsng6PCC4m3uQ255A,2177
 ifstate/vrrp.py,sha256=FJ9b1eJseTtZFfknHU-xV68Qz7cPrRrc5PTcjUVj-fY,5953
-ifstate-2.0.0rc6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-libifstate/__init__.py,sha256=sJRqKeltu3k9_X-uPS4yc1_aw0KR_bDTpxoBI2p0BDM,34056
+ifstate-2.0.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+libifstate/__init__.py,sha256=QtL4RLZeAijw8PhXbNkpBpd2esgaHlaGu-xOtjbJmqM,34375
 libifstate/exception.py,sha256=NmKqD9O8dRWBgO__Pt0_wGSR5GWZ1RHXZZEUI3ArVLo,2360
 libifstate/log.py,sha256=rG0ISWyeGGlC_jRREoSpkdySc5EmyhOQIgSfvRqlaZA,4651
-libifstate/util.py,sha256=DqYyFzNqRceJxxGqTg94gT8OTHQQ2gZxQOo5Gzx6-6s,11555
+libifstate/util.py,sha256=f5HPazDNbwtADJwXwhgx9YMmMfDj5NDokhpaAJBUV4I,10745
 libifstate/address/__init__.py,sha256=SobrZ9e2ItrmEidnKPBhUMitRDdTEajbkU9Rkmtx-gQ,3165
 libifstate/bpf/__init__.py,sha256=NVzaunTmJU2PbIQg9eWBMKpFgLh3EnD3ujNa7Yt6rNc,7699
 libifstate/bpf/ctypes.py,sha256=kLZJHZlba09Vc-tbsJAcKpDwdoNO2IjlYVLCopawHmA,4274
@@ -27,13 +27,13 @@ libifstate/parser/__init__.py,sha256=uzv5U-6RPy-SSIyxR6H_F0SvAOQQF8x5ygErpUhsa7Y
 libifstate/parser/base.py,sha256=v0S_R_aMZBdHJPI3zdelv5G0Xha-pUV2DRdmxhD7390,6624
 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/schema/2/ifstate.conf.schema.json,sha256=WYjy0BoRPCK59Fv7Z-rMu4-RVPT1v_9w7yVIlQVxros,221181
 libifstate/sysctl/__init__.py,sha256=_QNmH0CirbBy8VAupTm6UhIhB88fGWqUy9TnfmS0j5I,3637
-libifstate/tc/__init__.py,sha256=T8LEBxiHZH4sayPn9lK5hK8eB8dskuw6-kw81W_aMWU,12097
+libifstate/tc/__init__.py,sha256=48qZo1poc4v7KKiNpUsHVuRBQyu92LaNcEMtRHjDjt8,12093
 libifstate/wireguard/__init__.py,sha256=VSn3PzQXwZeRV1qf5nOc_RbeePQlXu8FUh2Lg356-ZA,8869
 libifstate/xdp/__init__.py,sha256=X1xhEIGng7R5d5F4KsChykT2g6H-XBRWbWABijoYDQA,7208
-ifstate-2.0.0rc6.dist-info/METADATA,sha256=_TQXDh5XJSUFCPgE1D4O11eyO6P8NBoaQsB6GwTc49M,1607
-ifstate-2.0.0rc6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ifstate-2.0.0rc6.dist-info/entry_points.txt,sha256=HF6jX7Uu_nF1Ly-J9uEPeiRapOxnM6LuHsb2y6Mt-k4,52
-ifstate-2.0.0rc6.dist-info/top_level.txt,sha256=A7peI7aKBaM69fsiSPvMbL3rzTKZZr5qDxKC-pHMGdE,19
-ifstate-2.0.0rc6.dist-info/RECORD,,
+ifstate-2.0.2.dist-info/METADATA,sha256=nycqBEIXnGHt7UxjyTBjb3W99lQKGemkK1UZF2LCaz0,1653
+ifstate-2.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ifstate-2.0.2.dist-info/entry_points.txt,sha256=HF6jX7Uu_nF1Ly-J9uEPeiRapOxnM6LuHsb2y6Mt-k4,52
+ifstate-2.0.2.dist-info/top_level.txt,sha256=A7peI7aKBaM69fsiSPvMbL3rzTKZZr5qDxKC-pHMGdE,19
+ifstate-2.0.2.dist-info/RECORD,,

libifstate/__init__.py

@@ -54,7 +54,7 @@ import json
 import errno
 import logging
 
-__version__ = "2.0.0rc6"
+__version__ = "2.0.2"
 
 class IfState():
     def __init__(self):
@@ -136,16 +136,15 @@ class IfState():
         self.link_registry = LinkRegistry(self.ignore.get('ifname', []), self.root_netns)
 
         self._update(self.root_netns, ifstates)
-        if 'namespaces' in ifstates:
-            self.namespaces = {}
-            self.new_namespaces = []
-            for netns_name, netns_ifstates in ifstates['namespaces'].items():
-                is_new = netns_name not in pyroute2.netns.listnetns()
-                self.namespaces[netns_name] = NetNameSpace(netns_name)
-                if is_new:
-                    self.new_namespaces.append(netns_name)
-                    self.link_registry.inventory_netns(self.namespaces[netns_name])
-                self._update(self.namespaces[netns_name], netns_ifstates)
+        self.namespaces = {}
+        self.new_namespaces = []
+        for netns_name, netns_ifstates in ifstates.get('namespaces', {}).items():
+            is_new = netns_name not in pyroute2.netns.listnetns()
+            self.namespaces[netns_name] = NetNameSpace(netns_name)
+            if is_new:
+                self.new_namespaces.append(netns_name)
+                self.link_registry.inventory_netns(self.namespaces[netns_name])
+            self._update(self.namespaces[netns_name], netns_ifstates)
 
     def _update(self, netns, ifstates):
         # parse network sysctl settings
@@ -169,6 +168,7 @@ class IfState():
                 netns.bpf_progs.add(name, config)
 
         # add interfaces from config
+        ifb_ifaces = {}
         for name, ifstate in ifstates['interfaces'].items():
             kind = ifstate['link']['kind']
             defaults = self.get_defaults(
@@ -235,7 +235,7 @@ class IfState():
                 netns.sysctl.add(name, ifstate['sysctl'])
 
             if 'cshaper' in ifstate:
-                profile_name = ifstate['parameters']['cshaper'].get(
+                profile_name = ifstate['cshaper'].get(
                     'profile', 'default')
                 logger.debug('cshaper profile {} enabled'.format(profile_name),
                              extra={'iface': name, 'netns': netns})
@@ -247,8 +247,8 @@ class IfState():
                 logger.debug('cshaper ifb name {}'.format(ifb_name),
                              extra={'iface': name, 'netns': netns})
 
-                ifb_state = {
-                    'name': ifb_name,
+                # prepare ifb interface settings
+                ifb_ifaces[ifb_name] = {
                     'link': {
                         'state': 'up',
                         'kind': 'ifb',
@@ -257,13 +257,19 @@ class IfState():
                         'qdisc': cshaper_profile['ingress_qdisc'],
                     }
                 }
-                ifb_state['tc']['qdisc']['bandwidth'] = ifstate['parameters']['cshaper'].get(
+
+                # configure tc on ifb
+                ifb_ifaces[ifb_name]['tc']['qdisc']['bandwidth'] = ifstate['cshaper'].get(
                     'ingress', 'unlimited')
+                netns.tc[ifb_name] = TC(netns, ifb_name, ifb_ifaces[ifb_name]['tc'])
 
+                # clone vrrp settings
                 if 'vrrp' in ifstate:
-                    ifb_state['vrrp'] = ifstate['vrrp']
+                    ifb_ifaces[ifb_name]['vrrp'] = ifstate['vrrp']
 
-                ifstates['interfaces'].append(ifb_state)
+                # add ifb link to known links
+                netns.links[ifb_name] = Link(self,
+                    netns, ifb_name, ifb_ifaces[ifb_name]["link"], {}, None, [], ifstate.get('vrrp'), None)
 
                 # egress
                 if 'tc' in ifstate:
@@ -290,10 +296,9 @@ class IfState():
                     ]
                 }
 
-                ifstate['tc']['qdisc']['bandwidth'] = ifstate['parameters']['cshaper'].get(
-                    'egress', 'unlimited')
+                ifstate['tc']['qdisc']['bandwidth'] = ifstate['cshaper'].get('egress', 'unlimited')
 
-                del ifstate['parameters']['cshaper']
+                del ifstate['cshaper']
 
             if 'tc' in ifstate:
                 netns.tc[name] = TC(
@@ -318,17 +323,20 @@ class IfState():
 
                 netns.xdp[name] = XDP(netns, name, ifstate['xdp'])
 
+        # cshaper: append ifb interfaces to config
+        ifstates['interfaces'].update(ifb_ifaces)
+
         # add routing from config
         if 'routing' in ifstates:
+            if netns.tables is None:
+                netns.tables = Tables(netns)
             if 'routes' in ifstates['routing']:
-                if netns.tables is None:
-                    netns.tables = Tables(netns)
                 for route in ifstates['routing']['routes']:
                     netns.tables.add(route)
 
+            if netns.rules is None:
+                netns.rules = Rules(netns)
             if 'rules' in ifstates['routing']:
-                if netns.rules is None:
-                    netns.rules = Rules(netns)
                 for rule in ifstates['routing']['rules']:
                     netns.rules.add(rule)
 

libifstate/schema/2/ifstate.conf.schema.json

@@ -1757,7 +1757,7 @@
                             "additionalProperties": false,
                             "properties": {
                                 "script": {
-                                    "description": "filename to be executed on interface configuration: the hook name will be used by default; relatives file are based on `/etc/needrestart/hooks`",
+                                    "description": "filename to be executed on interface configuration: the hook name will be used by default; relatives file are based on `/etc/ifstate/hooks`",
                                     "type": "string",
                                     "minLength": 1
                                 },

libifstate/tc/__init__.py

@@ -199,7 +199,7 @@ class TC():
                         "parent": parent,
                     }
                     try:
-                        self.netns.ipr.del_filter_by_info(**opts)
+                        self.netns.ipr.tc("del-filter", **opts)
                     except Exception as err:
                         if not isinstance(err, netlinkerror_classes):
                             raise
@@ -241,7 +241,7 @@ class TC():
                                 "info": tc_filter["prio"] << 16,
                                 "parent": parent,
                             }
-                            self.netns.ipr.del_filter_by_info(**opts)
+                            self.netns.ipr.tc("del-filter", **opts)
                             self.netns.ipr.tc("add-filter", **tc_filter)
 
                     except Exception as err:

libifstate/util.py

@@ -171,21 +171,6 @@ class IPRouteExt(IPRoute):
         self.__sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         self.sysfs_path = "/sys"
 
-    def del_filter_by_info(self, index=0, handle=0, info=0, parent=0):
-        msg = tcmsg()
-        msg['index'] = index
-        msg['handle'] = handle
-        msg['info'] = info
-        if parent != 0:
-            msg['parent'] = parent
-
-        return tuple(self.nlm_request(
-            msg,
-            msg_type=RTM_DELTFILTER,
-            msg_flags=NLM_F_REQUEST |
-            NLM_F_ACK
-        ))
-
     def get_ifname_by_index(self, index):
         link = next(iter(self.get_links(index)), None)
 
@@ -268,21 +253,6 @@ class NetNSExt(NetNS):
             except OSError:
                 pass
 
-    def del_filter_by_info(self, index=0, handle=0, info=0, parent=0):
-        msg = tcmsg()
-        msg['index'] = index
-        msg['handle'] = handle
-        msg['info'] = info
-        if parent != 0:
-            msg['parent'] = parent
-
-        return tuple(self.nlm_request(
-            msg,
-            msg_type=RTM_DELTFILTER,
-            msg_flags=NLM_F_REQUEST |
-            NLM_F_ACK
-        ))
-
     def get_ifname_by_index(self, index):
         link = next(iter(self.get_links(index)), None)