annet 3.4.0__py3-none-any.whl → 3.4.2__py3-none-any.whl

annet/rpl_generators/policy.py

@@ -1,12 +1,12 @@
 from abc import ABC, abstractmethod
-from collections.abc import Iterator, Sequence
+from collections.abc import Iterator, Sequence, Iterable
 from typing import Any, cast, Literal
 
 from annet.generators import PartialGenerator
 from annet.rpl import (
     CommunityActionValue,
     ResultType, RoutingPolicyStatement, RoutingPolicy, ConditionOperator, SingleCondition, SingleAction, ActionType,
-    MatchField,
+    MatchField, PrefixMatchValue,
 )
 from annet.rpl.statement_builder import AsPathActionValue, NextHopActionValue, ThenField
 from annet.rpl_generators.entities import (
@@ -15,7 +15,6 @@ from annet.rpl_generators.entities import (
     IpPrefixList, group_community_members, CommunityType,
 )
 
-
 HUAWEI_MATCH_COMMAND_MAP: dict[str, str] = {
     MatchField.as_path_filter: "as-path-filter {option_value}",
     MatchField.metric: "cost {option_value}",
@@ -58,6 +57,28 @@ ARISTA_THEN_COMMAND_MAP: dict[str, str] = {
     # unsupported: resolution
     # unsupported: rpki_valid_state
 }
+IOSXR_MATCH_COMMAND_MAP: dict[str, str] = {
+    MatchField.as_path_filter: "as-path in {option_value}",
+    MatchField.protocol: "protocol is {option_value}",
+    # unsupported: interface
+    # unsupported: metric
+    # unsupported: large-community
+}
+IOSXR_THEN_COMMAND_MAP: dict[str, str] = {
+    ThenField.local_pref: "local-preference {option_value}",
+    ThenField.origin: "origin {option_value}",
+    ThenField.tag: "tag {option_value}",
+    ThenField.metric_type: "metric-type {option_value}",
+    # unsupported: mpls_label  # label?
+    # unsupported: resolution
+    # unsupported: rpki_valid_state
+    # unsupported: large_community
+}
+IOSXR_RESULT_MAP = {
+    ResultType.ALLOW: "done",
+    ResultType.DENY: "drop",
+    ResultType.NEXT: "pass"
+}
 
 
 class RoutingPolicyGenerator(PartialGenerator, ABC):
@@ -408,7 +429,8 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
 
         for policy in self.get_policies(device):
             for statement in policy.statements:
-                yield from self._huawei_statement(communities, rd_filters, device, policy, statement, prefix_name_generator)
+                yield from self._huawei_statement(communities, rd_filters, device, policy, statement,
+                                                  prefix_name_generator)
 
     # arista
     def acl_arista(self, device):
@@ -564,7 +586,7 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
                 else:
                     yield "set", "large-community large-community-list", community_name, "additive"
         if action.value.added:
-            yield "set", "large-community large-community-list",  *action.value.added, "additive"
+            yield "set", "large-community large-community-list", *action.value.added, "additive"
         if action.value.removed:
             yield "set large-community large-community-list", *action.value.removed, "delete"
 
@@ -764,6 +786,8 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
             statement: RoutingPolicyStatement,
             prefix_name_generator: PrefixListNameGenerator,
     ) -> Iterator[Sequence[str]]:
+        if statement.number is None:
+            raise RuntimeError(f"Statement number should not be empty on Arista (found for policy: {policy.name})")
         with self.block(
                 "route-map",
                 policy.name,
@@ -789,3 +813,314 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
                 yield from self._arista_statement(
                     communities, rd_filters, device, policy, statement, prefix_name_generator,
                 )
+
+    # Cisco IOS XR
+    def acl_iosxr(self, device):
+        return r"""
+        route-policy *
+            ~ %global=1
+        """
+
+    def _iosxr_match_community(
+            self,
+            community_type: Literal["community", "extcommunity rt", "extcommunity soo"],
+            community: CommunityList,
+    ) -> Iterator[Sequence[str]]:
+        if community.logic is CommunityLogic.AND:
+            yield community_type, "matches-every", community.name
+        elif community.logic is CommunityLogic.OR:
+            yield community_type, "matches-any", community.name
+        else:
+            raise ValueError(f"Unknown community logic {community.logic}")
+
+    def _iosxr_match_communities(
+            self,
+            operator: ConditionOperator,
+            community_type: Literal["community", "extcommunity rt", "extcommunity soo"],
+            community_names: list[str],
+            communities: dict[str, CommunityList],
+    ) -> Iterator[Sequence[str]]:
+        if operator == ConditionOperator.HAS_ANY:
+            yield self._iosxr_or_matches(
+                self._iosxr_match_community(community_type, communities[name])
+                for name in community_names
+            ),
+        elif operator == ConditionOperator.HAS:
+            for name in community_names:
+                yield from self._iosxr_match_community(community_type, communities[name])
+        else:
+            raise NotImplementedError(f"Operator {operator} is not supported for {community_type} on Cisco IOS XR")
+
+    def _iosxr_match_rd(
+            self,
+            condition: SingleCondition[Sequence[str]],
+            rd_filters: dict[str, RDFilter],
+    ) -> Iterator[Sequence[str]]:
+        if condition.operator == ConditionOperator.HAS_ANY:
+            if len(condition.value) == 1:
+                yield "rd", "in", condition.value[0]
+                return
+            conds = " or ".join(f"rd in {name}" for name in condition.value)
+            yield f"({conds})",
+            return
+        elif condition.operator == ConditionOperator.HAS:
+            for name in condition.value:
+                yield "rd", "in", name
+        else:
+            raise NotImplementedError(f"Operator {condition.operator} is not supported for {condition.field} on Cisco IOS XR")
+
+    def _iosxr_match_prefix_lists(
+            self,
+            condition: SingleCondition[PrefixMatchValue],
+            name_generator: PrefixListNameGenerator
+    ) -> Iterator[Sequence[str]]:
+        matches = []
+        for name in condition.value.names:
+            plist = name_generator.get_prefix(name, condition.value)
+            matches.append(("destination in", plist.name))
+        if len(matches) == 1:
+            yield matches[0]
+        else:
+            yield self._iosxr_or_matches([matches]),
+
+    def _iosxr_match_local_pref(self, condition: SingleCondition) -> Iterator[Sequence[str]]:
+        if condition.operator is ConditionOperator.EQ:
+            yield "local-preference", "eq", str(condition.value)
+        elif condition.operator is ConditionOperator.LE:
+            yield "local-preference", "le", str(condition.value)
+        elif condition.operator is ConditionOperator.GE:
+            yield "local-preference", "ge", str(condition.value)
+        elif condition.operator is ConditionOperator.BETWEEN_INCLUDED:
+            yield "local-preference", "ge", str(condition.value[0])
+            yield "local-preference", "le", str(condition.value[1])
+        else:
+            raise NotImplementedError(
+                f"Operator {condition.operator} is not supported for {condition.field} on Cisco IOS XR",
+            )
+
+    def _iosxr_match_as_path_length(self, condition: SingleCondition) -> Iterator[Sequence[str]]:
+        if condition.operator is ConditionOperator.EQ:
+            yield "as-path length", "eq", str(condition.value)
+        elif condition.operator is ConditionOperator.LE:
+            yield "as-path length", "le", str(condition.value)
+        elif condition.operator is ConditionOperator.GE:
+            yield "as-path length", "ge", str(condition.value)
+        elif condition.operator is ConditionOperator.BETWEEN_INCLUDED:
+            yield "as-path length", "ge", str(condition.value[0])
+            yield "as-path length", "le", str(condition.value[1])
+        else:
+            raise NotImplementedError(
+                f"Operator {condition.operator} is not supported for {condition.field} on Cisco IOS XR",
+            )
+
+    def _iosxr_and_matches(self, conditions: Iterable[Iterable[Sequence[str]]]) -> str:
+        return " and ".join(" ".join(c) for seq in conditions for c in seq)
+
+    def _iosxr_or_matches(self, conditions: Iterable[Iterable[Sequence[str]]]) -> str:
+        return "(" + " or ".join(" ".join(c) for seq in conditions for c in seq) + ")"
+
+    def _iosxr_match(
+            self,
+            device: Any,
+            condition: SingleCondition[Any],
+            communities: dict[str, CommunityList],
+            rd_filters: dict[str, RDFilter],
+            name_generator: PrefixListNameGenerator,
+    ) -> Iterator[Sequence[str]]:
+        if condition.field == MatchField.community:
+            yield from self._iosxr_match_communities(condition.operator, "community", condition.value, communities)
+            return
+        elif condition.field == MatchField.extcommunity_rt:
+            yield from self._iosxr_match_communities(condition.operator, "extcommunity rt", condition.value, communities)
+            return
+        elif condition.field == MatchField.extcommunity_soo:
+            yield from self._iosxr_match_communities(condition.operator, "extcommunity soo", condition.value, communities)
+            return
+        elif condition.field == MatchField.local_pref:
+            yield from self._iosxr_match_local_pref(condition)
+            return
+        elif condition.field == MatchField.as_path_length:
+            yield from self._iosxr_match_as_path_length(condition)
+            return
+        elif condition.field == MatchField.rd:
+            yield from self._iosxr_match_rd(condition, rd_filters)
+            return
+        elif condition.field == MatchField.ip_prefix:
+            yield from self._iosxr_match_prefix_lists(condition, name_generator)
+            return
+        elif condition.field == MatchField.ipv6_prefix:
+            yield from self._iosxr_match_prefix_lists(condition, name_generator)
+            return
+
+        if condition.operator is not ConditionOperator.EQ:
+            raise NotImplementedError(
+                f"`{condition.field}` with operator {condition.operator} is not supported for Cisco IOS XR",
+            )
+        if condition.field not in IOSXR_MATCH_COMMAND_MAP:
+            raise NotImplementedError(f"Match using `{condition.field}` is not supported for Cisco IOS XR")
+        yield IOSXR_MATCH_COMMAND_MAP[condition.field].format(option_value=condition.value),
+
+    def _iosxr_then_as_path(
+            self,
+            device: Any,
+            action: SingleAction[AsPathActionValue],
+    ) -> Iterator[Sequence[str]]:
+        if action.value.set is not None:
+            raise RuntimeError("as_path.set is not supported for Cisco IOS XR")
+        if action.value.prepend:
+            for asn in action.value.prepend:
+                yield "prepend as-path", asn
+        if action.value.expand:
+            raise RuntimeError("as_path.expand is not supported for Cisco IOS XR")
+        if action.value.delete:
+            raise RuntimeError("as_path.delete is not supported for Cisco IOS XR")
+        if action.value.expand_last_as:
+            raise RuntimeError("as_path.expand_last_as is not supported for Cisco IOS XR")
+
+    def _iosxr_then_next_hop(
+            self,
+            device: Any,
+            action: SingleAction[NextHopActionValue],
+    ) -> Iterator[Sequence[str]]:
+        if action.value.target == "self":
+            yield "set", "next-hop", "self"
+        elif action.value.target == "discard":
+            yield "set", "next-hop", "discard"
+        elif action.value.target == "peer":
+            pass
+        elif action.value.target == "ipv4_addr":
+            yield "set", "next-hop", action.value.addr
+        elif action.value.target == "ipv6_addr":
+            yield "set", "next-hop", action.value.addr.lower()
+        elif action.value.target == "mapped_ipv4":
+            yield "set", "next-hop", f"::ffff:{action.value.addr}"
+        else:
+            raise RuntimeError(f"Next_hop target {action.value.target} is not supported for Cisco IOS XR")
+
+    def _iosxr_then_metric(
+            self,
+            device: Any,
+            action: SingleAction[NextHopActionValue],
+    ) -> Iterator[Sequence[str]]:
+        if action.type is ActionType.ADD:
+            yield "set", f"med +{action.value}"
+        elif action.type is ActionType.REMOVE:
+            yield "set", f"med -{action.value}"
+        elif action.type is ActionType.SET:
+            yield "set", f"med {action.value}"
+        else:
+            raise NotImplementedError(f"Action type {action.type} for metric is not supported for Cisco IOS XR")
+
+    def _iosxr_then_community(
+            self,
+            communities: dict[str, CommunityList],
+            device: Any,
+            action: SingleAction[CommunityActionValue],
+    ) -> Iterator[Sequence[str]]:
+        added = []
+        if action.value.replaced is not None:
+            yield "delete", "community", "all"
+            added.extend(action.value.replaced)
+        added.extend(action.value.added)
+        for name in added:
+            yield "set", "community", name, "additive"
+        for community_name in action.value.removed:
+            yield "delete", "community", "in", community_name
+
+    def _iosxr_community_type_str(self, comm_type: CommunityType) -> str:
+        if comm_type is CommunityType.RT:
+            return "rt"
+        elif comm_type is CommunityType.LARGE:
+            raise ValueError("Large community is not subtype of extcommunity")
+        elif comm_type is CommunityType.BASIC:
+            raise ValueError("Basic community is not subtype of extcommunity")
+        else:
+            raise NotImplementedError(f"Community type {comm_type} is not supported on Cisco IOS XR")
+
+    def _iosxr_then_extcommunity(
+            self,
+            communities: dict[str, CommunityList],
+            device: Any,
+            action: SingleAction[CommunityActionValue],
+    ) -> Iterator[Sequence[str]]:
+        added = []
+        if action.value.replaced is not None:
+            yield "delete", "extcommunity", "rt", "all"
+            added.extend(action.value.replaced)
+
+            added.extend(action.value.replaced)
+        for member_name in added:
+            typename = self._iosxr_community_type_str(communities[member_name].type)
+            yield "set", "extcommunity", typename, member_name, "additive"
+        for member_name in action.value.removed:
+            typename = self._iosxr_community_type_str(communities[member_name].type)
+            yield "delete", "extcommunity", typename, "in", member_name
+
+    def _iosxr_then(
+            self,
+            communities: dict[str, CommunityList],
+            device: Any,
+            action: SingleAction[Any],
+    ) -> Iterator[Sequence[str]]:
+        if action.field == ThenField.community:
+            yield from self._iosxr_then_community(communities, device, action)
+            return
+        if action.field == ThenField.extcommunity:
+            yield from self._iosxr_then_extcommunity(communities, device, action)
+            return
+        if action.field == ThenField.metric:
+            yield from self._iosxr_then_metric(device, action)
+            return
+        if action.field == ThenField.as_path:
+            yield from self._iosxr_then_as_path(device, cast(SingleAction[AsPathActionValue], action))
+            return
+        if action.field == ThenField.next_hop:
+            yield from self._iosxr_then_next_hop(device, cast(SingleAction[NextHopActionValue], action))
+            return
+        if action.type is not ActionType.SET:
+            raise NotImplementedError(f"Action type {action.type} for `{action.field}` is not supported for Cisco IOS XR")
+        if action.field not in IOSXR_THEN_COMMAND_MAP:
+            raise NotImplementedError(f"Then action using `{action.field}` is not supported for Cisco IOS XR")
+        cmd = IOSXR_THEN_COMMAND_MAP[action.field]
+        yield "set", cmd.format(option_value=action.value)
+
+    def _iosxr_statement(
+            self,
+            communities: dict[str, CommunityList],
+            rd_filters: dict[str, RDFilter],
+            device: Any,
+            policy: RoutingPolicy,
+            statement: RoutingPolicyStatement,
+            prefix_name_generator: PrefixListNameGenerator,
+    ) -> Iterator[Sequence[str]]:
+        if statement.match:
+            condition_expr = self._iosxr_and_matches(
+                self._iosxr_match(device, condition, communities, rd_filters, prefix_name_generator)
+                for condition in statement.match
+            )
+            with self.block(
+                    "if", condition_expr, "then",
+            ):
+                for action in statement.then:
+                    yield from self._iosxr_then(communities, device, action)
+                yield IOSXR_RESULT_MAP[statement.result],
+        else:
+            for action in statement.then:
+                yield from self._iosxr_then(communities, device, action)
+            yield IOSXR_RESULT_MAP[statement.result],
+
+    def run_iosxr(self, device):
+        prefix_lists = self.get_prefix_lists(device)
+        policies = self.get_policies(device)
+        prefix_name_generator = PrefixListNameGenerator(prefix_lists, policies)
+        communities = {c.name: c for c in self.get_community_lists(device)}
+        rd_filters = {f.name: f for f in self.get_rd_filters(device)}
+
+        for policy in policies:
+            with self.block(
+                    "route-policy", policy.name,
+            ):
+                for statement in policy.statements:
+                    yield from self._iosxr_statement(
+                        communities, rd_filters, device, policy, statement, prefix_name_generator,
+                    )

annet/rpl_generators/prefix_lists.py

@@ -1,6 +1,5 @@
 from abc import ABC, abstractmethod
 from collections.abc import Sequence, Iterable
-from ipaddress import ip_interface
 from typing import Any, Literal
 
 from annet.generators import PartialGenerator
@@ -120,3 +119,54 @@ class PrefixListFilterGenerator(PartialGenerator, ABC):
                             continue
                         yield from self._arista_prefix_list("ipv6", plist)
                         processed_names.add(plist.name)
+
+    # Cisco IOS XR
+    def acl_iosxr(self, device: Any):
+        return r"""
+        prefix-set
+            ~ %global=1
+        """
+
+    def _iosxr_prefixlist(self, prefixlist: IpPrefixList):
+        with self.block("prefix-set", prefixlist.name):
+            for n, member in enumerate(prefixlist.members):
+                if n + 1 < len(prefixlist.members):
+                    comma = ","
+                else:
+                    comma = ""
+
+                ge, le = member.or_longer
+                if ge is le is None:
+                    yield f"{member.prefix}{comma}",
+                elif ge is None:
+                    yield f"{member.prefix} le {le}{comma}",
+                elif le is None:
+                    yield f"{member.prefix} ge {ge}{comma}",
+                elif ge == le:
+                    yield f"{member.prefix} eq {ge}{comma}",
+                else:
+                    yield f"{member.prefix} ge {ge} le {le}{comma}",
+
+    def run_iosxr(self, device: Any):
+        prefix_lists = self.get_prefix_lists(device)
+        policies = self.get_policies(device)
+
+        name_generator = PrefixListNameGenerator(prefix_lists, policies)
+        processed_names = set()
+        for policy in policies:
+            for statement in policy.statements:
+                cond: SingleCondition[PrefixMatchValue]
+                for cond in statement.match.find_all(MatchField.ip_prefix):
+                    for name in cond.value.names:
+                        plist = name_generator.get_prefix(name, cond.value)
+                        if plist.name in processed_names:
+                            continue
+                        yield from self._iosxr_prefixlist(plist)
+                        processed_names.add(plist.name)
+                for cond in statement.match.find_all(MatchField.ipv6_prefix):
+                    for name in cond.value.names:
+                        plist = name_generator.get_prefix(name, cond.value)
+                        if plist.name in processed_names:
+                            continue
+                        yield from self._iosxr_prefixlist(plist)
+                        processed_names.add(plist.name)

annet/rpl_generators/rd.py

@@ -38,3 +38,19 @@ class RDFilterFilterGenerator(PartialGenerator, ABC):
             for i, route_distinguisher in enumerate(rd_filter.members):
                 rd_id = (i + 1) * 10 + 5
                 yield "ip rd-filter", rd_filter.number, f"index {rd_id}", "permit", route_distinguisher
+
+    def acl_iosxr(self, _):
+        return r"""
+        rd-set *
+            ~ %global=1
+        """
+
+    def run_iosxr(self, device: Any):
+        for rd_filter in self.get_used_rd_filters(device):
+            with self.block("rd-set", rd_filter.name):
+                for i, route_distinguisher in enumerate(rd_filter.members):
+                    if i + 1 < len(rd_filter.members):
+                        comma = ","
+                    else:
+                        comma = ""
+                    yield f"{route_distinguisher}{comma}",

annet/rulebook/juniper/__init__.py

@@ -3,7 +3,7 @@ import re
 from collections import OrderedDict as odict
 
 from annet.annlib.lib import jun_activate, jun_is_inactive, merge_dicts
-from annet.annlib.tabparser import JuniperFormatter
+from annet.vendors.tabparser import JuniperFormatter
 from annet.annlib.types import Op
 from annet.rulebook import common
 

annet/rulebook/texts/cisco.order

@@ -62,6 +62,8 @@ interface */Vlan\d+/
 interface *
     no switchport
     encapsulation
+    ip vrf forwarding
+    vrf forwarding
     vrf member
     ip
     ipv6

annet/rulebook/texts/iosxr.order

@@ -72,14 +72,31 @@ interface *
 
 interface */\S+\.\d+/
 
-route-map
+
+# all referenced in policy
+as-path-set *
+    ~
+prefix-set *
+    ~
+community-set *
+    ~
+extcommunity-set *
+    ~
+
+route-policy *
+    ~
 
 # удалять eth-trunk можно только после того, как вычистим member interfaces
 undo interface */port-channel\d+/  %order_reverse
 
-# remote as of neighbors should be assigned before peer-group, the rule is applied to neighbors, not peer-groups
+
 router bgp
-    neighbor */[\da-f\.\:]+/ remote-as
-    neighbor */[\da-f\.\:]+/ peer-group
+    bgp ~
+    neighbor-group *
+        ~
+    vrf *
+        ~
+    neighbor *
+        ~
 
 line

annet/vendors/base.py

@@ -3,7 +3,7 @@ from typing import ClassVar
 
 from annet.annlib.command import CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import CommonFormatter
+from annet.vendors.tabparser import CommonFormatter
 
 
 class AbstractVendor(abc.ABC):

annet/vendors/library/arista.py

@@ -1,6 +1,6 @@
 from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import AristaFormatter
+from annet.vendors.tabparser import AristaFormatter
 from annet.vendors.base import AbstractVendor
 from annet.vendors.registry import registry
 

annet/vendors/library/aruba.py

@@ -1,6 +1,6 @@
 from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import ArubaFormatter
+from annet.vendors.tabparser import ArubaFormatter
 from annet.vendors.base import AbstractVendor
 from annet.vendors.registry import registry
 

annet/vendors/library/b4com.py

@@ -1,6 +1,6 @@
 from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import B4comFormatter
+from annet.vendors.tabparser import B4comFormatter
 from annet.vendors.base import AbstractVendor
 from annet.vendors.registry import registry
 

annet/vendors/library/cisco.py

@@ -1,6 +1,6 @@
 from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import CiscoFormatter
+from annet.vendors.tabparser import CiscoFormatter
 from annet.vendors.base import AbstractVendor
 from annet.vendors.registry import registry
 

annet/vendors/library/h3c.py

@@ -1,6 +1,6 @@
 from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import HuaweiFormatter
+from annet.vendors.tabparser import HuaweiFormatter
 from annet.vendors.base import AbstractVendor
 from annet.vendors.registry import registry
 

annet/vendors/library/huawei.py

@@ -1,6 +1,6 @@
 from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import HuaweiFormatter
+from annet.vendors.tabparser import HuaweiFormatter
 from annet.vendors.base import AbstractVendor
 from annet.vendors.registry import registry
 

annet/vendors/library/iosxr.py

@@ -1,6 +1,6 @@
 from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import AsrFormatter
+from annet.vendors.tabparser import AsrFormatter
 from annet.vendors.base import AbstractVendor
 from annet.vendors.registry import registry
 

annet/vendors/library/juniper.py

@@ -1,6 +1,6 @@
 from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import JuniperFormatter
+from annet.vendors.tabparser import JuniperFormatter
 from annet.vendors.base import AbstractVendor
 from annet.vendors.registry import registry
 

annet/vendors/library/nexus.py

@@ -1,6 +1,6 @@
 from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import NexusFormatter
+from annet.vendors.tabparser import NexusFormatter
 from annet.vendors.base import AbstractVendor
 from annet.vendors.registry import registry
 

annet/vendors/library/nokia.py

@@ -1,6 +1,6 @@
 from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import NokiaFormatter
+from annet.vendors.tabparser import NokiaFormatter
 from annet.vendors.base import AbstractVendor
 from annet.vendors.registry import registry
 

annet/vendors/library/optixtrans.py

@@ -1,5 +1,5 @@
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import OptixtransFormatter
+from annet.vendors.tabparser import OptixtransFormatter
 from annet.vendors.registry import registry
 
 from .huawei import HuaweiVendor

annet/vendors/library/pc.py

@@ -2,7 +2,7 @@ import os
 
 from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import CommonFormatter
+from annet.vendors.tabparser import CommonFormatter
 from annet.vendors.base import AbstractVendor
 from annet.vendors.registry import registry
 

annet/vendors/library/ribbon.py

@@ -1,6 +1,6 @@
 from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import RibbonFormatter
+from annet.vendors.tabparser import RibbonFormatter
 from annet.vendors.base import AbstractVendor
 from annet.vendors.registry import registry
 

annet/vendors/library/routeros.py

@@ -1,6 +1,6 @@
 from annet.annlib.command import Command, CommandList
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.tabparser import RosFormatter
+from annet.vendors.tabparser import RosFormatter
 from annet.vendors.base import AbstractVendor
 from annet.vendors.registry import registry