ifstate 2.0.0rc6__tar.gz → 2.0.1__tar.gz

{ifstate-2.0.0rc6 → ifstate-2.0.1}/PKG-INFO

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

{ifstate-2.0.0rc6 → ifstate-2.0.1}/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 → ifstate-2.0.1}/ifstate.egg-info/PKG-INFO

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

{ifstate-2.0.0rc6 → ifstate-2.0.1}/ifstate.egg-info/SOURCES.txt

@@ -15,7 +15,6 @@ libifstate/__init__.py
 libifstate/exception.py
 libifstate/log.py
 libifstate/util.py
-libifstate/../schema/2/ifstate.conf.schema.json
 libifstate/address/__init__.py
 libifstate/bpf/__init__.py
 libifstate/bpf/ctypes.py

{ifstate-2.0.0rc6 → ifstate-2.0.1}/libifstate/__init__.py

@@ -54,7 +54,7 @@ import json
 import errno
 import logging
 
-__version__ = "2.0.0rc6"
+__version__ = "2.0.1"
 
 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
@@ -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)
 

{ifstate-2.0.0rc6 → ifstate-2.0.1}/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
                                 },