From b41a5324c12b3cc60aa0ddc126a3818dcb76085b Mon Sep 17 00:00:00 2001
From: Pau Nadeu Rabat <pau.nadeu@everywan.com>
Date: Mon, 18 Jan 2021 21:26:19 +0100
Subject: [PATCH] Removing Vrf from Commands for Sros

---
 hyperglass/models/commands/nokia_sros.py | 40 ++++++++++++------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/hyperglass/models/commands/nokia_sros.py b/hyperglass/models/commands/nokia_sros.py
index 5cc7f4e..231e5a0 100644
--- a/hyperglass/models/commands/nokia_sros.py
+++ b/hyperglass/models/commands/nokia_sros.py
@@ -10,36 +10,36 @@ from .common import CommandSet, CommandGroup
 class _IPv4(CommandSet):
     """Default commands for ipv4 commands."""
 
-    bgp_community: StrictStr = "/show router {vrf} bgp routes community {target}"
-    bgp_aspath: StrictStr = '/show router {vrf} bgp routes aspath-regex {target}'
-    bgp_route: StrictStr = "/show router {vrf} bgp routes {target} ipv4 hunt"
-    ping: StrictStr = "/ping {target} router-instance {vrf} source-address {source}"
-    traceroute: StrictStr = "traceroute: /traceroute {target} router-instance {vrf} source-address {source} wait 2 seconds"
+    bgp_community: StrictStr = "/show router bgp routes community {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} router-instance  source-address {source}"
+    traceroute: StrictStr = "traceroute: /traceroute {target} router-instance  source-address {source} wait 2 seconds"
 
 
 class _IPv6(CommandSet):
     """Default commands for ipv6 commands."""
-    bgp_community: StrictStr = "/show router {vrf} bgp routes community {target}"
-    bgp_aspath: StrictStr = '/show router {vrf} bgp routes aspath-regex {target}'
-    bgp_route: StrictStr = "/show router {vrf} bgp routes {target} ipv6 hunt"
-    ping: StrictStr = "/ping {target} router-instance {vrf} source-address {source}"
-    traceroute: StrictStr = "traceroute: /traceroute {target} router-instance {vrf} source-address {source} wait 2 seconds"
+    bgp_community: StrictStr = "/show router bgp routes community {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} router-instance  source-address {source}"
+    traceroute: StrictStr = "traceroute: /traceroute {target} router-instance  source-address {source} wait 2 seconds"
 
 class _VPNIPv4(CommandSet):
     """Default commands for dual afi commands."""
-    bgp_community: StrictStr = "/show router {vrf} bgp routes community {target}"
-    bgp_aspath: StrictStr = '/show router {vrf} bgp routes aspath-regex {target}'
-    bgp_route: StrictStr = "/show router {vrf} bgp routes {target} vpn-ipv4 hunt"
-    ping: StrictStr = "/ping {target} router-instance {vrf} source-address {source}"
-    traceroute: StrictStr = "traceroute: /traceroute {target} router-instance {vrf} source-address {source} wait 2 seconds"
+    bgp_community: StrictStr = "/show router bgp routes community {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} router-instance  source-address {source}"
+    traceroute: StrictStr = "traceroute: /traceroute {target} router-instance  source-address {source} wait 2 seconds"
 
 class _VPNIPv6(CommandSet):
     """Default commands for dual afi commands."""
-    bgp_community: StrictStr = "/show router {vrf} bgp routes community {target}"
-    bgp_aspath: StrictStr = '/show router {vrf} bgp routes aspath-regex {target}'
-    bgp_route: StrictStr = "/show router {vrf} bgp routes {target} vpn-ipv6 hunt"
-    ping: StrictStr = "/ping {target} router-instance {vrf} source-address {source}"
-    traceroute: StrictStr = "traceroute: /traceroute {target} router-instance {vrf} source-address {source} wait 2 seconds"
+    bgp_community: StrictStr = "/show router bgp routes community {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} router-instance  source-address {source}"
+    traceroute: StrictStr = "traceroute: /traceroute {target} router-instance  source-address {source} wait 2 seconds"
 
 class NokiaSROSCommands(CommandGroup):
     """Validation model for default nokia_sros commands."""