Replace deprecated datetime.datetime.utcnow

It was deprecated in Python 3.12 .

Change-Id: I8331e3f9c0ea021767a71baec90ce0866e661bd4
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>

barbican_tempest_plugin/tests/api/test_secrets.py

@@ -14,7 +14,6 @@
 #    under the License.
 
 import base64
-from datetime import datetime
 from datetime import timedelta
 import os
 
@@ -22,6 +21,7 @@ from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
 
+from oslo_utils import timeutils
 from tempest.lib import decorators
 
 from barbican_tempest_plugin.tests.api import base
@@ -44,7 +44,7 @@ class SecretsTest(base.BaseKeyManagerTest):
             iterations=1000, backend=default_backend()
         )
         key = base64.b64encode(kdf.derive(password))
-        expire_time = (datetime.utcnow() + timedelta(days=5))
+        expire_time = (timeutils.utcnow() + timedelta(days=5))
         sec = self.create_secret(
             expiration=expire_time.isoformat(), algorithm="aes",
             bit_length=256, mode="cbc", payload=key,

barbican_tempest_plugin/tests/rbac/v1/base.py

@@ -11,7 +11,6 @@
 # under the License.
 
 import base64
-from datetime import datetime
 from datetime import timedelta
 import os
 
@@ -19,6 +18,7 @@ from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
 
+from oslo_utils import timeutils
 from tempest import clients
 from tempest import config
 from tempest.lib import auth
@@ -249,7 +249,7 @@ class BarbicanV1RbacBase(test.BaseTestCase,
 
     def create_aes_secret_admin(self, secret_name):
         key = create_aes_key()
-        expire_time = (datetime.utcnow() + timedelta(days=5))
+        expire_time = (timeutils.utcnow() + timedelta(days=5))
         return key, self.do_request(
             'create_secret', client=self.admin_secret_client,
             expected_status=201, cleanup="secret",

barbican_tempest_plugin/tests/rbac/v1/test_secrets.py

@@ -12,9 +12,9 @@
 
 import abc
 import base64
-from datetime import datetime
 from datetime import timedelta
 
+from oslo_utils import timeutils
 from tempest import config
 from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
@@ -277,7 +277,7 @@ class ProjectReaderTests(ProjectReaderBase, BarbicanV1RbacSecrets):
         self.assertRaises(exceptions.Forbidden, self.client.create_secret)
 
         key = rbac_base.create_aes_key()
-        expire_time = (datetime.utcnow() + timedelta(days=5))
+        expire_time = (timeutils.utcnow() + timedelta(days=5))
 
         self.assertRaises(
             exceptions.Forbidden, self.client.create_secret,
@@ -521,7 +521,7 @@ class ProjectMemberTests(ProjectReaderTests):
         self.client.create_secret(name='test_create_secret')
 
         key = rbac_base.create_aes_key()
-        expire_time = (datetime.utcnow() + timedelta(days=5))
+        expire_time = (timeutils.utcnow() + timedelta(days=5))
         self.client.create_secret(
             name='test_create_secret2',
             expiration=expire_time.isoformat(), algorithm="aes",

barbican_tempest_plugin/tests/scenario/barbican_manager.py

@@ -14,7 +14,6 @@
 #    under the License.
 
 import base64
-from datetime import datetime
 from datetime import timedelta
 import os
 
@@ -28,6 +27,7 @@ from cryptography import x509
 from cryptography.x509.oid import NameOID
 
 from oslo_log import log as logging
+from oslo_utils import timeutils
 from tempest.api.compute import api_microversion_fixture
 from tempest import config
 from tempest.lib import exceptions as lib_exc
@@ -128,8 +128,8 @@ class BarbicanScenarioTest(mgr.ScenarioTest):
             subject_name=issuer,
             public_key=private_key.public_key(),
             serial_number=x509.random_serial_number(),
-            not_valid_before=datetime.utcnow(),
-            not_valid_after=datetime.utcnow() + timedelta(days=10)
+            not_valid_before=timeutils.utcnow(),
+            not_valid_after=timeutils.utcnow() + timedelta(days=10)
         ).add_extension(
             x509.BasicConstraints(
                 ca=True,
@@ -158,7 +158,7 @@ class BarbicanScenarioTest(mgr.ScenarioTest):
     def _store_cert(self, cert):
         pem_encoding = cert.public_bytes(encoding=serialization.Encoding.PEM)
         cert_b64 = base64.b64encode(pem_encoding)
-        expire_time = (datetime.utcnow() + timedelta(days=5))
+        expire_time = (timeutils.utcnow() + timedelta(days=5))
         LOG.debug("Uploading certificate to barbican")
         result = self.secret_client.create_secret(
             expiration=expire_time.isoformat(), algorithm="rsa",

requirements.txt

@@ -8,3 +8,4 @@ tempest>=27.0.0 # Apache-2.0
 cryptography>=2.1 # BSD/Apache-2.0
 
 oslo.config>=5.2.0 # Apache-2.0
+oslo.utils>=7.0.0 # Apache-2.0