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.

Sign up for GitHub

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

Jump to bottom

macsec: T5447: fix error message syntax - there is no tx and rx key, only key #3685

Merged
merged 1 commit into from
Jun 19, 2024
Merged

macsec: T5447: fix error message syntax - there is no tx and rx key, only key #3685

merged 1 commit into from
Jun 19, 2024

Conversation

c-po
Copy link
Member

@c-po c-po commented Jun 19, 2024 •
edited
Loading

Change Summary

Remove the TX and RX portion from the key error message as the CLI only offers key.

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

Proposed changes

How to test

Smoketest result

[email protected]:~$ /usr/libexec/vyos/tests/smoke/cli/test_interfaces_macsec.py
test_add_multiple_ip_addresses (__main__.MACsecInterfaceTest.test_add_multiple_ip_addresses) ... ok
test_add_single_ip_address (__main__.MACsecInterfaceTest.test_add_single_ip_address) ... ok
test_dhcp_client_options (__main__.MACsecInterfaceTest.test_dhcp_client_options) ... ok
test_dhcp_disable_interface (__main__.MACsecInterfaceTest.test_dhcp_disable_interface) ... ok
test_dhcp_vrf (__main__.MACsecInterfaceTest.test_dhcp_vrf) ... ok
test_dhcpv6_client_options (__main__.MACsecInterfaceTest.test_dhcpv6_client_options) ... ok
test_dhcpv6_vrf (__main__.MACsecInterfaceTest.test_dhcpv6_vrf) ... ok
test_dhcpv6pd_auto_sla_id (__main__.MACsecInterfaceTest.test_dhcpv6pd_auto_sla_id) ... ok
test_dhcpv6pd_manual_sla_id (__main__.MACsecInterfaceTest.test_dhcpv6pd_manual_sla_id) ... ok
test_interface_description (__main__.MACsecInterfaceTest.test_interface_description) ... ok
test_interface_disable (__main__.MACsecInterfaceTest.test_interface_disable) ... ok
test_interface_ip_options (__main__.MACsecInterfaceTest.test_interface_ip_options) ... ok
test_interface_ipv6_options (__main__.MACsecInterfaceTest.test_interface_ipv6_options) ... ok
test_interface_mtu (__main__.MACsecInterfaceTest.test_interface_mtu) ... ok
test_ipv6_link_local_address (__main__.MACsecInterfaceTest.test_ipv6_link_local_address) ... ok
test_macsec_encryption (__main__.MACsecInterfaceTest.test_macsec_encryption) ... ok
test_macsec_gcm_aes_128 (__main__.MACsecInterfaceTest.test_macsec_gcm_aes_128) ... ok
test_macsec_gcm_aes_256 (__main__.MACsecInterfaceTest.test_macsec_gcm_aes_256) ... ok
test_macsec_source_interface (__main__.MACsecInterfaceTest.test_macsec_source_interface) ... ok
test_macsec_static_keys (__main__.MACsecInterfaceTest.test_macsec_static_keys) ... ok
test_mtu_1200_no_ipv6_interface (__main__.MACsecInterfaceTest.test_mtu_1200_no_ipv6_interface) ... ok
test_span_mirror (__main__.MACsecInterfaceTest.test_span_mirror) ... skipped 'not supported'
test_vif_8021q_interfaces (__main__.MACsecInterfaceTest.test_vif_8021q_interfaces) ... skipped 'not supported'
test_vif_8021q_lower_up_down (__main__.MACsecInterfaceTest.test_vif_8021q_lower_up_down) ... skipped 'not supported'
test_vif_8021q_mtu_limits (__main__.MACsecInterfaceTest.test_vif_8021q_mtu_limits) ... skipped 'not supported'
test_vif_8021q_qos_change (__main__.MACsecInterfaceTest.test_vif_8021q_qos_change) ... skipped 'not supported'
test_vif_s_8021ad_vlan_interfaces (__main__.MACsecInterfaceTest.test_vif_s_8021ad_vlan_interfaces) ... skipped 'not supported'
test_vif_s_protocol_change (__main__.MACsecInterfaceTest.test_vif_s_protocol_change) ... skipped 'not supported'

----------------------------------------------------------------------
Ran 28 tests in 154.662s

OK (skipped=7)

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

@c-po c-po requested a review from a team as a code owner June 19, 2024 19:21
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 19, 2024 •
edited
Loading

👍
No issues in PR Title / Commit Title

@c-po
Copy link
Member Author

c-po commented Jun 19, 2024

@Mergifyio backport sagitta sagitta-stream circinus-stream

@mergify Mergify
Copy link
Contributor

mergify bot commented Jun 19, 2024 •
edited
Loading

backport sagitta sagitta-stream circinus-stream

✅ Backports have been created

@c-po c-po merged commit 608ee44 into vyos:current Jun 19, 2024
9 checks passed
This was referenced Jun 19, 2024
Merged
Merged
Merged
c-po added a commit that referenced this pull request Jun 19, 2024
@c-po
Merge pull request #3688 from vyos/mergify/bp/circinus-stream/pr-3685
59db786 
macsec: T5447: fix error message syntax - there is no tx and rx key, only key (backport #3685)
c-po added a commit that referenced this pull request Jun 20, 2024
@c-po
Merge pull request #3687 from vyos/mergify/bp/sagitta-stream/pr-3685
1ee62b2 
macsec: T5447: fix error message syntax - there is no tx and rx key, only key (backport #3685)
dmbaturin added a commit that referenced this pull request Jun 22, 2024
@dmbaturin
Merge pull request #3686 from vyos/mergify/bp/sagitta/pr-3685
a1c558b 
macsec: T5447: fix error message syntax - there is no tx and rx key, only key (backport #3685)
@c-po c-po deleted the macsec-error-message branch July 11, 2024 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jestabro jestabro jestabro approved these changes

@dmbaturin dmbaturin Awaiting requested review from dmbaturin dmbaturin was automatically assigned from vyos/reviewers

@sarthurdev sarthurdev Awaiting requested review from sarthurdev sarthurdev was automatically assigned from vyos/reviewers

@zdc zdc Awaiting requested review from zdc zdc was automatically assigned from vyos/reviewers

@sever-sever sever-sever Awaiting requested review from sever-sever sever-sever was automatically assigned from vyos/reviewers

Assignees

@c-po c-po

Labels
backport current
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@c-po @jestabro