diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-09-15 10:12:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-15 10:12:28 +0100 |
| commit | 238a9006cc78022ba5e95258c1033ccf8abfb1af (patch) | |
| tree | 21f504672a05f4bb1b8d2812a09b8a63b8570f7d | |
| parent | f406d48b527589200611dcbb5a99044489b1e9c5 (diff) | |
| parent | 793c6a1ee7f9ae0bd335cd04ee5e153219bbc5e0 (diff) | |
| download | vyos-1x-238a9006cc78022ba5e95258c1033ccf8abfb1af.tar.gz vyos-1x-238a9006cc78022ba5e95258c1033ccf8abfb1af.zip | |
Merge pull request #4289 from nvandamme/current
op-mode: T5992: show dhcpv6 leases with (mostly) the same fields as dhcp leases
| -rw-r--r-- | python/vyos/kea.py | 2 | ||||
| -rwxr-xr-x | src/op_mode/dhcp.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/python/vyos/kea.py b/python/vyos/kea.py index a47371e88..c7ae94b14 100644 --- a/python/vyos/kea.py +++ b/python/vyos/kea.py @@ -624,9 +624,9 @@ def kea_get_server_leases(config, inet, vrf_name, pools=[], state=[], origin=Non data_lease['origin'] = 'local' # TODO: Determine remote in HA # remove trailing dot in 'hostname' to ensure consistency for `vyos-hostsd-client` data_lease['hostname'] = lease.get('hostname', '').rstrip('.') or '-' + data_lease['mac'] = lease.get('hw-address', '-') if inet == '4': - data_lease['mac'] = lease['hw-address'] data_lease['start'] = lease['start_time'].timestamp() if inet == '6': diff --git a/src/op_mode/dhcp.py b/src/op_mode/dhcp.py index 4d6d092e6..03ad3268f 100755 --- a/src/op_mode/dhcp.py +++ b/src/op_mode/dhcp.py @@ -134,6 +134,7 @@ def _get_formatted_server_leases(raw_data, family='inet'): if family == 'inet6': for lease in raw_data: ipaddr = lease.get('ip') + hw_addr = lease.get('mac') state = lease.get('state') start = datetime.fromtimestamp( lease.get('last_communication'), timezone.utc @@ -146,19 +147,22 @@ def _get_formatted_server_leases(raw_data, family='inet'): remain = lease.get('remaining') lease_type = lease.get('type') pool = lease.get('pool') + hostname = lease.get('hostname') host_identifier = lease.get('duid') data_entries.append( - [ipaddr, state, start, end, remain, lease_type, pool, host_identifier] + [ipaddr, hw_addr, state, start, end, remain, pool, hostname, lease_type, host_identifier] ) headers = [ 'IPv6 address', + 'MAC address', 'State', 'Last communication', 'Lease expiration', 'Remaining', - 'Type', 'Pool', + 'Hostname', + 'Type', 'DUID', ] |