Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace dateutils usage with datetime and oslo.utils"

Browse Source
This commit is contained in:
Zuul
2025-08-07 20:46:25 +00:00
committed by Gerrit Code Review
parent 27baff5184 95d975f339
commit 9925fd2cc9
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
watcher/decision_engine/audit/continuous.py
View File

@@ -21,7 +21,7 @@
import datetime
from croniter import croniter
from dateutil import tz
from datetime import timezone
from oslo_utils import timeutils
from watcher.common import context
@@ -123,7 +123,7 @@ class ContinuousAuditHandler(base.AuditHandler):
'next_run_time') else 'run_date'
# We should convert UTC time to local time without tzinfo
trigger_args[time_var] = trigger_args[time_var].replace(
tzinfo=tz.tzutc()).astimezone(tz.tzlocal()).replace(tzinfo=None)
tzinfo=timezone.utc).astimezone().replace(tzinfo=None)
self.scheduler.add_job(self.execute_audit, trigger,
args=[audit, audit_context],
name='execute_audit',

9
watcher/decision_engine/strategy/strategies/zone_migration.py
View File

@@ -12,9 +12,8 @@
# limitations under the License.
#
from dateutil.parser import parse
from oslo_log import log
from oslo_utils import timeutils
from cinderclient.v3.volumes import Volume
from novaclient.v2.servers import Server
@@ -893,7 +892,8 @@ class ComputeSpecSortFilter(BaseFilter):
reverse=True)
elif sort_key == 'created_at':
result = sorted(items,
key=lambda x: parse(getattr(x, sort_key)),
key=lambda x: timeutils.parse_isotime(
getattr(x, sort_key)),
reverse=False)
return result
@@ -959,7 +959,8 @@ class StorageSpecSortFilter(BaseFilter):
if sort_key == 'created_at':
result = sorted(items,
key=lambda x: parse(getattr(x, sort_key)),
key=lambda x: timeutils.parse_isotime(
getattr(x, sort_key)),
reverse=False)
else:
result = sorted(items,