annet 0.2__py3-none-any.whl → 0.4__py3-none-any.whl

annet/annlib/netdev/devdb/__init__.py

@@ -21,7 +21,7 @@ def parse_hw_model(hw_model):
 def _prepare_db() -> Dict[str, Any]:
     try:
         from library.python import resource
-        raw = json.loads(resource.find("resfs/file/netdev/devdb/data/devdb.json").decode("utf-8"))
+        raw = json.loads(resource.resfs_read("contrib/python/annet/annet/annlib/netdev/devdb/data/devdb.json").decode("utf-8"))
     except ImportError:
         with open(path.join(path.dirname(__file__), "data", "devdb.json"), "r") as f:
             raw = json.load(f)

annet/gen.py

@@ -704,7 +704,9 @@ def _old_new_get_config_files(ctx: OldNewDeviceContext, device: Device) -> Devic
             return old_files
         if ctx.config == "running":
             old_files_running = ctx.downloaded_files.get(device)
-            if old_files_running and old_files_running.is_empty():
+            if not old_files_running:
+                return old_files
+            if old_files_running.is_empty():
                 exc = (ctx.failed_files.get(device) or
                        Exception("I can't get device files and I don't know why"))
                 get_logger(host=device.hostname).error(str(exc))

annet/generators/__init__.py

@@ -801,7 +801,7 @@ class Entire(BaseGenerator):
     def get_reload_cmds(self, device) -> str:
         ret = self.reload(device) or ""
         path = self.path(device)
-        if path and device.hw.PC and device.hw.soft.startswith(("Cumulus", "SwitchDev")):
+        if path and device.hw.PC and device.hw.soft.startswith(("Cumulus", "SwitchDev", "SONiC")):
             parts = []
             if ret:
                 parts.append(ret)

{annet-0.2.dist-info → annet-0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.2
+Version: 0.4
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.2.dist-info → annet-0.4.dist-info}/RECORD

@@ -8,7 +8,7 @@ annet/deploy.py,sha256=KYbq_EbO6-dwJT6r3Ou6JhJmZIiwFWHrlJt6AlCtc0I,15319
 annet/diff.py,sha256=0QG_3Ur5k7ajRuWUrM089yt_Fxss06OTBSUE3h54Nxw,3460
 annet/executor.py,sha256=bw7COJNtssuxIqbQehlHYJnkdUeYvvL8WO5B-c67XE0,19040
 annet/filtering.py,sha256=F4ZKUCU3Yb1RlL2zKdyHtVUaWPzjWF4vWyMcdygKNYk,852
-annet/gen.py,sha256=bqrz1Ef8Z61ezqPCotRyZgZPCPTnM7v2mesNFScws04,31370
+annet/gen.py,sha256=Dfh8pGyLoGl9eN5MKP0YolFpE4grTSA9SnHIhFoQQrY,31419
 annet/hardware.py,sha256=HYPDfji_GdRn5S0_0fl4rvM7byOY9aHxG6VMAtsLaxE,1090
 annet/implicit.py,sha256=QigK4uoxvrFho2h9yFjOq1d9rLsC5xFlAU4bKkCuMWk,5139
 annet/lib.py,sha256=zQIfNBg7fAAk2BHbHAqy_McAiXhz0RqpBAcfdU-6pAA,3742
@@ -34,7 +34,7 @@ annet/annlib/tabparser.py,sha256=bhYbuGJIg6VP5CLiq09UZjgrenP9DegKvw_kYy-Hus0,229
 annet/annlib/types.py,sha256=VHU0CBADfYmO0xzB_c5f-mcuU3dUumuJczQnqGlib9M,852
 annet/annlib/netdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/db.py,sha256=fI_u5aya4l61mbYSjj4JwlVfi3s7obt2jqERSuXGRUI,1634
-annet/annlib/netdev/devdb/__init__.py,sha256=x0LlxU6kkF6WoIg-Uctthdeg2uMGEJyWoeP6mwe1zFI,863
+annet/annlib/netdev/devdb/__init__.py,sha256=aKYjjLbJebdKBjnGDpVLQdSqrV2JL24spGm58tmMWVU,892
 annet/annlib/netdev/devdb/data/devdb.json,sha256=DJ0IsXqEvnuf27nL3qaQ6VseX_deSfROkOPijQjF86U,4733
 annet/annlib/netdev/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/views/dump.py,sha256=XJ6UO6sYSO5pIoe5R4eTQmKwx0_JJ71_h8QSYAURtyk,4184
@@ -50,7 +50,7 @@ annet/annlib/rulebook/common.py,sha256=9kCZwZpsH5UliF2OzaN9nLs2eLlz_d__4L7_oZ3Sr
 annet/api/__init__.py,sha256=mvrGvcZDPvPvhreJa_fTFCwf7zo9R7NX4nWduBm5lB4,33212
 annet/configs/context.yml,sha256=nt4QnzYzrG2hqmaWOUsab2wgFl-CXmFSzbto6rqqFt4,291
 annet/configs/logging.yaml,sha256=Hu42lRK248dssp9TgkbHCaZNl0E6f4IChGb0XaQnTVo,970
-annet/generators/__init__.py,sha256=ZIfbOODbPY1vycwh5nXVuErqAEESLpGd_V9Q9CdbiB8,34040
+annet/generators/__init__.py,sha256=7yp4OxluAMSozXRaDPabDqfyGJDh4YJXKcAb4KYEzyM,34049
 annet/generators/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/generators/common/initial.py,sha256=XI7uWLMuLrHC-uXm38oRbM1YVuELAvMHLZFHM9x5IF8,1229
 annet/rulebook/__init__.py,sha256=14IpOfTbeJtre7JKrfXVYiH0qAXsUSOL7AatUFmSQs0,3847
@@ -104,10 +104,10 @@ annet_generators/example/__init__.py,sha256=zVd8_DrXuOASrNzg2Ab94rPyvJff83L-_Hpp
 annet_generators/example/lldp.py,sha256=4zcI8QnB8KDd8NTJeVVUUpzf317VA1bznOEN-02VpeY,1145
 annet_nbexport/__init__.py,sha256=-repcOrdwQQWzzJ2yCngdiNHSw5qJWis7vogRBX9cRI,6380
 annet_nbexport/main.py,sha256=f65WKdS2xvbttllCe5IYkoenPEy8C4SzvNydhh4ZEVM,1216
-annet-0.2.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.2.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.2.dist-info/METADATA,sha256=Jc61sYYT5rccjP2Q0YznZs0GxXtM5_lnGaT1zzD-2pA,622
-annet-0.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-annet-0.2.dist-info/entry_points.txt,sha256=g_pJ55300jUXfafHl7izmDJ6RVSo6iW9IaNfysM3Y0w,151
-annet-0.2.dist-info/top_level.txt,sha256=uL47QByRwuZV5yWC58gd4IkHM8sVSAJ1pZb-6W-gMfY,38
-annet-0.2.dist-info/RECORD,,
+annet-0.4.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.4.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.4.dist-info/METADATA,sha256=UZc-0RdANw3-KdBDv71AuIHIp2drehmIM7uDP2gkUZM,622
+annet-0.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+annet-0.4.dist-info/entry_points.txt,sha256=g_pJ55300jUXfafHl7izmDJ6RVSo6iW9IaNfysM3Y0w,151
+annet-0.4.dist-info/top_level.txt,sha256=uL47QByRwuZV5yWC58gd4IkHM8sVSAJ1pZb-6W-gMfY,38
+annet-0.4.dist-info/RECORD,,