diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-01-27 13:36:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-27 13:36:58 +0000 |
| commit | d50cdfee916c6d0b5c60c03d589f9292954b6688 (patch) | |
| tree | f016969d6328685c1fcd9400562c5d8a34bb71d8 /python | |
| parent | cbe364a448c3e65ca1bcdd19c4a8045069853ce3 (diff) | |
| parent | 9723f1054a98d82ee71a18eb672472be0a632f8e (diff) | |
| download | vyos-1x-d50cdfee916c6d0b5c60c03d589f9292954b6688.tar.gz vyos-1x-d50cdfee916c6d0b5c60c03d589f9292954b6688.zip | |
Merge pull request #4320 from indrajitr/vyos-t7052-2
dhcp: T7052: Fix remaining time evaluation and formatting errors
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/kea.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/vyos/kea.py b/python/vyos/kea.py index baac75eda..65e2d99b4 100644 --- a/python/vyos/kea.py +++ b/python/vyos/kea.py @@ -496,7 +496,7 @@ def kea_get_server_leases(config, inet, pools=[], state=[], origin=None) -> list ) 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('.') + data_lease['hostname'] = lease.get('hostname', '').rstrip('.') or '-' if inet == '4': data_lease['mac'] = lease['hw-address'] @@ -511,7 +511,7 @@ def kea_get_server_leases(config, inet, pools=[], state=[], origin=None) -> list prefix_len = lease['prefix-len'] data_lease['ip'] += f'/{prefix_len}' - data_lease['remaining'] = '-' + data_lease['remaining'] = '' now = datetime.now(timezone.utc) if lease['valid-lft'] > 0 and lease['expire_time'] > now: @@ -521,7 +521,7 @@ def kea_get_server_leases(config, inet, pools=[], state=[], origin=None) -> list # Do not add old leases if ( - data_lease['remaining'] + data_lease['remaining'] != '' and data_lease['pool'] in pools and data_lease['state'] != 'free' and (not state or state == 'all' or data_lease['state'] in state) |