annet 0.14.1__py3-none-any.whl → 0.14.3__py3-none-any.whl

annet/adapters/netbox/common/models.py

@@ -53,6 +53,7 @@ class Prefix:
     custom_fields: dict[str, Any]
     created: datetime
     last_updated: datetime
+    description: str | None = ""
 
 
 @dataclass
@@ -67,6 +68,7 @@ class IpAddress:
     created: datetime
     last_updated: datetime
     prefix: Optional[Prefix] = None
+    vrf: Optional[Entity] = None
 
 
 @dataclass
@@ -103,6 +105,7 @@ class Interface(Entity):
     tagged_vlans: Optional[List[InterfaceVlan]]
     display: str = ""
     ip_addresses: List[IpAddress] = field(default_factory=list)
+    vrf: Optional[Entity] = None
 
 
 @dataclass

annet/annlib/jsontools.py

@@ -30,9 +30,13 @@ def apply_json_fragment(
         except jsonpointer.JsonPointerException:
             # no value found in new_fragment by the pointer,
             # try to delete it from the new config
-            doc, part = pointer.to_last(full_new_config)
-            if isinstance(doc, dict) and isinstance(part, str):
-                doc.pop(part, None)
+            try:
+                doc, part = pointer.to_last(full_new_config)
+                if isinstance(doc, dict) and isinstance(part, str):
+                    doc.pop(part, None)
+            except jsonpointer.JsonPointerException:
+                # not found in the old config either
+                pass
             continue
 
         _ensure_pointer_exists(full_new_config, pointer)

annet/generators/result.py

@@ -105,12 +105,17 @@ class RunGeneratorResult:
                 new_fragment,
                 result_acl,
             )
-            if filepath in reload_prios and \
-                    reload_prios[filepath] > generator_result.reload_prio:
+            if jsontools.format_json(new_config) == jsontools.format_json(previous_config):
+                # config is not changed, deprioritize reload_cmd
+                reload_prio = 0
+            else:
+                reload_prio = generator_result.reload_prio
+
+            if filepath in reload_prios and reload_prios[filepath] > reload_prio:
                 _, reload_cmd = files[filepath]
             else:
                 reload_cmd = generator_result.reload
-                reload_prios[filepath] = generator_result.reload_prio
+                reload_prios[filepath] = reload_prio
             files[filepath] = (new_config, reload_cmd)
         return files
 

{annet-0.14.1.dist-info → annet-0.14.3.dist-info}/METADATA

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

{annet-0.14.1.dist-info → annet-0.14.3.dist-info}/RECORD

@@ -27,7 +27,7 @@ annet/adapters/netbox/provider.py,sha256=OM7Hq2vnMHNVBfubJvx2qJlMYm3VvKhomdLMNO8
 annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/common/client.py,sha256=-lWZmphD-OPuLIHNKhW_h2bnjrVaiyKYAD_MUPasEbo,2483
 annet/adapters/netbox/common/manufacturer.py,sha256=van_-9-3cnBadZkF3Srae_m8cUSjf8KQCCCHFcdeQyo,1758
-annet/adapters/netbox/common/models.py,sha256=zxAADsHld1r0z3RswEt6bYQrJUYHyI_1hBSB-GbPvIM,2760
+annet/adapters/netbox/common/models.py,sha256=bJP6lIWFB85AW5gLNyfd0VHeqEtYIdLJcNH9r8cb8RI,2859
 annet/adapters/netbox/common/query.py,sha256=OgUuF-bvshpoBUkrOs0tsMUAhjTsttzx3VV30ryFl0Y,577
 annet/adapters/netbox/common/status_client.py,sha256=W4nTb2yvBlJ2UkWUmUhKQ2PaSQb1shjhHj5ebb4s2s4,591
 annet/adapters/netbox/common/storage_opts.py,sha256=rl_0pr3VzmOy6PDZIUMkKSBfJh90gD9TFL3yBhK_8ME,337
@@ -40,7 +40,7 @@ annet/annlib/command.py,sha256=uuBddMQphtn8P5MO5kzIa8_QrtMns-k05VeKv1bcAuA,1043
 annet/annlib/diff.py,sha256=UPt3kYFQdQdVVy3ePYzNHPAxMVmHxCrCnZnMCV6ou2Q,4587
 annet/annlib/errors.py,sha256=jBcSFzY6Vj-FxR__vqjFm-87AwYQ0xHuAopTirii5AU,287
 annet/annlib/filter_acl.py,sha256=0w1VF6WcONiTYTQh0yWi6_j9rCTc_kMLAUMr0hbdkNU,7203
-annet/annlib/jsontools.py,sha256=aGf1ZmkyuQ7FOB7-sP4KGE4smLd7pDZHBUGEF_XQTso,3651
+annet/annlib/jsontools.py,sha256=J_pToAAXQphP1QFh6uLQH9PnmHO68I5WV64qIQXLeDQ,3807
 annet/annlib/lib.py,sha256=eJ4hcVuQ6pdYBzLs4YKCHFtq45idOfZCYp92XfF7_QI,15317
 annet/annlib/output.py,sha256=_SjJ6G6bejvnTKqNHw6xeio0FT9oO3OIkLaOC3cEga4,7569
 annet/annlib/patching.py,sha256=GwG2lT4w-I1Ls3Eswn6SPJLBUVt2M3Ysw1fmXsWamYw,19793
@@ -72,7 +72,7 @@ annet/generators/jsonfragment.py,sha256=itHDq46B50o2-zxnEtCAPb8XKyc0-ozTe-E_Mjpk
 annet/generators/partial.py,sha256=XI01KDA--XwjSEU33SOQCCJZRXFq5boRz1uJA8lVA1g,3502
 annet/generators/perf.py,sha256=K72ivUuXbNXrsHrLeKWhGmczGYWsB7kUDdDzqOX6j3c,2370
 annet/generators/ref.py,sha256=QVdeL8po1D0kBsVLOpCjFR81D8yNTk-kaQj5WUM4hng,438
-annet/generators/result.py,sha256=boMG4mwvitBLlHdPM8rPOqlKPrrNAqdV6NAM9wwIZHc,4765
+annet/generators/result.py,sha256=zMAvGOYQU803bGy6datZduHLgrEqK2Zba_Jcf9Qn9p0,4976
 annet/generators/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/generators/common/initial.py,sha256=qYBxXFhyOPy34cxc6hsIXseod-lYCmmbuNHpM0uteY0,1244
 annet/rulebook/__init__.py,sha256=14IpOfTbeJtre7JKrfXVYiH0qAXsUSOL7AatUFmSQs0,3847
@@ -124,10 +124,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.14.1.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.14.1.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.14.1.dist-info/METADATA,sha256=Ytr-6UkYSrc_wLkYHOza5V7iSPFGHtdteNJ6IoQzdzw,694
-annet-0.14.1.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-annet-0.14.1.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
-annet-0.14.1.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.14.1.dist-info/RECORD,,
+annet-0.14.3.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.14.3.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.14.3.dist-info/METADATA,sha256=tidvB8sVztyRupypCAJF8mNOCVk7zUq_d90JmC5QgOo,694
+annet-0.14.3.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+annet-0.14.3.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
+annet-0.14.3.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.14.3.dist-info/RECORD,,

{annet-0.14.1.dist-info → annet-0.14.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.2.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any