diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2025-06-25 16:35:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-25 16:35:09 +0300 |
| commit | 017de519b38ff48249f986a0584f28d8ca9e3d69 (patch) | |
| tree | 4da9834a91d842ebb57b60d7ca52c4e2b6e6de79 | |
| parent | 6eb93578a33f27007c4ecda8b71efbd880a97653 (diff) | |
| parent | 1c94f3a6a6b92b629ca5a886c92ee6463e85e121 (diff) | |
| download | vyos-1x-017de519b38ff48249f986a0584f28d8ca9e3d69.tar.gz vyos-1x-017de519b38ff48249f986a0584f28d8ca9e3d69.zip | |
Merge pull request #40 from natali-rs1985/T7424-fix
T7424: Add missing hugepage memory configuration for config load tests
| -rw-r--r-- | python/vyos/vpp/config_verify.py | 2 | ||||
| -rw-r--r-- | smoketest/config-tests/vpp | 1 | ||||
| -rw-r--r-- | smoketest/configs/vpp | 7 |
3 files changed, 9 insertions, 1 deletions
diff --git a/python/vyos/vpp/config_verify.py b/python/vyos/vpp/config_verify.py index 9cfbfb7cd..4505d205f 100644 --- a/python/vyos/vpp/config_verify.py +++ b/python/vyos/vpp/config_verify.py @@ -252,7 +252,7 @@ def verify_vpp_memory(config: dict): if memory_required > available_memory: raise ConfigError( - 'Not enough free memory to start VPP: ' + 'Not enough free hugepage memory to start VPP: ' f'available: {round(available_memory / 1024 ** 3, 1)} GB, ' f'required: {round(memory_required / 1024 ** 3, 1)} GB. ' 'Please add kernel memory options for HugePages and reboot' diff --git a/smoketest/config-tests/vpp b/smoketest/config-tests/vpp index 50d13990c..e42568965 100644 --- a/smoketest/config-tests/vpp +++ b/smoketest/config-tests/vpp @@ -15,6 +15,7 @@ set system console device ttyS0 speed '115200' set system host-name 'r16' set system login user vyos authentication encrypted-password '$6$rounds=656000$FZBlGpWsmSrV2Rvq$YPNAPtk4k6u99FAMxR6cw4DUPCgOomwCgRZRSO5rAoJK8RlMSCkVAFVF3ozL/3mZMfxcuCnwvd5HX6f9V5KzO.' set system name-server '203.0.113.1' +set system option kernel memory hugepage-size 2M hugepage-count '2048' set system option time-format '24-hour' set system syslog local facility all level 'info' set system syslog local facility local7 level 'debug' diff --git a/smoketest/configs/vpp b/smoketest/configs/vpp index e2223bc02..472c2919b 100644 --- a/smoketest/configs/vpp +++ b/smoketest/configs/vpp @@ -42,6 +42,13 @@ system { } name-server "203.0.113.1" option { + kernel { + memory { + hugepage-size 2M { + hugepage-count "2048" + } + } + } time-format "24-hour" } syslog { |