annet 3.1.4__tar.gz → 3.3.0__tar.gz

{annet-3.1.4/annet.egg-info → annet-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 3.1.4
+Version: 3.3.0
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -21,7 +21,7 @@ Requires-Dist: yarl>=1.8.2
 Requires-Dist: adaptix==3.0.0b7
 Requires-Dist: dataclass-rest==0.4
 Provides-Extra: netbox
-Requires-Dist: annetbox[sync]>=0.3.0; extra == "netbox"
+Requires-Dist: annetbox[sync]>=0.4.0; extra == "netbox"
 Dynamic: home-page
 Dynamic: license
 Dynamic: license-file

{annet-3.1.4 → annet-3.3.0}/annet/adapters/netbox/v42/models.py

@@ -3,6 +3,7 @@ from datetime import datetime, timezone
 from typing import Optional
 from annet.adapters.netbox.common.models import InterfaceType, IpFamily, Label, Prefix, Entity
 from annet.adapters.netbox.v41.models import InterfaceV41, IpAddressV41, NetboxDeviceV41
+import annetbox.v42.models
 
 
 @dataclass
@@ -61,3 +62,8 @@ class NetboxDeviceV42(NetboxDeviceV41):
             connected_endpoints=[],
             mode=None,
         )
+
+
+# should be unified in case of netbox update
+Vrf = annetbox.v42.models.Vrf
+Vlan = annetbox.v42.models.Vlan

{annet-3.1.4 → annet-3.3.0}/annet/adapters/netbox/v42/storage.py

@@ -1,4 +1,6 @@
 import ssl
+from typing import Optional
+
 from adaptix import P
 from adaptix.conversion import get_converter, link, link_constant, link_function
 from annetbox.v42 import client_sync
@@ -6,7 +8,8 @@ from annetbox.v42 import models as api_models
 
 from annet.adapters.netbox.common.adapter import NetboxAdapter, get_device_breed, get_device_hw
 from annet.adapters.netbox.common.storage_base import BaseNetboxStorage
-from annet.adapters.netbox.v42.models import InterfaceV42, NetboxDeviceV42, PrefixV42, IpAddressV42
+from annet.adapters.netbox.common.storage_opts import NetboxStorageOpts
+from annet.adapters.netbox.v42.models import InterfaceV42, NetboxDeviceV42, PrefixV42, IpAddressV42, Vlan, Vrf
 from annet.storage import Storage
 
 
