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

nhrp: T2326: NHRP migration to FRR #4217

Merged
merged 1 commit into from
Jan 13, 2025
Merged

nhrp: T2326: NHRP migration to FRR #4217

merged 1 commit into from
Jan 13, 2025

Conversation

aapostoliuk
Copy link
Contributor

@aapostoliuk aapostoliuk commented Dec 3, 2024 •
edited
Loading

NHRP migration to FRR

Change Summary

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): migration to another package

Related Task(s)

https://vyos.dev/T2326

Related PR(s)

vyos/vyos-build#885

Component(s) name

nhrp

Proposed changes

Replaced the old package opnnhrp with FRR nhrpd.
Advantages:

  1. opennhrp project is not supported now.
  2. It fixes compatibility between NHRP and IPSec. FRR manages an IPSec VPN connection.
  3. It will allow the use of IPv6 over DMVPN in the future.

Restrictions:

  1. The tunnel interface subnet mask must be /32

Changes:
Configuration mode:
All commands were remade according to FRR.

vyos@vyos# set protocols nhrp tunnel tun100
Possible completions:
   authentication       NHRP authentication
   holdtime             Holding time in seconds
 > map                  Map tunnel IP to NBMA
   mtu                  Maximum Transmission Unit (MTU)
+  multicast            Map multicast to NBMA
   network-id           NHRP network id
 > nhs                  Map tunnel IP to NBMA of Next Hop Server
   redirect             Enable sending of Cisco style NHRP Traffic Indication packets
   registration-no-unique
                        Zone to be local-zone
   shortcut             Enable creation of shortcut routes. A received NHRP Traffic
                        Indication will trigger the resolution and establishment of a
                        shortcut route

Operational mode:
All commands were remade according to FRR.

vyos@vyos:~$ show ip nhrp
Possible completions:
  cache                 Show NHRP interface connection information
  nhs                   Show NHRP tunnel connection information
  shortcut


vyos@vyos:~$ reset ip nhrp
Possible completions:
  cache                 Clear Dynamic cache entries
  shortcut              Clear Shortcut entries

How to test

Smoketest result

vyos@vyos:~$ /usr/libexec/vyos/tests/smoke/cli/test_protocols_nhrp.py
test_01_nhrp_config (__main__.TestProtocolsNHRP.test_01_nhrp_config) ... ok

----------------------------------------------------------------------
Ran 1 test in 9.307s

OK
vyos@vyos:~$ /usr/libexec/vyos/tests/smoke/cli/test_vpn_ipsec.py
test_dhcp_fail_handling (__main__.TestVPNIPsec.test_dhcp_fail_handling) ... ok
test_dmvpn (__main__.TestVPNIPsec.test_dmvpn) ... ok
test_flex_vpn_vips (__main__.TestVPNIPsec.test_flex_vpn_vips) ... ok
test_remote_access (__main__.TestVPNIPsec.test_remote_access) ... ok
test_remote_access_dhcp_fail_handling (__main__.TestVPNIPsec.test_remote_access_dhcp_fail_handling) ... ok
test_remote_access_eap_tls (__main__.TestVPNIPsec.test_remote_access_eap_tls) ... ok
test_remote_access_no_rekey (__main__.TestVPNIPsec.test_remote_access_no_rekey) ... ok
test_remote_access_pool_range (__main__.TestVPNIPsec.test_remote_access_pool_range) ... ok
test_remote_access_vti (__main__.TestVPNIPsec.test_remote_access_vti) ... ok
test_remote_access_x509 (__main__.TestVPNIPsec.test_remote_access_x509) ... ok
test_site_to_site (__main__.TestVPNIPsec.test_site_to_site) ... ok
test_site_to_site_vti (__main__.TestVPNIPsec.test_site_to_site_vti) ... ok
test_site_to_site_x509 (__main__.TestVPNIPsec.test_site_to_site_x509) ... ok

