ifstate 1.11.5__tar.gz → 1.11.7__tar.gz

{ifstate-1.11.5 → ifstate-1.11.7}/PKG-INFO

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

{ifstate-1.11.5 → ifstate-1.11.7}/ifstate.egg-info/PKG-INFO

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

{ifstate-1.11.5 → ifstate-1.11.7}/libifstate/__init__.py

@@ -47,7 +47,7 @@ import json
 import errno
 import logging
 
-__version__ = "1.11.5"
+__version__ = "1.11.7"
 
 
 class IfState():

{ifstate-1.11.5 → ifstate-1.11.7}/libifstate/link/base.py

@@ -572,20 +572,22 @@ class Link(ABC):
                     # set sysctl settings if required
                     sysctl.apply(self.settings['ifname'], do_apply)
 
+                    # set master if required
+                    if master is not None:
+                        try:
+                            self.netns.ipr.link('set', index=self.idx, master=master)
+                        except Exception as err:
+                            if not isinstance(err, netlinkerror_classes):
+                                raise
+                            excpts.add('set', err, master=master)
+
                     # set brport settings if required
                     if self.brport:
                         if self.brport.has_changes(self.idx):
                             self.brport.apply(do_apply, self.idx, excpts)
 
-                    # set master and state if required
+                    # set state if required
                     if not excpts.has_op('brport'):
-                        if master is not None:
-                            try:
-                                self.netns.ipr.link('set', index=self.idx, master=master)
-                            except Exception as err:
-                                if not isinstance(err, netlinkerror_classes):
-                                    raise
-                                excpts.add('set', err, master=master)
                         if state is not None:
                             try:
                                 self.netns.ipr.link('set', index=self.idx, state=state)

{ifstate-1.11.5 → ifstate-1.11.7}/libifstate/netns/__init__.py

@@ -66,7 +66,10 @@ class NetNameSpace():
         memo[id(self)] = result
         for k, v in self.__dict__.items():
             if k == 'ipr':
-                setattr(result, k, v)
+                if self.netns is None:
+                    setattr(result, k, IPRouteExt())
+                else:
+                    setattr(result, k, NetNSExt(self.netns))
             else:
                 setattr(result, k, deepcopy(v, memo))
         return result

{ifstate-1.11.5 → ifstate-1.11.7}/libifstate/wireguard/__init__.py

@@ -38,7 +38,14 @@ class WireGuard():
         memo[id(self)] = result
         for k, v in self.__dict__.items():
             if k == 'wg':
-                setattr(result, k, v)
+                if self.netns.netns is not None:
+                    pyroute2.netns.pushns(self.netns.netns)
+
+                try:
+                    setattr(result, k, WG())
+                finally:
+                    if self.netns.netns is not None:
+                        pyroute2.netns.popns()
             else:
                 setattr(result, k, deepcopy(v, memo))
         return result