Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

container: T6406: fix NameError: name 'vyos' is not defined (backport #3547) #3554

Merged
merged 1 commit into from
May 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 30, 2024

Change Summary

Commit 7491056 ("T6406: rename cpus to cpu") did not import the function from the Python module. @nvollmar

Traceback (most recent call last):
  File "/usr/libexec/vyos/conf_mode/container.py", line 490, in <module>
    verify(c)
  File "/usr/libexec/vyos/conf_mode/container.py", line 132, in verify
    cores = vyos.cpu.get_core_count()
            ^^^^
NameError: name 'vyos' is not defined

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)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

Component(s) name

container

Proposed changes

How to test

Smoketest result

vyos@vyos:~$ /usr/libexec/vyos/tests/smoke/cli/test_container.py
test_basic (__main__.TestContainer.test_basic) ... ok
test_cpu_limit (__main__.TestContainer.test_cpu_limit) ... ok
test_dual_stack_network (__main__.TestContainer.test_dual_stack_network) ... ok
test_ipv4_network (__main__.TestContainer.test_ipv4_network) ... ok
test_ipv6_network (__main__.TestContainer.test_ipv6_network) ... ok
test_uid_gid (__main__.TestContainer.test_uid_gid) ... ok

----------------------------------------------------------------------
Ran 6 tests in 114.165s

OK

Checklist:

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

This is an automatic backport of pull request #3547 done by [Mergify](https://mergify.com).

Commit 7491056 ("T6406: rename cpus to cpu") did not import the function
from the Python module.

(cherry picked from commit 8439f8a)
@mergify mergify bot requested a review from a team as a code owner May 30, 2024 11:45
@github-actions github-actions bot added the sagitta VyOS 1.4 LTS label May 30, 2024
@c-po c-po enabled auto-merge May 30, 2024 12:03
@c-po c-po merged commit 8facd62 into sagitta May 30, 2024
6 checks passed
@mergify mergify bot deleted the mergify/bp/sagitta/pr-3547 branch May 30, 2024 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sagitta VyOS 1.4 LTS
Development

Successfully merging this pull request may close these issues.

2 participants