@@ -79,8 +82,21 @@ class NetboxV42Adapter(NetboxAdapter[NetboxDeviceV42, InterfaceV42, IpAddressV42
     def list_ipprefixes(self, prefixes: list[str]) -> list[PrefixV42]:
         return self.convert_ip_prefixes(self.netbox.ipam_all_prefixes(prefix=prefixes).results)
 
+    def list_all_vrfs(self) -> list[Vrf]:
+        return self.netbox.ipam_all_vrfs().results
+
+    def list_all_vlans(self) -> list[Vlan]:
+        return self.netbox.ipam_all_vlans().results
+
 
 class NetboxStorageV42(BaseNetboxStorage[NetboxDeviceV42, InterfaceV42, IpAddressV42, PrefixV42]):
+    netbox: NetboxV42Adapter
+
+    def __init__(self, opts: Optional[NetboxStorageOpts] = None):
+        super().__init__(opts)
+        self._all_vlans: list[Vlan] | None = None
+        self._all_vrfs: list[Vrf] | None = None
+
     def _init_adapter(
             self,
             url: str,
@@ -89,3 +105,13 @@ class NetboxStorageV42(BaseNetboxStorage[NetboxDeviceV42, InterfaceV42, IpAddres
             threads: int,
     ) -> NetboxAdapter[NetboxDeviceV42, InterfaceV42, IpAddressV42, PrefixV42]:
         return NetboxV42Adapter(self, url, token, ssl_context, threads)
+
+    def resolve_all_vlans(self) -> list[Vlan]:
+        if self._all_vlans is None:
+            self._all_vlans = self.netbox.list_all_vlans()
+        return self._all_vlans
+
+    def resolve_all_vrfs(self) -> list[Vrf]:
+        if self._all_vrfs is None:
+            self._all_vrfs = self.netbox.list_all_vrfs()
+        return self._all_vrfs

{annet-3.1.4 → annet-3.3.0}/annet/annlib/rulebook/common.py

@@ -2,9 +2,9 @@ import os
 import typing
 from collections import OrderedDict as odict
 
-from annet.annlib.command import CommandList, Command
-
+from annet.annlib.command import Command, CommandList
 from annet.types import Op
+from annet.vendors import registry_connector
 
 
 # =====
@@ -287,87 +287,5 @@ class ApplyItem(typing.NamedTuple):
     after: CommandList
 
 
-def apply(hw, do_commit, do_finalize, **_):
-    before, after = CommandList(), CommandList()
-    if hw.Huawei:
-        before.add_cmd(Command("system-view"))
-        if do_commit and (hw.Huawei.CE or hw.Huawei.NE):
-            after.add_cmd(Command("commit"))
-        after.add_cmd(Command("q"))
-        if do_finalize:
-            after.add_cmd(Command("save", timeout=20))
-    elif hw.Arista:
-        before.add_cmd(Command("conf s"))
-        if do_commit:
-            after.add_cmd(Command("commit"))
-        else:
-            after.add_cmd(Command("abort"))  # просто exit оставит висеть configure session
-        if do_finalize:
-            after.add_cmd(Command("write memory"))
-    elif hw.ASR or hw.XRV or hw.XR:
-        # коммит сам сохраняет изменения в стартап do_finalize не применим
-        before.add_cmd(Command("configure exclusive"))
-        if do_commit:
-            after.add_cmd(Command("commit"))
-        after.add_cmd(Command("exit"))
-    elif hw.Cisco or hw.Nexus:
-        # классический ios и nxos не умеет коммиты
-        before.add_cmd(Command("conf t"))
-        after.add_cmd(Command("exit"))
-        if do_finalize:
-            after.add_cmd(Command("copy running-config startup-config", timeout=40))
-    elif hw.Juniper:
-        # коммит сам сохраняет изменения в стартап do_finalize не применим
-        before.add_cmd(Command("configure exclusive"))
-        if do_commit:
-            after.add_cmd(Command("commit", timeout=30))
-        after.add_cmd(Command("exit"))
-    elif hw.PC:
-        if hw.soft.startswith(("Cumulus", "SwitchDev")):
-            if os.environ.get("ETCKEEPER_CHECK", False):
-                before.add_cmd(Command("etckeeper check"))
-    elif hw.Nokia:
-        # коммит сам сохраняет изменения в стартап do_finalize не применим
-        before.add_cmd(Command("configure private"))
-        if do_commit:
-            after.add_cmd(Command("commit"))
-    elif hw.RouterOS:
-        # FIXME: пока не удалось победить \x1b[c после включения safe mode
-        # if len(cmds) > 99:
-        #     raise Exception("RouterOS does not support more 100 actions in safe mode")
-        # before.add_cmd(RosDevice.SAFE_MODE)
-        pass
-        # after.add_cmd(RosDevice.SAFE_MODE)
-    elif hw.Aruba:
-        before.add_cmd(Command("conf t"))
-        after.add_cmd(Command("end"))
-        if do_commit:
-            after.add_cmd(Command("commit apply"))
-        if do_finalize:
-            after.add_cmd(Command("write memory"))
-    elif hw.Ribbon:
-        # коммит сам сохраняет изменения в стартап do_finalize не применим
-        before.add_cmd(Command("configure exclusive"))
-        if do_commit:
-            after.add_cmd(Command("commit", timeout=30))
-        after.add_cmd(Command("exit"))
-    elif hw.B4com.CS2148P:
-        before.add_cmd(Command("conf t"))
-        after.add_cmd(Command("end"))
-        if do_finalize:
-            after.add_cmd(Command("write", timeout=40))
-    elif hw.B4com:
-        before.add_cmd(Command("conf t"))
-        if do_commit:
-            after.add_cmd(Command("commit"))
-            after.add_cmd(Command("end"))
-        if do_finalize:
-            after.add_cmd(Command("write", timeout=40))
-    elif hw.H3C:
-        before.add_cmd(Command("system-view"))
-        if do_finalize:
-            after.add_cmd(Command("save force", timeout=90))
-    else:
-        raise Exception("unknown hw %s" % hw)
-
-    return before, after
+def apply(hw, do_commit, do_finalize, path):
+    return registry_connector.get().match(hw).apply(hw, do_commit, do_finalize, path)

{annet-3.1.4 → annet-3.3.0}/annet/generators/__init__.py

@@ -157,7 +157,7 @@ def run_partial_generators(
 
 
 @tracing.function(name="run_partial_generator")
-def _run_partial_generator(gen: "PartialGenerator", run_args: GeneratorPartialRunArgs) -> Optional[GeneratorPartialResult]:
+def _run_partial_generator(gen: "PartialGenerator", run_args: GeneratorPartialRunArgs) -> GeneratorPartialResult | None:
     logger = get_logger(generator=_make_generator_ctx(gen))
     device = run_args.device
     output = ""
@@ -207,7 +207,9 @@ def _run_partial_generator(gen: "PartialGenerator", run_args: GeneratorPartialRu
 
     if run_args.use_acl:
         try:
-            with tracing_connector.get().start_as_current_span("apply_acl", tracer_name=__name__, min_duration="0.01") as acl_span:
+            with tracing_connector.get().start_as_current_span(
+                "apply_acl", tracer_name=__name__, min_duration="0.01"
+            ) as acl_span:
                 tracing_connector.get().set_device_attributes(acl_span, run_args.device)
                 config = patching.apply_acl(
                     config=config,
@@ -265,8 +267,8 @@ def check_entire_generators_required_packages(gens, device_packages: FrozenSet[s
 
 @tracing.function
 def run_file_generators(
-        gens: Iterable[Union["JSONFragment", "Entire"]],
-        device: "Device",
+    gens: Iterable[Union["JSONFragment", "Entire"]],
+    device: "Device",
 ) -> RunGeneratorResult:
     """Run generators that generate files or file parts."""
     ret = RunGeneratorResult()
@@ -295,21 +297,22 @@ def run_file_generators(
 @tracing.function(min_duration="0.5")
 def _run_entire_generator(gen: "Entire", device: "Device") -> Optional[GeneratorResult]:
     logger = get_logger(generator=_make_generator_ctx(gen))
-    if not gen.supports_device(device):
-        logger.info("generator %s is not supported for device %s", gen, device.hostname)
-        return
-
     span = tracing_connector.get().get_current_span()
     if span:
         tracing_connector.get().set_device_attributes(span, device)
         tracing_connector.get().set_dimensions_attributes(span, gen, device)
 
-    path = gen.path(device)
-    if not path:
-        raise RuntimeError("entire generator should return non-empty path")
-
-    logger.info("Generating ENTIRE ...")
     with GeneratorPerfMesurer(gen, trace_min_duration="0.5") as pm:
+        if not gen.supports_device(device):
+            logger.debug("generator %s is not supported for device %s", gen, device.hostname)
+            return
+
+        path = gen.path(device)
+        if not path:
+            raise RuntimeError("entire generator should return non-empty path")
+
+        logger.info("Generating ENTIRE ...")
+
         output = gen(device)
 
     return GeneratorEntireResult(
@@ -329,35 +332,37 @@ def _make_generator_ctx(gen):
 
 
 def _run_json_fragment_generator(
-        gen: "JSONFragment",
-        device: "Device",
+    gen: "JSONFragment",
+    device: "Device",
 ) -> Optional[GeneratorResult]:
     logger = get_logger(generator=_make_generator_ctx(gen))
-    if not gen.supports_device(device):
-        logger.info("generator %s is not supported for device %s", gen, device.hostname)
-        return
-
-    path = gen.path(device)
-    if not path:
-        raise RuntimeError("json fragment generator should return non-empty path")
-
-    acl_item_or_list_of_items = gen.acl(device)
-    safe_acl_item_or_list_of_items = gen.acl_safe(device)
-    if not acl_item_or_list_of_items:
-        raise RuntimeError("json fragment generator should return non-empty acl")
-    if isinstance(acl_item_or_list_of_items, list):
-        acl = acl_item_or_list_of_items
-    else:
-        acl = [acl_item_or_list_of_items]
-    if isinstance(safe_acl_item_or_list_of_items, list):
-        acl_safe = safe_acl_item_or_list_of_items
-    else:
-        acl_safe = [safe_acl_item_or_list_of_items]
-
-    logger.info("Generating JSON_FRAGMENT ...")
+
     with GeneratorPerfMesurer(gen) as pm:
+        if not gen.supports_device(device):
+            logger.info("generator %s is not supported for device %s", gen, device.hostname)
+            return
+
+        path = gen.path(device)
+        if not path:
+            raise RuntimeError("json fragment generator should return non-empty path")
+
+        acl_item_or_list_of_items = gen.acl(device)
+        safe_acl_item_or_list_of_items = gen.acl_safe(device)
+        if not acl_item_or_list_of_items:
+            raise RuntimeError("json fragment generator should return non-empty acl")
+        if isinstance(acl_item_or_list_of_items, list):
+            acl = acl_item_or_list_of_items
+        else:
+            acl = [acl_item_or_list_of_items]
+        if isinstance(safe_acl_item_or_list_of_items, list):
+            acl_safe = safe_acl_item_or_list_of_items
+        else:
+            acl_safe = [safe_acl_item_or_list_of_items]
+
+        logger.info("Generating JSON_FRAGMENT ...")
+
         config = gen(device)
-    reload_cmds = gen.get_reload_cmds(device)
+        reload_cmds = gen.get_reload_cmds(device)
     return GeneratorJSONFragmentResult(
         name=gen.__class__.__name__,
         tags=gen.TAGS,
@@ -407,7 +412,8 @@ def _load_gen_module(module_path: str):
     except ModuleNotFoundError as e:
         try:  # maybe it's a path to module
             module_abs_path = os.path.abspath(module_path)
-            module = importlib.machinery.SourceFileLoader(re.sub(r"[./]", "_", module_abs_path).strip("_"), module_abs_path).load_module()
+            module = importlib.machinery.SourceFileLoader(re.sub(r"[./]", "_", module_abs_path).strip("_"),
+                                                          module_abs_path).load_module()
         except ModuleNotFoundError:
             raise e
     return module

{annet-3.1.4 → annet-3.3.0}/annet/generators/entire.py

@@ -3,19 +3,10 @@ from __future__ import annotations
 import pkgutil
 import re
 import types
-from typing import (
-    FrozenSet,
-    Iterable,
-    List,
-    Optional,
-    Set,
-    Union,
-)
-
-from annet.lib import (
-    flatten,
-    mako_render,
-)
+from typing import FrozenSet, Iterable, List, Optional, Set, Union
+
+from annet.lib import flatten, mako_render
+
 from .base import BaseGenerator, _filter_str
 from .exceptions import NotSupportedDevice
 
@@ -39,8 +30,7 @@ class Entire(BaseGenerator):
     def run(self, device) -> Union[None, str, Iterable[Union[str, tuple]]]:
         raise NotImplementedError
 
-    def reload(self, device) -> Optional[
-        str]:  # pylint: disable=unused-argument
+    def reload(self, device) -> Optional[str]:  # pylint: disable=unused-argument
         return
 
     def get_reload_cmds(self, device) -> str:

{annet-3.1.4 → annet-3.3.0}/annet/generators/perf.py

@@ -1,27 +1,19 @@
-from __future__ import annotations
-
 import time
-from typing import (
-    Optional,
-    Union,
-)
+from typing import Optional, Union
 
 from annet import tracing
 from annet.tracing import tracing_connector
-from annet.types import (
-    GeneratorPartialRunArgs,
-    GeneratorPerf,
-)
-from .entire import Entire
-from .partial import PartialGenerator
+from annet.types import GeneratorPartialRunArgs, GeneratorPerf
+
+from .base import BaseGenerator
 
 
 class GeneratorPerfMesurer:
     def __init__(
-            self,
-            gen: Union[PartialGenerator, Entire],
-            run_args: Optional[GeneratorPartialRunArgs] = None,
-            trace_min_duration: tracing.MinDurationT = None
+        self,
+        gen: BaseGenerator,
+        run_args: Optional[GeneratorPartialRunArgs] = None,
+        trace_min_duration: tracing.MinDurationT = None
     ):
         self._gen = gen
         self._run_args = run_args
@@ -44,8 +36,7 @@ class GeneratorPerfMesurer:
         self._span = self._span_ctx.__enter__()  # pylint: disable=unnecessary-dunder-call
 
         if self._span:
-            self._span.set_attributes(
-                {"generator.class": self._gen.__class__.__name__})
+            self._span.set_attributes({"generator.class": self._gen.__class__.__name__})
             if self._run_args:
                 tracing_connector.get().set_device_attributes(
                     self._span, self._run_args.device,

{annet-3.1.4 → annet-3.3.0}/annet/vendors/base.py

@@ -1,6 +1,7 @@
 import abc
 from typing import ClassVar
 
+from annet.annlib.command import CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
 from annet.annlib.tabparser import CommonFormatter
 
@@ -12,6 +13,11 @@ class AbstractVendor(abc.ABC):
     def match(self) -> list[str]:
         raise NotImplementedError
 
+    def apply(
+        self, hw: HardwareView, do_commit: bool, do_finalize: bool, path: str
+    ) -> tuple[CommandList, CommandList]:
+        return CommandList(), CommandList()
+
     @property
     @abc.abstractmethod
     def reverse(self) -> str:

{annet-3.1.4 → annet-3.3.0}/annet/vendors/library/arista.py

@@ -1,3 +1,4 @@
+from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
 from annet.annlib.tabparser import AristaFormatter
 from annet.vendors.base import AbstractVendor
@@ -8,6 +9,19 @@ from annet.vendors.registry import registry
 class AristaVendor(AbstractVendor):
     NAME = "arista"
 
+    def apply(self, hw: HardwareView, do_commit: bool, do_finalize: bool, path: str) -> tuple[CommandList, CommandList]:
+        before, after = CommandList(), CommandList()
+
+        before.add_cmd(Command("conf s"))
+        if do_commit:
+            after.add_cmd(Command("commit"))
+        else:
+            after.add_cmd(Command("abort"))  # просто exit оставит висеть configure session
+        if do_finalize:
+            after.add_cmd(Command("write memory"))
+
+        return before, after
+
     def match(self) -> list[str]:
         return ["Arista"]
 

{annet-3.1.4 → annet-3.3.0}/annet/vendors/library/aruba.py

@@ -1,3 +1,4 @@
+from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
 from annet.annlib.tabparser import ArubaFormatter
 from annet.vendors.base import AbstractVendor
@@ -8,6 +9,18 @@ from annet.vendors.registry import registry
 class ArubaVendor(AbstractVendor):
     NAME = "aruba"
 
+    def apply(self, hw: HardwareView, do_commit: bool, do_finalize: bool, path: str) -> tuple[CommandList, CommandList]:
+        before, after = CommandList(), CommandList()
+
+        before.add_cmd(Command("conf t"))
+        after.add_cmd(Command("end"))
+        if do_commit:
+            after.add_cmd(Command("commit apply"))
+        if do_finalize:
+            after.add_cmd(Command("write memory"))
+
+        return before, after
+
     def match(self) -> list[str]:
         return ["Aruba"]
 

annet-3.3.0/annet/vendors/library/b4com.py

@@ -0,0 +1,46 @@
+from annet.annlib.command import Command, CommandList
+from annet.annlib.netdev.views.hardware import HardwareView
+from annet.annlib.tabparser import B4comFormatter
+from annet.vendors.base import AbstractVendor
+from annet.vendors.registry import registry
+
+
+@registry.register
+class B4ComVendor(AbstractVendor):
+    NAME = "b4com"
+
+    def apply(self, hw: HardwareView, do_commit: bool, do_finalize: bool, path: str) -> tuple[CommandList, CommandList]:
+        before, after = CommandList(), CommandList()
+
+        if hw.B4com.CS2148P:
+            before.add_cmd(Command("conf t"))
+            after.add_cmd(Command("end"))
+            if do_finalize:
+                after.add_cmd(Command("write", timeout=40))
+        else:
+            before.add_cmd(Command("conf t"))
+            if do_commit:
+                after.add_cmd(Command("commit"))
+                after.add_cmd(Command("end"))
+            if do_finalize:
+                after.add_cmd(Command("write", timeout=40))
+
+        return before, after
+
+    def match(self) -> list[str]:
+        return ["B4com"]
+
+    @property
+    def reverse(self) -> str:
+        return "no"
+
+    @property
+    def hardware(self) -> HardwareView:
+        return HardwareView("B4com")
+
+    def make_formatter(self, **kwargs) -> B4comFormatter:
+        return B4comFormatter(**kwargs)
+
+    @property
+    def exit(self) -> str:
+        return "exit"

{annet-3.1.4 → annet-3.3.0}/annet/vendors/library/cisco.py

@@ -1,3 +1,4 @@
+from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
 from annet.annlib.tabparser import CiscoFormatter
 from annet.vendors.base import AbstractVendor
@@ -8,6 +9,16 @@ from annet.vendors.registry import registry
 class CiscoVendor(AbstractVendor):
     NAME = "cisco"
 
+    def apply(self, hw: HardwareView, do_commit: bool, do_finalize: bool, path: str) -> tuple[CommandList, CommandList]:
+        before, after = CommandList(), CommandList()
+
+        before.add_cmd(Command("conf t"))
+        after.add_cmd(Command("exit"))
+        if do_finalize:
+            after.add_cmd(Command("copy running-config startup-config", timeout=40))
+
+        return before, after
+
     def match(self) -> list[str]:
         return ["Cisco"]
 

{annet-3.1.4 → annet-3.3.0}/annet/vendors/library/h3c.py

@@ -1,3 +1,4 @@
+from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
 from annet.annlib.tabparser import HuaweiFormatter
 from annet.vendors.base import AbstractVendor
@@ -8,6 +9,15 @@ from annet.vendors.registry import registry
 class H3CVendor(AbstractVendor):
     NAME = "h3c"
 
+    def apply(self, hw: HardwareView, do_commit: bool, do_finalize: bool, path: str) -> tuple[CommandList, CommandList]:
+        before, after = CommandList(), CommandList()
+
+        before.add_cmd(Command("system-view"))
+        if do_finalize:
+            after.add_cmd(Command("save force", timeout=90))
+
+        return before, after
+
     def match(self) -> list[str]:
         return ["H3C"]
 

{annet-3.1.4 → annet-3.3.0}/annet/vendors/library/huawei.py

@@ -1,3 +1,4 @@
+from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
 from annet.annlib.tabparser import HuaweiFormatter
 from annet.vendors.base import AbstractVendor
@@ -8,6 +9,18 @@ from annet.vendors.registry import registry
 class HuaweiVendor(AbstractVendor):
     NAME = "huawei"
 
+    def apply(self, hw: HardwareView, do_commit: bool, do_finalize: bool, path: str) -> tuple[CommandList, CommandList]:
+        before, after = CommandList(), CommandList()
+
+        before.add_cmd(Command("system-view"))
+        if do_commit and (hw.Huawei.CE or hw.Huawei.NE):
+            after.add_cmd(Command("commit"))
+        after.add_cmd(Command("q"))
+        if do_finalize:
+            after.add_cmd(Command("save", timeout=20))
+
+        return before, after
+
     def match(self) -> list[str]:
         return ["Huawei"]
 

{annet-3.1.4 → annet-3.3.0}/annet/vendors/library/iosxr.py

@@ -1,3 +1,4 @@
+from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
 from annet.annlib.tabparser import AsrFormatter
 from annet.vendors.base import AbstractVendor
@@ -8,6 +9,16 @@ from annet.vendors.registry import registry
 class IosXrVendor(AbstractVendor):
     NAME = "iosxr"
 
+    def apply(self, hw: HardwareView, do_commit: bool, do_finalize: bool, path: str) -> tuple[CommandList, CommandList]:
+        before, after = CommandList(), CommandList()
+
+        before.add_cmd(Command("configure exclusive"))
+        if do_commit:
+            after.add_cmd(Command("commit"))
+        after.add_cmd(Command("exit"))
+
+        return before, after
+
     def match(self) -> list[str]:
         return ["Cisco.ASR", "Cisco.XR", "Cisco.XRV"]
 

{annet-3.1.4 → annet-3.3.0}/annet/vendors/library/juniper.py

@@ -1,3 +1,4 @@
+from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
 from annet.annlib.tabparser import JuniperFormatter
 from annet.vendors.base import AbstractVendor
@@ -8,6 +9,16 @@ from annet.vendors.registry import registry
 class JuniperVendor(AbstractVendor):
     NAME = "juniper"
 
+    def apply(self, hw: HardwareView, do_commit: bool, do_finalize: bool, path: str) -> tuple[CommandList, CommandList]:
+        before, after = CommandList(), CommandList()
+
+        before.add_cmd(Command("configure exclusive"))
+        if do_commit:
+            after.add_cmd(Command("commit", timeout=30))
+        after.add_cmd(Command("exit"))
+
+        return before, after
+
     def match(self) -> list[str]:
         return ["Juniper"]
 

{annet-3.1.4 → annet-3.3.0}/annet/vendors/library/nexus.py

@@ -1,3 +1,4 @@
+from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
 from annet.annlib.tabparser import NexusFormatter
 from annet.vendors.base import AbstractVendor
@@ -8,6 +9,16 @@ from annet.vendors.registry import registry
 class NexusVendor(AbstractVendor):
     NAME = "nexus"
 
+    def apply(self, hw: HardwareView, do_commit: bool, do_finalize: bool, path: str) -> tuple[CommandList, CommandList]:
+        before, after = CommandList(), CommandList()
+
+        before.add_cmd(Command("conf t"))
+        after.add_cmd(Command("exit"))
+        if do_finalize:
+            after.add_cmd(Command("copy running-config startup-config", timeout=40))
+
+        return before, after
+
     def match(self) -> list[str]:
         return ["Cisco.Nexus"]
 

{annet-3.1.4 → annet-3.3.0}/annet/vendors/library/nokia.py

@@ -1,3 +1,4 @@
+from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
 from annet.annlib.tabparser import NokiaFormatter
 from annet.vendors.base import AbstractVendor
@@ -8,6 +9,15 @@ from annet.vendors.registry import registry
 class NokiaVendor(AbstractVendor):
     NAME = "nokia"
 
+    def apply(self, hw: HardwareView, do_commit: bool, do_finalize: bool, path: str) -> tuple[CommandList, CommandList]:
+        before, after = CommandList(), CommandList()
+
+        before.add_cmd(Command("configure private"))
+        if do_commit:
+            after.add_cmd(Command("commit"))
+
+        return before, after
+
     def match(self) -> list[str]:
         return ["Nokia"]