----------------------------------------------------------------------
Ran 13 tests in 88.830s

OK
vyos@vyos:~$ /usr/libexec/vyos/tests/smoke/cli/test_interfaces_tunnel.py
test_add_multiple_ip_addresses (__main__.TunnelInterfaceTest.test_add_multiple_ip_addresses) ... ok
test_add_single_ip_address (__main__.TunnelInterfaceTest.test_add_single_ip_address) ... ok
test_add_to_invalid_vrf (__main__.TunnelInterfaceTest.test_add_to_invalid_vrf) ... ok
test_dhcp_client_options (__main__.TunnelInterfaceTest.test_dhcp_client_options) ... skipped 'not supported'
test_dhcp_disable_interface (__main__.TunnelInterfaceTest.test_dhcp_disable_interface) ... skipped 'not supported'
test_dhcp_vrf (__main__.TunnelInterfaceTest.test_dhcp_vrf) ... skipped 'not supported'
test_dhcpv6_client_options (__main__.TunnelInterfaceTest.test_dhcpv6_client_options) ... skipped 'not supported'
test_dhcpv6_vrf (__main__.TunnelInterfaceTest.test_dhcpv6_vrf) ... skipped 'not supported'
test_dhcpv6pd_auto_sla_id (__main__.TunnelInterfaceTest.test_dhcpv6pd_auto_sla_id) ... skipped 'not supported'
test_dhcpv6pd_manual_sla_id (__main__.TunnelInterfaceTest.test_dhcpv6pd_manual_sla_id) ... skipped 'not supported'
test_eapol (__main__.TunnelInterfaceTest.test_eapol) ... skipped 'not supported'
test_erspan_v1 (__main__.TunnelInterfaceTest.test_erspan_v1) ... ok
test_gretap_parameters_change (__main__.TunnelInterfaceTest.test_gretap_parameters_change) ... ok
test_interface_description (__main__.TunnelInterfaceTest.test_interface_description) ... ok
test_interface_disable (__main__.TunnelInterfaceTest.test_interface_disable) ... ok
test_interface_ip_options (__main__.TunnelInterfaceTest.test_interface_ip_options) ... ok
test_interface_ipv6_options (__main__.TunnelInterfaceTest.test_interface_ipv6_options) ... ok
test_interface_mtu (__main__.TunnelInterfaceTest.test_interface_mtu) ... ok
test_ip6erspan_v2 (__main__.TunnelInterfaceTest.test_ip6erspan_v2) ... ok
test_ipv4_encapsulations (__main__.TunnelInterfaceTest.test_ipv4_encapsulations) ... ok
test_ipv6_encapsulations (__main__.TunnelInterfaceTest.test_ipv6_encapsulations) ... ok
test_ipv6_link_local_address (__main__.TunnelInterfaceTest.test_ipv6_link_local_address) ... ok
test_move_interface_between_vrf_instances (__main__.TunnelInterfaceTest.test_move_interface_between_vrf_instances) ... ok
test_mtu_1200_no_ipv6_interface (__main__.TunnelInterfaceTest.test_mtu_1200_no_ipv6_interface) ... ok
test_multiple_gre_tunnel_different_remote (__main__.TunnelInterfaceTest.test_multiple_gre_tunnel_different_remote) ... ok
test_multiple_gre_tunnel_same_remote (__main__.TunnelInterfaceTest.test_multiple_gre_tunnel_same_remote) ... ok
test_span_mirror (__main__.TunnelInterfaceTest.test_span_mirror) ... skipped 'not supported'
test_tunnel_invalid_source_interface (__main__.TunnelInterfaceTest.test_tunnel_invalid_source_interface) ... ok
test_tunnel_parameters_gre (__main__.TunnelInterfaceTest.test_tunnel_parameters_gre) ... ok
test_tunnel_src_any_gre_key (__main__.TunnelInterfaceTest.test_tunnel_src_any_gre_key) ... ok
test_vif_8021q_interfaces (__main__.TunnelInterfaceTest.test_vif_8021q_interfaces) ... skipped 'not supported'
test_vif_8021q_lower_up_down (__main__.TunnelInterfaceTest.test_vif_8021q_lower_up_down) ... skipped 'not supported'
test_vif_8021q_mtu_limits (__main__.TunnelInterfaceTest.test_vif_8021q_mtu_limits) ... skipped 'not supported'
test_vif_8021q_qos_change (__main__.TunnelInterfaceTest.test_vif_8021q_qos_change) ... skipped 'not supported'
test_vif_s_8021ad_vlan_interfaces (__main__.TunnelInterfaceTest.test_vif_s_8021ad_vlan_interfaces) ... skipped 'not supported'
test_vif_s_protocol_change (__main__.TunnelInterfaceTest.test_vif_s_protocol_change) ... skipped 'not supported'

