ifstate 1.11.5__py3-none-any.whl → 1.11.7__py3-none-any.whl

{ifstate-1.11.5.dist-info → ifstate-1.11.7.dist-info}/METADATA

@@ -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.dist-info → ifstate-1.11.7.dist-info}/RECORD

@@ -2,7 +2,7 @@ ifstate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ifstate/ifstate.py,sha256=nKwjyC945wVUdNlFwucsyoIloEvB3yxr3ggNjhE3XxQ,7866
 ifstate/shell.py,sha256=7_JFpi4icr9MijynDzbb0v5mxhFsng6PCC4m3uQ255A,2177
 ifstate/vrrp.py,sha256=GOSwQFf3IrcWF5DbQCJQqZ7p33TaFMEVp8LwyRDolWM,4016
-libifstate/__init__.py,sha256=9d00JiE3iCW1nLG73858AudDkzXl8Ahn2dEPAG_juEc,30521
+libifstate/__init__.py,sha256=hfGwzBulOivZb66Uh0Pa1LvIDD6qALIikzQYF4uLVHE,30521
 libifstate/exception.py,sha256=-4WgzgXHXdzLdAkaj1sJw_PVQDefzyoyH3EMXpdUN70,2407
 libifstate/log.py,sha256=M-wyjU-QcauMmZd0QK65dgdoDSZC-LmQ-ZDeiPfhGzc,3953
 libifstate/util.py,sha256=6YQLCLvK5lV1dmP8rDgesBeze5DM3qC2egJ2Gw0KZVI,9190
@@ -13,24 +13,24 @@ libifstate/bpf/map.py,sha256=cLHNMvRBDNW2yVCEf3z242_oRdU0HqVbFEYVkKXng0w,10818
 libifstate/brport/__init__.py,sha256=NzdA8F4hr2se1bXKNnyKZbvOFlCWBq_cdjwsL1H0Y-o,2964
 libifstate/fdb/__init__.py,sha256=jMplRZZQKkgwFQT2L7Ua4YCdLKwOzkd43_6OFtet2No,6262
 libifstate/link/__init__.py,sha256=QZggoC-bIscqwVedqVycaSqS1CmXB3Bx3m2FZei8Q_4,115
-libifstate/link/base.py,sha256=zoNU1yts5qmM7aQq2YNUPvKwPle-snh2hh1tdtty3Zg,32955
+libifstate/link/base.py,sha256=oXWSMtb96BpQsI-jIDHfdNlPH6DiFBoE2VU7ky44-_I,32962
 libifstate/link/physical.py,sha256=cJiq-MCfy-3XQoU-OxzgfPZZtu_pJ8u2ioJgn9VYdGk,560
 libifstate/link/tun.py,sha256=m55o5cwO3h3DCLofUR-68fM4ggLoTKElp6ZJ2LrJSCc,959
 libifstate/link/veth.py,sha256=DtohI4PNlWoPijROf6AA6pikCvDhFXh15zQSWQBbfsA,1989
 libifstate/neighbour/__init__.py,sha256=FJJpbJvqnxvOEii6QDMYzW5jQDEbiEy71GQOEbqaS48,2463
-libifstate/netns/__init__.py,sha256=fsxsXRICrxnzSr5RiRp5_LHG8LuR0-cuFjZoiK50XlI,8942
+libifstate/netns/__init__.py,sha256=wyF6hKr4dOcl1EUFccQQurBD22ckUjbgX2WecTKslNs,9079
 libifstate/parser/__init__.py,sha256=byz1W0G7UewVc5FFie-ti3UZjGK3-75wHIaOeq0oySQ,88
 libifstate/parser/base.py,sha256=4Y_kaUysbgQRM9u_Kg3Lr_5GWFGdTXDmP4EC3McsNzU,4628
 libifstate/parser/yaml.py,sha256=u9D9nPfVhYADTd01EYxFYIywnTBccNF1solOcGeLUjM,1345
 libifstate/routing/__init__.py,sha256=ufNsUoe-YecKOyVO3m4rtZdSMqblbd3sazFflsb7otQ,19159
 libifstate/sysctl/__init__.py,sha256=L2gkoLnac_HM6RbCaKmsEuDTNj2m7U4Rjw42TEti0kg,3074
 libifstate/tc/__init__.py,sha256=inPdampCOIr_4oKNB3awqMkW0Eh4fpPh9jvSba6sPVg,12092
-libifstate/wireguard/__init__.py,sha256=knI1heZiTgysbczvii3XNdnrfqVnzIQZcbsOo81u9EE,5640
+libifstate/wireguard/__init__.py,sha256=1HoqHqixzCInqWsL7gkuABTz9DlhZdJj5kiso-cQoV0,5903
 libifstate/xdp/__init__.py,sha256=X1xhEIGng7R5d5F4KsChykT2g6H-XBRWbWABijoYDQA,7208
 schema/ifstate.conf.schema.json,sha256=p8yMFCqGdWgJVjc-5x1I3bjbKKeIk9EwpJkinlI91B8,191657
-ifstate-1.11.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ifstate-1.11.5.dist-info/METADATA,sha256=gfEuzhLkfcHTygDRP3ZuSL78P3fUJIJxlMPO2BxM6po,1385
-ifstate-1.11.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-ifstate-1.11.5.dist-info/entry_points.txt,sha256=HF6jX7Uu_nF1Ly-J9uEPeiRapOxnM6LuHsb2y6Mt-k4,52
-ifstate-1.11.5.dist-info/top_level.txt,sha256=A7peI7aKBaM69fsiSPvMbL3rzTKZZr5qDxKC-pHMGdE,19
-ifstate-1.11.5.dist-info/RECORD,,
+ifstate-1.11.7.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ifstate-1.11.7.dist-info/METADATA,sha256=u4RNPSOqo4t7YYCfR4MUCSH11mu_2GOSfEJ6LFVIzI0,1385
+ifstate-1.11.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ifstate-1.11.7.dist-info/entry_points.txt,sha256=HF6jX7Uu_nF1Ly-J9uEPeiRapOxnM6LuHsb2y6Mt-k4,52
+ifstate-1.11.7.dist-info/top_level.txt,sha256=A7peI7aKBaM69fsiSPvMbL3rzTKZZr5qDxKC-pHMGdE,19
+ifstate-1.11.7.dist-info/RECORD,,

libifstate/__init__.py

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

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)

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

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