annet 0.14.1__tar.gz → 0.14.3__tar.gz

{annet-0.14.1/annet.egg-info → annet-0.14.3}/PKG-INFO

@@ -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 → annet-0.14.3}/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-0.14.1 → annet-0.14.3}/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-0.14.1 → annet-0.14.3}/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 → annet-0.14.3/annet.egg-info}/PKG-INFO

@@ -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