diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-12-13 07:53:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-13 07:53:27 +0100 |
| commit | dd64840da821e43667d77453b80010c36acc5d4e (patch) | |
| tree | ebb7bbbf001ed2a2e7dcd016de5f7c426b4c2a67 | |
| parent | 5dda9e0968cd6b727030d7723805df656bcc5b10 (diff) | |
| parent | 56a8eaeda7e8b526c8a52e5f955701e75d5bf893 (diff) | |
| download | vyos-1x-dd64840da821e43667d77453b80010c36acc5d4e.tar.gz vyos-1x-dd64840da821e43667d77453b80010c36acc5d4e.zip | |
Merge pull request #2623 from sarthurdev/kea_opmode_fix
dhcp: T3316: Fix raw op-mode lease output
| -rwxr-xr-x | src/op_mode/dhcp.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/op_mode/dhcp.py b/src/op_mode/dhcp.py index bd2c522ca..a9271ea79 100755 --- a/src/op_mode/dhcp.py +++ b/src/op_mode/dhcp.py @@ -102,11 +102,11 @@ def _get_raw_server_leases(family='inet', pool=None, sorted=None, state=[], orig if family == 'inet': data_lease['mac'] = lease['hwaddr'] - data_lease['start'] = lease['start_timestamp'] + data_lease['start'] = lease['start_timestamp'].timestamp() data_lease['hostname'] = lease['hostname'] if family == 'inet6': - data_lease['last_communication'] = lease['start_timestamp'] + data_lease['last_communication'] = lease['start_timestamp'].timestamp() data_lease['iaid_duid'] = _format_hex_string(lease['duid']) lease_types_long = {'0': 'non-temporary', '1': 'temporary', '2': 'prefix delegation'} data_lease['type'] = lease_types_long[lease['lease_type']] @@ -123,7 +123,7 @@ def _get_raw_server_leases(family='inet', pool=None, sorted=None, state=[], orig # Do not add old leases if data_lease['remaining'] != '' and data_lease['pool'] in pool and data_lease['state'] != 'free': - if not state or data_lease['state'] in state: + if not state or state == 'all' or data_lease['state'] in state: data.append(data_lease) # deduplicate @@ -151,7 +151,7 @@ def _get_formatted_server_leases(raw_data, family='inet'): ipaddr = lease.get('ip') hw_addr = lease.get('mac') state = lease.get('state') - start = lease.get('start').timestamp() + start = lease.get('start') start = _utc_to_local(start).strftime('%Y/%m/%d %H:%M:%S') end = lease.get('end') end = _utc_to_local(end).strftime('%Y/%m/%d %H:%M:%S') if end else '-' @@ -168,7 +168,7 @@ def _get_formatted_server_leases(raw_data, family='inet'): for lease in raw_data: ipaddr = lease.get('ip') state = lease.get('state') - start = lease.get('last_communication').timestamp() + start = lease.get('last_communication') start = _utc_to_local(start).strftime('%Y/%m/%d %H:%M:%S') end = lease.get('end') end = _utc_to_local(end).strftime('%Y/%m/%d %H:%M:%S') |