dhcp.py T6998 - fix datetime to be zone aware, add fix for hostname

src/op_mode/dhcp.py

@@ -101,8 +101,8 @@ def _get_raw_server_leases(family='inet', pool=None, sorted=None, state=[], orig
         lifetime = lease['valid-lft']
         expiry = (lease['cltt'] + lifetime)
 
-        lease['start_timestamp'] = datetime.utcfromtimestamp(expiry - lifetime)
-        lease['expire_timestamp'] = datetime.utcfromtimestamp(expiry) if expiry else None
+        lease['start_timestamp'] = datetime.fromtimestamp(expiry - lifetime, timezone.utc)
+        lease['expire_timestamp'] = datetime.fromtimestamp(expiry, timezone.utc) if expiry else None
 
         data_lease = {}
         data_lease['ip'] = lease['ip-address']
@@ -113,7 +113,7 @@ def _get_raw_server_leases(family='inet', pool=None, sorted=None, state=[], orig
         data_lease['origin'] = 'local' # TODO: Determine remote in HA
         data_lease['hostname'] = lease.get('hostname', '-')
         # remove trailing dot to ensure consistency for `vyos-hostsd-client`
-        if data_lease['hostname'][-1] == '.':
+        if len(data_lease['hostname']) > 1 and data_lease['hostname'][-1] == '.':
             data_lease['hostname'] = data_lease['hostname'][:-1]
 
         if family == 'inet':
@@ -170,10 +170,8 @@ 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')
-            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 '-'
+            start = datetime.fromtimestamp(lease.get('start'))
+            end = datetime.fromtimestamp(lease.get('end')) if lease.get('end') else '-'
             remain = lease.get('remaining')
             pool = lease.get('pool')
             hostname = lease.get('hostname')