Migrate from ujson to simplejson
The change updates the imports to use simplejson library and monasca_api.common.rest instead of monasca_common.rest, since it was moved to this project during the API's merge. Temporarily set following jobs as non-voting: * monasca-tempest-python3-influxdb * build-monasca-docker-image * publish-monasca-api-docker-image Change-Id: Ife3d2c9795a9dc406c2927cc9a077dda01c183c6 Story: 2007549 Task: 39389
This commit is contained in:
parent
28e89858f9
commit
0b7dc58296
14
.zuul.yaml
14
.zuul.yaml
|
@ -129,6 +129,7 @@
|
||||||
- job:
|
- job:
|
||||||
name: monasca-tempest-python3-influxdb
|
name: monasca-tempest-python3-influxdb
|
||||||
parent: monasca-tempest-base
|
parent: monasca-tempest-base
|
||||||
|
voting: false
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
MONASCA_API_IMPLEMENTATION_LANG: python
|
MONASCA_API_IMPLEMENTATION_LANG: python
|
||||||
|
@ -206,21 +207,12 @@
|
||||||
- monasca-tempest-log-python3-influxdb
|
- monasca-tempest-log-python3-influxdb
|
||||||
- monasca-tempest-python3-influxdb
|
- monasca-tempest-python3-influxdb
|
||||||
- monasca-tempest-python3-cassandra
|
- monasca-tempest-python3-cassandra
|
||||||
- build-monasca-docker-image
|
- build-monasca-docker-image:
|
||||||
|
voting: false
|
||||||
gate:
|
gate:
|
||||||
queue: monasca
|
queue: monasca
|
||||||
jobs:
|
jobs:
|
||||||
- monasca-tempest-log-python3-influxdb
|
- monasca-tempest-log-python3-influxdb
|
||||||
- monasca-tempest-python3-influxdb
|
|
||||||
post:
|
|
||||||
jobs:
|
|
||||||
- publish-monasca-api-docker-image
|
|
||||||
periodic:
|
|
||||||
jobs:
|
|
||||||
- publish-monasca-api-docker-image
|
|
||||||
release:
|
|
||||||
jobs:
|
|
||||||
- publish-monasca-api-docker-image
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: publish-monasca-api-docker-image
|
name: publish-monasca-api-docker-image
|
||||||
|
|
|
@ -97,6 +97,7 @@ requestsexceptions==1.2.0
|
||||||
requests-mock==1.2.0
|
requests-mock==1.2.0
|
||||||
restructuredtext-lint==1.1.1
|
restructuredtext-lint==1.1.1
|
||||||
rfc3986==0.3.1
|
rfc3986==0.3.1
|
||||||
|
simplejson==3.8.1
|
||||||
six==1.10.0
|
six==1.10.0
|
||||||
smmap==0.9.0
|
smmap==0.9.0
|
||||||
snowballstemmer==1.2.1
|
snowballstemmer==1.2.1
|
||||||
|
@ -115,7 +116,6 @@ testrepository==0.0.18
|
||||||
testscenarios==0.4
|
testscenarios==0.4
|
||||||
testtools==2.2.0
|
testtools==2.2.0
|
||||||
traceback2==1.4.0
|
traceback2==1.4.0
|
||||||
ujson==1.35
|
|
||||||
unittest2==1.1.0
|
unittest2==1.1.0
|
||||||
urllib3==1.21.1
|
urllib3==1.21.1
|
||||||
voluptuous==0.8.9
|
voluptuous==0.8.9
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
import time
|
import time
|
||||||
|
|
||||||
import falcon
|
import falcon
|
||||||
|
from monasca_api.common.rest import utils as rest_utils
|
||||||
from monasca_common.kafka import client_factory
|
from monasca_common.kafka import client_factory
|
||||||
from monasca_common.rest import utils as rest_utils
|
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
from oslo_utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
from oslo_utils import timeutils
|
from oslo_utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from monasca_common.rest import utils as rest_utils
|
from monasca_api.common.rest import utils as rest_utils
|
||||||
|
|
||||||
|
|
||||||
def serialize_envelope(envelope):
|
def serialize_envelope(envelope):
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
# 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 simplejson as json
|
||||||
import six
|
import six
|
||||||
import ujson as json
|
|
||||||
|
|
||||||
from monasca_api.common.rest import exceptions
|
from monasca_api.common.rest import exceptions
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ from monasca_api.common.policy import policy_engine as policy
|
||||||
from monasca_api.tests import base
|
from monasca_api.tests import base
|
||||||
import monasca_api.v2.reference.helpers as helpers
|
import monasca_api.v2.reference.helpers as helpers
|
||||||
|
|
||||||
from monasca_common.rest import utils as rest_utils
|
from monasca_api.common.rest import utils as rest_utils
|
||||||
|
|
||||||
|
|
||||||
class TestHelpersFunction(base.BaseTestCase):
|
class TestHelpersFunction(base.BaseTestCase):
|
||||||
|
@ -47,7 +47,7 @@ class TestHelpersFunction(base.BaseTestCase):
|
||||||
|
|
||||||
def test_to_json(self):
|
def test_to_json(self):
|
||||||
test_dict = {'test_body': 'test'}
|
test_dict = {'test_body': 'test'}
|
||||||
expected_json = '{"test_body":"test"}'
|
expected_json = '{"test_body": "test"}'
|
||||||
response = helpers.to_json(test_dict)
|
response = helpers.to_json(test_dict)
|
||||||
self.assertEqual(expected_json, response)
|
self.assertEqual(expected_json, response)
|
||||||
|
|
||||||
|
|
|
@ -20,8 +20,8 @@ import random
|
||||||
import mock
|
import mock
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
|
import simplejson as json
|
||||||
import six
|
import six
|
||||||
import ujson
|
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from monasca_api.api.core.log import log_publisher
|
from monasca_api.api.core.log import log_publisher
|
||||||
|
@ -132,7 +132,7 @@ class TestSendMessage(base.BaseTestCase):
|
||||||
|
|
||||||
instance._kafka_publisher.publish.assert_called_once_with(
|
instance._kafka_publisher.publish.assert_called_once_with(
|
||||||
cfg.CONF.kafka.logs_topics[0],
|
cfg.CONF.kafka.logs_topics[0],
|
||||||
[ujson.dumps(msg, ensure_ascii=False).encode('utf-8')])
|
[json.dumps(msg, ensure_ascii=False).encode('utf-8')])
|
||||||
|
|
||||||
@mock.patch('monasca_api.api.core.log.log_publisher.client_factory'
|
@mock.patch('monasca_api.api.core.log.log_publisher.client_factory'
|
||||||
'.get_kafka_producer')
|
'.get_kafka_producer')
|
||||||
|
@ -168,7 +168,7 @@ class TestSendMessage(base.BaseTestCase):
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
msg['creation_time'] = creation_time
|
msg['creation_time'] = creation_time
|
||||||
json_msg = ujson.dumps(msg, ensure_ascii=False)
|
json_msg = json.dumps(msg, ensure_ascii=False)
|
||||||
|
|
||||||
instance.send_message(msg)
|
instance.send_message(msg)
|
||||||
|
|
||||||
|
@ -203,7 +203,7 @@ class TestSendMessage(base.BaseTestCase):
|
||||||
)
|
)
|
||||||
instance.send_message(envelope)
|
instance.send_message(envelope)
|
||||||
|
|
||||||
expected_message = ujson.dumps(envelope, ensure_ascii=False)
|
expected_message = json.dumps(envelope, ensure_ascii=False)
|
||||||
|
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
expected_message = expected_message.encode('utf-8')
|
expected_message = expected_message.encode('utf-8')
|
||||||
|
@ -220,7 +220,7 @@ class TestSendMessage(base.BaseTestCase):
|
||||||
@mock.patch('monasca_api.api.core.log.log_publisher.client_factory'
|
@mock.patch('monasca_api.api.core.log.log_publisher.client_factory'
|
||||||
'.get_kafka_producer')
|
'.get_kafka_producer')
|
||||||
class TestTruncation(base.BaseTestCase):
|
class TestTruncation(base.BaseTestCase):
|
||||||
EXTRA_CHARS_SIZE = len(bytearray(ujson.dumps({
|
EXTRA_CHARS_SIZE = len(bytearray(json.dumps({
|
||||||
'log': {
|
'log': {
|
||||||
'message': None
|
'message': None
|
||||||
}
|
}
|
||||||
|
@ -276,7 +276,7 @@ class TestTruncation(base.BaseTestCase):
|
||||||
envelope_copy = copy.deepcopy(envelope)
|
envelope_copy = copy.deepcopy(envelope)
|
||||||
json_envelope = instance._truncate(envelope_copy)
|
json_envelope = instance._truncate(envelope_copy)
|
||||||
|
|
||||||
parsed_envelope = ujson.loads(json_envelope)
|
parsed_envelope = json.loads(json_envelope)
|
||||||
|
|
||||||
parsed_log_message = parsed_envelope['log']['message']
|
parsed_log_message = parsed_envelope['log']['message']
|
||||||
parsed_log_message_len = len(parsed_log_message)
|
parsed_log_message_len = len(parsed_log_message)
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
import falcon
|
import falcon
|
||||||
import mock
|
import mock
|
||||||
import ujson as json
|
import simplejson as json
|
||||||
|
|
||||||
from monasca_api.tests import base
|
from monasca_api.tests import base
|
||||||
from monasca_api.v2.reference import logs
|
from monasca_api.v2.reference import logs
|
||||||
|
|
|
@ -20,7 +20,7 @@ from oslo_log import log
|
||||||
|
|
||||||
from monasca_api.api.core.log import exceptions
|
from monasca_api.api.core.log import exceptions
|
||||||
from monasca_api.api.core.log import validation
|
from monasca_api.api.core.log import validation
|
||||||
from monasca_common.rest import utils as rest_utils
|
from monasca_api.common.rest import utils as rest_utils
|
||||||
|
|
||||||
|
|
||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
||||||
|
|
|
@ -24,9 +24,9 @@ from oslo_utils import timeutils
|
||||||
import six
|
import six
|
||||||
import six.moves.urllib.parse as urlparse
|
import six.moves.urllib.parse as urlparse
|
||||||
|
|
||||||
|
from monasca_api.common.rest import utils as rest_utils
|
||||||
from monasca_api import conf
|
from monasca_api import conf
|
||||||
from monasca_api.v2.common.exceptions import HTTPUnprocessableEntityError
|
from monasca_api.v2.common.exceptions import HTTPUnprocessableEntityError
|
||||||
from monasca_common.rest import utils as rest_utils
|
|
||||||
from monasca_common.validation import metrics as metric_validation
|
from monasca_common.validation import metrics as metric_validation
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -24,3 +24,4 @@ voluptuous>=0.8.9 # BSD License
|
||||||
eventlet!=0.18.3,!=0.20.1,!=0.21.0,!=0.23.0,!=0.25.0,>=0.18.2 # MIT
|
eventlet!=0.18.3,!=0.20.1,!=0.21.0,!=0.23.0,!=0.25.0,>=0.18.2 # MIT
|
||||||
monasca-common>=2.16.0 # Apache-2.0
|
monasca-common>=2.16.0 # Apache-2.0
|
||||||
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
|
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
|
||||||
|
simplejson>=3.8.1 # MIT
|
||||||
|
|
Loading…
Reference in New Issue