----------------------------------------------------------------------
Ran 36 tests in 139.949s

OK (skipped=15)

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

@aapostoliuk aapostoliuk requested a review from a team as a code owner December 3, 2024 10:29
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 3, 2024 •
edited
Loading

👍
No issues in PR Title / Commit Title

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 3, 2024 •
edited
Loading

✅ No issues found in unused-imports check.. Please refer the workflow run

@aapostoliuk aapostoliuk marked this pull request as draft December 3, 2024 10:30
@c-po c-po mentioned this pull request Dec 13, 2024
Merged
14 tasks
@github-actions GitHub Actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link

Conflicts have been resolved. A maintainer will review the pull request shortly.

@aapostoliuk aapostoliuk force-pushed the T2326-circinus branch 2 times, most recently from 82c7537 to 58f3339 Compare January 6, 2025 15:18
@aapostoliuk aapostoliuk marked this pull request as ready for review January 6, 2025 15:24
@aapostoliuk aapostoliuk force-pushed the T2326-circinus branch 4 times, most recently from 204e822 to 8a80ad9 Compare January 9, 2025 13:40
sarthurdev
sarthurdev approved these changes Jan 9, 2025
View reviewed changes
Copy link
Member

@sarthurdev sarthurdev left a comment

Choose a reason for hiding this comment

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

LGTM

Should also have PR to remove the package build: https://github.com/vyos/vyos-build/tree/current/scripts/package-build/opennhrp

c-po
c-po requested changes Jan 9, 2025
View reviewed changes
python/vyos/frrender.py Show resolved Hide resolved
python/vyos/frrender.py Outdated Show resolved Hide resolved
python/vyos/frrender.py Outdated Show resolved Hide resolved
@aapostoliuk
nhrp: T2326: NHRP migration to FRR
5e8307b 
NHRP migration to FRR
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 9, 2025

CI integration ❌ failed!

Details

CI logs

  • CLI Smoketests (no interfaces) ❌ failed
  • CLI Smoketests (interfaces only) 👍 passed
  • Config tests 👍 passed
  • RAID1 tests 👍 passed
  • TPM tests 👍 passed

@aapostoliuk aapostoliuk mentioned this pull request Jan 13, 2025
Merged
11 tasks
@aapostoliuk
Copy link
Contributor Author

Opennhrp is removed in
vyos/vyos-build#885

@c-po c-po enabled auto-merge January 13, 2025 18:52
@c-po c-po disabled auto-merge January 13, 2025 18:52
@c-po c-po merged commit 4663c59 into vyos:current Jan 13, 2025
15 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@c-po c-po c-po approved these changes

@sarthurdev sarthurdev sarthurdev approved these changes

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

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

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

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

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

@nicolas-fort nicolas-fort Awaiting requested review from nicolas-fort nicolas-fort is a code owner

Assignees

@aapostoliuk aapostoliuk

Labels
current
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@aapostoliuk @sarthurdev @c-po