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

T6555: openvpn: fix inclusion of data-ciphers for server bridge test #4063

Merged

Conversation

Crushable1278
Copy link

@Crushable1278 Crushable1278 commented Sep 13, 2024

Change Summary

Commit dc1da7c ("OPENVPN: T6555: add server-bridge options in mode server") added a new smoketest which used the data-ciphers command which is new starting with VyOS 1.5, where VyOS 1.4 expects ncp-ciphers.

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)

OPENVPN: T6555: add server-bridge options in mode server (backport #3920) #4037

Component(s) name

test_interfaces_openvpn.py:test_openvpn_server_server_bridge smoketest

Proposed changes

Change the invalid configuration path data-ciphers to the valid-for-VyOS 1.4 ncp-ciphers.

How to test

conf
set interfaces openvpn vtun5010 encryption data-ciphers aes192

Observe the produced error:

  Configuration path: interfaces openvpn vtun5010 encryption [data-ciphers] is not valid
  Set failed

or execute /usr/libexec/vyos/tests/smoke/cli/test_interfaces_openvpn.py

DEBUG - Running Testcase: /usr/libexec/vyos/tests/smoke/cli/test_interfaces_openvpn.py
DEBUG - test_openvpn_client_interfaces (__main__.TestInterfacesOpenVPN.test_openvpn_client_interfaces) ... ok
DEBUG - test_openvpn_client_verify (__main__.TestInterfacesOpenVPN.test_openvpn_client_verify) ... ok
DEBUG - test_openvpn_options (__main__.TestInterfacesOpenVPN.test_openvpn_options) ... ok
DEBUG - test_openvpn_server_server_bridge (__main__.TestInterfacesOpenVPN.test_openvpn_server_server_bridge) ... ERROR
DEBUG - test_openvpn_server_subnet_topology (__main__.TestInterfacesOpenVPN.test_openvpn_server_subnet_topology) ... ok
DEBUG - test_openvpn_server_verify (__main__.TestInterfacesOpenVPN.test_openvpn_server_verify) ... ok
DEBUG - test_openvpn_site2site_interfaces_tun (__main__.TestInterfacesOpenVPN.test_openvpn_site2site_interfaces_tun) ... ok
DEBUG - test_openvpn_site2site_verify (__main__.TestInterfacesOpenVPN.test_openvpn_site2site_verify) ... ok
DEBUG - 
DEBUG - ======================================================================
DEBUG - ERROR: test_openvpn_server_server_bridge (__main__.TestInterfacesOpenVPN.test_openvpn_server_server_bridge)
DEBUG - ----------------------------------------------------------------------
DEBUG - Traceback (most recent call last):
DEBUG -   File "/usr/libexec/vyos/tests/smoke/cli/test_interfaces_openvpn.py", line 628, in test_openvpn_server_server_bridge
DEBUG -     self.cli_set(path + ['encryption', 'data-ciphers', 'aes192'])
DEBUG -   File "/usr/libexec/vyos/tests/smoke/cli/base_vyostest_shim.py", line 71, in cli_set
DEBUG -     self._session.set(config)
DEBUG -   File "/usr/lib/python3/dist-packages/vyos/configsession.py", line 154, in set
DEBUG -     self.__run_command([SET] + path + value)
DEBUG -   File "/usr/lib/python3/dist-packages/vyos/configsession.py", line 143, in __run_command
DEBUG -     raise ConfigSessionError(output)
DEBUG - vyos.configsession.ConfigSessionError: Configuration path: [interfaces openvpn vtun5010 encryption data-ciphers aes192] is not valid
DEBUG - 
DEBUG - Set failed
DEBUG - 
DEBUG - 
DEBUG - ----------------------------------------------------------------------
DEBUG - Ran 8 tests in 75.145s

Smoketest result

After making the necessary change found in this PR:

DEBUG - Running Testcase: /usr/libexec/vyos/tests/smoke/cli/test_interfaces_openvpn.py
DEBUG - test_openvpn_client_interfaces (__main__.TestInterfacesOpenVPN.test_openvpn_client_interfaces) ... ok
DEBUG - test_openvpn_client_verify (__main__.TestInterfacesOpenVPN.test_openvpn_client_verify) ... ok
DEBUG - test_openvpn_options (__main__.TestInterfacesOpenVPN.test_openvpn_options) ... ok
DEBUG - test_openvpn_server_server_bridge (__main__.TestInterfacesOpenVPN.test_openvpn_server_server_bridge) ... ok
DEBUG - test_openvpn_server_subnet_topology (__main__.TestInterfacesOpenVPN.test_openvpn_server_subnet_topology) ... ok
DEBUG - test_openvpn_server_verify (__main__.TestInterfacesOpenVPN.test_openvpn_server_verify) ... ok
DEBUG - test_openvpn_site2site_interfaces_tun (__main__.TestInterfacesOpenVPN.test_openvpn_site2site_interfaces_tun) ... ok
DEBUG - test_openvpn_site2site_verify (__main__.TestInterfacesOpenVPN.test_openvpn_site2site_verify) ... ok
DEBUG - 
DEBUG - ----------------------------------------------------------------------
DEBUG - Ran 8 tests in 320.848s
DEBUG - 
DEBUG - 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

@github-actions github-actions bot added the sagitta VyOS 1.4 LTS label Sep 13, 2024
Copy link

github-actions bot commented Sep 13, 2024

👍
No issues in PR Title / Commit Title

@Crushable1278 Crushable1278 force-pushed the T6555-openvpn-fix-server-bridge-smoketest branch from 13e6829 to 2a872f0 Compare September 13, 2024 07:07
…test

Commit dc1da7c ("OPENVPN: T6555: add server-bridge options in mode server") added a new smoketest which used the data-ciphers command which is new starting with VyOS 1.5.
@Crushable1278 Crushable1278 force-pushed the T6555-openvpn-fix-server-bridge-smoketest branch from 2a872f0 to 3015992 Compare September 13, 2024 07:22
@Crushable1278 Crushable1278 marked this pull request as ready for review September 13, 2024 07:39
@Crushable1278 Crushable1278 requested a review from a team as a code owner September 13, 2024 07:39
@fett0 fett0 merged commit 6c467b1 into vyos:sagitta Sep 13, 2024
9 checks passed
@Crushable1278 Crushable1278 deleted the T6555-openvpn-fix-server-bridge-smoketest branch September 13, 2024 18:41
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.

4 participants