diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-02-19 16:16:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-19 16:16:46 +0100 |
| commit | 388fecf3cfb7729dbd18162a19f84b08afea4afd (patch) | |
| tree | a82f01805b3e3e298b5d5933907305ec5dc7de4d /src/conf_mode | |
| parent | c386550aa8dd07026eba25bf40323c8d2439b6e2 (diff) | |
| parent | a9070f1d5770241a46c4632528fef86edaba8392 (diff) | |
| download | vyos-1x-388fecf3cfb7729dbd18162a19f84b08afea4afd.tar.gz vyos-1x-388fecf3cfb7729dbd18162a19f84b08afea4afd.zip | |
Merge pull request #4997 from natali-rs1985/T8261
vpp: T8261: Refactor resource settings into 'resource-allocation' section
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/vpp.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/conf_mode/vpp.py b/src/conf_mode/vpp.py index d436fbe6b..b02c809ec 100755 --- a/src/conf_mode/vpp.py +++ b/src/conf_mode/vpp.py @@ -170,9 +170,14 @@ def _configure_vpp_cpu_settings(config: dict): def _normalize_buffers(config: dict): """Replace 'auto' buffers_per_numa with calculated value""" - if config['settings']['buffers']['buffers_per_numa'] == 'auto': + if ( + config['settings']['resource_allocation']['buffers']['buffers_per_numa'] + == 'auto' + ): buffers = memory.buffers_required(config['settings']) - config['settings']['buffers']['buffers_per_numa'] = str(buffers) + config['settings']['resource_allocation']['buffers']['buffers_per_numa'] = str( + buffers + ) def _get_max_xdp_rx_queues(config: dict): @@ -770,7 +775,9 @@ def apply(config): vpp_control = VPPControl() # preconfigure LCP plugin - if 'ignore_kernel_routes' in config.get('settings', {}).get('lcp', {}): + if 'ignore_kernel_routes' in config['settings'].get( + 'resource_allocation', {} + ): vpp_control.cli_cmd('lcp param route-no-paths off') else: vpp_control.cli_cmd('lcp param route-no-paths on') |