annet 0.16.3__tar.gz → 0.16.5__tar.gz

{annet-0.16.3/annet.egg-info → annet-0.16.5}/PKG-INFO

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

{annet-0.16.3 → annet-0.16.5}/annet/annlib/diff.py

@@ -59,9 +59,8 @@ def diff_cmp(diff_l, diff_r):
     (op_l, line_l, _, _) = diff_l
     (op_r, line_r, _, _) = diff_r
 
-    cmp_line = (line_l > line_r) - (line_l < line_r)
     cmp_op = ops_order[op_l] - ops_order[op_r]
-    if cmp_line == 0:
+    if line_l == line_r:
         # При равенстве строк порядок определяется операцией
         return cmp_op
 
@@ -101,9 +100,7 @@ def diff_cmp(diff_l, diff_r):
             else:
                 continue
             break
-    if res != 0:
-        return res
-    return cmp_line
+    return res
 
 
 def resort_diff(diff: Diff) -> Diff:

{annet-0.16.3 → annet-0.16.5}/annet/annlib/patching.py

@@ -180,6 +180,9 @@ class Orderer:
         return (f_order or 0), cmd_direct, odict(children), f_rule
 
     def order_config(self, config):
+        if self.vendor not in platform.VENDOR_REVERSES:
+            return config
+
         ordered = []
         reverse_prefix = platform.VENDOR_REVERSES[self.vendor]
         if not config:

{annet-0.16.3 → annet-0.16.5}/annet/api/__init__.py

@@ -359,8 +359,14 @@ def diff(
             pc_diff_files.sort(key=lambda f: f.label)
             ret[device] = PCDiff(hostname=device.hostname, diff_files=pc_diff_files)
         elif old is not None:
+            orderer = patching.Orderer.from_hw(device.hw)
             rb = rulebook.get_rulebook(device.hw)
-            diff_tree = patching.make_diff(old, new, rb, [acl_rules, res.filter_acl_rules])
+            diff_tree = patching.make_diff(
+                old,
+                orderer.order_config(new),
+                rb,
+                [acl_rules, res.filter_acl_rules],
+            )
             diff_tree = patching.strip_unchanged(diff_tree)
             ret[device] = diff_tree
 

{annet-0.16.3 → annet-0.16.5}/annet/gen.py

@@ -27,7 +27,6 @@ from contextlog import get_logger
 
 from annet import generators, implicit, patching, tabparser, tracing
 from annet.annlib import jsontools
-from annet.annlib.rbparser import platform
 from annet.annlib.rbparser.acl import compile_acl_text
 from annet.cli_args import DeployOptions, GenOptions, ShowGenOptions
 from annet.deploy import scrub_config, get_fetcher
@@ -512,12 +511,11 @@ def worker(device_id, args: ShowGenOptions, stdin, loader: "Loader", filterer: F
         for (path, (data, _)) in sorted(new_file_fragments.items(), key=itemgetter(0)):
             dumped_data = json.dumps(data, indent=4, sort_keys=True, ensure_ascii=False)
             yield (output_driver.entire_config_dest_path(device, path), dumped_data, False)
-
         # Consider result of partial run empty and create an empty dest file
         # only if there are some acl rules that has been matched.
         # Otherwise treat it as if no supported generators have been found.
         acl_rules = res.get_acl_rules(args.acl_safe)
-        if device.hw.vendor in platform.VENDOR_REVERSES and acl_rules:
+        if acl_rules:
             orderer = patching.Orderer.from_hw(device.hw)
             yield (output_driver.cfg_file_names(device)[0],
                    format_config_blocks(

{annet-0.16.3 → annet-0.16.5}/annet/lib.py

@@ -44,7 +44,7 @@ _DEFAULT_CONTEXT_PATH: Optional[str] = None   # defaults to ~/.annet/context.yml
 
 def get_homedir_path() -> str:
     if _HOMEDIR_PATH is None:
-        set_homedir_path("~/.annet/")
+        set_homedir_path(os.path.expanduser("~/.annet/"))
     return _HOMEDIR_PATH
 
 

{annet-0.16.3 → annet-0.16.5/annet.egg-info}/PKG-INFO

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