Skip to content

T8078: dhcpv6: allow lease renew for pd & parameters #4889

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

Merged
sever-sever merged 1 commit into from
Dec 11, 2025
+22 −2
Merged

T8078: dhcpv6: allow lease renew for pd & parameters #4889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions src/op_mode/dhcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,11 +308,31 @@ def _wrapper(*args, **kwargs):
v = 'v6' if family == 'inet6' else ''
interface = kwargs.get('interface')
interface_path = Section.get_config_path(interface)
Copy link
Member

@c-po c-po Dec 10, 2025

Choose a reason for hiding this comment

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

I wonder if Section.get_config_path(interface) should return a list instead, as we mostly work with lists - but this is another discussion.

path_elems = interface_path.split()
base_path = ['interfaces'] + path_elems

unconf_message = f'DHCP{v} client not configured on interface {interface}!'

# Check if config does not exist
if not config.exists(f'interfaces {interface_path} address dhcp{v}'):
iface_conf = config.get_config_dict(
base_path, key_mangling=('-', '_'), get_first_key=True
)

if family == 'inet6':
addrs = iface_conf.get('address', [])
has_dhcpv6_addr = 'dhcpv6' in addrs

dhcpv6_opts = iface_conf.get('dhcpv6_options', {})
has_parameters_only = 'parameters_only' in dhcpv6_opts
has_pd = 'pd' in dhcpv6_opts

config_exists = has_dhcpv6_addr or has_parameters_only or has_pd
else:
addrs = iface_conf.get('address', [])
config_exists = 'dhcp' in addrs

if not config_exists:
raise vyos.opmode.UnconfiguredObject(unconf_message)

return func(*args, **kwargs)

return _wrapper
Expand Down
Loading