diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-09-16 15:43:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-16 15:43:17 +0100 |
| commit | 78b961810ac346e9083659b29ada26e35dec95a1 (patch) | |
| tree | f83c49a50b2ea0dc8b9cf1c2a12449fcce2b3b79 /src | |
| parent | 8b0c9b7f7d54c876e12552296a4967f24d09afe9 (diff) | |
| parent | 8890dd18a689f5c490e9444bc3036d6176b32b7a (diff) | |
| download | vyos-1x-78b961810ac346e9083659b29ada26e35dec95a1.tar.gz vyos-1x-78b961810ac346e9083659b29ada26e35dec95a1.zip | |
Merge pull request #4696 from natali-rs1985/T7783
T7783: T7786: VPP clarify error messages for CPU requirements
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/vpp.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/conf_mode/vpp.py b/src/conf_mode/vpp.py index 518860605..307c25df4 100755 --- a/src/conf_mode/vpp.py +++ b/src/conf_mode/vpp.py @@ -390,7 +390,6 @@ def verify(config): raise ConfigError('"settings interface" is required but not set!') # check if the system meets minimal requirements - verify_vpp_minimum_cpus() verify_vpp_minimum_memory() # check if Ethernet interfaces exist @@ -400,9 +399,12 @@ def verify(config): raise ConfigError(f'Interface {iface} does not exist or is not Ethernet!') # Resource usage checks - if 'cpu' in config['settings']: - cpu_settings = config['settings']['cpu'] + cpu_settings = config['settings'].get('cpu', {}) + + if not any(key in cpu_settings for key in ('workers', 'corelist_workers')): + verify_vpp_minimum_cpus() + if 'cpu' in config['settings']: # Check if there are enough CPU cores to skip according to config if 'skip_cores' in cpu_settings: skip_cores = int(cpu_settings['skip_cores']) |