annet 2.5.1__tar.gz → 2.5.3__tar.gz

{annet-2.5.1/annet.egg-info → annet-2.5.3}/PKG-INFO

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

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