annet 0.16.24__tar.gz → 0.16.25__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of annet might be problematic. Click here for more details.
- {annet-0.16.24/annet.egg-info → annet-0.16.25}/PKG-INFO +1 -1
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/jsontools.py +2 -1
- {annet-0.16.24 → annet-0.16.25/annet.egg-info}/PKG-INFO +1 -1
- {annet-0.16.24 → annet-0.16.25}/AUTHORS +0 -0
- {annet-0.16.24 → annet-0.16.25}/LICENSE +0 -0
- {annet-0.16.24 → annet-0.16.25}/MANIFEST.in +0 -0
- {annet-0.16.24 → annet-0.16.25}/README.md +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/fetchers/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/fetchers/stub/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/fetchers/stub/fetcher.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/file/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/file/provider.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/netbox/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/netbox/common/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/netbox/common/client.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/netbox/common/manufacturer.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/netbox/common/models.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/netbox/common/query.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/netbox/common/status_client.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/netbox/common/storage_opts.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/netbox/provider.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/netbox/v24/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/netbox/v24/storage.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/netbox/v37/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/adapters/netbox/v37/storage.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annet.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/command.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/diff.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/errors.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/filter_acl.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/lib.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/netdev/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/netdev/db.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/netdev/devdb/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/netdev/devdb/data/devdb.json +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/netdev/views/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/netdev/views/dump.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/netdev/views/hardware.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/output.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/patching.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/rbparser/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/rbparser/acl.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/rbparser/deploying.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/rbparser/ordering.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/rbparser/platform.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/rbparser/syntax.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/rulebook/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/rulebook/common.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/tabparser.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/annlib/types.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/api/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/argparse.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/bgp_models.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/cli.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/cli_args.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/configs/context.yml +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/configs/logging.yaml +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/connectors.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/deploy.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/diff.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/executor.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/filtering.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/gen.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/generators/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/generators/base.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/generators/common/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/generators/common/initial.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/generators/entire.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/generators/exceptions.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/generators/jsonfragment.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/generators/partial.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/generators/perf.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/generators/ref.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/generators/result.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/hardware.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/implicit.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/lib.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/mesh/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/mesh/basemodel.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/mesh/device_models.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/mesh/executor.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/mesh/match_args.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/mesh/models_converter.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/mesh/peer_models.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/mesh/registry.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/output.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/parallel.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/patching.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/reference.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rpl/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rpl/action.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rpl/condition.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rpl/match_builder.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rpl/policy.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rpl/result.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rpl/routemap.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rpl/statement_builder.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/arista/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/arista/iface.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/aruba/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/aruba/ap_env.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/aruba/misc.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/b4com/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/b4com/file.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/cisco/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/cisco/iface.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/cisco/misc.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/cisco/vlandb.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/common.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/deploying.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/huawei/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/huawei/aaa.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/huawei/bgp.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/huawei/iface.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/huawei/misc.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/huawei/vlandb.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/juniper/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/nexus/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/nexus/iface.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/patching.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/ribbon/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/routeros/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/routeros/file.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/arista.deploy +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/arista.order +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/arista.rul +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/aruba.deploy +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/aruba.order +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/aruba.rul +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/b4com.deploy +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/b4com.order +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/b4com.rul +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/cisco.deploy +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/cisco.order +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/cisco.rul +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/huawei.deploy +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/huawei.order +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/huawei.rul +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/juniper.rul +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/nexus.deploy +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/nexus.order +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/nexus.rul +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/nokia.rul +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/optixtrans.deploy +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/optixtrans.order +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/optixtrans.rul +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/pc.deploy +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/pc.order +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/pc.rul +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/ribbon.deploy +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/ribbon.rul +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/routeros.order +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/rulebook/texts/routeros.rul +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/storage.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/tabparser.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/text_term_format.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/tracing.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet/types.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet.egg-info/SOURCES.txt +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet.egg-info/dependency_links.txt +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet.egg-info/entry_points.txt +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet.egg-info/requires.txt +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet.egg-info/top_level.txt +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet_generators/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet_generators/example/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet_generators/example/lldp.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet_generators/mesh_example/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet_generators/mesh_example/bgp.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet_generators/mesh_example/mesh_logic.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet_generators/rpl_example/__init__.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet_generators/rpl_example/items.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet_generators/rpl_example/policy_generator.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/annet_generators/rpl_example/route_policy.py +0 -0
- {annet-0.16.24 → annet-0.16.25}/requirements.txt +0 -0
- {annet-0.16.24 → annet-0.16.25}/setup.cfg +0 -0
- {annet-0.16.24 → annet-0.16.25}/setup.py +0 -0
|
@@ -4,6 +4,7 @@ import copy
|
|
|
4
4
|
import fnmatch
|
|
5
5
|
import json
|
|
6
6
|
from collections.abc import Mapping, Sequence
|
|
7
|
+
from operator import itemgetter
|
|
7
8
|
from typing import Any, Dict, List, Optional
|
|
8
9
|
|
|
9
10
|
import jsonpatch
|
|
@@ -73,7 +74,7 @@ def _ensure_pointer_exists(doc: Dict[str, Any], pointer: jsonpointer.JsonPointer
|
|
|
73
74
|
|
|
74
75
|
def make_patch(old: Dict[str, Any], new: Dict[str, Any]) -> List[Dict[str, Any]]:
|
|
75
76
|
"""Generate a JSON patch by comparing the old document with the new one."""
|
|
76
|
-
return jsonpatch.make_patch(old, new).patch
|
|
77
|
+
return sorted(jsonpatch.make_patch(old, new).patch, key=itemgetter("path"))
|
|
77
78
|
|
|
78
79
|
|
|
79
80
|
def apply_patch(content: Optional[bytes], patch_bytes: bytes) -> bytes:
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|