summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-02-10 21:05:54 +0100
committerChristian Poessinger <christian@poessinger.com>2021-02-10 21:05:54 +0100
commit5a98ca315ef96d4553c1530a1bb66d5458f38fe8 (patch)
tree2ff8db68d7195e2bec1a43cb25d60642e126ff9f
parenta72ea95cb276e13713e4a6433707e368ce8ee8fa (diff)
downloadvyos-1x-5a98ca315ef96d4553c1530a1bb66d5458f38fe8.tar.gz
vyos-1x-5a98ca315ef96d4553c1530a1bb66d5458f38fe8.zip
smoketest: static-routes: enable VRF table leaking test
As we have upgrade to FRR 7.5 in current the issue within FRR vtysh [1] is fixed. [1]: https://github.com/FRRouting/frr/issues/8016
-rwxr-xr-xsmoketest/scripts/cli/test_protocols_static.py26
1 files changed, 8 insertions, 18 deletions
diff --git a/smoketest/scripts/cli/test_protocols_static.py b/smoketest/scripts/cli/test_protocols_static.py
index a4c320a62..cf591f060 100755
--- a/smoketest/scripts/cli/test_protocols_static.py
+++ b/smoketest/scripts/cli/test_protocols_static.py
@@ -212,11 +212,8 @@ class StaticRouteTest(unittest.TestCase):
self.session.set(base + ['next-hop', next_hop, 'distance', next_hop_config['distance']])
if 'interface' in next_hop_config:
self.session.set(base + ['next-hop', next_hop, 'interface', next_hop_config['interface']])
-
- # This is currently not supported because of an FRR issue:
- # https://github.com/FRRouting/frr/issues/8016
- # if 'vrf' in next_hop_config:
- # self.session.set(base + ['next-hop', next_hop, 'vrf', next_hop_config['vrf']])
+ if 'vrf' in next_hop_config:
+ self.session.set(base + ['next-hop', next_hop, 'vrf', next_hop_config['vrf']])
if 'interface' in route_config:
@@ -226,11 +223,8 @@ class StaticRouteTest(unittest.TestCase):
self.session.set(base + ['interface', interface, 'disable'])
if 'distance' in interface_config:
self.session.set(base + ['interface', interface, 'distance', interface_config['distance']])
-
- # This is currently not supported because of an FRR issue:
- # https://github.com/FRRouting/frr/issues/8016
- # if 'vrf' in interface_config:
- # self.session.set(base + ['interface', interface, 'vrf', interface_config['vrf']])
+ if 'vrf' in interface_config:
+ self.session.set(base + ['interface', interface, 'vrf', interface_config['vrf']])
if 'blackhole' in route_config:
self.session.set(base + ['blackhole'])
@@ -259,10 +253,8 @@ class StaticRouteTest(unittest.TestCase):
tmp += ' ' + next_hop_config['interface']
if 'distance' in next_hop_config:
tmp += ' ' + next_hop_config['distance']
- # This is currently not supported because of an FRR issue:
- # https://github.com/FRRouting/frr/issues/8016
- # if 'vrf' in next_hop_config:
- # tmp += ' nexthop-vrf ' + next_hop_config['vrf']
+ if 'vrf' in next_hop_config:
+ tmp += ' nexthop-vrf ' + next_hop_config['vrf']
tmp += ' table ' + table
if 'disable' in next_hop_config:
@@ -277,10 +269,8 @@ class StaticRouteTest(unittest.TestCase):
tmp += ' ' + interface_config['interface']
if 'distance' in interface_config:
tmp += ' ' + interface_config['distance']
- # This is currently not supported because of an FRR issue:
- # https://github.com/FRRouting/frr/issues/8016
- # if 'vrf' in interface_config:
- # tmp += ' nexthop-vrf ' + interface_config['vrf']
+ if 'vrf' in interface_config:
+ tmp += ' nexthop-vrf ' + interface_config['vrf']
tmp += ' table ' + table
if 'disable' in interface_config: