Replace deprecated datetime.datetime.utcnow

It was deprecated in Python 3.12 .

Change-Id: Id28b2788981bc81931693f51a09d7731d93b4791

ceilometer/tests/unit/polling/test_manager.py

@@ -25,6 +25,7 @@ from unittest import mock
 
 import fixtures
 from keystoneauth1 import exceptions as ka_exceptions
+from oslo_utils import timeutils
 from stevedore import extension
 
 from ceilometer.compute import discovery as nova_discover
@@ -48,7 +49,7 @@ def default_test_data(name='test'):
         user_id='test',
         project_id='test',
         resource_id='test_run_tasks',
-        timestamp=datetime.datetime.utcnow().isoformat(),
+        timestamp=timeutils.utcnow().isoformat(),
         resource_metadata={'name': 'Pollster'})
 
 
@@ -169,7 +170,7 @@ class BatchTestPollster(TestPollster):
         self.resources.extend(resources)
         for resource in resources:
             c = copy.deepcopy(self.test_data)
-            c.timestamp = datetime.datetime.utcnow().isoformat()
+            c.timestamp = timeutils.utcnow().isoformat()
             c.resource_id = resource
             c.resource_metadata['resource'] = resource
             yield c

ceilometer/tests/unit/publisher/test_file.py

@@ -15,13 +15,13 @@
 """Tests for ceilometer/publisher/file.py
 """
 
-import datetime
 import json
 import logging.handlers
 import os
 import tempfile
 
 from oslo_utils import netutils
+from oslo_utils import timeutils
 from oslotest import base
 
 from ceilometer.publisher import file
@@ -40,7 +40,7 @@ class TestFilePublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
         sample.Sample(
@@ -51,7 +51,7 @@ class TestFilePublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
         sample.Sample(
@@ -62,7 +62,7 @@ class TestFilePublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
     ]

ceilometer/tests/unit/publisher/test_http.py

@@ -18,6 +18,7 @@ import datetime
 from unittest import mock
 import uuid
 
+from oslo_utils import timeutils
 from oslotest import base
 import requests
 from urllib import parse as urlparse
@@ -41,7 +42,7 @@ class TestHttpPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id=resource_id,
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
         sample.Sample(
@@ -52,7 +53,7 @@ class TestHttpPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id=resource_id,
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
         sample.Sample(
@@ -70,7 +71,7 @@ class TestHttpPublisher(base.BaseTestCase):
 
     event_data = [event.Event(
         message_id=str(uuid.uuid4()), event_type='event_%d' % i,
-        generated=datetime.datetime.utcnow().isoformat(),
+        generated=timeutils.utcnow().isoformat(),
         traits=[], raw={'payload': {'some': 'aa'}}) for i in range(3)]
 
     def setUp(self):

ceilometer/tests/unit/publisher/test_messaging_publisher.py

@@ -13,13 +13,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 """Tests for ceilometer/publisher/messaging.py"""
-import datetime
 from unittest import mock
 import uuid
 
 import oslo_messaging
 from oslo_messaging._drivers import impl_kafka as kafka_driver
 from oslo_utils import netutils
+from oslo_utils import timeutils
 import testscenarios.testcase
 
 from ceilometer.event import models as event
@@ -33,7 +33,7 @@ class BasePublisherTestCase(tests_base.BaseTestCase):
     test_event_data = [
         event.Event(message_id=uuid.uuid4(),
                     event_type='event_%d' % i,
-                    generated=datetime.datetime.utcnow(),
+                    generated=timeutils.utcnow(),
                     traits=[], raw={})
         for i in range(0, 5)
     ]
@@ -47,7 +47,7 @@ class BasePublisherTestCase(tests_base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
         sample.Sample(
@@ -58,7 +58,7 @@ class BasePublisherTestCase(tests_base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
         sample.Sample(
@@ -69,7 +69,7 @@ class BasePublisherTestCase(tests_base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
         sample.Sample(
@@ -80,7 +80,7 @@ class BasePublisherTestCase(tests_base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
         sample.Sample(
@@ -91,7 +91,7 @@ class BasePublisherTestCase(tests_base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
     ]

ceilometer/tests/unit/publisher/test_opentelemetry_http.py

@@ -14,7 +14,6 @@
 # under the License.
 """Tests for ceilometer/publisher/opentelemetry.py"""
 
-import datetime
 import json
 import time
 from unittest import mock
@@ -33,7 +32,7 @@ from ceilometer import service
 class TestOpentelemetryHttpPublisher(base.BaseTestCase):
 
     resource_id = str(uuid.uuid4())
-    format_time = datetime.datetime.utcnow().isoformat()
+    format_time = timeutils.utcnow().isoformat()
     sample_data = [
         sample.Sample(
             name='alpha',

ceilometer/tests/unit/publisher/test_prometheus.py

@@ -18,6 +18,7 @@ import datetime
 from unittest import mock
 import uuid
 
+from oslo_utils import timeutils
 from oslotest import base
 import requests
 from urllib import parse as urlparse
@@ -40,7 +41,7 @@ class TestPrometheusPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id=resource_id,
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
         sample.Sample(
@@ -51,7 +52,7 @@ class TestPrometheusPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id=resource_id,
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
         sample.Sample(

ceilometer/tests/unit/publisher/test_tcp.py

@@ -14,11 +14,11 @@
 # under the License.
 """Tests for ceilometer/publisher/tcp.py"""
 
-import datetime
 from unittest import mock
 
 import msgpack
 from oslo_utils import netutils
+from oslo_utils import timeutils
 from oslotest import base
 
 from ceilometer.publisher.tcp import TCPPublisher
@@ -40,7 +40,7 @@ class TestTCPPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
             source=COUNTER_SOURCE,
         ),
@@ -52,7 +52,7 @@ class TestTCPPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
             source=COUNTER_SOURCE,
         ),
@@ -64,7 +64,7 @@ class TestTCPPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
             source=COUNTER_SOURCE,
         ),
@@ -76,7 +76,7 @@ class TestTCPPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
             source=COUNTER_SOURCE,
         ),
@@ -88,7 +88,7 @@ class TestTCPPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
             source=COUNTER_SOURCE,
         ),

ceilometer/tests/unit/publisher/test_udp.py

@@ -14,11 +14,11 @@
 # under the License.
 """Tests for ceilometer/publisher/udp.py"""
 
-import datetime
 from unittest import mock
 
 import msgpack
 from oslo_utils import netutils
+from oslo_utils import timeutils
 from oslotest import base
 
 from ceilometer.publisher import udp
@@ -40,7 +40,7 @@ class TestUDPPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
             source=COUNTER_SOURCE,
         ),
@@ -52,7 +52,7 @@ class TestUDPPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
             source=COUNTER_SOURCE,
         ),
@@ -64,7 +64,7 @@ class TestUDPPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
             source=COUNTER_SOURCE,
         ),
@@ -76,7 +76,7 @@ class TestUDPPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
             source=COUNTER_SOURCE,
         ),
@@ -88,7 +88,7 @@ class TestUDPPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id='test_run_tasks',
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
             source=COUNTER_SOURCE,
         ),

ceilometer/tests/unit/publisher/test_zaqar.py

@@ -15,6 +15,7 @@ import datetime
 from unittest import mock
 import uuid
 
+from oslo_utils import timeutils
 from oslotest import base
 from urllib import parse as urlparse
 
@@ -37,7 +38,7 @@ class TestZaqarPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id=resource_id,
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
         sample.Sample(
@@ -48,7 +49,7 @@ class TestZaqarPublisher(base.BaseTestCase):
             user_id='test',
             project_id='test',
             resource_id=resource_id,
-            timestamp=datetime.datetime.utcnow().isoformat(),
+            timestamp=timeutils.utcnow().isoformat(),
             resource_metadata={'name': 'TestPublish'},
         ),
         sample.Sample(
@@ -66,7 +67,7 @@ class TestZaqarPublisher(base.BaseTestCase):
 
     event_data = [event.Event(
         message_id=str(uuid.uuid4()), event_type='event_%d' % i,
-        generated=datetime.datetime.utcnow().isoformat(),
+        generated=timeutils.utcnow().isoformat(),
         traits=[], raw={'payload': {'some': 'aa'}}) for i in range(3)]
 
     def setUp(self):

ceilometer/tests/unit/test_event_pipeline.py

@@ -11,11 +11,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import datetime
 import traceback
 import uuid
 
 import fixtures
+from oslo_utils import timeutils
 
 from ceilometer.event import models
 from ceilometer.pipeline import base as pipeline
@@ -48,7 +48,7 @@ class EventPipelineTestCase(base.BaseTestCase):
         self.test_event = models.Event(
             message_id=uuid.uuid4(),
             event_type='a',
-            generated=datetime.datetime.utcnow(),
+            generated=timeutils.utcnow(),
             traits=[
                 models.Trait('t_text', 1, 'text_trait'),
                 models.Trait('t_int', 2, 'int_trait'),
@@ -61,7 +61,7 @@ class EventPipelineTestCase(base.BaseTestCase):
         self.test_event2 = models.Event(
             message_id=uuid.uuid4(),
             event_type='b',
-            generated=datetime.datetime.utcnow(),
+            generated=timeutils.utcnow(),
             traits=[
                 models.Trait('t_text', 1, 'text_trait'),
                 models.Trait('t_int', 2, 'int_trait'),

tools/send_test_data.py

@@ -30,6 +30,7 @@ import uuid
 
 import make_test_data
 import oslo_messaging
+from oslo_utils import timeutils
 
 from ceilometer import messaging
 from ceilometer.publisher import utils
@@ -52,9 +53,9 @@ def get_notifier(conf):
 def generate_data(conf, send_batch, make_data_args, samples_count,
                   batch_size, resources_count, topic):
     make_data_args.interval = 1
-    make_data_args.start = (datetime.datetime.utcnow() -
+    make_data_args.start = (timeutils.utcnow() -
                             datetime.timedelta(minutes=samples_count))
-    make_data_args.end = datetime.datetime.utcnow()
+    make_data_args.end = timeutils.utcnow()
 
     make_data_args.resource_id = None
     resources_list = [str(uuid.uuid4())