From ad7db8acebc36ce4ebd15f793773d26f70b3dba8 Mon Sep 17 00:00:00 2001 From: checktheroads Date: Mon, 18 Jan 2021 14:06:03 -0700 Subject: [PATCH] fix formatting --- README.md | 2 +- hyperglass/models/commands/__init__.py | 6 ++--- hyperglass/models/commands/nokia_sros.py | 28 ++++++++++-------------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 1d52b8a..3cb9ca4 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,9 @@ hyperglass is intended to make implementing a looking glass too easy not to do, - Huawei - Juniper JunOS - Mikrotik + - Nokia SR OS - TNSR - VyOS - - Nokia SR OS - Configurable support for any other [supported platform](https://hyperglass.io/docs/platforms) - Optionally access devices via an SSH proxy/jump server - VRF support diff --git a/hyperglass/models/commands/__init__.py b/hyperglass/models/commands/__init__.py index efbf4ef..9ca62df 100644 --- a/hyperglass/models/commands/__init__.py +++ b/hyperglass/models/commands/__init__.py @@ -11,9 +11,9 @@ from .juniper import JuniperCommands from .cisco_xr import CiscoXRCommands from .cisco_ios import CiscoIOSCommands from .cisco_nxos import CiscoNXOSCommands +from .nokia_sros import NokiaSROSCommands from .mikrotik_routeros import MikrotikRouterOS from .mikrotik_switchos import MikrotikSwitchOS -from .nokia_sros import NokiaSROSCommands _NOS_MAP = { "arista": AristaCommands, @@ -24,9 +24,9 @@ _NOS_MAP = { "juniper": JuniperCommands, "mikrotik_routeros": MikrotikRouterOS, "mikrotik_switchos": MikrotikSwitchOS, + "nokia_sros": NokiaSROSCommands, "tnsr": TNSRCommands, "vyos": VyosCommands, - "nokia_sros": NokiaSROSCommands, } @@ -41,9 +41,9 @@ class Commands(HyperglassModelExtra): huawei: CommandGroup = HuaweiCommands() mikrotik_routeros: CommandGroup = MikrotikRouterOS() mikrotik_switchos: CommandGroup = MikrotikSwitchOS() + nokia_sros: CommandGroup = NokiaSROSCommands() tnsr: CommandGroup = TNSRCommands() vyos: CommandGroup = VyosCommands() - nokia_sros: CommandGroup = NokiaSROSCommands() @classmethod def import_params(cls, **input_params): diff --git a/hyperglass/models/commands/nokia_sros.py b/hyperglass/models/commands/nokia_sros.py index 0a869d2..bc8d5b6 100644 --- a/hyperglass/models/commands/nokia_sros.py +++ b/hyperglass/models/commands/nokia_sros.py @@ -9,46 +9,42 @@ from .common import CommandSet, CommandGroup class _IPv4(CommandSet): """Default commands for ipv4 commands.""" + bgp_community: StrictStr = "/show router bgp routes community {target}" - bgp_aspath: StrictStr = '/show router bgp routes aspath-regex {target}' + bgp_aspath: StrictStr = "/show router bgp routes aspath-regex {target}" bgp_route: StrictStr = "/show router bgp routes {target} ipv4 hunt" ping: StrictStr = "/ping {target} source-address {source}" - traceroute: StrictStr = ( - "/traceroute {target} source-address {source} wait 2 seconds" - ) + traceroute: StrictStr = "/traceroute {target} source-address {source} wait 2 seconds" class _IPv6(CommandSet): """Default commands for ipv6 commands.""" + bgp_community: StrictStr = "/show router bgp routes community {target}" - bgp_aspath: StrictStr = '/show router bgp routes aspath-regex {target}' + bgp_aspath: StrictStr = "/show router bgp routes aspath-regex {target}" bgp_route: StrictStr = "/show router bgp routes {target} ipv6 hunt" ping: StrictStr = "/ping {target} source-address {source}" - traceroute: StrictStr = ( - "/traceroute {target} source-address {source} wait 2 seconds" - ) + traceroute: StrictStr = "/traceroute {target} source-address {source} wait 2 seconds" class _VPNIPv4(CommandSet): """Default commands for dual afi commands.""" + bgp_community: StrictStr = "/show router bgp routes community {target}" - bgp_aspath: StrictStr = '/show router bgp routes aspath-regex {target}' + bgp_aspath: StrictStr = "/show router bgp routes aspath-regex {target}" bgp_route: StrictStr = "/show router bgp routes {target} vpn-ipv4 hunt" ping: StrictStr = "/ping {target} source-address {source}" - traceroute: StrictStr = ( - "/traceroute {target} source-address {source} wait 2 seconds" - ) + traceroute: StrictStr = "/traceroute {target} source-address {source} wait 2 seconds" class _VPNIPv6(CommandSet): """Default commands for dual afi commands.""" + bgp_community: StrictStr = "/show router bgp routes community {target}" - bgp_aspath: StrictStr = '/show router bgp routes aspath-regex {target}' + bgp_aspath: StrictStr = "/show router bgp routes aspath-regex {target}" bgp_route: StrictStr = "/show router bgp routes {target} vpn-ipv6 hunt" ping: StrictStr = "/ping {target} source-address {source}" - traceroute: StrictStr = ( - "/traceroute {target} source-address {source} wait 2 seconds" - ) + traceroute: StrictStr = "/traceroute {target} source-address {source} wait 2 seconds" class NokiaSROSCommands(CommandGroup):