From 7d50be0318db808b7f66775603569f565c28cced Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Tue, 12 Dec 2023 22:30:53 +0100
Subject: dhcp: T3316: Fix raw op-mode lease output

---
 src/op_mode/dhcp.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/op_mode/dhcp.py b/src/op_mode/dhcp.py
index bd2c522ca..84158eeb1 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']]
@@ -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')
-- 
cgit v1.2.3


From 56a8eaeda7e8b526c8a52e5f955701e75d5bf893 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Tue, 12 Dec 2023 22:44:33 +0100
Subject: dhcp: T3316: Fix dhcp op-mode state 'all' matching

---
 src/op_mode/dhcp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/op_mode/dhcp.py b/src/op_mode/dhcp.py
index 84158eeb1..a9271ea79 100755
--- a/src/op_mode/dhcp.py
+++ b/src/op_mode/dhcp.py
@@ -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
-- 
cgit v1.2.3