From 330462551b4c3ce0c3dbd81d231d2ed027d9ab12 Mon Sep 17 00:00:00 2001 From: Brad Cowie Date: Thu, 10 Jul 2025 16:09:24 +1200 Subject: [PATCH] Import os-ken 3.1.0 source --- os_ken/services/protocols/bgp/utils/stats.py | 4 ++-- releasenotes/source/2025.1.rst | 6 ++++++ releasenotes/source/index.rst | 1 + test-requirements.txt | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 releasenotes/source/2025.1.rst diff --git a/os_ken/services/protocols/bgp/utils/stats.py b/os_ken/services/protocols/bgp/utils/stats.py index 7125675..b53678a 100644 --- a/os_ken/services/protocols/bgp/utils/stats.py +++ b/os_ken/services/protocols/bgp/utils/stats.py @@ -85,8 +85,8 @@ def log(stats_resource=None, stats_source=None, log_level=DEFAULT_LOG_LEVEL, kwargs[RESOURCE_NAME] = stats_resource.name if TIMESTAMP not in kwargs: - kwargs[TIMESTAMP] = datetime.datetime.utcfromtimestamp( - time.time()).strftime("%Y-%m-%dT%H:%M:%S.%fZ") + kwargs[TIMESTAMP] = datetime.datetime.now( + tz=datetime.timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.%fZ") _STATS_LOGGER.log(log_level, json.dumps(kwargs)) diff --git a/releasenotes/source/2025.1.rst b/releasenotes/source/2025.1.rst new file mode 100644 index 0000000..3add0e5 --- /dev/null +++ b/releasenotes/source/2025.1.rst @@ -0,0 +1,6 @@ +=========================== +2025.1 Series Release Notes +=========================== + +.. release-notes:: + :branch: stable/2025.1 diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 655a80a..247cf9d 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + 2025.1 2024.2 2024.1 2023.2 diff --git a/test-requirements.txt b/test-requirements.txt index 089cb54..9705447 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,6 @@ hacking>=6.1.0,<6.2.0 # Apache-2.0 coverage>=4.4.1 # Apache-2.0 -python-subunit>=1.0.0 # Apache-2.0/BSD oslotest>=3.2.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 testtools>=2.2.0 # MIT