Remove s350_base_interfaces custom map - it is allready in napalm base

This commit is contained in:
Petr Klima committed 2024-03-29 16:58:16 +01:00
1 parent c4a36239f6
commit 971310b790
1 file changed
+8 -16
+8 -16
View File
@@ -38,14 +38,6 @@ from napalm.base.netmiko_helpers import netmiko_args
import napalm.base.constants as C
import napalm.base.canonical_map
# make may own base_interfaces for s350
s350_base_interfaces = {
**napalm.base.canonical_map.base_interfaces,
"fa": "FastEthernet",
"gi": "GigabitEthernet",
"te": "TengigabitEthernet",
}
from typing import List
@@ -152,7 +144,7 @@ class S350Driver(NetworkDriver):
else:
raise ValueError("Unexpected output: {}".format(line.split()))
interface = canonical_interface_name(interface, s350_base_interfaces)
interface = canonical_interface_name(interface)
entry = {
"interface": interface,
@@ -271,7 +263,7 @@ class S350Driver(NetworkDriver):
if not line:
continue
interface = line.split()[0]
interface = canonical_interface_name(interface, s350_base_interfaces)
interface = canonical_interface_name(interface)
interfaces.append(str(interface))
@@ -451,7 +443,7 @@ class S350Driver(NetworkDriver):
"mac_address": napalm.base.helpers.mac(mac),
}
interface = canonical_interface_name(interface, s350_base_interfaces)
interface = canonical_interface_name(interface)
interfaces[interface] = entry
@@ -489,7 +481,7 @@ class S350Driver(NetworkDriver):
ip = netaddr.IPNetwork(cidr)
family = "ipv{0}".format(ip.version)
interface = canonical_interface_name(interface, s350_base_interfaces)
interface = canonical_interface_name(interface)
interfaces[interface] = {family: {str(ip.ip): {"prefix_length": ip.prefixlen}}}
@@ -547,7 +539,7 @@ class S350Driver(NetworkDriver):
remote_port = line_elems[2]
remote_name = line_elems[3]
local_port = canonical_interface_name(local_port, s350_base_interfaces)
local_port = canonical_interface_name(local_port)
neighbor = {
"hostname": remote_name,
@@ -601,14 +593,14 @@ class S350Driver(NetworkDriver):
if interface:
if interface == local_port:
entry = self._get_lldp_neighbors_detail_parse(local_port)
local_port = canonical_interface_name(local_port, s350_base_interfaces)
local_port = canonical_interface_name(local_port)
details[local_port] = [
entry,
]
else:
entry = self._get_lldp_neighbors_detail_parse(local_port)
local_port = canonical_interface_name(local_port, s350_base_interfaces)
local_port = canonical_interface_name(local_port)
details[local_port] = [
entry,
]
@@ -643,7 +635,7 @@ class S350Driver(NetworkDriver):
elif line.startswith("Capabilities"):
caps = self._get_lldp_neighbors_detail_capabilities_parse(line)
remote_port_id = canonical_interface_name(remote_port_id, s350_base_interfaces)
remote_port_id = canonical_interface_name(remote_port_id)
entry = {
"parent_interface": "N/A",