Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vyos/vyos-vpp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f680364c3ff28b6f108faff00e0972db9c02028b
Choose a base ref
..
head repository: vyos/vyos-vpp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1659d7b60ee1128c365c597ee85697c051c23e4b
Choose a head ref
Showing with 6 additions and 6 deletions.
  1. +1 −1 data/templates/vpp/startup.conf.j2
  2. +2 −2 interface-definitions/vpp.xml.in
  3. +2 −2 smoketest/scripts/cli/test_vpp.py
  4. +1 −1 src/conf_mode/vpp.py
2 changes: 1 addition & 1 deletion data/templates/vpp/startup.conf.j2
View file
Original file line number Diff line number Diff line change
@@ -110,7 +110,7 @@ plugins {
linux-cp {
lcp-sync
lcp-auto-subint
{% if lcp.disable_route_no_paths is not vyos_defined %}
{% if lcp.ignore_kernel_routes is not vyos_defined %}
route-no-paths
{% endif %}
}
4 changes: 2 additions & 2 deletions interface-definitions/vpp.xml.in
View file
Original file line number Diff line number Diff line change
@@ -643,9 +643,9 @@
</leafNode>
</children>
</node>
<leafNode name="disable-route-no-paths">
<leafNode name="ignore-kernel-routes">
<properties>
<help>Disable route no paths option</help>
<help>Ignore kernel routes</help>
<valueless/>
</properties>
</leafNode>
4 changes: 2 additions & 2 deletions smoketest/scripts/cli/test_vpp.py
View file
Original file line number Diff line number Diff line change
@@ -101,10 +101,10 @@ def test_01_vpp_basic(self):
required_str = 'lcp route-no-paths on'
self.assertIn(required_str, out)

self.cli_set(base_path + ['settings', 'lcp', 'disable-route-no-paths'])
self.cli_set(base_path + ['settings', 'lcp', 'ignore-kernel-routes'])
self.cli_commit()

# check disabled 'route not path'
# check disabled 'route no path'
_, out = rc_cmd('sudo vppctl show lcp')
required_str = 'lcp route-no-paths off'
self.assertIn(required_str, out)
2 changes: 1 addition & 1 deletion src/conf_mode/vpp.py
View file
Original file line number Diff line number Diff line change
@@ -471,7 +471,7 @@ def apply(config):
# immediately after the service restart
vpp_control = VPPControl(attempts=20, interval=500)
# preconfigure LCP plugin
if 'disable_route_no_paths' in config.get('settings', {}).get('lcp', {}):
if 'ignore_kernel_routes' in config.get('settings', {}).get('lcp', {}):
vpp_control.cli_cmd('lcp param route-no-paths off')
else:
vpp_control.cli_cmd('lcp param route-no-paths on')