From 9c16a0055a7645980b05c61d22705c42d449895b Mon Sep 17 00:00:00 2001 From: Wieger Bontekoe Date: Sun, 31 Mar 2024 11:53:46 +0200 Subject: [PATCH] Update vyos.py Remove logging --- napalm_vyos/vyos.py | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/napalm_vyos/vyos.py b/napalm_vyos/vyos.py index be4fca7..6ab5e12 100644 --- a/napalm_vyos/vyos.py +++ b/napalm_vyos/vyos.py @@ -25,9 +25,6 @@ import re import tempfile import vyattaconfparser -from django.core.cache import cache - -cache.clear() # NAPALM base import napalm.base.constants as C @@ -40,9 +37,6 @@ from napalm.base.exceptions import ( ) from netmiko import ConnectHandler, SCPConn, __version__ as netmiko_version -logger = logging.getLogger("peering.manager.peering") - - class VyOSDriver(NetworkDriver): _MINUTE_SECONDS = 60 @@ -452,16 +446,14 @@ class VyOSDriver(NetworkDriver): 192.168.1.3 4 64521 7132 7103 0 0 0 4d21h05m 0 192.168.1.4 4 64522 0 0 0 0 0 never Active """ - logger.warning("GET BGP PEERS") output = self.device.send_command("show ip bgp summary") output = output.split("\n") - logger.warning(output[2]) + match = re.search( r".* router identifier (\d+\.\d+\.\d+\.\d+), local AS number (\d+)", output[2], ) if not match: - logger.warning("BGP neighbor parsing failed") return {} router_id = match[1] local_as = int(match[2]) @@ -472,9 +464,7 @@ class VyOSDriver(NetworkDriver): # delete the header and empty element bgp_info = [i.strip() for i in output[9:-2] if i] - logger.warning("Got BGP information") - logger.warning("STRIPPING:") - logger.warning(bgp_info) + for i in bgp_info: if len(i) > 0: values = i.split() @@ -491,8 +481,6 @@ class VyOSDriver(NetworkDriver): state_prefix, ) = values[:10] - logger.warning("PEER ID: %s" % peer_id) - is_enabled = "(Admin)" not in state_prefix received_prefixes = None @@ -513,8 +501,6 @@ class VyOSDriver(NetworkDriver): else: raise ValueError("BGP neighbor parsing failed") - logger.warning("SHOW IP BGP NEIGHBORS %s" % peer_id) - """ 'show ip bgp neighbors 192.168.1.1' output example: BGP neighbor is 192.168.1.1, remote AS 64519, local AS 64520, external link @@ -560,8 +546,7 @@ class VyOSDriver(NetworkDriver): } peer_dict["address_family"] = af_dict bgp_neighbor_data["global"]["peers"][peer_id] = peer_dict - logger.warning("Returning BGP data") - logger.warning(bgp_neighbor_data) + return bgp_neighbor_data import re