Merge "Get rid of oslo.serialization"
This commit is contained in:
commit
7fa890fb01
|
@ -13,6 +13,7 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
import base64
|
||||||
import gzip
|
import gzip
|
||||||
import io
|
import io
|
||||||
import logging
|
import logging
|
||||||
|
@ -27,7 +28,6 @@ import time
|
||||||
|
|
||||||
from oslo_concurrency import processutils
|
from oslo_concurrency import processutils
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_serialization import base64
|
|
||||||
from oslo_utils import excutils
|
from oslo_utils import excutils
|
||||||
from oslo_utils import imageutils
|
from oslo_utils import imageutils
|
||||||
from oslo_utils import units
|
from oslo_utils import units
|
||||||
|
@ -564,7 +564,7 @@ def _get_configdrive(configdrive, node_uuid, tempdir=None):
|
||||||
dir=tempdir)
|
dir=tempdir)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
data = io.BytesIO(base64.decode_as_bytes(data))
|
data = io.BytesIO(base64.b64decode(data))
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
if isinstance(data, bytes):
|
if isinstance(data, bytes):
|
||||||
LOG.debug('Config drive for node %(node)s is not base64 encoded '
|
LOG.debug('Config drive for node %(node)s is not base64 encoded '
|
||||||
|
|
|
@ -24,10 +24,10 @@ SHOULD include dedicated exception logging.
|
||||||
|
|
||||||
import collections
|
import collections
|
||||||
from http import client as http_client
|
from http import client as http_client
|
||||||
|
import json
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
from oslo_serialization import jsonutils
|
|
||||||
from oslo_utils import excutils
|
from oslo_utils import excutils
|
||||||
|
|
||||||
from ironic_lib.common.i18n import _
|
from ironic_lib.common.i18n import _
|
||||||
|
@ -67,7 +67,7 @@ def _ensure_exception_kwargs_serializable(exc_class_name, kwargs):
|
||||||
constructor.
|
constructor.
|
||||||
:returns: a dictionary of serializable keyword arguments.
|
:returns: a dictionary of serializable keyword arguments.
|
||||||
"""
|
"""
|
||||||
serializers = [(jsonutils.dumps, _('when converting to JSON')),
|
serializers = [(json.dumps, _('when converting to JSON')),
|
||||||
(str, _('when converting to string'))]
|
(str, _('when converting to string'))]
|
||||||
exceptions = collections.defaultdict(list)
|
exceptions = collections.defaultdict(list)
|
||||||
serializable_kwargs = {}
|
serializable_kwargs = {}
|
||||||
|
|
|
@ -53,8 +53,8 @@ class TestIronicException(base.IronicLibTestCase):
|
||||||
e = TestException(spam=Unserializable(), ham='eggs')
|
e = TestException(spam=Unserializable(), ham='eggs')
|
||||||
message = log_mock.call_args[0][0] % log_mock.call_args[0][1]
|
message = log_mock.call_args[0][0] % log_mock.call_args[0][1]
|
||||||
self.assertIsNotNone(
|
self.assertIsNotNone(
|
||||||
re.search('spam: .*JSON.* ValueError: Circular reference detected;'
|
re.search('spam: .*JSON.* NotImplementedError: nostr', message),
|
||||||
'.*string.* NotImplementedError: nostr', message)
|
message
|
||||||
)
|
)
|
||||||
self.assertEqual({'ham': '"eggs"', 'code': 500}, e.kwargs)
|
self.assertEqual({'ham': '"eggs"', 'code': 500}, e.kwargs)
|
||||||
|
|
||||||
|
@ -66,6 +66,6 @@ class TestIronicException(base.IronicLibTestCase):
|
||||||
ham='eggs')
|
ham='eggs')
|
||||||
message = log_mock.call_args[0][0] % log_mock.call_args[0][1]
|
message = log_mock.call_args[0][0] % log_mock.call_args[0][1]
|
||||||
self.assertIsNotNone(
|
self.assertIsNotNone(
|
||||||
re.search('spam: .*JSON.* ValueError: Circular reference detected;'
|
re.search('spam: .*JSON.* NotImplementedError: nostr', message),
|
||||||
'.*string.* NotImplementedError: nostr', message)
|
message
|
||||||
)
|
)
|
||||||
|
|
|
@ -6,7 +6,6 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||||
oslo.concurrency>=3.26.0 # Apache-2.0
|
oslo.concurrency>=3.26.0 # Apache-2.0
|
||||||
oslo.config>=5.2.0 # Apache-2.0
|
oslo.config>=5.2.0 # Apache-2.0
|
||||||
oslo.i18n>=3.15.3 # Apache-2.0
|
oslo.i18n>=3.15.3 # Apache-2.0
|
||||||
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
|
||||||
oslo.utils>=3.33.0 # Apache-2.0
|
oslo.utils>=3.33.0 # Apache-2.0
|
||||||
requests>=2.14.2 # Apache-2.0
|
requests>=2.14.2 # Apache-2.0
|
||||||
oslo.log>=3.36.0 # Apache-2.0
|
oslo.log>=3.36.0 # Apache-2.0
|
||||||
|
|
Loading…
Reference in New Issue