ifstate 1.10.0__tar.gz → 1.10.1__tar.gz

{ifstate-1.10.0 → ifstate-1.10.1}/PKG-INFO

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

{ifstate-1.10.0 → ifstate-1.10.1}/ifstate.egg-info/PKG-INFO

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

{ifstate-1.10.0 → ifstate-1.10.1}/libifstate/__init__.py

@@ -8,6 +8,7 @@ from libifstate.parser import Parser
 from libifstate.tc import TC
 from libifstate.exception import netlinkerror_classes
 import bisect
+import pyroute2
 
 from pyroute2.netlink.rtnl.ifaddrmsg import IFA_F_PERMANENT
 try:
@@ -46,7 +47,7 @@ import json
 import errno
 import logging
 
-__version__ = "1.10.0"
+__version__ = "1.10.1"
 
 
 class IfState():
@@ -122,8 +123,13 @@ class IfState():
         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)
 
     def _update(self, netns, ifstates):
@@ -415,7 +421,7 @@ class IfState():
 
         # create and destroy namespaces to match config
         if not by_vrrp and self.namespaces is not None:
-            prepare_netns(do_apply, self.namespaces.keys())
+            prepare_netns(do_apply, self.namespaces.keys(), self.new_namespaces)
             logger.info("")
 
         # get link dependency tree

{ifstate-1.10.0 → ifstate-1.10.1}/libifstate/netns/__init__.py

@@ -63,17 +63,17 @@ class NetNameSpace():
         else:
             peer_ipr = netns_name_map[peer_netns_name]
             peer_pid = peer_ipr.child
-    
+
         result = self.ipr.get_netnsid(pid=peer_pid)
         if result['nsid'] == 4294967295:
             self.ipr.set_netnsid(pid=peer_pid)
             result = self.ipr.get_netnsid(pid=peer_pid)
-    
+
         peer_nsid = result['nsid']
 
         return (peer_ipr, peer_nsid)
 
-def prepare_netns(do_apply, target_netns_list):
+def prepare_netns(do_apply, target_netns_list, new_netns_list):
     logger.info("configure network namespaces...")
 
     # get mapping of netns names to lists of pids
@@ -96,7 +96,7 @@ def prepare_netns(do_apply, target_netns_list):
                 pyroute2.netns.remove(name)
 
         # create missing netns
-        elif name not in current_netns_list:
+        elif name not in current_netns_list or name in new_netns_list:
             logger.log_add(name)
 
         # log already existing namespaces
@@ -135,7 +135,7 @@ class LinkRegistry():
         self.ignores = ignores
 
         for namespace in namespaces:
-            self._inventory_netns(namespace)
+            self.inventory_netns(namespace)
 
         if logger.getEffectiveLevel() <= logging.DEBUG:
             self.debug_dump()
@@ -155,7 +155,7 @@ class LinkRegistry():
                 return link
         return None
 
-    def _inventory_netns(self, target_netns):
+    def inventory_netns(self, target_netns):
         for link in target_netns.ipr.get_links():
             self.registry.append(LinkRegistryItem(
                 self,

{ifstate-1.10.0 → ifstate-1.10.1}/libifstate/util.py

@@ -2,7 +2,8 @@ from libifstate.log import logger, IfStateLogging
 from pyroute2 import IPRoute, NetNS, netns
 
 from pyroute2.netlink.rtnl.tcmsg import tcmsg
-from pyroute2.netlink.rtnl import RTM_DELTFILTER
+from pyroute2.netlink.rtnl import RTM_DELTFILTER, RTM_NEWNSID
+from pyroute2.netlink.rtnl.nsidmsg import nsidmsg
 from pyroute2.netlink import NLM_F_REQUEST
 from pyroute2.netlink import NLM_F_ACK
 from pyroute2.netlink import NLM_F_CREATE
@@ -139,6 +140,30 @@ class IPRouteExt(IPRoute):
 
         return link.get_attr('IFLA_IFNAME')
 
+    def set_netnsid(self, nsid=None, pid=None, fd=None):
+        '''
+        call pyroute2's set_netnsid if available or use
+        fallback implementation for pyroute2 <=0.79
+        '''
+        if hasattr(super(), 'set_netnsid'):
+            return super().set_netnsid(nsid, pid, fd)
+        else:
+            msg = nsidmsg()
+
+            if nsid is None or nsid < 0:
+                # kernel auto select
+                msg['attrs'].append(('NETNSA_NSID', 4294967295))
+            else:
+                msg['attrs'].append(('NETNSA_NSID', nsid))
+
+            if pid is not None:
+                msg['attrs'].append(('NETNSA_PID', pid))
+
+            if fd is not None:
+                msg['attrs'].append(('NETNSA_FD', fd))
+
+            return self.nlm_request(msg, RTM_NEWNSID, NLM_F_REQUEST | NLM_F_ACK)
+
 class NetNSExt(NetNS):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -226,6 +251,30 @@ class NetNSExt(NetNS):
 
         return link.get_attr('IFLA_IFNAME')
 
+    def set_netnsid(self, nsid=None, pid=None, fd=None):
+        '''
+        call pyroute2's set_netnsid if available or use
+        fallback implementation for pyroute2 <=0.79
+        '''
+        if hasattr(super(), 'set_netnsid'):
+            return super().set_netnsid(nsid, pid, fd)
+        else:
+            msg = nsidmsg()
+
+            if nsid is None or nsid < 0:
+                # kernel auto select
+                msg['attrs'].append(('NETNSA_NSID', 4294967295))
+            else:
+                msg['attrs'].append(('NETNSA_NSID', nsid))
+
+            if pid is not None:
+                msg['attrs'].append(('NETNSA_PID', pid))
+
+            if fd is not None:
+                msg['attrs'].append(('NETNSA_FD', fd))
+
+            return self.nlm_request(msg, RTM_NEWNSID, NLM_F_REQUEST | NLM_F_ACK)
+
 class LinkDependency:
     def __init__(self, ifname, netns):
         self.ifname = ifname

{ifstate-1.10.0 → ifstate-1.10.1}/schema/ifstate.conf.schema.json

@@ -2,7 +2,7 @@
     "$id": "https://ifstate.net/schema/ifstate.conf.schema.json",
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "ifstate.conf",
-    "description": "IfState 1.9.0 Configuration Schema",
+    "description": "IfState 1.10.1 Configuration Schema",
     "type": "object",
     "required": [
         "interfaces"
@@ -2853,7 +2853,7 @@
                                 "description": "XFRM interface",
                                 "required": [
                                     "kind",
-                                    "xfrm_link"
+                                    "xfrm_if_id"
                                 ],
                                 "additionalProperties": false,
                                 "properties": {