ifstate 2.0.0rc5__py3-none-any.whl → 2.0.1__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.0rc5.dist-info → ifstate-2.0.1.dist-info}/METADATA

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

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

@@ -1,9 +1,9 @@
 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.0rc5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-libifstate/__init__.py,sha256=43OxRa35lKLNpMIR3_jmDICD_R0DUZqpAvasIzfatew,34059
+ifstate-2.0.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+libifstate/__init__.py,sha256=j_ELThVxr4gMe1iROCuRbvv3xoU73F01UQ9Pp-yhJL8,33972
 libifstate/exception.py,sha256=NmKqD9O8dRWBgO__Pt0_wGSR5GWZ1RHXZZEUI3ArVLo,2360
 libifstate/log.py,sha256=rG0ISWyeGGlC_jRREoSpkdySc5EmyhOQIgSfvRqlaZA,4651
 libifstate/util.py,sha256=DqYyFzNqRceJxxGqTg94gT8OTHQQ2gZxQOo5Gzx6-6s,11555
@@ -24,16 +24,16 @@ libifstate/link/veth.py,sha256=Sv5WZMMsefYFz9I0BQSZyKytCQYxv0vjwAnB7FYHR1A,2283
 libifstate/neighbour/__init__.py,sha256=FJJpbJvqnxvOEii6QDMYzW5jQDEbiEy71GQOEbqaS48,2463
 libifstate/netns/__init__.py,sha256=5Ak4vHU5UvdSYPFIQ8i8VMba2luyUeSpYAtRXxdTGPE,10287
 libifstate/parser/__init__.py,sha256=uzv5U-6RPy-SSIyxR6H_F0SvAOQQF8x5ygErpUhsa7Y,109
-libifstate/parser/base.py,sha256=PPUXWzZ1iMWseZzeV2uWmFIInmi8xxGDgul6afmVjd4,6584
+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/sysctl/__init__.py,sha256=VLzz1YcNEclRMVvwZuJgkYxPTjErl-7-rwSOKiEG6_M,3544
+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/wireguard/__init__.py,sha256=VSn3PzQXwZeRV1qf5nOc_RbeePQlXu8FUh2Lg356-ZA,8869
 libifstate/xdp/__init__.py,sha256=X1xhEIGng7R5d5F4KsChykT2g6H-XBRWbWABijoYDQA,7208
-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,,
+ifstate-2.0.1.dist-info/METADATA,sha256=SHtdea2vsqaFqD70x23z2B08VsrUXOsvGgCJeMg4kYw,1604
+ifstate-2.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ifstate-2.0.1.dist-info/entry_points.txt,sha256=HF6jX7Uu_nF1Ly-J9uEPeiRapOxnM6LuHsb2y6Mt-k4,52
+ifstate-2.0.1.dist-info/top_level.txt,sha256=A7peI7aKBaM69fsiSPvMbL3rzTKZZr5qDxKC-pHMGdE,19
+ifstate-2.0.1.dist-info/RECORD,,

libifstate/__init__.py

@@ -54,7 +54,7 @@ import json
 import errno
 import logging
 
-__version__ = "2.0.0rc5"
+__version__ = "2.0.1"
 
 class IfState():
     def __init__(self):
@@ -90,7 +90,7 @@ class IfState():
         if self.features['schema']:
             # check config schema
             schema = json.loads(pkgutil.get_data(
-                "libifstate", "../schema/{}/ifstate.conf.schema.json".format(__version__.split('.')[0])))
+                "libifstate", "schema/{}/ifstate.conf.schema.json".format(__version__.split('.')[0])))
             try:
                 validate(ifstates, schema, format_checker=FormatChecker())
             except ValidationError as ex:
@@ -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
@@ -320,15 +319,15 @@ class IfState():
 
         # 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/parser/base.py

@@ -144,7 +144,7 @@ class Parser(ABC):
         return a
 
     def _update_lo(self, cfg):
-        if 'interfaces' in cfg:
+        if 'interfaces' in cfg and isinstance(cfg['interfaces'], dict):
             if 'lo' in cfg['interfaces']:
                 cfg['interfaces']['lo'] = self.merge(
                     deepcopy(Parser._default_lo_link), cfg['interfaces']['lo'])

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/sysctl/__init__.py

@@ -26,7 +26,10 @@ class Sysctl():
 
     def add(self, iface, sysctl):
         # deeply apply changes to the default/previously defined values
-        self.sysctls[iface] = deep_update(self.sysctls[iface], sysctl)
+        if iface in self.sysctls:
+            self.sysctls[iface] = deep_update(self.sysctls[iface], sysctl)
+        else:
+            self.sysctls[iface] = sysctl
 
     def add_global(self, proto, sysctl):
         self.globals[proto] = sysctl