From 54c80d9b96448cf24570499e065b7bc7ffdf3023 Mon Sep 17 00:00:00 2001 From: Ivan Kliuk Date: Wed, 1 Oct 2014 06:32:44 +0300 Subject: [PATCH] Refactoring JSON serialization of response object Swapping DRY code jsonutils.loads(webob.TestResponse.body) with webob.TestResponse.json_body property. Change-Id: I2f4e0cd3f1f8abc209e19491287f3630b1c4e80d Closes-Bug: #1304967 --- nailgun/nailgun/test/base.py | 22 +++---- .../test/integration/test_attributes.py | 6 +- .../test/integration/test_capacity_handler.py | 3 +- .../test/integration/test_changes_model.py | 5 +- .../test_cluster_changes_handler.py | 34 +++++----- .../test_cluster_collection_handlers.py | 12 ++-- .../test/integration/test_cluster_handler.py | 15 ++--- .../integration/test_network_configuration.py | 66 +++++++++---------- .../test/integration/test_network_manager.py | 4 +- .../test/integration/test_network_models.py | 4 +- .../integration/test_network_validation.py | 19 +++--- .../test_node_allocation_stats_handler.py | 3 +- .../test_node_collection_handlers.py | 49 ++++++-------- .../test/integration/test_node_handler.py | 19 +++--- .../integration/test_node_nic_assignment.py | 44 ++++++------- .../test_node_nic_collection_handler.py | 33 +++++----- .../test_node_nic_handlers_w_bonding.py | 20 +++--- .../integration/test_orchestrator_handlers.py | 13 ++-- .../test/integration/test_put_same_json.py | 8 +-- .../nailgun/test/integration/test_roles.py | 22 +++---- .../test/integration/test_rpc_consumer.py | 3 +- .../test/integration/test_task_managers.py | 3 +- .../test_verify_networks_task_manager.py | 26 ++++---- .../test/unit/test_fuel_key_handler.py | 2 +- .../nailgun/test/unit/test_logs_handlers.py | 15 ++--- nailgun/nailgun/test/unit/test_node_disks.py | 8 +-- .../test/unit/test_node_nic_handler.py | 36 ++++------ .../test_notification_collection_handler.py | 29 ++++---- .../test/unit/test_notification_handler.py | 33 +++++----- .../unit/test_release_collection_handlers.py | 8 +-- .../nailgun/test/unit/test_release_handler.py | 12 ++-- .../nailgun/test/unit/test_version_handler.py | 3 +- 32 files changed, 260 insertions(+), 319 deletions(-) diff --git a/nailgun/nailgun/test/base.py b/nailgun/nailgun/test/base.py index 2d00ff115f..5aafb03708 100644 --- a/nailgun/nailgun/test/base.py +++ b/nailgun/nailgun/test/base.py @@ -142,7 +142,7 @@ class Environment(object): headers=self.default_headers ) self.tester.assertEqual(resp.status_code, 201) - release = jsonutils.loads(resp.body) + release = resp.json_body self.releases.append( self.db.query(Release).get(release['id']) ) @@ -177,7 +177,7 @@ class Environment(object): expect_errors=True ) self.tester.assertEqual(resp.status_code, 201) - cluster = jsonutils.loads(resp.body) + cluster = resp.json_body self.clusters.append( Cluster.get_by_uid(cluster['id']) ) @@ -238,7 +238,7 @@ class Environment(object): if str(expect_http)[0] != "2": return None self.tester.assertEqual(resp.status_code, expect_http) - node = jsonutils.loads(resp.body) + node = resp.json_body node_db = Node.get_by_uid(node['id']) if 'interfaces' not in node_data['meta'] \ or not node_data['meta']['interfaces']: @@ -468,7 +468,7 @@ class Environment(object): expect_errors=True ) self.tester.assertEqual(202, resp.status_code) - response = jsonutils.loads(resp.body) + response = resp.json_body return self.db.query(Task).filter_by( uuid=response['uuid'] ).first() @@ -486,9 +486,8 @@ class Environment(object): headers=self.default_headers) self.tester.assertEqual(202, resp.status_code) - response = jsonutils.loads(resp.body) return self.db.query(Task).filter_by( - uuid=response['uuid'] + uuid=resp.json_body['uuid'] ).first() else: raise NotImplementedError( @@ -506,9 +505,8 @@ class Environment(object): self.tester.assertEqual(expect_http, resp.status_code) if not str(expect_http).startswith("2"): return resp.body - response = jsonutils.loads(resp.body) return self.db.query(Task).filter_by( - uuid=response['uuid'] + uuid=resp.json_body['uuid'] ).first() else: raise NotImplementedError( @@ -526,9 +524,8 @@ class Environment(object): self.tester.assertEqual(resp.status_code, expect_http) if not str(expect_http).startswith("2"): return resp.body - response = jsonutils.loads(resp.body) return self.db.query(Task).filter_by( - uuid=response['uuid'] + uuid=resp.json_body['uuid'] ).first() else: raise NotImplementedError( @@ -569,8 +566,7 @@ class Environment(object): headers=self.default_headers ) self.tester.assertEqual(202, resp.status_code) - response = jsonutils.loads(resp.body) - task_uuid = response['uuid'] + task_uuid = resp.json_body['uuid'] return self.db.query(Task).filter_by(uuid=task_uuid).first() else: raise NotImplementedError( @@ -585,7 +581,7 @@ class Environment(object): kwargs={"node_id": node_id}), headers=self.default_headers) self.tester.assertEqual(resp.status_code, 200) - data = jsonutils.loads(resp.body) + data = resp.json_body nics = self.db.query(NodeNICInterface).filter( NodeNICInterface.name.in_(nic_names) diff --git a/nailgun/nailgun/test/integration/test_attributes.py b/nailgun/nailgun/test/integration/test_attributes.py index 208d0d4cb2..6560572129 100644 --- a/nailgun/nailgun/test/integration/test_attributes.py +++ b/nailgun/nailgun/test/integration/test_attributes.py @@ -36,7 +36,7 @@ class TestAttributes(BaseIntegrationTest): release = objects.Release.get_by_uid(cluster['release_id']) self.assertEqual(200, resp.status_code) self.assertEqual( - jsonutils.loads(resp.body)['editable'], + resp.json_body['editable'], release.attributes_metadata['editable'] ) attrs = objects.Cluster.get_attributes(cluster_db) @@ -156,7 +156,7 @@ class TestAttributes(BaseIntegrationTest): ) self.assertEqual(200, resp.status_code) self.assertEqual( - jsonutils.loads(resp.body)['editable'], + resp.json_body['editable'], release.attributes_metadata['editable'] ) @@ -191,7 +191,7 @@ class TestAttributes(BaseIntegrationTest): cluster['release_id'] ) self.assertEqual( - jsonutils.loads(resp.body)['editable'], + resp.json_body['editable'], release.attributes_metadata['editable'] ) diff --git a/nailgun/nailgun/test/integration/test_capacity_handler.py b/nailgun/nailgun/test/integration/test_capacity_handler.py index 04e74e560c..0f180fb04a 100644 --- a/nailgun/nailgun/test/integration/test_capacity_handler.py +++ b/nailgun/nailgun/test/integration/test_capacity_handler.py @@ -20,7 +20,6 @@ from mock import patch from StringIO import StringIO from nailgun.db.sqlalchemy.models import Task -from nailgun.openstack.common import jsonutils from nailgun.test.base import BaseIntegrationTest from nailgun.test.base import fake_tasks from nailgun.test.base import reverse @@ -43,7 +42,7 @@ class TestHandlers(BaseIntegrationTest): reverse('CapacityLogHandler'), headers=self.default_headers ) - return jsonutils.loads(resp.body) + return resp.json_body @fake_tasks() def test_capacity_log_handler(self): diff --git a/nailgun/nailgun/test/integration/test_changes_model.py b/nailgun/nailgun/test/integration/test_changes_model.py index 9a3be35fec..09e73479ac 100644 --- a/nailgun/nailgun/test/integration/test_changes_model.py +++ b/nailgun/nailgun/test/integration/test_changes_model.py @@ -61,10 +61,9 @@ class TestClusterChanges(BaseIntegrationTest): kwargs={'obj_id': cluster['id']}), headers=self.default_headers ) - response = jsonutils.loads(resp.body) self.assertIn( {"name": "disks", "node_id": node_db.id}, - response["changes"] + resp.json_body["changes"] ) def test_node_volumes_clears_after_deletion_from_cluster(self): @@ -142,7 +141,7 @@ class TestClusterChanges(BaseIntegrationTest): kwargs={'cluster_id': cluster['id']}), headers=self.default_headers ) - net_id = jsonutils.loads(resp.body)['networks'][0]["id"] + net_id = resp.json_body['networks'][0]["id"] resp = self.app.put( reverse( 'NovaNetworkConfigurationHandler', diff --git a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py b/nailgun/nailgun/test/integration/test_cluster_changes_handler.py index 2a76cf5dd0..ee169cbc6e 100644 --- a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py +++ b/nailgun/nailgun/test/integration/test_cluster_changes_handler.py @@ -848,8 +848,9 @@ class TestHandlers(BaseIntegrationTest): {"pending_addition": True}] ) - net_data = jsonutils.loads( - self.env.neutron_networks_get(self.env.clusters[0].id).body) + net_data = self.env.neutron_networks_get( + self.env.clusters[0].id + ).json_body pub = filter(lambda ng: ng['name'] == 'public', net_data['networks'])[0] pub.update({'ip_ranges': [['172.16.0.10', '172.16.0.13'], @@ -857,8 +858,7 @@ class TestHandlers(BaseIntegrationTest): resp = self.env.neutron_networks_put(self.env.clusters[0].id, net_data) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) - self.assertEqual(task['status'], 'ready') + self.assertEqual(resp.json_body['status'], 'ready') self.env.launch_deployment() @@ -888,8 +888,9 @@ class TestHandlers(BaseIntegrationTest): {"pending_addition": True}] ) - net_data = jsonutils.loads( - self.env.neutron_networks_get(self.env.clusters[0].id).body) + net_data = self.env.neutron_networks_get( + self.env.clusters[0].id + ).json_body pub = filter(lambda ng: ng['name'] == 'public', net_data['networks'])[0] pub.update({'ip_ranges': [['172.16.0.10', '172.16.0.12'], @@ -897,8 +898,7 @@ class TestHandlers(BaseIntegrationTest): resp = self.env.neutron_networks_put(self.env.clusters[0].id, net_data) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) - self.assertEqual(task['status'], 'ready') + self.assertEqual(resp.json_body['status'], 'ready') self.env.launch_deployment() @@ -925,8 +925,9 @@ class TestHandlers(BaseIntegrationTest): {"pending_addition": True}] ) - net_data = jsonutils.loads( - self.env.neutron_networks_get(self.env.clusters[0].id).body) + net_data = self.env.neutron_networks_get( + self.env.clusters[0].id + ).json_body pub = filter(lambda ng: ng['name'] == 'public', net_data['networks'])[0] pub.update({'ip_ranges': [['172.16.10.10', '172.16.10.122']], @@ -937,8 +938,7 @@ class TestHandlers(BaseIntegrationTest): resp = self.env.neutron_networks_put(self.env.clusters[0].id, net_data) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) - self.assertEqual(task['status'], 'ready') + self.assertEqual(resp.json_body['status'], 'ready') self.env.launch_deployment() @@ -964,16 +964,16 @@ class TestHandlers(BaseIntegrationTest): {"pending_addition": True}] ) - net_data = jsonutils.loads( - self.env.neutron_networks_get(self.env.clusters[0].id).body) + net_data = self.env.neutron_networks_get( + self.env.clusters[0].id + ).json_body pub = filter(lambda ng: ng['name'] == 'public', net_data['networks'])[0] pub.update({'ip_ranges': [['172.16.0.10', '172.16.0.11']]}) resp = self.env.neutron_networks_put(self.env.clusters[0].id, net_data) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) - self.assertEqual(task['status'], 'ready') + self.assertEqual(resp.json_body['status'], 'ready') task = self.env.launch_deployment() @@ -1148,7 +1148,7 @@ class TestHandlers(BaseIntegrationTest): cluster_id = self.env.clusters[0].id resp = self.env.nova_networks_get(cluster_id) - nets = jsonutils.loads(resp.body) + nets = resp.json_body for net in nets["networks"]: if net["name"] in ["management", ]: net["vlan_start"] = None diff --git a/nailgun/nailgun/test/integration/test_cluster_collection_handlers.py b/nailgun/nailgun/test/integration/test_cluster_collection_handlers.py index bfa6390aa2..da9f686924 100644 --- a/nailgun/nailgun/test/integration/test_cluster_collection_handlers.py +++ b/nailgun/nailgun/test/integration/test_cluster_collection_handlers.py @@ -29,11 +29,11 @@ from nailgun.test.base import reverse class TestHandlers(BaseIntegrationTest): def _get_cluster_networks(self, cluster_id): - nets = jsonutils.loads(self.app.get( + nets = self.app.get( reverse('NovaNetworkConfigurationHandler', {"cluster_id": cluster_id}), headers=self.default_headers, - ).body)["networks"] + ).json_body["networks"] return nets def test_cluster_list_empty(self): @@ -42,8 +42,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual([], response) + self.assertEqual([], resp.json_body) def test_cluster_create(self): release_id = self.env.create_release(api=False).id @@ -195,9 +194,8 @@ class TestHandlers(BaseIntegrationTest): @patch('nailgun.rpc.cast') def test_verify_networks(self, mocked_rpc): cluster = self.env.create_cluster(api=True) - nets = jsonutils.loads(self.env.nova_networks_get(cluster['id']).body) + nets = self.env.nova_networks_get(cluster['id']).json_body resp = self.env.nova_networks_put(cluster['id'], nets) self.assertEqual(202, resp.status_code) - task = jsonutils.loads(resp.body) - self.assertEqual(task['status'], 'ready') + self.assertEqual(resp.json_body['status'], 'ready') diff --git a/nailgun/nailgun/test/integration/test_cluster_handler.py b/nailgun/nailgun/test/integration/test_cluster_handler.py index a10b70001f..59f43fd4f2 100644 --- a/nailgun/nailgun/test/integration/test_cluster_handler.py +++ b/nailgun/nailgun/test/integration/test_cluster_handler.py @@ -44,10 +44,9 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(cluster.id, response['id']) - self.assertEqual(cluster.name, response['name']) - self.assertEqual(cluster.release.id, response['release_id']) + self.assertEqual(cluster.id, resp.json_body['id']) + self.assertEqual(cluster.name, resp.json_body['name']) + self.assertEqual(cluster.release.id, resp.json_body['release_id']) def test_cluster_creation(self): release = self.env.create_release(api=False) @@ -61,9 +60,8 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(201, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(yet_another_cluster_name, response['name']) - self.assertEqual(release.id, response['release_id']) + self.assertEqual(yet_another_cluster_name, resp.json_body['name']) + self.assertEqual(release.id, resp.json_body['release_id']) def test_cluster_update(self): updated_name = u'Updated cluster' @@ -248,5 +246,4 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(get_resp.status_code, 200) - self.datadiff(jsonutils.loads(get_resp.body), - cluster.attributes.generated) + self.datadiff(get_resp.json_body, cluster.attributes.generated) diff --git a/nailgun/nailgun/test/integration/test_network_configuration.py b/nailgun/nailgun/test/integration/test_network_configuration.py index 7e58ecbd5d..3f8fb52710 100644 --- a/nailgun/nailgun/test/integration/test_network_configuration.py +++ b/nailgun/nailgun/test/integration/test_network_configuration.py @@ -33,8 +33,8 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): self.cluster = self.db.query(Cluster).get(cluster['id']) def test_get_request_should_return_net_manager_and_networks(self): - response = self.env.nova_networks_get(self.cluster.id) - data = jsonutils.loads(response.body) + resp = self.env.nova_networks_get(self.cluster.id) + data = resp.json_body cluster = self.db.query(Cluster).get(self.cluster.id) self.assertEqual(data['networking_parameters']['net_manager'], @@ -90,8 +90,8 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): ) def test_refresh_mask_on_cidr_change(self): - response = self.env.nova_networks_get(self.cluster.id) - data = jsonutils.loads(response.body) + resp = self.env.nova_networks_get(self.cluster.id) + data = resp.json_body mgmt = [n for n in data['networks'] if n['name'] == 'management'][0] @@ -100,7 +100,7 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): resp = self.env.nova_networks_put(self.cluster.id, data) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'ready') self.db.refresh(self.cluster) @@ -173,7 +173,7 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): resp = self.env.nova_networks_put(self.cluster.id, new_nets, expect_errors=True) self.assertEqual(202, resp.status_code) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'error') self.assertEqual( task['message'], @@ -182,7 +182,7 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): def test_admin_public_floating_untagged_others_tagged(self): resp = self.env.nova_networks_get(self.cluster.id) - data = jsonutils.loads(resp.body) + data = resp.json_body for net in data['networks']: if net['name'] in ('fuelweb_admin', 'public', 'fixed'): self.assertIsNone(net['vlan_start']) @@ -192,7 +192,7 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): def test_mgmt_storage_networks_have_no_gateway(self): resp = self.env.nova_networks_get(self.cluster.id) self.assertEqual(200, resp.status_code) - data = jsonutils.loads(resp.body) + data = resp.json_body for net in data['networks']: if net['name'] in ['management', 'storage']: self.assertIsNone(net['gateway']) @@ -214,7 +214,7 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): ) resp = self.env.nova_networks_get(cluster['id']) - data = jsonutils.loads(resp.body) + data = resp.json_body mgmt = filter(lambda n: n['name'] == 'management', data['networks'])[0] self.assertEqual(mgmt['gateway'], '192.168.0.1') @@ -239,7 +239,7 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): ) resp = self.env.nova_networks_get(cluster['id']) - data = jsonutils.loads(resp.body) + data = resp.json_body for n in data['networks']: if n['name'] in ('management', 'storage'): self.assertIsNone(n['gateway']) @@ -256,8 +256,8 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): self.cluster = self.db.query(Cluster).get(cluster['id']) def test_get_request_should_return_net_provider_segment_and_networks(self): - response = self.env.neutron_networks_get(self.cluster.id) - data = jsonutils.loads(response.body) + resp = self.env.neutron_networks_get(self.cluster.id) + data = resp.json_body cluster = self.db.query(Cluster).get(self.cluster.id) self.assertEqual(data['networking_parameters']['segmentation_type'], @@ -277,8 +277,8 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): self.assertEqual(network[key], getattr(network_group, key)) def test_get_request_should_return_vips(self): - response = self.env.neutron_networks_get(self.cluster.id) - data = jsonutils.loads(response.body) + resp = self.env.neutron_networks_get(self.cluster.id) + data = resp.json_body self.assertIn('public_vip', data) self.assertIn('management_vip', data) @@ -289,8 +289,8 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): self.assertEqual(404, resp.status_code) def test_refresh_mask_on_cidr_change(self): - response = self.env.neutron_networks_get(self.cluster.id) - data = jsonutils.loads(response.body) + resp = self.env.neutron_networks_get(self.cluster.id) + data = resp.json_body mgmt = [n for n in data['networks'] if n['name'] == 'management'][0] @@ -299,7 +299,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): resp = self.env.neutron_networks_put(self.cluster.id, data) self.assertEqual(202, resp.status_code) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'ready') self.db.refresh(self.cluster) @@ -309,13 +309,13 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): def test_do_not_update_net_segmentation_type(self): resp = self.env.neutron_networks_get(self.cluster.id) - data = jsonutils.loads(resp.body) + data = resp.json_body data['networking_parameters']['segmentation_type'] = 'vlan' resp = self.env.neutron_networks_put(self.cluster.id, data, expect_errors=True) self.assertEqual(202, resp.status_code) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'error') self.assertEqual( task['message'], @@ -324,7 +324,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): def test_network_group_update_changes_network(self): resp = self.env.neutron_networks_get(self.cluster.id) - data = jsonutils.loads(resp.body) + data = resp.json_body network = self.db.query(NetworkGroup).get(data['networks'][0]['id']) self.assertIsNotNone(network) @@ -338,7 +338,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): def test_update_networks_fails_if_change_net_segmentation_type(self): resp = self.env.neutron_networks_get(self.cluster.id) - data = jsonutils.loads(resp.body) + data = resp.json_body network = self.db.query(NetworkGroup).get(data['networks'][0]['id']) self.assertIsNotNone(network) @@ -348,7 +348,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): resp = self.env.neutron_networks_put(self.cluster.id, data, expect_errors=True) self.assertEqual(202, resp.status_code) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'error') self.assertEqual( task['message'], @@ -363,7 +363,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): resp = self.env.neutron_networks_put(self.cluster.id, new_nets, expect_errors=True) self.assertEqual(202, resp.status_code) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'error') self.assertEqual( task['message'], @@ -371,8 +371,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): ) def test_refresh_public_cidr_on_its_change(self): - data = jsonutils.loads(self.env.neutron_networks_get( - self.cluster.id).body) + data = self.env.neutron_networks_get(self.cluster.id).json_body publ = filter(lambda ng: ng['name'] == 'public', data['networks'])[0] self.assertEqual(publ['cidr'], '172.16.0.0/24') @@ -385,7 +384,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): resp = self.env.neutron_networks_put(self.cluster.id, data) self.assertEqual(202, resp.status_code) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'ready') self.db.refresh(self.cluster) @@ -395,7 +394,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): def test_admin_public_untagged_others_tagged(self): resp = self.env.neutron_networks_get(self.cluster.id) - data = jsonutils.loads(resp.body) + data = resp.json_body for net in data['networks']: if net['name'] in ('fuelweb_admin', 'public',): self.assertIsNone(net['vlan_start']) @@ -405,7 +404,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): def test_mgmt_storage_networks_have_no_gateway(self): resp = self.env.neutron_networks_get(self.cluster.id) self.assertEqual(200, resp.status_code) - data = jsonutils.loads(resp.body) + data = resp.json_body for net in data['networks']: if net['name'] in ['management', 'storage']: self.assertIsNone(net['gateway']) @@ -427,7 +426,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): ) resp = self.env.neutron_networks_get(cluster['id']) - data = jsonutils.loads(resp.body) + data = resp.json_body mgmt = filter(lambda n: n['name'] == 'management', data['networks'])[0] self.assertEqual(mgmt['gateway'], '192.168.0.1') @@ -444,8 +443,7 @@ class TestNovaNetworkConfigurationHandlerHA(BaseIntegrationTest): self.net_manager = NetworkManager def test_returns_management_vip_and_public_vip(self): - resp = jsonutils.loads( - self.env.nova_networks_get(self.cluster.id).body) + resp = self.env.nova_networks_get(self.cluster.id).json_body self.assertEqual( resp['management_vip'], @@ -477,11 +475,11 @@ class TestAdminNetworkConfiguration(BaseIntegrationTest): def test_netconfig_error_when_admin_cidr_match_other_network_cidr(self): resp = self.env.nova_networks_get(self.cluster['id']) - nets = jsonutils.loads(resp.body) + nets = resp.json_body resp = self.env.nova_networks_put(self.cluster['id'], nets, expect_errors=True) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'error') self.assertEqual(task['progress'], 100) self.assertEqual(task['name'], 'check_networks') @@ -493,7 +491,7 @@ class TestAdminNetworkConfiguration(BaseIntegrationTest): resp = self.env.cluster_changes_put(self.cluster['id'], expect_errors=True) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'error') self.assertEqual(task['progress'], 100) self.assertEqual(task['name'], 'deploy') diff --git a/nailgun/nailgun/test/integration/test_network_manager.py b/nailgun/nailgun/test/integration/test_network_manager.py index 87fe37fb12..c77cf58af6 100644 --- a/nailgun/nailgun/test/integration/test_network_manager.py +++ b/nailgun/nailgun/test/integration/test_network_manager.py @@ -32,7 +32,6 @@ from nailgun.db.sqlalchemy.models import Node from nailgun.db.sqlalchemy.models import NodeNICInterface from nailgun.network.neutron import NeutronManager from nailgun.network.nova_network import NovaNetworkManager -from nailgun.openstack.common import jsonutils from nailgun.test.base import BaseIntegrationTest from nailgun.test.base import fake_tasks @@ -152,8 +151,7 @@ class TestNetworkManager(BaseIntegrationTest): networks_data = \ {'networking_parameters': {'net_manager': 'VlanManager'}} resp = self.env.nova_networks_put(cluster['id'], networks_data) - task = jsonutils.loads(resp.body) - self.assertEqual(task['status'], 'ready') + self.assertEqual(resp.json_body['status'], 'ready') network_data = self.env.network_manager.get_node_networks( self.env.nodes[0] ) diff --git a/nailgun/nailgun/test/integration/test_network_models.py b/nailgun/nailgun/test/integration/test_network_models.py index 9de57117ab..731c2ea29a 100644 --- a/nailgun/nailgun/test/integration/test_network_models.py +++ b/nailgun/nailgun/test/integration/test_network_models.py @@ -46,9 +46,9 @@ class TestNetworkModels(BaseIntegrationTest): supertask = self.env.launch_deployment() self.env.wait_ready(supertask, 60) - test_nets = jsonutils.loads(self.env.nova_networks_get( + test_nets = self.env.nova_networks_get( self.env.clusters[0].id - ).body) + ).json_body resp_nova_net = self.env.nova_networks_put( self.env.clusters[0].id, diff --git a/nailgun/nailgun/test/integration/test_network_validation.py b/nailgun/nailgun/test/integration/test_network_validation.py index c4c0cc5b6d..a3db102432 100644 --- a/nailgun/nailgun/test/integration/test_network_validation.py +++ b/nailgun/nailgun/test/integration/test_network_validation.py @@ -21,7 +21,6 @@ from nailgun.db.sqlalchemy.models import Cluster from nailgun.db.sqlalchemy.models import NetworkGroup from nailgun.db.sqlalchemy.models import NeutronConfig from nailgun.db.sqlalchemy.models import NovaNetworkConfig -from nailgun.openstack.common import jsonutils from nailgun.test.base import BaseIntegrationTest @@ -54,7 +53,7 @@ class TestNetworkChecking(BaseIntegrationTest): resp = self.env.cluster_changes_put(cluster_id, expect_errors=True) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'error') self.assertEqual(task['progress'], 100) self.assertEqual(task['name'], 'deploy') @@ -65,7 +64,7 @@ class TestNetworkChecking(BaseIntegrationTest): resp = self.env.nova_networks_put(cluster_id, nets, expect_errors=True) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'error') self.assertEqual(task['progress'], 100) self.assertEqual(task['name'], 'check_networks') @@ -75,7 +74,7 @@ class TestNetworkChecking(BaseIntegrationTest): def update_nova_networks_success(self, cluster_id, nets): resp = self.env.nova_networks_put(cluster_id, nets) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'ready') self.assertEqual(task['progress'], 100) self.assertEqual(task['name'], 'check_networks') @@ -85,7 +84,7 @@ class TestNetworkChecking(BaseIntegrationTest): resp = self.env.neutron_networks_put(cluster_id, nets, expect_errors=True) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'error') self.assertEqual(task['progress'], 100) self.assertEqual(task['name'], 'check_networks') @@ -95,7 +94,7 @@ class TestNetworkChecking(BaseIntegrationTest): def update_neutron_networks_success(self, cluster_id, nets): resp = self.env.neutron_networks_put(cluster_id, nets) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'ready') self.assertEqual(task['progress'], 100) self.assertEqual(task['name'], 'check_networks') @@ -120,7 +119,7 @@ class TestNovaHandlers(TestNetworkChecking): ) self.cluster = self.env.clusters[0] resp = self.env.nova_networks_get(self.cluster.id) - self.nets = jsonutils.loads(resp.body) + self.nets = resp.json_body def test_network_checking(self): self.update_nova_networks_success(self.cluster.id, self.nets) @@ -413,7 +412,7 @@ class TestNeutronHandlersGre(TestNetworkChecking): ) self.cluster = self.env.clusters[0] resp = self.env.neutron_networks_get(self.cluster.id) - self.nets = jsonutils.loads(resp.body) + self.nets = resp.json_body def test_network_checking(self): self.update_neutron_networks_success(self.cluster.id, self.nets) @@ -557,7 +556,7 @@ class TestNeutronHandlersGre(TestNetworkChecking): self.update_neutron_networks_success(self.cluster.id, self.nets) resp = self.env.neutron_networks_get(self.cluster.id) - self.nets = jsonutils.loads(resp.body) + self.nets = resp.json_body self.assertEqual(self.find_net_by_name('public')['cidr'], '172.16.0.0/25') @@ -715,7 +714,7 @@ class TestNeutronHandlersVlan(TestNetworkChecking): ) self.cluster = self.env.clusters[0] resp = self.env.neutron_networks_get(self.cluster.id) - self.nets = jsonutils.loads(resp.body) + self.nets = resp.json_body def test_network_checking(self): self.update_neutron_networks_success(self.cluster.id, self.nets) diff --git a/nailgun/nailgun/test/integration/test_node_allocation_stats_handler.py b/nailgun/nailgun/test/integration/test_node_allocation_stats_handler.py index 14fc31b643..d5f8ec0bc7 100644 --- a/nailgun/nailgun/test/integration/test_node_allocation_stats_handler.py +++ b/nailgun/nailgun/test/integration/test_node_allocation_stats_handler.py @@ -14,7 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -from nailgun.openstack.common import jsonutils from nailgun.test.base import BaseIntegrationTest from nailgun.test.base import reverse @@ -23,7 +22,7 @@ class TestHandlers(BaseIntegrationTest): def _get_allocation_stats(self): resp = self.app.get( reverse('NodesAllocationStatsHandler')) - return jsonutils.loads(resp.body) + return resp.json_body def test_allocation_stats_unallocated(self): self.env.create_node(api=False) diff --git a/nailgun/nailgun/test/integration/test_node_collection_handlers.py b/nailgun/nailgun/test/integration/test_node_collection_handlers.py index 84bc108ca8..f5c0a5e328 100644 --- a/nailgun/nailgun/test/integration/test_node_collection_handlers.py +++ b/nailgun/nailgun/test/integration/test_node_collection_handlers.py @@ -28,8 +28,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual([], response) + self.assertEqual([], resp.json_body) def test_notification_node_id(self): node = self.env.create_node( @@ -42,7 +41,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NotificationCollectionHandler'), headers=self.default_headers ) - notif_api = jsonutils.loads(resp.body)[0] + notif_api = resp.json_body[0] self.assertEqual(node['id'], notif_api['node_id']) def test_node_get_with_cluster(self): @@ -61,11 +60,10 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(1, len(response)) + self.assertEqual(1, len(resp.json_body)) self.assertEqual( self.env.nodes[1].id, - response[0]['id'] + resp.json_body[0]['id'] ) def test_node_get_with_cluster_None(self): @@ -83,9 +81,8 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(1, len(response)) - self.assertEqual(self.env.nodes[0].id, response[0]['id']) + self.assertEqual(1, len(resp.json_body)) + self.assertEqual(self.env.nodes[0].id, resp.json_body[0]['id']) def test_node_get_without_cluster_specification(self): self.env.create( @@ -101,8 +98,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(2, len(response)) + self.assertEqual(2, len(resp.json_body)) def test_node_get_with_cluster_and_assigned_ip_addrs(self): self.env.create( @@ -124,8 +120,7 @@ class TestHandlers(BaseIntegrationTest): ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(2, len(response)) + self.assertEqual(2, len(resp.json_body)) def test_node_creation(self): resp = self.app.post( @@ -135,8 +130,7 @@ class TestHandlers(BaseIntegrationTest): 'status': 'discover'}), headers=self.default_headers) self.assertEqual(resp.status_code, 201) - response = jsonutils.loads(resp.body) - self.assertEqual('discover', response['status']) + self.assertEqual('discover', resp.json_body['status']) def test_node_update(self): node = self.env.create_node(api=False) @@ -305,7 +299,7 @@ class TestHandlers(BaseIntegrationTest): 'agent_checksum': 'test' }), headers=self.default_headers) - response = jsonutils.loads(resp.body) + response = resp.json_body self.assertEqual(resp.status_code, 200) self.assertFalse('cached' in response and response['cached']) resp = self.app.put( @@ -316,7 +310,7 @@ class TestHandlers(BaseIntegrationTest): 'agent_checksum': 'test' }), headers=self.default_headers) - response = jsonutils.loads(resp.body) + response = resp.json_body self.assertEqual(resp.status_code, 200) self.assertTrue('cached' in response and response['cached']) @@ -432,10 +426,10 @@ class TestHandlers(BaseIntegrationTest): expect_errors=True ) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) + # Here we are checking if node mac is successfully updated - self.assertEqual(node1_json["mac"], response[0]["mac"]) - self.assertEqual(meta, response[0]["meta"]) + self.assertEqual(node1_json["mac"], resp.json_body[0]["mac"]) + self.assertEqual(meta, resp.json_body[0]["meta"]) def test_duplicated_node_create_fails(self): node = self.env.create_node(api=False) @@ -473,9 +467,8 @@ class TestHandlers(BaseIntegrationTest): 'pending_roles': []}]), headers=self.default_headers) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(1, len(response)) - self.assertEqual(node.id, response[0]['id']) + self.assertEqual(1, len(resp.json_body)) + self.assertEqual(node.id, resp.json_body[0]['id']) self.assertEqual(node.name, default_name) self.assertEqual(node.cluster, None) self.assertEqual(node.pending_role_list, []) @@ -489,17 +482,15 @@ class TestHandlers(BaseIntegrationTest): **{'mac': mac} ) - node = jsonutils.loads( - self.app.get(reverse('NodeCollectionHandler')).body - )[0] + node = self.app.get(reverse('NodeCollectionHandler')).json_body[0] self.assertEqual(node['name'], 'Untitled ({0})'.format(node_mac[-5:])) node_name_test(node_mac.upper()) - node_id = jsonutils.loads( - self.app.get(reverse('NodeCollectionHandler')).body - )[0]['id'] + node_id = self.app.get( + reverse('NodeCollectionHandler') + ).json_body[0]['id'] self.app.delete( reverse('NodeHandler', {'obj_id': node_id}) diff --git a/nailgun/nailgun/test/integration/test_node_handler.py b/nailgun/nailgun/test/integration/test_node_handler.py index bfc125cb91..de67f63856 100644 --- a/nailgun/nailgun/test/integration/test_node_handler.py +++ b/nailgun/nailgun/test/integration/test_node_handler.py @@ -33,21 +33,20 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeHandler', kwargs={'obj_id': node.id}), headers=self.default_headers) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(node.id, response['id']) - self.assertEqual(node.name, response['name']) - self.assertEqual(node.mac, response['mac']) + self.assertEqual(node.id, resp.json_body['id']) + self.assertEqual(node.name, resp.json_body['name']) + self.assertEqual(node.mac, resp.json_body['mac']) self.assertEqual( - node.pending_addition, response['pending_addition']) + node.pending_addition, resp.json_body['pending_addition']) self.assertEqual( - node.pending_deletion, response['pending_deletion']) - self.assertEqual(node.status, response['status']) + node.pending_deletion, resp.json_body['pending_deletion']) + self.assertEqual(node.status, resp.json_body['status']) self.assertEqual( node.meta['cpu']['total'], - response['meta']['cpu']['total'] + resp.json_body['meta']['cpu']['total'] ) - self.assertEqual(node.meta['disks'], response['meta']['disks']) - self.assertEqual(node.meta['memory'], response['meta']['memory']) + self.assertEqual(node.meta['disks'], resp.json_body['meta']['disks']) + self.assertEqual(node.meta['memory'], resp.json_body['meta']['memory']) def test_node_creation_with_id(self): node_id = '080000000003' diff --git a/nailgun/nailgun/test/integration/test_node_nic_assignment.py b/nailgun/nailgun/test/integration/test_node_nic_assignment.py index a92a128c02..c5cbfcf06a 100644 --- a/nailgun/nailgun/test/integration/test_node_nic_assignment.py +++ b/nailgun/nailgun/test/integration/test_node_nic_assignment.py @@ -43,9 +43,7 @@ class TestClusterHandlers(BaseIntegrationTest): self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) - - for resp_nic in response: + for resp_nic in resp.json_body: net_names = [net['name'] for net in resp_nic['assigned_networks']] if resp_nic['mac'] == mac: self.assertTrue("fuelweb_admin" in net_names) @@ -74,8 +72,8 @@ class TestClusterHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) - for resp_nic in response: + + for resp_nic in resp.json_body: self.assertEqual(resp_nic['assigned_networks'], []) def test_assignment_is_removed_when_delete_cluster(self): @@ -111,8 +109,8 @@ class TestNodeHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) - for resp_nic in response: + + for resp_nic in resp.json_body: net_names = [net['name'] for net in resp_nic['assigned_networks']] if resp_nic['mac'] == mac: self.assertTrue("fuelweb_admin" in net_names) @@ -140,7 +138,7 @@ class TestNodeHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) + response = resp.json_body for resp_nic in response: net_names = [net['name'] for net in resp_nic['assigned_networks']] if resp_nic['mac'] == mac: @@ -153,14 +151,14 @@ class TestNodeHandlers(BaseIntegrationTest): cluster = self.env.create_cluster(api=True) resp = self.env.nova_networks_get(cluster['id']) - nets = jsonutils.loads(resp.body) + nets = resp.json_body for net in nets['networks']: if net['name'] == 'management': net['vlan_start'] = None resp = self.env.nova_networks_put(cluster['id'], nets) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'ready') mac = self.env.generate_random_mac() @@ -182,7 +180,7 @@ class TestNodeHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) + response = resp.json_body net_name_per_nic = [['fuelweb_admin', 'storage', 'fixed'], ['public'], ['management']] @@ -197,7 +195,7 @@ class TestNodeHandlers(BaseIntegrationTest): net['vlan_start'] = 112 resp = self.env.nova_networks_put(cluster['id'], nets) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'ready') mac = self.env.generate_random_mac() @@ -219,7 +217,7 @@ class TestNodeHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) + response = resp.json_body net_name_per_nic = [['fuelweb_admin', 'storage', 'fixed', 'public', 'management'], [], []] @@ -232,13 +230,13 @@ class TestNodeHandlers(BaseIntegrationTest): net_provider='neutron', net_segment_type='vlan') resp = self.env.neutron_networks_get(cluster['id']) - nets = jsonutils.loads(resp.body) + nets = resp.json_body for net in nets['networks']: if net['name'] == 'management': net['vlan_start'] = None resp = self.env.neutron_networks_put(cluster['id'], nets) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'ready') mac = self.env.generate_random_mac() @@ -260,7 +258,7 @@ class TestNodeHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) + response = resp.json_body net_name_per_nic = [['fuelweb_admin', 'storage', 'private'], ['public'], ['management']] @@ -275,7 +273,7 @@ class TestNodeHandlers(BaseIntegrationTest): net['vlan_start'] = 112 resp = self.env.neutron_networks_put(cluster['id'], nets) self.assertEqual(resp.status_code, 202) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], 'ready') mac = self.env.generate_random_mac() @@ -297,7 +295,7 @@ class TestNodeHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) + response = resp.json_body net_name_per_nic = [['fuelweb_admin', 'storage', 'public', 'management', 'private'], [], []] @@ -326,7 +324,7 @@ class TestNodeHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) + response = resp.json_body for resp_nic in response: self.assertEqual(resp_nic['assigned_networks'], []) @@ -347,7 +345,7 @@ class TestNodeHandlers(BaseIntegrationTest): ) resp_macs = map( lambda interface: interface["mac"], - jsonutils.loads(resp.body) + resp.json_body ) self.assertEqual(resp.status_code, 200) self.assertItemsEqual(macs, resp_macs) @@ -482,8 +480,8 @@ class TestNodePublicNetworkToNICAssignment(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - data = jsonutils.loads(resp.body) - eth1 = [nic for nic in data if nic['name'] == 'eth1'] + + eth1 = [nic for nic in resp.json_body if nic['name'] == 'eth1'] self.assertEqual(len(eth1), 1) self.assertEqual( len(filter(lambda n: n['name'] == 'public', @@ -525,7 +523,7 @@ class TestNodeNICsHandlersValidation(BaseIntegrationTest): kwargs={"node_id": self.env.nodes[0]["id"]}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - self.data = jsonutils.loads(resp.body) + self.data = resp.json_body self.nics_w_nets = filter(lambda nic: nic.get("assigned_networks"), self.data) self.assertGreater(len(self.nics_w_nets), 0) diff --git a/nailgun/nailgun/test/integration/test_node_nic_collection_handler.py b/nailgun/nailgun/test/integration/test_node_nic_collection_handler.py index 14b65e6ace..f2085c7373 100644 --- a/nailgun/nailgun/test/integration/test_node_nic_collection_handler.py +++ b/nailgun/nailgun/test/integration/test_node_nic_collection_handler.py @@ -33,28 +33,27 @@ class TestNodeCollectionNICsHandler(BaseIntegrationTest): node = self.env.create_node(api=True, meta=meta, mac=mac, cluster_id=cluster['id']) - resp = self.app.get( + resp_get = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) + self.assertEqual(resp_get.status_code, 200) + a_nets = filter(lambda nic: nic['mac'] == mac, - response)[0]['assigned_networks'] - for resp_nic in response: + resp_get.json_body)[0]['assigned_networks'] + for resp_nic in resp_get.json_body: if resp_nic['mac'] == mac: resp_nic['assigned_networks'] = [] else: resp_nic['assigned_networks'].extend(a_nets) resp_nic['assigned_networks'].sort() - nodes_list = [{'id': node['id'], 'interfaces': response}] + nodes_list = [{'id': node['id'], 'interfaces': resp_get.json_body}] - resp = self.app.put( + resp_put = self.app.put( reverse('NodeCollectionNICsHandler'), jsonutils.dumps(nodes_list), headers=self.default_headers) - self.assertEqual(resp.status_code, 200) - new_response = jsonutils.loads(resp.body) - self.assertEqual(new_response, nodes_list) + self.assertEqual(resp_put.status_code, 200) + self.assertEqual(resp_put.json_body, nodes_list) @fake_tasks() def test_interface_changes_added(self): @@ -84,9 +83,9 @@ class TestNodeCollectionNICsHandler(BaseIntegrationTest): node_id = self.env.nodes[0].id # Getting nics resp = self.env.node_nics_get(node_id) - interfaces = jsonutils.loads(resp.body) + # Updating nics - self.env.node_nics_put(node_id, interfaces) + self.env.node_nics_put(node_id, resp.json_body) # Checking 'interfaces' change in cluster changes changes = filter_changes( consts.CLUSTER_CHANGES.interfaces, @@ -124,10 +123,9 @@ class TestNodeCollectionNICsDefaultHandler(BaseIntegrationTest): self.assertEqual(resp.status_code, 200) # check response - resp = jsonutils.loads(resp.body) - self.assertEqual(len(resp), 2) + self.assertEqual(len(resp.json_body), 2) - macs = [iface['mac'] for node in resp for iface in node] + macs = [iface['mac'] for node in resp.json_body for iface in node] self.assertTrue('01:01:01:01:01:01' in macs) self.assertTrue('02:02:02:02:02:02' in macs) self.assertFalse('03:03:03:03:03:03' in macs) @@ -140,10 +138,9 @@ class TestNodeCollectionNICsDefaultHandler(BaseIntegrationTest): self.assertEqual(resp.status_code, 200) # check response - resp = jsonutils.loads(resp.body) - self.assertEqual(len(resp), 3) + self.assertEqual(len(resp.json_body), 3) - macs = [iface['mac'] for node in resp for iface in node] + macs = [iface['mac'] for node in resp.json_body for iface in node] self.assertTrue('01:01:01:01:01:01' in macs) self.assertTrue('02:02:02:02:02:02' in macs) self.assertTrue('03:03:03:03:03:03' in macs) diff --git a/nailgun/nailgun/test/integration/test_node_nic_handlers_w_bonding.py b/nailgun/nailgun/test/integration/test_node_nic_handlers_w_bonding.py index 52506e8526..e82255720d 100644 --- a/nailgun/nailgun/test/integration/test_node_nic_handlers_w_bonding.py +++ b/nailgun/nailgun/test/integration/test_node_nic_handlers_w_bonding.py @@ -49,7 +49,7 @@ class TestNodeNICsBonding(BaseIntegrationTest): kwargs={"node_id": self.env.nodes[0]["id"]}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - self.data = jsonutils.loads(resp.body) + self.data = resp.json_body self.admin_nic, self.other_nic, self.empty_nic = None, None, None for nic in self.data: net_names = [n["name"] for n in nic["assigned_networks"]] @@ -94,17 +94,17 @@ class TestNodeNICsBonding(BaseIntegrationTest): resp = self.env.node_nics_get(self.env.nodes[0]["id"]) self.assertEqual(resp.status_code, 200) - data = jsonutils.loads(resp.body) + bonds = filter( lambda iface: iface["type"] == NETWORK_INTERFACE_TYPES.bond, - data) + resp.json_body) self.assertEqual(len(bonds), 1) self.assertEqual(bonds[0]["name"], 'ovs-bond0') def nics_bond_remove(self, put_func): resp = self.env.node_nics_get(self.env.nodes[0]["id"]) self.assertEqual(resp.status_code, 200) - self.data = jsonutils.loads(resp.body) + self.data = resp.json_body for nic in self.data: if nic["type"] == NETWORK_INTERFACE_TYPES.bond: bond = nic @@ -130,8 +130,8 @@ class TestNodeNICsBonding(BaseIntegrationTest): resp = self.env.node_nics_get(self.env.nodes[0]["id"]) self.assertEqual(resp.status_code, 200) - data = jsonutils.loads(resp.body) - for nic in data: + + for nic in resp.json_body: self.assertNotEqual(nic["type"], NETWORK_INTERFACE_TYPES.bond) def test_nics_bond_removed_on_node_unassign(self): @@ -152,8 +152,8 @@ class TestNodeNICsBonding(BaseIntegrationTest): self.assertEqual(node.cluster, None) resp = self.env.node_nics_get(node.id) self.assertEqual(resp.status_code, 200) - data = jsonutils.loads(resp.body) - for nic in data: + + for nic in resp.json_body: self.assertNotEqual(nic["type"], NETWORK_INTERFACE_TYPES.bond) def test_nics_bond_removed_on_remove_node_from_cluster(self): @@ -173,8 +173,8 @@ class TestNodeNICsBonding(BaseIntegrationTest): self.assertEqual(node.cluster, None) resp = self.env.node_nics_get(node.id) self.assertEqual(resp.status_code, 200) - data = jsonutils.loads(resp.body) - for nic in data: + + for nic in resp.json_body: self.assertNotEqual(nic["type"], NETWORK_INTERFACE_TYPES.bond) def test_nics_bond_create_failed_no_type(self): diff --git a/nailgun/nailgun/test/integration/test_orchestrator_handlers.py b/nailgun/nailgun/test/integration/test_orchestrator_handlers.py index 325b04e5ef..3715868335 100644 --- a/nailgun/nailgun/test/integration/test_orchestrator_handlers.py +++ b/nailgun/nailgun/test/integration/test_orchestrator_handlers.py @@ -56,7 +56,7 @@ class TestOrchestratorInfoHandlers(BaseIntegrationTest): headers=self.default_headers) self.assertEqual(get_resp.status_code, 200) - self.datadiff(orchestrator_data, jsonutils.loads(get_resp.body)) + self.datadiff(orchestrator_data, get_resp.json_body) # deleting provisioning info delete_resp = self.app.delete( @@ -119,7 +119,7 @@ class TestDefaultOrchestratorInfoHandlers(BaseIntegrationTest): headers=self.default_headers) self.assertEqual(resp.status_code, 200) - self.assertEqual(3, len(jsonutils.loads(resp.body))) + self.assertEqual(3, len(resp.json_body)) def test_default_provisioning_handler(self): resp = self.app.get( @@ -128,7 +128,7 @@ class TestDefaultOrchestratorInfoHandlers(BaseIntegrationTest): headers=self.default_headers) self.assertEqual(resp.status_code, 200) - self.assertEqual(3, len(jsonutils.loads(resp.body)['nodes'])) + self.assertEqual(3, len(resp.json_body['nodes'])) def test_default_provisioning_handler_for_selected_nodes(self): node_ids = [node.uid for node in self.cluster.nodes][:2] @@ -139,7 +139,7 @@ class TestDefaultOrchestratorInfoHandlers(BaseIntegrationTest): resp = self.app.get(url, headers=self.default_headers) self.assertEqual(resp.status_code, 200) - data = jsonutils.loads(resp.body)['nodes'] + data = resp.json_body['nodes'] self.assertEqual(2, len(data)) actual_uids = [node['uid'] for node in data] self.assertItemsEqual(actual_uids, node_ids) @@ -153,9 +153,8 @@ class TestDefaultOrchestratorInfoHandlers(BaseIntegrationTest): resp = self.app.get(url, headers=self.default_headers) self.assertEqual(resp.status_code, 200) - data = jsonutils.loads(resp.body) - self.assertEqual(2, len(data)) - actual_uids = [node['uid'] for node in data] + self.assertEqual(2, len(resp.json_body)) + actual_uids = [node['uid'] for node in resp.json_body] self.assertItemsEqual(actual_uids, node_ids) def test_cluster_provisioning_customization(self): diff --git a/nailgun/nailgun/test/integration/test_put_same_json.py b/nailgun/nailgun/test/integration/test_put_same_json.py index 1d8b8ab93a..74e12bb7b3 100644 --- a/nailgun/nailgun/test/integration/test_put_same_json.py +++ b/nailgun/nailgun/test/integration/test_put_same_json.py @@ -14,7 +14,7 @@ from mock import patch -from nailgun.openstack.common import jsonutils as json +from nailgun.openstack.common import jsonutils from nailgun.test import base @@ -42,7 +42,7 @@ class TestPutSameJson(base.BaseIntegrationTest): """ response = self.app.put( base.reverse(name, kwargs=arguments), - json.dumps(data), + jsonutils.dumps(data), headers=self.default_headers ) self.assertEqual(response.status_code, expected_status) @@ -51,11 +51,11 @@ class TestPutSameJson(base.BaseIntegrationTest): """Makes a GET request to a resource with `name`. Returns a deserialized dict. """ - response = self.app.get( + resp = self.app.get( base.reverse(name, kwargs=arguments), headers=self.default_headers ) - return json.loads(response.body) + return resp.json_body def test_release(self): release = self.env.create_release() diff --git a/nailgun/nailgun/test/integration/test_roles.py b/nailgun/nailgun/test/integration/test_roles.py index 2275169586..8794aebd56 100644 --- a/nailgun/nailgun/test/integration/test_roles.py +++ b/nailgun/nailgun/test/integration/test_roles.py @@ -32,7 +32,7 @@ class TestRoles(BaseIntegrationTest): ) test_role_name = "testrole" - release_json = jsonutils.loads(resp.body)[0] + release_json = resp.json_body[0] old_roles = set(release_json["roles"]) release_json["roles"].append(test_role_name) @@ -42,7 +42,7 @@ class TestRoles(BaseIntegrationTest): jsonutils.dumps(release_json), headers=self.default_headers ) - new_roles = jsonutils.loads(resp.body)["roles"] + new_roles = resp.json_body["roles"] self.assertIn(test_role_name, new_roles) self.assertLessEqual(old_roles, set(new_roles)) @@ -54,7 +54,7 @@ class TestRoles(BaseIntegrationTest): ) test_role_name = "testrole" - release_json = jsonutils.loads(resp.body)[0] + release_json = resp.json_body[0] old_roles = release_json["roles"] release_json["roles"].append(test_role_name) release_json["roles"].remove(old_roles[0]) @@ -66,7 +66,7 @@ class TestRoles(BaseIntegrationTest): jsonutils.dumps(release_json), headers=self.default_headers ) - new_roles = jsonutils.loads(resp.body)["roles"] + new_roles = resp.json_body["roles"] self.assertEqual(expected_roles, new_roles) def test_roles_add_duplicated_through_handler(self): @@ -77,7 +77,7 @@ class TestRoles(BaseIntegrationTest): ) test_role_name = "testrole" - release_json = jsonutils.loads(resp.body)[0] + release_json = resp.json_body[0] old_roles = release_json["roles"] release_json["roles"].append(test_role_name) expected_roles = list(release_json["roles"]) @@ -90,7 +90,7 @@ class TestRoles(BaseIntegrationTest): jsonutils.dumps(release_json), headers=self.default_headers ) - new_roles = jsonutils.loads(resp.body)["roles"] + new_roles = resp.json_body["roles"] self.assertEqual(expected_roles, new_roles) def test_roles_add_duplicated_to_db_directly(self): @@ -99,7 +99,7 @@ class TestRoles(BaseIntegrationTest): reverse('ReleaseCollectionHandler'), headers=self.default_headers ) - release_json = jsonutils.loads(resp.body)[0] + release_json = resp.json_body[0] old_roles = list(release_json["roles"]) role = Role(name=old_roles[0], @@ -117,7 +117,7 @@ class TestRoles(BaseIntegrationTest): reverse('ReleaseCollectionHandler'), headers=self.default_headers ) - release_json = jsonutils.loads(resp.body)[0] + release_json = resp.json_body[0] new_roles = list(release_json["roles"]) self.assertEqual(old_roles, new_roles) @@ -128,7 +128,7 @@ class TestRoles(BaseIntegrationTest): headers=self.default_headers ) - release_json = jsonutils.loads(resp.body)[0] + release_json = resp.json_body[0] old_roles = release_json["roles"] removed_role = release_json["roles"][0] release_json["roles"] = release_json["roles"][1:] @@ -139,7 +139,7 @@ class TestRoles(BaseIntegrationTest): jsonutils.dumps(release_json), headers=self.default_headers ) - new_roles = jsonutils.loads(resp.body)["roles"] + new_roles = resp.json_body["roles"] self.assertLess(len(new_roles), len(old_roles)) self.assertNotIn(removed_role, new_roles) @@ -154,7 +154,7 @@ class TestRoles(BaseIntegrationTest): headers=self.default_headers ) - release_json = jsonutils.loads(resp.body)[0] + release_json = resp.json_body[0] old_roles = set(release_json["roles"]) old_roles.remove("controller") diff --git a/nailgun/nailgun/test/integration/test_rpc_consumer.py b/nailgun/nailgun/test/integration/test_rpc_consumer.py index b65a4ff30b..20ee7c0d05 100644 --- a/nailgun/nailgun/test/integration/test_rpc_consumer.py +++ b/nailgun/nailgun/test/integration/test_rpc_consumer.py @@ -24,7 +24,6 @@ from nailgun.db.sqlalchemy.models import NetworkGroup from nailgun.db.sqlalchemy.models import Node from nailgun.db.sqlalchemy.models import Notification from nailgun.db.sqlalchemy.models import Task -from nailgun.openstack.common import jsonutils from nailgun.rpc import receiver as rcvr from nailgun.settings import settings from nailgun.task import helpers @@ -157,7 +156,7 @@ class TestVerifyNetworks(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(resp.status_code, 200) - task = jsonutils.loads(resp.body) + task = resp.json_body self.assertEqual(task['status'], "error") error_nodes = [{'uid': node1.id, 'interface': 'eth0', 'name': node1.name, 'absent_vlans': [104], diff --git a/nailgun/nailgun/test/integration/test_task_managers.py b/nailgun/nailgun/test/integration/test_task_managers.py index 36d7ebc131..e7d070da86 100644 --- a/nailgun/nailgun/test/integration/test_task_managers.py +++ b/nailgun/nailgun/test/integration/test_task_managers.py @@ -33,7 +33,6 @@ from nailgun.db.sqlalchemy.models import Node from nailgun.db.sqlalchemy.models import Notification from nailgun.db.sqlalchemy.models import Task from nailgun.errors import errors -from nailgun.openstack.common import jsonutils from nailgun.task.manager import ApplyChangesTaskManager from nailgun.test.base import BaseIntegrationTest from nailgun.test.base import fake_tasks @@ -293,7 +292,7 @@ class TestTaskManagers(BaseIntegrationTest): kwargs={'cluster_id': cluster_id}), headers=self.default_headers ) - deploy_uuid = jsonutils.loads(resp.body)['uuid'] + deploy_uuid = resp.json_body['uuid'] self.app.delete( reverse( 'ClusterHandler', diff --git a/nailgun/nailgun/test/integration/test_verify_networks_task_manager.py b/nailgun/nailgun/test/integration/test_verify_networks_task_manager.py index c8c1831138..ec1ae981f0 100644 --- a/nailgun/nailgun/test/integration/test_verify_networks_task_manager.py +++ b/nailgun/nailgun/test/integration/test_verify_networks_task_manager.py @@ -21,7 +21,6 @@ import unittest2 from nailgun.consts import CLUSTER_STATUSES from nailgun.consts import NETWORK_INTERFACE_TYPES from nailgun.consts import OVS_BOND_MODES -from nailgun.openstack.common import jsonutils from nailgun.test.base import BaseIntegrationTest from nailgun.test.base import fake_tasks from nailgun.test.base import reverse @@ -65,7 +64,7 @@ class TestVerifyNetworkTaskManagers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - nets = jsonutils.loads(resp.body) + nets = resp.json_body nets['networks'][-1]["vlan_start"] = 500 task = self.env.launch_verify_networks(nets) @@ -82,7 +81,7 @@ class TestVerifyNetworkTaskManagers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - nets = jsonutils.loads(resp.body) + nets = resp.json_body admin_ng = self.env.network_manager.get_admin_network_group() @@ -108,7 +107,7 @@ class TestVerifyNetworkTaskManagers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - nets = jsonutils.loads(resp.body) + nets = resp.json_body for net in nets['networks']: if net['name'] in ('storage',): @@ -138,7 +137,7 @@ class TestVerifyNetworkTaskManagers(BaseIntegrationTest): ), headers=self.default_headers ) - nets = jsonutils.loads(resp.body) + nets = resp.json_body task = self.env.launch_verify_networks(nets) self.db.refresh(task) @@ -165,7 +164,7 @@ class TestVerifyNetworkTaskManagers(BaseIntegrationTest): ), headers=self.default_headers ) - nets = jsonutils.loads(resp.body) + nets = resp.json_body task = self.env.launch_verify_networks(nets) self.db.refresh(task) @@ -317,9 +316,9 @@ class TestNetworkVerificationWithBonds(BaseIntegrationTest): kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - data = jsonutils.loads(resp.body) + admin_nic, other_nic, empty_nic = None, None, None - for nic in data: + for nic in resp.json_body: net_names = [n['name'] for n in nic['assigned_networks']] if 'fuelweb_admin' in net_names: admin_nic = nic @@ -328,14 +327,14 @@ class TestNetworkVerificationWithBonds(BaseIntegrationTest): else: empty_nic = nic self.assertTrue(admin_nic and other_nic and empty_nic) - return data, admin_nic, other_nic, empty_nic + return resp.json_body, admin_nic, other_nic, empty_nic def verify_bonds(self, node): resp = self.env.node_nics_get(node["id"]) self.assertEqual(resp.status_code, 200) - data = jsonutils.loads(resp.body) + bond = filter(lambda nic: nic["type"] == NETWORK_INTERFACE_TYPES.bond, - data) + resp.json_body) self.assertEqual(len(bond), 1) self.assertEqual(bond[0]["name"], "ovs-bond0") @@ -374,9 +373,8 @@ class TestNetworkVerificationWithBonds(BaseIntegrationTest): expect_errors=True ) self.assertEqual(202, resp.status_code) - data = jsonutils.loads(resp.body) self.assertEqual( - data['result'], + resp.json_body['result'], {u'warning': [u"Node '{0}': interface 'ovs-bond0' slave NICs have " u"different or unrecognized speeds".format( self.env.nodes[0].name)]}) @@ -440,7 +438,7 @@ class TestVerifyNeutronVlan(BaseIntegrationTest): headers=self.default_headers) self.assertEqual(200, resp.status_code) priv_nics = {} - for node in jsonutils.loads(resp.body): + for node in resp.json_body: for net in node['network_data']: if net['name'] == 'private': priv_nics[node['id']] = net['dev'] diff --git a/nailgun/nailgun/test/unit/test_fuel_key_handler.py b/nailgun/nailgun/test/unit/test_fuel_key_handler.py index 1077a0062d..c1f20630fe 100644 --- a/nailgun/nailgun/test/unit/test_fuel_key_handler.py +++ b/nailgun/nailgun/test/unit/test_fuel_key_handler.py @@ -45,7 +45,7 @@ class TestFuelKeyHandler(BaseTestCase): self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) + response = resp.json_body self.assertEqual( response, {"key": base64.b64encode(jsonutils.dumps(key_data))} diff --git a/nailgun/nailgun/test/unit/test_logs_handlers.py b/nailgun/nailgun/test/unit/test_logs_handlers.py index 6f8b43b3ce..8a1d05ace9 100644 --- a/nailgun/nailgun/test/unit/test_logs_handlers.py +++ b/nailgun/nailgun/test/unit/test_logs_handlers.py @@ -76,8 +76,8 @@ class TestLogs(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(response, settings.LOGS) + + self.assertEqual(resp.json_body, settings.LOGS) def test_log_source_by_node_collection_handler(self): node_ip = '40.30.20.10' @@ -89,7 +89,7 @@ class TestLogs(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) + response = resp.json_body self.assertEqual(response, []) log_entry = ['date111', 'level222', 'text333'] @@ -100,8 +100,7 @@ class TestLogs(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(response, [settings.LOGS[1]]) + self.assertEqual(resp.json_body, [settings.LOGS[1]]) def test_log_entry_collection_handler(self): node_ip = '10.20.30.40' @@ -128,7 +127,7 @@ class TestLogs(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) + response = resp.json_body response['entries'].reverse() self.assertEqual(response['entries'], log_entries) @@ -138,7 +137,7 @@ class TestLogs(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) + response = resp.json_body response['entries'].reverse() self.assertEqual(response['entries'], log_entries) @@ -170,7 +169,7 @@ class TestLogs(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) + response = resp.json_body response['entries'].reverse() self.assertEqual(response['entries'], log_entries) settings.LOGS[0]['multiline'] = False diff --git a/nailgun/nailgun/test/unit/test_node_disks.py b/nailgun/nailgun/test/unit/test_node_disks.py index d45fe15aba..5aa8698c39 100644 --- a/nailgun/nailgun/test/unit/test_node_disks.py +++ b/nailgun/nailgun/test/unit/test_node_disks.py @@ -51,7 +51,7 @@ class TestNodeDisksHandlers(BaseIntegrationTest): headers=self.default_headers) self.assertEqual(200, resp.status_code) - return jsonutils.loads(resp.body) + return resp.json_body def put(self, node_id, data, expect_errors=False): resp = self.app.put( @@ -62,7 +62,7 @@ class TestNodeDisksHandlers(BaseIntegrationTest): if not expect_errors: self.assertEqual(200, resp.status_code) - return jsonutils.loads(resp.body) + return resp.json_body else: return resp @@ -328,7 +328,7 @@ class TestNodeDefaultsDisksHandler(BaseIntegrationTest): headers=self.default_headers) self.assertEqual(200, resp.status_code) - return jsonutils.loads(resp.body) + return resp.json_body def test_node_disk_amount_regenerates_volumes_info_if_new_disk_added(self): cluster = self.env.create_cluster(api=True) @@ -384,7 +384,7 @@ class TestNodeVolumesInformationHandler(BaseIntegrationTest): headers=self.default_headers) self.assertEqual(200, resp.status_code) - return jsonutils.loads(resp.body) + return resp.json_body def create_node(self, role): self.env.create( diff --git a/nailgun/nailgun/test/unit/test_node_nic_handler.py b/nailgun/nailgun/test/unit/test_node_nic_handler.py index 00b2493083..b60ba14d00 100644 --- a/nailgun/nailgun/test/unit/test_node_nic_handler.py +++ b/nailgun/nailgun/test/unit/test_node_nic_handler.py @@ -52,8 +52,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) - self.assertEqual(response, []) + self.assertEqual(resp.json_body, []) def test_get_handler_with_incompleted_iface_data(self): meta = self.env.default_metadata() @@ -81,8 +80,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers ) - ifaces = jsonutils.loads(resp.body) - self.assertEqual(ifaces, []) + self.assertEqual(resp.json_body, []) def test_get_handler_with_invalid_speed_data(self): meta = self.env.default_metadata() @@ -118,7 +116,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeHandler', kwargs={'obj_id': node['id']}), headers=self.default_headers ) - ifaces = jsonutils.loads(resp.body)['meta']['interfaces'] + ifaces = resp.json_body['meta']['interfaces'] self.assertEqual( ifaces, [ @@ -135,8 +133,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) - self.assertEqual(response, []) + self.assertEqual(resp.json_body, []) def test_get_handler_with_NICs(self): meta = self.env.default_metadata() @@ -152,15 +149,14 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node_db.id}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) self.assertItemsEqual( - map(lambda i: i['id'], response), + map(lambda i: i['id'], resp.json_body), map(lambda i: i.id, node_db.interfaces) ) for nic in meta['interfaces']: filtered_nics = filter( lambda i: i['mac'] == nic['mac'], - response + resp.json_body ) resp_nic = filtered_nics[0] self.assertEqual(resp_nic['mac'], nic['mac']) @@ -190,9 +186,8 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) - self.assertEqual(len(response), 1) - resp_nic = response[0] + self.assertEqual(len(resp.json_body), 1) + resp_nic = resp.json_body[0] nic = new_meta['interfaces'][0] self.assertEqual(resp_nic['mac'], nic['mac']) self.assertEqual(resp_nic['current_speed'], nic['current_speed']) @@ -220,12 +215,11 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) - self.assertEqual(len(response), len(meta['interfaces'])) + self.assertEqual(len(resp.json_body), len(meta['interfaces'])) for nic in meta['interfaces']: filtered_nics = filter( lambda i: i['mac'] == nic['mac'], - response + resp.json_body ) resp_nic = filtered_nics[0] self.assertEqual(resp_nic['mac'], nic['mac']) @@ -246,8 +240,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) - self.assertNotEquals(response[0]['id'], fake_id) + self.assertNotEquals(resp.json_body[0]['id'], fake_id) def test_mac_address_should_be_in_lower_case(self): meta = self.env.default_metadata() @@ -259,8 +252,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) self.assertEqual(resp.status_code, 200) - response = jsonutils.loads(resp.body) - self.assertNotEquals(response[0]['mac'], new_mac.lower()) + self.assertNotEquals(resp.json_body[0]['mac'], new_mac.lower()) def test_remove_assigned_interface(self): def get_nodes(): @@ -269,7 +261,7 @@ class TestHandlers(BaseIntegrationTest): kwargs={'cluster_id': self.env.clusters[0].id}), headers=self.default_headers, ) - return jsonutils.loads(resp.body) + return resp.json_body self.env.create(nodes_kwargs=[{'api': True}]) @@ -338,7 +330,7 @@ class TestHandlers(BaseIntegrationTest): kwargs={'cluster_id': self.env.clusters[0].id}), headers=self.default_headers, ) - return jsonutils.loads(resp.body) + return resp.json_body meta = self.env.default_metadata() meta["interfaces"] = [ diff --git a/nailgun/nailgun/test/unit/test_notification_collection_handler.py b/nailgun/nailgun/test/unit/test_notification_collection_handler.py index ea26cb0473..7a24d51b88 100644 --- a/nailgun/nailgun/test/unit/test_notification_collection_handler.py +++ b/nailgun/nailgun/test/unit/test_notification_collection_handler.py @@ -27,8 +27,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual([], response) + self.assertEqual([], resp.json_body) def test_not_empty(self): c = self.env.create_cluster(api=False) @@ -39,14 +38,13 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(len(response), 2) - if response[0]['id'] == n0.id: - rn0 = response[0] - rn1 = response[1] + self.assertEqual(len(resp.json_body), 2) + if resp.json_body[0]['id'] == n0.id: + rn0 = resp.json_body[0] + rn1 = resp.json_body[1] else: - rn0 = response[1] - rn1 = response[0] + rn0 = resp.json_body[1] + rn1 = resp.json_body[0] self.assertEqual(rn1['cluster'], n1.cluster_id) self.assertIsNone(rn0.get('cluster', None)) @@ -70,14 +68,13 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(len(response), 2) - if response[0]['id'] == n0.id: - rn0 = response[0] - rn1 = response[1] + self.assertEqual(len(resp.json_body), 2) + if resp.json_body[0]['id'] == n0.id: + rn0 = resp.json_body[0] + rn1 = resp.json_body[1] else: - rn0 = response[1] - rn1 = response[0] + rn0 = resp.json_body[1] + rn1 = resp.json_body[0] self.assertEqual(rn1['cluster'], n1.cluster_id) self.assertEqual(rn1['status'], 'read') self.assertIsNone(rn0.get('cluster', None)) diff --git a/nailgun/nailgun/test/unit/test_notification_handler.py b/nailgun/nailgun/test/unit/test_notification_handler.py index 273fcd54e1..dca293f307 100644 --- a/nailgun/nailgun/test/unit/test_notification_handler.py +++ b/nailgun/nailgun/test/unit/test_notification_handler.py @@ -31,13 +31,12 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertIsNone(response.get('cluster')) + self.assertIsNone(resp.json_body.get('cluster')) self.assertEqual(notification.status, 'unread') - self.assertEqual(notification.id, response['id']) - self.assertEqual(notification.status, response['status']) - self.assertEqual(notification.topic, response['topic']) - self.assertEqual(notification.message, response['message']) + self.assertEqual(notification.id, resp.json_body['id']) + self.assertEqual(notification.status, resp.json_body['status']) + self.assertEqual(notification.topic, resp.json_body['topic']) + self.assertEqual(notification.message, resp.json_body['message']) def test_notification_datetime(self): self.env.create_node( @@ -48,7 +47,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NotificationCollectionHandler'), headers=self.default_headers ) - notif_api = jsonutils.loads(resp.body)[0] + notif_api = resp.json_body[0] self.assertIn('date', notif_api) self.assertNotEqual(notif_api['date'], '') self.assertIn('time', notif_api) @@ -65,13 +64,12 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(response.get('cluster'), cluster.id) + self.assertEqual(resp.json_body.get('cluster'), cluster.id) self.assertEqual(notification.status, 'unread') - self.assertEqual(notification.id, response['id']) - self.assertEqual(notification.status, response['status']) - self.assertEqual(notification.topic, response['topic']) - self.assertEqual(notification.message, response['message']) + self.assertEqual(notification.id, resp.json_body['id']) + self.assertEqual(notification.status, resp.json_body['status']) + self.assertEqual(notification.topic, resp.json_body['topic']) + self.assertEqual(notification.message, resp.json_body['message']) def test_notification_update(self): notification = self.env.create_notification() @@ -86,11 +84,10 @@ class TestHandlers(BaseIntegrationTest): jsonutils.dumps(notification_update), headers=self.default_headers ) - response = jsonutils.loads(resp.body) - self.assertEqual(notification.id, response['id']) - self.assertEqual('read', response['status']) - self.assertEqual(notification.topic, response['topic']) - self.assertEqual(notification.message, response['message']) + self.assertEqual(notification.id, resp.json_body['id']) + self.assertEqual('read', resp.json_body['status']) + self.assertEqual(notification.topic, resp.json_body['topic']) + self.assertEqual(notification.message, resp.json_body['message']) def test_notification_not_found(self): notification = self.env.create_notification() diff --git a/nailgun/nailgun/test/unit/test_release_collection_handlers.py b/nailgun/nailgun/test/unit/test_release_collection_handlers.py index 77117ad806..68582e9f7a 100644 --- a/nailgun/nailgun/test/unit/test_release_collection_handlers.py +++ b/nailgun/nailgun/test/unit/test_release_collection_handlers.py @@ -27,8 +27,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual([], response) + self.assertEqual([], resp.json_body) def test_release_creation(self): resp = self.app.post( @@ -256,6 +255,5 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(1, len(response)) - self.assertEqual(orch_data, response[0]["orchestrator_data"]) + self.assertEqual(1, len(resp.json_body)) + self.assertEqual(orch_data, resp.json_body[0]["orchestrator_data"]) diff --git a/nailgun/nailgun/test/unit/test_release_handler.py b/nailgun/nailgun/test/unit/test_release_handler.py index cd43734eba..b1a9446261 100644 --- a/nailgun/nailgun/test/unit/test_release_handler.py +++ b/nailgun/nailgun/test/unit/test_release_handler.py @@ -32,12 +32,11 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) release_from_db = self.db.query(Release).one() self.db.refresh(release_from_db) self.assertEqual('5.1', release_from_db.version) - self.assertEqual('5.1', response['version']) - self.assertEqual('modified release', response['name']) + self.assertEqual('5.1', resp.json_body['version']) + self.assertEqual('modified release', resp.json_body['name']) def test_release_put_returns_400_if_no_body(self): release = self.env.create_release(api=False) @@ -78,9 +77,7 @@ class TestHandlers(BaseIntegrationTest): }), headers=self.default_headers) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - - self.assertEqual(response['is_deployable'], deployable) + self.assertEqual(resp.json_body['is_deployable'], deployable) def test_release_deployable_in_experimental(self): # make sure that we have experimental mode @@ -103,5 +100,4 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers, ) self.assertEqual(200, resp.status_code) - response = jsonutils.loads(resp.body) - self.assertEqual(response['is_deployable'], True) + self.assertEqual(resp.json_body['is_deployable'], True) diff --git a/nailgun/nailgun/test/unit/test_version_handler.py b/nailgun/nailgun/test/unit/test_version_handler.py index 60944eb81c..fc280f30a1 100644 --- a/nailgun/nailgun/test/unit/test_version_handler.py +++ b/nailgun/nailgun/test/unit/test_version_handler.py @@ -20,7 +20,6 @@ from mock import patch from contextlib import nested -from nailgun.openstack.common import jsonutils from nailgun.test.base import BaseIntegrationTest from nailgun.test.base import reverse @@ -52,7 +51,7 @@ class TestVersionHandler(BaseIntegrationTest): ) self.assertEqual(200, resp.status_code) self.assertEqual( - jsonutils.loads(resp.body), + resp.json_body, { "release": "0.1b", "nailgun_sha": "12345",