annet 0.12.2__py3-none-any.whl → 0.12.4__py3-none-any.whl

annet/annlib/netdev/devdb/data/devdb.json

@@ -96,7 +96,7 @@
     "Nokia.NS7750": " 7750",
     "Nokia.SR_1s": "SR-1s",
 
-    "PC": "^(PC|pc|[Mm]ellanox SN|[Ee]dge-?[Cc]ore|[Mm]oxa)",
+    "PC": "^(PC|pc|[Mm]ellanox SN|[Ee]dge-?[Cc]ore|[Mm]oxa|[Aa]sterfusion CX)",
 
     "PC.Whitebox": "([Mm]ellanox SN|[Ee]dge-?[Cc]ore)",
     "PC.Whitebox.Mellanox": "[Mm]ellanox",
@@ -111,6 +111,10 @@
     "PC.Moxa": "[Mm]oxa",
     "PC.Moxa.NPort": " [Nn][Pp]ort",
     "PC.Moxa.NPort.6610": "6610",
+    "PC.Whitebox.Asterfusion": "[Aa]sterfusion",
+    "PC.Whitebox.Asterfusion.CX": " CX",
+    "PC.Whitebox.Asterfusion.CX.CX500": " CX5\\d\\d",
+    "PC.Whitebox.Asterfusion.CX.CX500.CX532P-N": " CX532P-N",
 
     "RouterOS": "^([Rr]outer[Oo][Ss]|[Mm]ikro[Tt]ik)",
 
@@ -133,5 +137,9 @@
 
     "Ribbon": "^Ribbon",
     "Ribbon.OPT": " OPT",
-    "Ribbon.OPT.OPT9608": "9608D?"
+    "Ribbon.OPT.OPT9608": "9608D?",
+
+    "H3C": "^[Hh]3[Cc]",
+    "H3C.S12500": " S125\\d{2}",
+    "H3C.S12500.S12500R": " S12500R"
 }

annet/gen.py

@@ -821,7 +821,6 @@ class Loader:
         self._no_empty_warning = no_empty_warning
         self._devices_map: Dict[int, Device] = {}
         self._gens: DeviceGenerators = DeviceGenerators()
-        self._counter = itertools.count()
 
         self._preload()
 
@@ -835,7 +834,7 @@ class Loader:
                     preload_extra_fields=True,
                 )
                 for device in devices:
-                    self._devices_map[next(self._counter)] = device
+                    self._devices_map[device.id] = device
                 self._gens.update(_old_resolve_gens(self._args, storage, devices))
         if not devices and not self._no_empty_warning:
             get_logger().error("No devices found for %s", self._args.query)

{annet-0.12.2.dist-info → annet-0.12.4.dist-info}/METADATA

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

{annet-0.12.2.dist-info → annet-0.12.4.dist-info}/RECORD

@@ -8,7 +8,7 @@ annet/deploy.py,sha256=B8E0P_VvCrS2URjFvgmUiIkHp95g7pAWfmT34igaDeo,18893
 annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
 annet/executor.py,sha256=bw7COJNtssuxIqbQehlHYJnkdUeYvvL8WO5B-c67XE0,19040
 annet/filtering.py,sha256=F4ZKUCU3Yb1RlL2zKdyHtVUaWPzjWF4vWyMcdygKNYk,852
-annet/gen.py,sha256=3ywi-RoQXf55HuvhOvAA0dZonStxFkKoCOYjaNeo9N0,32552
+annet/gen.py,sha256=HCd_9GukT5OT6qm6OIi9XZH6OuGMynABeaG81gU3edU,32500
 annet/hardware.py,sha256=HYPDfji_GdRn5S0_0fl4rvM7byOY9aHxG6VMAtsLaxE,1090
 annet/implicit.py,sha256=QigK4uoxvrFho2h9yFjOq1d9rLsC5xFlAU4bKkCuMWk,5139
 annet/lib.py,sha256=zQIfNBg7fAAk2BHbHAqy_McAiXhz0RqpBAcfdU-6pAA,3742
@@ -53,7 +53,7 @@ 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=aKYjjLbJebdKBjnGDpVLQdSqrV2JL24spGm58tmMWVU,892
-annet/annlib/netdev/devdb/data/devdb.json,sha256=DJ0IsXqEvnuf27nL3qaQ6VseX_deSfROkOPijQjF86U,4733
+annet/annlib/netdev/devdb/data/devdb.json,sha256=2zEvVnK0SGYgRlYM95OTJvacTLjEBO-L9_qc77GBYCE,5054
 annet/annlib/netdev/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/views/dump.py,sha256=XJ6UO6sYSO5pIoe5R4eTQmKwx0_JJ71_h8QSYAURtyk,4184
 annet/annlib/netdev/views/hardware.py,sha256=_ZgaZgT6l4UEf94QaLtKIV31rRNJH4MPXh0-3xbesOc,3192
@@ -128,10 +128,10 @@ annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=zVd8_DrXuOASrNzg2Ab94rPyvJff83L-_HppDFxnUjM,228
 annet_generators/example/lldp.py,sha256=68CLrK7vxTQQy9XIBxtywuEdBNlIlfXGYj8_wYWs5UI,1146
-annet-0.12.2.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.12.2.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.12.2.dist-info/METADATA,sha256=4hCPO4oGou8j2lSYEFAuDODeQOfLpktiPIYH6rOT6dg,694
-annet-0.12.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-annet-0.12.2.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
-annet-0.12.2.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.12.2.dist-info/RECORD,,
+annet-0.12.4.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.12.4.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.12.4.dist-info/METADATA,sha256=bLsuZdXIPwgFBlHmOJ0WaA3wH2iXHmGtncAXlru-xwc,694
+annet-0.12.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+annet-0.12.4.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
+annet-0.12.4.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.12.4.dist-info/RECORD,,