Skip to content
This repository was archived by the owner on Aug 15, 2025. It is now read-only.

Conversation

@natali-rs1985
Copy link
Contributor

Change Summary

We now use different approach for tests and live environment (we retrieve Hugepages from config, not from the system).
Thanks to the recent changes vyos/vyos-build#984 we can avoid the difference in the behaviour

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Other (please describe):

Related Task(s)

Related PR(s)

Proposed changes

How to test

vyos@vyos:~$ /usr/libexec/vyos/tests/smoke/cli/test_vpp.py
test_01_vpp_basic (__main__.TestVPP.test_01_vpp_basic) ... ok
test_02_vpp_vxlan (__main__.TestVPP.test_02_vpp_vxlan) ... ok
test_03_vpp_gre (__main__.TestVPP.test_03_vpp_gre) ... ok
test_04_vpp_geneve (__main__.TestVPP.test_04_vpp_geneve) ... skipped 'Skipping this test geneve index always is 0'
test_05_vpp_loopback (__main__.TestVPP.test_05_vpp_loopback) ... ok
test_06_vpp_bonding (__main__.TestVPP.test_06_vpp_bonding) ... skipped 'Skipping temporary bonding, sometimes get recursion T7117'
test_07_vpp_bridge (__main__.TestVPP.test_07_vpp_bridge) ... ok
test_08_vpp_ipip (__main__.TestVPP.test_08_vpp_ipip) ... ok
test_09_vpp_xconnect (__main__.TestVPP.test_09_vpp_xconnect) ... ok
test_10_vpp_driver_options (__main__.TestVPP.test_10_vpp_driver_options) ... ok
test_11_vpp_cpu_settings (__main__.TestVPP.test_11_vpp_cpu_settings) ... ok
test_12_vpp_cpu_corelist_workers (__main__.TestVPP.test_12_vpp_cpu_corelist_workers) ... ok
test_13_1_buffer_page_size (__main__.TestVPP.test_13_1_buffer_page_size) ... ok
test_13_2_statseg_page_size (__main__.TestVPP.test_13_2_statseg_page_size) ... ok
test_13_3_mem_page_size (__main__.TestVPP.test_13_3_mem_page_size) ... skipped 'Skipping'
test_14_mem_default_hugepage (__main__.TestVPP.test_14_mem_default_hugepage) ... ok
test_15_vpp_ipsec_xfrm_nl (__main__.TestVPP.test_15_vpp_ipsec_xfrm_nl) ... ok
test_16_vpp_cgnat (__main__.TestVPP.test_16_vpp_cgnat) ... ok
test_17_vpp_nat (__main__.TestVPP.test_17_vpp_nat) ... ok

----------------------------------------------------------------------
Ran 19 tests in 699.199s

OK (skipped=3)

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR centralizes resource default values into a static map and removes smoke-test–specific kernel memory settings in VPP tests.

  • Tests no longer inject kernel memory config and rely on the unified default_resource_map.
  • config_verify.py, memory.py, and cpu.py now use default_resource_map instead of dynamic defaults.
  • The smoke-test helper get_resource_defaults and related logic have been removed in favor of a single default_resource_map.

Reviewed Changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
smoketest/scripts/cli/test_vpp.py Removed kernel memory CLI settings and cleanup in tests
python/vyos/vpp/config_verify.py Switched to default_resource_map for min_cpus/min_memory
python/vyos/vpp/config_resource_checks/resource_defaults.py Replaced dynamic defaults with a static default_resource_map
python/vyos/vpp/config_resource_checks/memory.py Updated memory checks to use default_resource_map
python/vyos/vpp/config_resource_checks/cpu.py Updated CPU checks to use default_resource_map

@dmbaturin dmbaturin merged commit fce4f84 into vyos-legacy:current Jul 8, 2025
1 check passed
natali-rs1985 added a commit to natali-rs1985/vyos-vpp that referenced this pull request Aug 1, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants