From f5c4f5a8ecd16e7aaabe70934f6a7998e9dcd48e Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 29 Sep 2020 18:33:40 -0500 Subject: ietf-system: Use new util fn for timestamp string --- ncserver/module/system.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ncserver/module/system.py b/ncserver/module/system.py index 552d357..af9d9ce 100644 --- a/ncserver/module/system.py +++ b/ncserver/module/system.py @@ -17,7 +17,7 @@ import platform import subprocess import time -from datetime import datetime, timezone +from datetime import datetime from math import floor from socket import gethostname, sethostname @@ -25,7 +25,7 @@ from lxml import etree from netconf import error, util from ncserver.base.util import _, ensure_leaf, handle_list_operation, \ - node_operation + node_operation, yang_dt_for_timestamp QName = etree.QName # pylint: disable=I1101 @@ -222,16 +222,16 @@ def operational(node): plat.append(util.leaf_elm('sys:machine', platform.machine())) clock = util.subelm(state, 'sys:clock') - now = datetime.now(timezone.utc) - zone = now.astimezone().tzinfo - clock.append(util.leaf_elm('sys:current-datetime', - datetime.now(zone).isoformat())) + clock.append(util.leaf_elm( + 'sys:current-datetime', + yang_dt_for_timestamp(datetime.now().timestamp()) + )) with open('/proc/uptime', 'r') as upfile: raw = upfile.read().split(' ')[0] boot = floor(time.time() - float(raw)) - fmted = datetime.fromtimestamp(boot, tz=zone).isoformat() - clock.append(util.leaf_elm('sys:boot-datetime', fmted)) + clock.append(util.leaf_elm('sys:boot-datetime', + yang_dt_for_timestamp(boot))) # -- Editing functions -- -- cgit v1.2.3-70-g09d2