annet 2.5.1__py3-none-any.whl → 2.5.3__py3-none-any.whl

annet/annlib/netdev/views/hardware.py

@@ -152,5 +152,7 @@ def svi_name(hw: HardwareView, num: int) -> str:
         return f"irb.{num}"
     elif hw.Huawei:
         return f"Vlanif{num}"
+    elif hw.Arista or hw.Cisco:
+        return f"Vlan{num}"
     else:
         return f"vlan{num}"

annet/api/__init__.py

@@ -582,43 +582,44 @@ class Deployer:
         return ans
 
     def check_diff(self, result: annet.deploy.DeployResult, loader: ann_gen.Loader):
-        success_device_ids = []
-        for host, hres in result.results.items():
-            device = self.fqdn_to_device[host]
-            if (
-                not isinstance(hres, Exception) and
-                host not in self.empty_diff_hostnames and
-                device.is_pc()
-            ):
-                success_device_ids.append(device.id)
         diff_args = self.args.copy_from(
             self.args,
             config="running",
         )
+        if not diff_args.query:
+            return
 
-        if diff_args.query:
-            ann_gen.live_configs = None
-
-            diffs, failed = diff(diff_args, loader, success_device_ids)
-            for device_id, exc in failed.items():
-                self.failed_configs[loader.get_device(device_id).fqdn] = exc
-
-            non_pc_diffs = {
-                loader.get_device(device_id): diff
-                for device_id, diff in diffs.items()
-                if not isinstance(diff, PCDiff)
-            }
-            devices_to_diff = ann_diff.collapse_diffs(non_pc_diffs)
-            devices_to_diff.update({
-                (loader.get_device(device_id),): diff
-                for device_id, diff in diffs.items()
-                if isinstance(diff, PCDiff)}
-            )
-        else:
-            devices_to_diff = {}
+        # clear cache
+        ann_gen.live_configs = None
 
-        for devices, diff_obj in devices_to_diff.items():
-            if diff_obj:
+        # collect new diffs for devices on which we had successfully uploaded something
+        success_device_ids = []
+        for host, hres in result.results.items():
+            if (
+                not isinstance(hres, Exception) and
+                host not in self.empty_diff_hostnames
+            ):
+                device = self.fqdn_to_device[host]
+                success_device_ids.append(device.id)
+        diffs, failed = diff(diff_args, loader, success_device_ids)
+        for device_id, exc in failed.items():
+            self.failed_configs[loader.get_device(device_id).fqdn] = exc
+
+        # "collapse" non-PC diffs
+        diffs_by_device_id = ann_diff.collapse_diffs({
+            loader.get_device(device_id): diff
+            for device_id, diff in diffs.items()
+            if diff and not isinstance(diff, PCDiff)
+        })
+        # add PC diffs as is
+        diffs_by_device_id.update({
+            (loader.get_device(device_id),): diff
+            for device_id, diff in diffs.items()
+            if diff and isinstance(diff, PCDiff)
+        })
+        if diffs_by_device_id:
+            print("The diff is still present:")
+            for devices, diff_obj in diffs_by_device_id.items():
                 for dev in devices:
                     self.failed_configs[dev.fqdn] = Warning("Deploy OK, but diff still exists")
                 if isinstance(diff_obj, PCDiff):

annet/generators/jsonfragment.py

