diff --git a/barbicanclient/tests/v1/test_containers.py b/barbicanclient/tests/v1/test_containers.py index fa490019..82552747 100644 --- a/barbicanclient/tests/v1/test_containers.py +++ b/barbicanclient/tests/v1/test_containers.py @@ -13,9 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json - import mock +from oslo_serialization import jsonutils from oslo_utils import timeutils import six @@ -150,7 +149,7 @@ class WhenTestingContainers(test_client.BaseEntityResource): self.responses.last_request.url) # Verify that correct information was sent in the call. - container_req = json.loads(self.responses.last_request.text) + container_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(self.container.name, container_req['name']) self.assertEqual(self.container.type, container_req['type']) self.assertEqual(self.container.generic_secret_refs_json, @@ -172,7 +171,7 @@ class WhenTestingContainers(test_client.BaseEntityResource): self.responses.last_request.url) # Verify that correct information was sent in the call. - container_req = json.loads(self.responses.last_request.text) + container_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(self.container.name, container_req['name']) self.assertEqual(self.container.type, container_req['type']) self.assertEqual(self.container.generic_secret_refs_json, @@ -197,7 +196,7 @@ class WhenTestingContainers(test_client.BaseEntityResource): self.responses.last_request.url) # Verify that correct information was sent in the call. - container_req = json.loads(self.responses.last_request.text) + container_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(self.container.name, container_req['name']) self.assertEqual('certificate', container_req['type']) self.assertItemsEqual(self.container.certificate_secret_refs_json, @@ -222,7 +221,7 @@ class WhenTestingContainers(test_client.BaseEntityResource): self.responses.last_request.url) # Verify that correct information was sent in the call. - container_req = json.loads(self.responses.last_request.text) + container_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(self.container.name, container_req['name']) self.assertEqual('certificate', container_req['type']) self.assertItemsEqual(self.container.certificate_secret_refs_json, @@ -246,7 +245,7 @@ class WhenTestingContainers(test_client.BaseEntityResource): self.responses.last_request.url) # Verify that correct information was sent in the call. - container_req = json.loads(self.responses.last_request.text) + container_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(self.container.name, container_req['name']) self.assertEqual('rsa', container_req['type']) self.assertItemsEqual(self.container.rsa_secret_refs_json, @@ -271,7 +270,7 @@ class WhenTestingContainers(test_client.BaseEntityResource): self.responses.last_request.url) # Verify that correct information was sent in the call. - container_req = json.loads(self.responses.last_request.text) + container_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(self.container.name, container_req['name']) self.assertEqual('rsa', container_req['type']) self.assertItemsEqual(self.container.rsa_secret_refs_json, @@ -546,7 +545,7 @@ class WhenTestingContainers(test_client.BaseEntityResource): self.assertIsInstance(container, containers.Container) self.assertEqual(self.entity_href, container.container_ref) - body = json.loads(self.responses.last_request.text) + body = jsonutils.loads(self.responses.last_request.text) self.assertEqual(self.consumers_post_resource, self.responses.last_request.url) self.assertEqual(self.container.consumer, body) @@ -560,7 +559,7 @@ class WhenTestingContainers(test_client.BaseEntityResource): self.container.consumer.get('URL') ) - body = json.loads(self.responses.last_request.text) + body = jsonutils.loads(self.responses.last_request.text) self.assertEqual(self.consumers_delete_resource, self.responses.last_request.url) self.assertEqual(self.container.consumer, body) diff --git a/barbicanclient/tests/v1/test_orders.py b/barbicanclient/tests/v1/test_orders.py index ec1231ae..6053cd04 100644 --- a/barbicanclient/tests/v1/test_orders.py +++ b/barbicanclient/tests/v1/test_orders.py @@ -12,8 +12,8 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. -import json +from oslo_serialization import jsonutils from oslo_utils import timeutils import uuid @@ -88,7 +88,7 @@ class OrdersTestCase(test_client.BaseEntityResource): self.manager = self.client.orders def _get_order_args(self, order_data): - order_args = json.loads(order_data) + order_args = jsonutils.loads(order_data) order_args.update(order_args.pop('meta')) order_args.pop('type') return order_args @@ -152,7 +152,7 @@ class WhenTestingKeyOrders(OrdersTestCase): self.responses.last_request.url) # Verify that correct information was sent in the call. - order_req = json.loads(self.responses.last_request.text) + order_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual('name', order_req['meta']['name']) self.assertEqual('algorithm', order_req['meta']['algorithm']) @@ -176,7 +176,7 @@ class WhenTestingKeyOrders(OrdersTestCase): self.responses.last_request.url) # Verify that correct information was sent in the call. - order_req = json.loads(self.responses.last_request.text) + order_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual('name', order_req['meta']['name']) self.assertEqual('algorithm', order_req['meta']['algorithm']) @@ -321,7 +321,8 @@ class WhenTestingOrderManager(OrdersTestCase): self.entity_href) def test_should_get_list(self): - data = {"orders": [json.loads(self.key_order_data) for _ in range(3)]} + data = {"orders": [jsonutils.loads(self.key_order_data) + for _ in range(3)]} self.responses.get(self.entity_base, json=data) orders_list = self.manager.list(limit=10, offset=5) @@ -418,7 +419,7 @@ class WhenTestingCertificateOrders(OrdersTestCase): self.responses.last_request.url) # Verify that correct information was sent in the call. - order_req = json.loads(self.responses.last_request.text) + order_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual('name', order_req['meta']['name']) self.assertEqual('cn=server.example.com,o=example.com', order_req['meta']['subject_dn']) @@ -428,7 +429,8 @@ class WhenTestingCertificateOrders(OrdersTestCase): order_req['meta']['container_ref']) def test_list(self): - data = {"orders": [json.loads(self.cert_order_data) for _ in range(3)]} + data = {"orders": [jsonutils.loads(self.cert_order_data) + for _ in range(3)]} self.responses.get(self.entity_base, json=data) orders_list = self.manager.list(limit=10, offset=5) diff --git a/barbicanclient/tests/v1/test_secrets.py b/barbicanclient/tests/v1/test_secrets.py index 748ec614..dcc2fdfd 100644 --- a/barbicanclient/tests/v1/test_secrets.py +++ b/barbicanclient/tests/v1/test_secrets.py @@ -12,9 +12,10 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. -import base64 -import json +import base64 + +from oslo_serialization import jsonutils from oslo_utils import timeutils from barbicanclient import base @@ -72,7 +73,7 @@ class WhenTestingSecrets(test_client.BaseEntityResource): self.assertEqual(self.entity_href, secret_href) # Verify that correct information was sent in the call. - secret_req = json.loads(self.responses.last_request.text) + secret_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(self.secret.name, secret_req['name']) self.assertEqual(self.secret.payload, secret_req['payload']) @@ -87,7 +88,7 @@ class WhenTestingSecrets(test_client.BaseEntityResource): self.assertEqual(self.entity_href, secret_href) # Verify that correct information was sent in the call. - secret_req = json.loads(self.responses.last_request.text) + secret_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(self.secret.name, secret_req['name']) self.assertEqual(self.secret.payload, secret_req['payload']) @@ -109,7 +110,7 @@ class WhenTestingSecrets(test_client.BaseEntityResource): secret.payload = binary_payload secret.store() - secret_req = json.loads(self.responses.last_request.text) + secret_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(self.secret.name, secret_req['name']) self.assertEqual(u'application/octet-stream', secret_req['payload_content_type']) @@ -130,7 +131,7 @@ class WhenTestingSecrets(test_client.BaseEntityResource): secret.payload = text_payload secret.store() - secret_req = json.loads(self.responses.last_request.text) + secret_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(text_payload, secret_req['payload']) self.assertEqual(u'text/plain', secret_req['payload_content_type']) @@ -151,7 +152,7 @@ class WhenTestingSecrets(test_client.BaseEntityResource): secret.payload_content_type = payload_content_type secret.store() - secret_req = json.loads(self.responses.last_request.text) + secret_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(payload, secret_req['payload']) self.assertEqual(payload_content_type, secret_req['payload_content_type']) @@ -177,7 +178,7 @@ class WhenTestingSecrets(test_client.BaseEntityResource): secret.payload_content_encoding = payload_content_encoding secret.store() - secret_req = json.loads(self.responses.last_request.text) + secret_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(encoded_payload, secret_req['payload']) self.assertEqual(payload_content_type, secret_req['payload_content_type'])