annet 0.14.0__tar.gz → 0.14.2__tar.gz

{annet-0.14.0/annet.egg-info → annet-0.14.2}/PKG-INFO

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

{annet-0.14.0 → annet-0.14.2}/annet/adapters/netbox/v37/storage.py

@@ -204,7 +204,7 @@ class NetboxStorageV37(Storage):
         res = extend_device(
             device=device,
             storage=self,
-            interfaces=interfaces[device.id],
+            interfaces=interfaces,
             neighbours=neighbours,
         )
         return res

{annet-0.14.0 → annet-0.14.2}/annet/annlib/jsontools.py

@@ -28,7 +28,15 @@ def apply_json_fragment(
         try:
             new_value = pointer.get(new_fragment)
         except jsonpointer.JsonPointerException:
-            # no value found in new_fragment by the pointer, skip the ACL item
+            # no value found in new_fragment by the pointer,
+            # try to delete it from the new config
+            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.0 → annet-0.14.2}/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.0 → annet-0.14.2/annet.egg-info}/PKG-INFO

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