@@ -12,7 +12,6 @@ from typing import (
 
 from annet.storage import Device, Storage
 from .base import TreeGenerator, _filter_str
-from .exceptions import NotSupportedDevice
 
 
 class JSONFragment(TreeGenerator):
@@ -115,13 +114,17 @@ class JSONFragment(TreeGenerator):
         return self.process_scalar_value(value)
 
     def _set_dict(self, cfg, pointer, value):
+        processed_value = self.process_value(value)
         # pointer has at least one key
         if len(pointer) == 1:
             if pointer[0] in cfg:
-                cfg[pointer[0]] = [cfg[pointer[0]], self.process_value(value)]
-            else:
-                cfg[pointer[0]] = self.process_value(value)
+                # conflict, generator tries to insert key that already exists
+                raise ValueError(
+                    f"Key {pointer[0]} already exists in config. "
+                    f"Existing value: {cfg[pointer[0]]}, new value: {processed_value}"
+                )
+            cfg[pointer[0]] = processed_value
         else:
             if pointer[0] not in cfg:
                 cfg[pointer[0]] = {}
-            self._set_dict(cfg[pointer[0]], pointer[1:], self.process_value(value))
+            self._set_dict(cfg[pointer[0]], pointer[1:], processed_value)

annet/rulebook/b4com/iface.py

@@ -13,6 +13,16 @@ def mtu(rule, key, diff, **kwargs):
         yield from common.default(rule, key, diff, **kwargs)
 
 
+def description(rule, key, diff, **kwargs):
+    """
+    Удаляем description без указания значения
+    """
+    if diff[Op.REMOVED]:
+        yield (False, "no description", None)
+    elif diff[Op.ADDED]:
+        yield from common.default(rule, key, diff, **kwargs)
+
+
 def sflow(rule, key, diff, **kwargs):
     """
     Команда sflow sampling-rate * direction ingress max-header-size *

annet/rulebook/texts/b4com.order

@@ -6,3 +6,14 @@
 # Фичи должны быть включены прежде всего
 feature
 # Далее нужно будет указать команды и их порядок
+interface *
+    description
+    ip vrf forwarding
+    ipv6 address
+    mtu
+    lldp-agent
+        set lldp
+        lldp tlv
+        dcbx
+        exit
+    sflow

annet/rulebook/texts/b4com.rul

@@ -13,7 +13,10 @@
 # Physical
 sflow *
 
-interface */(ce|xe)[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.iface.diff
+interface */(ce|xe|eth)[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.iface.diff
+    description *                 %logic=b4com.iface.description
+    ip vrf forwarding *
+    ip address *
     ipv6 address *
     mtu *                         %logic=b4com.iface.mtu
     sflow *                       %logic=b4com.iface.sflow

{annet-2.5.1.dist-info → annet-2.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 2.5.1
+Version: 2.5.3
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-2.5.1.dist-info → annet-2.5.3.dist-info}/RECORD

@@ -69,7 +69,7 @@ annet/annlib/netdev/devdb/__init__.py,sha256=aKYjjLbJebdKBjnGDpVLQdSqrV2JL24spGm
 annet/annlib/netdev/devdb/data/devdb.json,sha256=4RTRg9PbRiUfi-kVIalim7Rtdkdu_48MGGtrZ6XmXmg,6677
 annet/annlib/netdev/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/views/dump.py,sha256=rIlyvnA3uM8bB_7oq1nS2KDxTp6dQh2hz-FbNhYIpOU,4630
-annet/annlib/netdev/views/hardware.py,sha256=3JCZLH7deIHhCguwPJTUX-WDvWjG_xt6BdSEZSO6zkQ,4226
+annet/annlib/netdev/views/hardware.py,sha256=R22iXYjGkfLaBbDMEMpcEfqgwLsB1u5VJwF8tyPtJb0,4286
 annet/annlib/rbparser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rbparser/acl.py,sha256=RR8yPt6t96_IiyuKVbeZ-3x32cyhBAT2wC1y99oWBO8,3931
 annet/annlib/rbparser/deploying.py,sha256=ACT8QNhDAhJx3ZKuGh2nYBOrpdka2qEKuLDxvQAGKLk,1649
@@ -78,14 +78,14 @@ annet/annlib/rbparser/platform.py,sha256=65-r9mboRA3gaz9DRkSwPCdCRQneItqxppdMB6z
 annet/annlib/rbparser/syntax.py,sha256=iZ7Y-4QQBw4L3UtjEh54qisiRDhobl7HZxFNdP8mi54,3577
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=hqwmmNofm5q2f-hV2usMY-IPMeiANLth28tZcRBYJTw,16640
-annet/api/__init__.py,sha256=BnFu1BbGZVgiT4GKa5x8reIHV40hl8UGR4vtwD8VREI,32992
+annet/api/__init__.py,sha256=DU88rY4sQLUoBE9g0WxgqF6GdL7CIUAak01Ejuf63qc,33098
 annet/configs/context.yml,sha256=RVLrKLIHpCty7AGwOnmqf7Uu0iZQCn-AjYhophDJer8,259
 annet/configs/logging.yaml,sha256=EUagfir99QqA73Scc3k7sfQccbU3E1SvEQdyhLFtCl4,997
 annet/generators/__init__.py,sha256=rVHHDTPKHPZsml1eNEAj3o-8RweFTN8J7LX3tKMXdIY,16402
 annet/generators/base.py,sha256=rgQLcQBPZm4ecbKmRhVOpBR-GFJAiVfdb_y5f2-LUR8,3670
 annet/generators/entire.py,sha256=Oe7d0VuIn2sLcOKuRVQW9uR8Vuirg0edekFMSZCMnI4,2786
 annet/generators/exceptions.py,sha256=GPXTBgn2xZ3Ev_bdOPlfCLGRC1kQHe_dEq88S-uyi5s,151
-annet/generators/jsonfragment.py,sha256=s7zOjX6JR43sIA9wse13GEPU06aeOa75uiA8WBOVDa8,4207
+annet/generators/jsonfragment.py,sha256=Cl43t9_OtNWRxesk3B69h60KvD37tiK9W7sLLmppAT4,4379
 annet/generators/partial.py,sha256=XI01KDA--XwjSEU33SOQCCJZRXFq5boRz1uJA8lVA1g,3502
 annet/generators/perf.py,sha256=K72ivUuXbNXrsHrLeKWhGmczGYWsB7kUDdDzqOX6j3c,2370
 annet/generators/ref.py,sha256=QVdeL8po1D0kBsVLOpCjFR81D8yNTk-kaQj5WUM4hng,438
@@ -130,7 +130,7 @@ annet/rulebook/aruba/ap_env.py,sha256=5fUVLhXH4-0DAtv8t0yoqJUibaRMuzF8Q7mGFzNsEN
 annet/rulebook/aruba/misc.py,sha256=O0p_wsR07gtB8rm1eJvJ7VYnGm5T8Uau_SVKR9FVInI,234
 annet/rulebook/b4com/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/rulebook/b4com/file.py,sha256=zK7RwBk1YaVoDSFSg1u7Pt8u0Fk3nhhu27aJRngemwc,137
-annet/rulebook/b4com/iface.py,sha256=0MXq01fhgd0ZxrS99TMxEP9qqIW2ofadsIBthCZVPTc,1392
+annet/rulebook/b4com/iface.py,sha256=FGOYeeL3ZcogT8bDrmMYPG0KiZ5Q7iz5R19e1zrE0P8,1683
 annet/rulebook/cisco/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/rulebook/cisco/iface.py,sha256=WISkzjp_G7WKPpg098FCIm4b7ipOxtRLOQbu-7gMUL0,1792
 annet/rulebook/cisco/misc.py,sha256=zgKdWGmjRYmvq58dh7Lbn7ofwSYZoISgXsUh5lkGKF8,2318
@@ -153,8 +153,8 @@ annet/rulebook/texts/aruba.deploy,sha256=hI432Bq-of_LMXuUflCu7eNSEFpx6qmj0KItEw6
 annet/rulebook/texts/aruba.order,sha256=ZMakkn0EJ9zomgY6VssoptJImrHrUmYnCqivzLBFTRo,1158
 annet/rulebook/texts/aruba.rul,sha256=zvGVpoYyJvMoL0fb1NQ8we_GCLZXno8nwWpZIOScLQQ,2584
 annet/rulebook/texts/b4com.deploy,sha256=SVX8-yLHM90tJC4M-ekpGuGM1aQZW3euSGyg67l--R0,781
-annet/rulebook/texts/b4com.order,sha256=G3aToAIHHzKzDCM3q7_lyr9wJvuVOXVbVvF3wm5PiTE,707
-annet/rulebook/texts/b4com.rul,sha256=OiQroBySk33he1YNN3jOn5sGL_WDBJEejDI6F7jIWo0,1224
+annet/rulebook/texts/b4com.order,sha256=nzPSPpq8f6WnVazOekJUEgt7ueEtf3Ietdl1m1X2qF8,867
+annet/rulebook/texts/b4com.rul,sha256=JhnaGx6Hc7sEMUGgFyru2PfmTNgFhcF-lgckopMMSP8,1334
 annet/rulebook/texts/cisco.deploy,sha256=Hu0NkcGv3f1CWUrnbzI3eQOPXJxtH4NNOPRV68IrW4U,1226
 annet/rulebook/texts/cisco.order,sha256=OvNHMNqkCc-DN2dEjLCTKv_7ZhiaHt4q2X4Y4Z8dvR4,1901
 annet/rulebook/texts/cisco.rul,sha256=jgL5_xnSwd_H4E8cx4gcneSvJC5W1zz6_BWSb64iuxI,3017
@@ -177,8 +177,8 @@ annet/rulebook/texts/ribbon.deploy,sha256=hCq2XeAcwaYanyQ8lTdnez6Pgq-gRqpNuR8dAl
 annet/rulebook/texts/ribbon.rul,sha256=609LyLTDCtXPVQNAzqS-VEyCpW3byHP8TCMJLFMn5cc,2108
 annet/rulebook/texts/routeros.order,sha256=M71uy_hf0KAjLNS3zZY3uih4m2xLUcu26FEoVVjC6k0,905
 annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019O1DE,1203
-annet-2.5.1.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-2.5.1.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-2.5.3.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-2.5.3.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=1z030I00c9KeqW0ntkT1IRLYKD5LZAHYjiNHrOLen1Q,221
 annet_generators/example/lldp.py,sha256=24bGvShxbio-JxUdaehyPRu31LhH9YwSwFDrWVRn6yo,2100
@@ -190,8 +190,8 @@ annet_generators/rpl_example/generator.py,sha256=zndIGfV4ZlTxPgAGYs7bMQvTc_tYScO
 annet_generators/rpl_example/items.py,sha256=d99HSXDHFjZq511EvGhIqRTWK3F4ZsCWfdUqFYQcyhE,772
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-2.5.1.dist-info/METADATA,sha256=yV5XEXm3TVL8ONqDFzOU1Gfw1aKGTDkKLAaZhtWg5Wc,815
-annet-2.5.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-annet-2.5.1.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-2.5.1.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-2.5.1.dist-info/RECORD,,
+annet-2.5.3.dist-info/METADATA,sha256=BdGFeD779806YbIpVm9lyPy5egBoglx5bQjBlZnkH-o,815
+annet-2.5.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+annet-2.5.3.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-2.5.3.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-2.5.3.dist-info/RECORD,,