From 7769a9fbbd325f41ddd24f201c3f8debbae77a1c Mon Sep 17 00:00:00 2001 From: Dima Shulyak Date: Mon, 3 Mar 2014 11:13:59 +0200 Subject: [PATCH] Update editable attributes partially If we receive from PUT smth like: {"editable": {"storage": {"osd_pool_size": {"value": 3}, "volumes_ceph": {"value": true}}}} attributes.editable will contain only received data and no default one Changing paste.TestApp for webtest.TestApp cause TestApp does not have PATCH method available Change-Id: I259ee806c9464cb82b391e9c3b633e5e7f5f11d3 Closes-Bug: #1283135 --- nailgun/nailgun/api/handlers/cluster.py | 35 +++++++++++- nailgun/nailgun/test/base.py | 31 +++++----- .../test/integration/test_attributes.py | 50 +++++++++++++---- .../test/integration/test_capacity_handler.py | 6 +- .../test_cluster_changes_handler.py | 8 +-- .../test_cluster_collection_handlers.py | 8 +-- .../test/integration/test_cluster_handler.py | 24 ++++---- .../integration/test_network_configuration.py | 36 ++++++------ .../test/integration/test_network_models.py | 6 +- .../integration/test_network_validation.py | 12 ++-- .../test_node_collection_handlers.py | 50 ++++++++--------- .../test/integration/test_node_handler.py | 16 +++--- .../integration/test_node_nic_assignment.py | 56 +++++++++---------- .../test_node_nic_collection_handler.py | 4 +- .../test_node_nic_handlers_w_bonding.py | 14 ++--- .../test/integration/test_notification.py | 2 +- .../integration/test_orchestrator_handlers.py | 16 +++--- .../nailgun/test/integration/test_redhat.py | 2 +- .../nailgun/test/integration/test_roles.py | 2 +- .../test/integration/test_rpc_consumer.py | 2 +- .../test/integration/test_task_managers.py | 6 +- .../test_verify_networks_task_manager.py | 16 +++--- .../test/unit/test_fuel_key_handler.py | 2 +- nailgun/nailgun/test/unit/test_handlers.py | 8 +-- .../nailgun/test/unit/test_logs_handlers.py | 20 +++---- .../test/unit/test_node_assignment_handler.py | 14 ++--- .../nailgun/test/unit/test_node_deletion.py | 2 +- nailgun/nailgun/test/unit/test_node_disks.py | 18 +++--- .../test/unit/test_node_nic_handler.py | 26 ++++----- .../test_notification_collection_handler.py | 10 ++-- .../test/unit/test_notification_handler.py | 6 +- nailgun/nailgun/test/unit/test_redhat.py | 14 ++--- .../unit/test_release_collection_handlers.py | 12 ++-- .../nailgun/test/unit/test_release_handler.py | 6 +- .../nailgun/test/unit/test_task_handler.py | 4 +- .../nailgun/test/unit/test_version_handler.py | 2 +- nailgun/test-requirements.txt | 1 + 37 files changed, 304 insertions(+), 243 deletions(-) diff --git a/nailgun/nailgun/api/handlers/cluster.py b/nailgun/nailgun/api/handlers/cluster.py index 3c4c6923a3..01808b9820 100644 --- a/nailgun/nailgun/api/handlers/cluster.py +++ b/nailgun/nailgun/api/handlers/cluster.py @@ -40,6 +40,7 @@ from nailgun.task.manager import ApplyChangesTaskManager from nailgun.task.manager import ClusterDeletionManager from nailgun.task.manager import ResetEnvironmentTaskManager from nailgun.task.manager import StopDeploymentTaskManager +from nailgun import utils class ClusterHandler(BaseHandler): @@ -277,18 +278,46 @@ class ClusterAttributesHandler(BaseHandler): if not cluster.attributes: raise web.internalerror("No attributes found!") + if cluster.is_locked: + error = web.forbidden() + error.data = "Environment attributes can't be changed " \ + "after, or in deploy." + raise error + data = self.checked_data() + for key, value in data.iteritems(): + setattr(cluster.attributes, key, value) + + cluster.add_pending_changes("attributes") + db().commit() + return {"editable": cluster.attributes.editable} + + @content_json + def PATCH(self, cluster_id): + """:returns: JSONized Cluster attributes. + :http: * 200 (OK) + * 400 (wrong attributes data specified) + * 404 (cluster not found in db) + * 500 (cluster has no attributes) + """ + cluster = self.get_object_or_404(Cluster, cluster_id) + + if not cluster.attributes: + raise web.internalerror("No attributes found!") + if cluster.is_locked: error = web.forbidden() error.data = "Environment attributes can't be changed " \ "after, or in deploy." raise error - for key, value in data.iteritems(): - setattr(cluster.attributes, key, value) - cluster.add_pending_changes("attributes") + data = self.checked_data() + cluster.attributes.editable = utils.dict_merge( + cluster.attributes.editable, data['editable']) + + cluster.add_pending_changes("attributes") db().commit() return {"editable": cluster.attributes.editable} diff --git a/nailgun/nailgun/test/base.py b/nailgun/nailgun/test/base.py index 2f582047ec..4d662e6bb2 100644 --- a/nailgun/nailgun/test/base.py +++ b/nailgun/nailgun/test/base.py @@ -32,7 +32,7 @@ from itertools import izip from netaddr import IPNetwork from random import randint -from paste.fixture import TestApp +from webtest import app import nailgun from nailgun.api.urls.v1 import urls @@ -121,7 +121,7 @@ class Environment(object): params=json.dumps(release_data), headers=self.default_headers ) - self.tester.assertEquals(resp.status, 201) + self.tester.assertEquals(resp.status_code, 201) release = json.loads(resp.body) self.releases.append( self.db.query(Release).get(release['id']) @@ -145,7 +145,7 @@ class Environment(object): params=json.dumps(release_data), headers=self.default_headers ) - self.tester.assertEquals(resp.status, 200) + self.tester.assertEquals(resp.status_code, 200) download_task = json.loads(resp.body) return self.db.query(Task).get(download_task['id']) @@ -173,7 +173,7 @@ class Environment(object): json.dumps(cluster_data), headers=self.default_headers ) - self.tester.assertEquals(resp.status, 201) + self.tester.assertEquals(resp.status_code, 201) cluster = json.loads(resp.body) self.clusters.append( self.db.query(Cluster).get(cluster['id']) @@ -231,12 +231,12 @@ class Environment(object): headers=self.default_headers, expect_errors=True ) - self.tester.assertEquals(resp.status, expect_http) + self.tester.assertEquals(resp.status_code, expect_http) if expect_message: self.tester.assertEquals(resp.body, expect_message) if str(expect_http)[0] != "2": return None - self.tester.assertEquals(resp.status, expect_http) + self.tester.assertEquals(resp.status_code, expect_http) node = json.loads(resp.body) node_db = self.db.query(Node).get(node['id']) if 'interfaces' not in node_data['meta'] \ @@ -498,7 +498,7 @@ class Environment(object): headers=self.default_headers, expect_errors=True ) - self.tester.assertEquals(200, resp.status) + self.tester.assertEquals(200, resp.status_code) response = json.loads(resp.body) return self.db.query(Task).filter_by( uuid=response['uuid'] @@ -515,7 +515,8 @@ class Environment(object): 'ClusterChangesHandler', kwargs={'cluster_id': self.clusters[0].id}), headers=self.default_headers) - self.tester.assertEquals(202, resp.status) + + self.tester.assertEquals(202, resp.status_code) response = json.loads(resp.body) return self.db.query(Task).filter_by( uuid=response['uuid'] @@ -533,7 +534,7 @@ class Environment(object): kwargs={'cluster_id': self.clusters[0].id}), expect_errors=True, headers=self.default_headers) - self.tester.assertEquals(expect_http, resp.status) + self.tester.assertEquals(expect_http, resp.status_code) if not str(expect_http).startswith("2"): return resp.body response = json.loads(resp.body) @@ -553,7 +554,7 @@ class Environment(object): kwargs={'cluster_id': self.clusters[0].id}), expect_errors=True, headers=self.default_headers) - self.tester.assertEquals(resp.status, expect_http) + self.tester.assertEquals(resp.status_code, expect_http) if not str(expect_http).startswith("2"): return resp.body response = json.loads(resp.body) @@ -588,7 +589,7 @@ class Environment(object): ), headers=self.default_headers ) - self.tester.assertEquals(200, resp.status) + self.tester.assertEquals(200, resp.status_code) nets = resp.body resp = self.app.put( @@ -598,7 +599,7 @@ class Environment(object): nets, headers=self.default_headers ) - self.tester.assertEquals(200, resp.status) + self.tester.assertEquals(200, resp.status_code) response = json.loads(resp.body) task_uuid = response['uuid'] return self.db.query(Task).filter_by(uuid=task_uuid).first() @@ -614,7 +615,7 @@ class Environment(object): reverse("NodeNICsHandler", kwargs={"node_id": node_id}), headers=self.default_headers) - self.tester.assertEquals(resp.status, 200) + self.tester.assertEquals(resp.status_code, 200) data = json.loads(resp.body) nics = self.db.query(NodeNICInterface).filter( @@ -638,7 +639,7 @@ class Environment(object): "assigned_networks": assigned_nets }) resp = self.node_nics_put(node_id, data) - self.tester.assertEquals(resp.status, 200) + self.tester.assertEquals(resp.status_code, 200) def refresh_nodes(self): for n in self.nodes[:]: @@ -782,7 +783,7 @@ class BaseTestCase(TestCase): @classmethod def setUpClass(cls): cls.db = db() - cls.app = TestApp(build_app().wsgifunc()) + cls.app = app.TestApp(build_app().wsgifunc()) syncdb() @classmethod diff --git a/nailgun/nailgun/test/integration/test_attributes.py b/nailgun/nailgun/test/integration/test_attributes.py index f5bb237de0..d05bdf1f56 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 = self.db.query(Release).get( cluster['release_id'] ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) self.assertEquals( json.loads(resp.body)['editable'], release.attributes_metadata['editable'] @@ -63,9 +63,9 @@ class TestAttributes(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(500, resp.status) + self.assertEquals(500, resp.status_code) - def test_attributes_update(self): + def test_attributes_update_put(self): cluster_id = self.env.create_cluster(api=True)['id'] resp = self.app.get( reverse( @@ -73,7 +73,7 @@ class TestAttributes(BaseIntegrationTest): kwargs={'cluster_id': cluster_id}), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) resp = self.app.put( reverse( 'ClusterAttributesHandler', @@ -85,11 +85,13 @@ class TestAttributes(BaseIntegrationTest): }), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) attrs = self.db.query(Attributes).filter( Attributes.cluster_id == cluster_id ).first() self.assertEquals("bar", attrs.editable["foo"]) + attrs.editable.pop('foo') + self.assertEqual(attrs.editable, {}) # 400 on generated update resp = self.app.put( reverse( @@ -103,7 +105,7 @@ class TestAttributes(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(400, resp.status) + self.assertEquals(400, resp.status_code) # 400 if editable is not dict resp = self.app.put( reverse( @@ -115,7 +117,35 @@ class TestAttributes(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(400, resp.status) + self.assertEquals(400, resp.status_code) + + def test_attributes_update_patch(self): + cluster_id = self.env.create_cluster(api=True)['id'] + resp = self.app.get( + reverse( + 'ClusterAttributesHandler', + kwargs={'cluster_id': cluster_id}), + headers=self.default_headers + ) + self.assertEquals(200, resp.status_code) + resp = self.app.patch( + reverse( + 'ClusterAttributesHandler', + kwargs={'cluster_id': cluster_id}), + params=json.dumps({ + 'editable': { + "foo": "bar" + }, + }), + headers=self.default_headers + ) + self.assertEquals(200, resp.status_code) + attrs = self.db.query(Attributes).filter( + Attributes.cluster_id == cluster_id + ).first() + self.assertEquals("bar", attrs.editable["foo"]) + attrs.editable.pop('foo') + self.assertNotEqual(attrs.editable, {}) def test_get_default_attributes(self): cluster = self.env.create_cluster(api=True) @@ -128,7 +158,7 @@ class TestAttributes(BaseIntegrationTest): kwargs={'cluster_id': cluster['id']}), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) self.assertEquals( json.loads(resp.body)['editable'], release.attributes_metadata['editable'] @@ -149,7 +179,7 @@ class TestAttributes(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) attrs = self.db.query(Attributes).filter( Attributes.cluster_id == cluster['id'] ).first() @@ -161,7 +191,7 @@ class TestAttributes(BaseIntegrationTest): kwargs={'cluster_id': cluster['id']}), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) release = self.db.query(Release).get( cluster['release_id'] ) diff --git a/nailgun/nailgun/test/integration/test_capacity_handler.py b/nailgun/nailgun/test/integration/test_capacity_handler.py index 67b07c1605..b23e08d1ac 100644 --- a/nailgun/nailgun/test/integration/test_capacity_handler.py +++ b/nailgun/nailgun/test/integration/test_capacity_handler.py @@ -31,7 +31,7 @@ class TestHandlers(BaseIntegrationTest): resp = self.app.put( reverse('CapacityLogHandler'), headers=self.default_headers) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) capacity_task = self.db.query(Task).filter_by( name="capacity_log" @@ -70,7 +70,7 @@ class TestHandlers(BaseIntegrationTest): def test_capacity_csv_checksum(self): self._create_capacity_log() resp = self.app.get(reverse('CapacityLogCsvHandler')) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response_stream = StringIO(resp.body) checksum = md5(''.join(response_stream.readlines()[:-2])).hexdigest() @@ -143,4 +143,4 @@ class TestHandlers(BaseIntegrationTest): self._create_capacity_log() resp = self.app.get(reverse('CapacityLogCsvHandler')) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) diff --git a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py b/nailgun/nailgun/test/integration/test_cluster_changes_handler.py index d40da05596..1b58d25e8a 100644 --- a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py +++ b/nailgun/nailgun/test/integration/test_cluster_changes_handler.py @@ -741,7 +741,7 @@ class TestHandlers(BaseIntegrationTest): ['172.16.0.20', '172.16.0.22']]}) resp = self.env.neutron_networks_put(self.env.clusters[0].id, net_data) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') @@ -781,7 +781,7 @@ class TestHandlers(BaseIntegrationTest): ['172.16.0.20', '172.16.0.22']]}) resp = self.env.neutron_networks_put(self.env.clusters[0].id, net_data) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') @@ -821,7 +821,7 @@ class TestHandlers(BaseIntegrationTest): '172.16.10.254'] resp = self.env.neutron_networks_put(self.env.clusters[0].id, net_data) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') @@ -856,7 +856,7 @@ class TestHandlers(BaseIntegrationTest): 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.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') diff --git a/nailgun/nailgun/test/integration/test_cluster_collection_handlers.py b/nailgun/nailgun/test/integration/test_cluster_collection_handlers.py index 301e54e0b1..d0cbfc9a62 100644 --- a/nailgun/nailgun/test/integration/test_cluster_collection_handlers.py +++ b/nailgun/nailgun/test/integration/test_cluster_collection_handlers.py @@ -42,7 +42,7 @@ class TestHandlers(BaseIntegrationTest): reverse('ClusterCollectionHandler'), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals([], response) @@ -56,7 +56,7 @@ class TestHandlers(BaseIntegrationTest): }), headers=self.default_headers ) - self.assertEquals(201, resp.status) + self.assertEquals(201, resp.status_code) def test_cluster_create_no_ip_addresses(self): """In this test we check that no error is occured @@ -151,7 +151,7 @@ class TestHandlers(BaseIntegrationTest): }), headers=self.default_headers ) - self.assertEquals(201, resp.status) + self.assertEquals(201, resp.status_code) nets = self.db.query(NetworkGroup).filter( not_(NetworkGroup.name == "fuelweb_admin") ).all() @@ -209,6 +209,6 @@ class TestHandlers(BaseIntegrationTest): nets = json.loads(self.env.nova_networks_get(cluster['id']).body) resp = self.env.nova_networks_put(cluster['id'], nets) - self.assertEquals(202, resp.status) + self.assertEquals(202, resp.status_code) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') diff --git a/nailgun/nailgun/test/integration/test_cluster_handler.py b/nailgun/nailgun/test/integration/test_cluster_handler.py index 49208c2209..47cd96fb46 100644 --- a/nailgun/nailgun/test/integration/test_cluster_handler.py +++ b/nailgun/nailgun/test/integration/test_cluster_handler.py @@ -41,7 +41,7 @@ class TestHandlers(BaseIntegrationTest): reverse('ClusterHandler', kwargs={'cluster_id': cluster.id}), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(cluster.id, response['id']) self.assertEquals(cluster.name, response['name']) @@ -58,7 +58,7 @@ class TestHandlers(BaseIntegrationTest): }), headers=self.default_headers ) - self.assertEquals(201, resp.status) + self.assertEquals(201, resp.status_code) response = json.loads(resp.body) self.assertEquals(yet_another_cluster_name, response['name']) self.assertEquals(release.id, response['release_id']) @@ -75,7 +75,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) self.db.refresh(cluster) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) clusters = self.db.query(Cluster).filter( Cluster.name == updated_name ).all() @@ -93,7 +93,7 @@ class TestHandlers(BaseIntegrationTest): json.dumps({'net_manager': 'VlanManager'}), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) self.db.refresh(cluster) self.assertEquals(cluster.net_manager, "VlanManager") @@ -106,7 +106,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) self.assertEquals(resp.body, "Change of 'net_provider' is prohibited") def test_cluster_update_fails_on_net_segment_type_change(self): @@ -122,7 +122,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) self.assertEquals(resp.body, "Change of 'net_segment_type' is prohibited") @@ -135,7 +135,7 @@ class TestHandlers(BaseIntegrationTest): json.dumps({'nodes': [node1.id]}), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) nodes = self.db.query(Node).filter(Node.cluster == cluster).all() self.assertEquals(1, len(nodes)) @@ -146,7 +146,7 @@ class TestHandlers(BaseIntegrationTest): json.dumps({'nodes': [node2.id]}), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) nodes = self.db.query(Node).filter(Node.cluster == cluster) self.assertEquals(1, nodes.count()) @@ -155,7 +155,7 @@ class TestHandlers(BaseIntegrationTest): cluster = self.env.create_cluster(api=True) resp = self.delete(cluster['id']) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) self.assertEquals(self.db.query(Node).count(), 0) self.assertEquals(self.db.query(Cluster).count(), 0) @@ -168,7 +168,7 @@ class TestHandlers(BaseIntegrationTest): {"status": "ready"}]) resp = self.delete(self.env.clusters[0].id) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) def cluster_is_empty(): return self.db.query(Cluster).count() == 0 @@ -191,7 +191,7 @@ class TestHandlers(BaseIntegrationTest): {'online': False, 'status': 'ready'}]) resp = self.delete(self.env.clusters[0].id) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) def cluster_is_empty_and_in_db_one_node(): return self.db.query(Cluster).count() == 0 and \ @@ -254,5 +254,5 @@ class TestHandlers(BaseIntegrationTest): kwargs={'cluster_id': cluster.id}), headers=self.default_headers ) - self.assertEquals(get_resp.status, 200) + self.assertEquals(get_resp.status_code, 200) self.datadiff(json.loads(get_resp.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 9650d6a433..c567b088f1 100644 --- a/nailgun/nailgun/test/integration/test_network_configuration.py +++ b/nailgun/nailgun/test/integration/test_network_configuration.py @@ -57,7 +57,7 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): def test_not_found_cluster(self): resp = self.env.nova_networks_get(self.cluster.id + 999, expect_errors=True) - self.assertEquals(404, resp.status) + self.assertEquals(404, resp.status_code) def test_change_net_manager(self): new_net_manager = {'net_manager': 'VlanManager'} @@ -96,7 +96,7 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): mgmt['network_size'] = 128 resp = self.env.nova_networks_put(self.cluster.id, data) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') @@ -115,7 +115,7 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) self.assertEquals( resp.body, u"Wrong net provider - environment uses 'nova_network'" @@ -142,7 +142,7 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): 'vlan_start': new_vlan_id}]} resp = self.env.nova_networks_put(self.cluster.id, new_nets) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) self.db.refresh(network) self.assertEquals(network.amount, 1) self.assertEquals(network.vlan_start, 500) @@ -169,7 +169,7 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): resp = self.env.nova_networks_put(self.cluster.id, new_nets, expect_errors=True) - self.assertEquals(202, resp.status) + self.assertEquals(202, resp.status_code) task = json.loads(resp.body) self.assertEquals(task['status'], 'error') self.assertEquals( @@ -188,7 +188,7 @@ class TestNovaNetworkConfigurationHandlerMultinode(BaseIntegrationTest): def test_mgmt_storage_networks_have_no_gateway(self): resp = self.env.nova_networks_get(self.cluster.id) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) data = json.loads(resp.body) for net in data['networks']: if net['name'] in ['management', 'storage']: @@ -287,7 +287,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): def test_not_found_cluster(self): resp = self.env.neutron_networks_get(self.cluster.id + 999, expect_errors=True) - self.assertEquals(404, resp.status) + self.assertEquals(404, resp.status_code) def test_refresh_mask_on_cidr_change(self): response = self.env.neutron_networks_get(self.cluster.id) @@ -300,7 +300,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): mgmt['network_size'] = 128 resp = self.env.neutron_networks_put(self.cluster.id, data) - self.assertEquals(202, resp.status) + self.assertEquals(202, resp.status_code) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') @@ -317,7 +317,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): resp = self.env.neutron_networks_put(self.cluster.id, data, expect_errors=True) - self.assertEquals(202, resp.status) + self.assertEquals(202, resp.status_code) task = json.loads(resp.body) self.assertEquals(task['status'], 'error') self.assertEquals( @@ -334,7 +334,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): data['networks'][0]['vlan_start'] = 500 # non-used vlan id resp = self.env.neutron_networks_put(self.cluster.id, data) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) self.db.refresh(network) self.assertEquals(network.amount, 1) @@ -351,7 +351,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): resp = self.env.neutron_networks_put(self.cluster.id, data, expect_errors=True) - self.assertEquals(202, resp.status) + self.assertEquals(202, resp.status_code) task = json.loads(resp.body) self.assertEquals(task['status'], 'error') self.assertEquals( @@ -366,7 +366,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): resp = self.env.neutron_networks_put(self.cluster.id, new_nets, expect_errors=True) - self.assertEquals(202, resp.status) + self.assertEquals(202, resp.status_code) task = json.loads(resp.body) self.assertEquals(task['status'], 'error') self.assertEquals( @@ -387,7 +387,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): '199.61.0.122'] resp = self.env.neutron_networks_put(self.cluster.id, data) - self.assertEquals(202, resp.status) + self.assertEquals(202, resp.status_code) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') @@ -404,7 +404,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): publ['netmask'] = '255.255.252.0' resp = self.env.neutron_networks_put(self.cluster.id, data) - self.assertEquals(202, resp.status) + self.assertEquals(202, resp.status_code) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') @@ -422,7 +422,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): # it is OK as public CIDR is ignored and nothing else is changed resp = self.env.neutron_networks_put(self.cluster.id, data) - self.assertEquals(202, resp.status) + self.assertEquals(202, resp.status_code) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') @@ -442,7 +442,7 @@ class TestNeutronNetworkConfigurationHandlerMultinode(BaseIntegrationTest): def test_mgmt_storage_networks_have_no_gateway(self): resp = self.env.neutron_networks_get(self.cluster.id) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) data = json.loads(resp.body) for net in data['networks']: if net['name'] in ['management', 'storage']: @@ -518,7 +518,7 @@ class TestAdminNetworkConfiguration(BaseIntegrationTest): nets = json.loads(resp.body) resp = self.env.nova_networks_put(self.cluster['id'], nets, expect_errors=True) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'error') self.assertEquals(task['progress'], 100) @@ -530,7 +530,7 @@ class TestAdminNetworkConfiguration(BaseIntegrationTest): def test_deploy_error_when_admin_cidr_match_other_network_cidr(self): resp = self.env.cluster_changes_put(self.cluster['id'], expect_errors=True) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'error') self.assertEquals(task['progress'], 100) diff --git a/nailgun/nailgun/test/integration/test_network_models.py b/nailgun/nailgun/test/integration/test_network_models.py index 46343d1a61..73aac9b467 100644 --- a/nailgun/nailgun/test/integration/test_network_models.py +++ b/nailgun/nailgun/test/integration/test_network_models.py @@ -93,10 +93,10 @@ class TestNetworkModels(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(resp_nova_net.status, 403) + self.assertEquals(resp_nova_net.status_code, 403) # it's 400 because we used Nova network - self.assertEquals(resp_neutron_net.status, 400) - self.assertEquals(resp_cluster.status, 403) + self.assertEquals(resp_neutron_net.status_code, 400) + self.assertEquals(resp_cluster.status_code, 403) def test_network_group_creates_several_networks(self): cluster = self.env.create_cluster(api=False) diff --git a/nailgun/nailgun/test/integration/test_network_validation.py b/nailgun/nailgun/test/integration/test_network_validation.py index 17fa5b20f0..1592c1a7a4 100644 --- a/nailgun/nailgun/test/integration/test_network_validation.py +++ b/nailgun/nailgun/test/integration/test_network_validation.py @@ -47,7 +47,7 @@ class TestNetworkChecking(BaseIntegrationTest): def set_cluster_changes_w_error(self, cluster_id): resp = self.env.cluster_changes_put(cluster_id, expect_errors=True) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'error') self.assertEquals(task['progress'], 100) @@ -58,7 +58,7 @@ class TestNetworkChecking(BaseIntegrationTest): def update_nova_networks_w_error(self, cluster_id, nets): resp = self.env.nova_networks_put(cluster_id, nets, expect_errors=True) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'error') self.assertEquals(task['progress'], 100) @@ -68,7 +68,7 @@ class TestNetworkChecking(BaseIntegrationTest): def update_nova_networks_success(self, cluster_id, nets): resp = self.env.nova_networks_put(cluster_id, nets) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') self.assertEquals(task['progress'], 100) @@ -78,7 +78,7 @@ class TestNetworkChecking(BaseIntegrationTest): def update_neutron_networks_w_error(self, cluster_id, nets): resp = self.env.neutron_networks_put(cluster_id, nets, expect_errors=True) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'error') self.assertEquals(task['progress'], 100) @@ -88,7 +88,7 @@ class TestNetworkChecking(BaseIntegrationTest): def update_neutron_networks_success(self, cluster_id, nets): resp = self.env.neutron_networks_put(cluster_id, nets) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') self.assertEquals(task['progress'], 100) @@ -360,7 +360,7 @@ class TestNovaHandlers(TestNetworkChecking): kwargs={'node_id': node_db.id}), json.dumps(nics), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) task = self.set_cluster_changes_w_error(self.cluster.id) self.assertIn( diff --git a/nailgun/nailgun/test/integration/test_node_collection_handlers.py b/nailgun/nailgun/test/integration/test_node_collection_handlers.py index 1102945b69..17687dbaca 100644 --- a/nailgun/nailgun/test/integration/test_node_collection_handlers.py +++ b/nailgun/nailgun/test/integration/test_node_collection_handlers.py @@ -28,7 +28,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeCollectionHandler'), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals([], response) @@ -61,7 +61,7 @@ class TestHandlers(BaseIntegrationTest): params={'cluster_id': cluster.id}, headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(1, len(response)) self.assertEquals( @@ -83,7 +83,7 @@ class TestHandlers(BaseIntegrationTest): params={'cluster_id': ''}, headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(1, len(response)) self.assertEquals(self.env.nodes[0].id, response[0]['id']) @@ -101,7 +101,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeCollectionHandler'), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(2, len(response)) @@ -124,7 +124,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(2, len(response)) @@ -135,7 +135,7 @@ class TestHandlers(BaseIntegrationTest): 'meta': self.env.default_metadata(), 'status': 'discover'}), headers=self.default_headers) - self.assertEquals(resp.status, 201) + self.assertEquals(resp.status_code, 201) response = json.loads(resp.body) self.assertEquals('discover', response['status']) @@ -145,7 +145,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeCollectionHandler'), json.dumps([{'mac': node.mac, 'manufacturer': 'new'}]), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.get( reverse('NodeCollectionHandler'), headers=self.default_headers @@ -161,7 +161,7 @@ class TestHandlers(BaseIntegrationTest): json.dumps([{'manufacturer': 'man0'}]), headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) self.assertEquals(resp.body, "Neither MAC nor ID is specified") resp = self.app.put( @@ -170,7 +170,7 @@ class TestHandlers(BaseIntegrationTest): 'manufacturer': 'man1'}]), headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) self.assertEquals(resp.body, "Neither MAC nor ID is specified") resp = self.app.put( @@ -179,7 +179,7 @@ class TestHandlers(BaseIntegrationTest): 'manufacturer': 'man2'}]), headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) self.assertEquals(resp.body, "Neither MAC nor ID is specified") resp = self.app.put( @@ -189,7 +189,7 @@ class TestHandlers(BaseIntegrationTest): 'manufacturer': 'man3'}]), headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) self.assertEquals(resp.body, "Neither MAC nor ID is specified") resp = self.app.put( @@ -199,7 +199,7 @@ class TestHandlers(BaseIntegrationTest): 'manufacturer': 'man4'}]), headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) self.assertEquals(resp.body, "Null MAC is specified") resp = self.app.put( @@ -208,21 +208,21 @@ class TestHandlers(BaseIntegrationTest): 'mac': node.mac, 'manufacturer': 'man5'}]), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.put( reverse('NodeCollectionHandler'), json.dumps([{'id': node.id, 'manufacturer': 'man6'}]), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.put( reverse('NodeCollectionHandler'), json.dumps([{'mac': node.mac, 'manufacturer': 'man7'}]), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.put( reverse('NodeCollectionHandler'), @@ -230,7 +230,7 @@ class TestHandlers(BaseIntegrationTest): 'mac': node.mac, 'manufacturer': 'man8'}]), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) def node_update_with_invalid_id(self): node = self.env.create_node(api=False) @@ -241,7 +241,7 @@ class TestHandlers(BaseIntegrationTest): 'mac': node.mac}]), headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) self.assertEquals(resp.body, "Invalid ID specified") def test_node_update_agent_discover(self): @@ -259,7 +259,7 @@ class TestHandlers(BaseIntegrationTest): ]), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.get( reverse('NodeCollectionHandler'), headers=self.default_headers @@ -278,7 +278,7 @@ class TestHandlers(BaseIntegrationTest): 'manufacturer': 'old'} ]), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) node = self.db.query(Node).get(node.id) self.assertEquals(node.timestamp, timestamp) @@ -289,7 +289,7 @@ class TestHandlers(BaseIntegrationTest): 'manufacturer': 'new', 'is_agent': True} ]), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) node = self.db.query(Node).get(node.id) self.assertNotEquals(node.timestamp, timestamp) self.assertEquals('new', node.manufacturer) @@ -318,7 +318,7 @@ class TestHandlers(BaseIntegrationTest): json.dumps(node2_json), headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 409) + self.assertEquals(resp.status_code, 409) def test_node_create_without_mac(self): node = self.env.create_node( @@ -350,7 +350,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEqual(resp.status, 200) + self.assertEqual(resp.status_code, 200) response = json.loads(resp.body) # Here we are checking if node mac is successfully updated self.assertEqual(node1_json["mac"], response[0]["mac"]) @@ -363,7 +363,7 @@ class TestHandlers(BaseIntegrationTest): json.dumps({'mac': node.mac}), headers=self.default_headers, expect_errors=True) - self.assertEquals(409, resp.status) + self.assertEquals(409, resp.status_code) def test_node_creation_fail(self): resp = self.app.post( @@ -373,7 +373,7 @@ class TestHandlers(BaseIntegrationTest): 'status': 'error'}), headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 403) + self.assertEquals(resp.status_code, 403) def test_reset_cluster_name_when_unassign_node(self): self.env.create( @@ -391,7 +391,7 @@ class TestHandlers(BaseIntegrationTest): 'cluster_id': None, 'pending_roles': []}]), headers=self.default_headers) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(1, len(response)) self.assertEquals(node.id, response[0]['id']) diff --git a/nailgun/nailgun/test/integration/test_node_handler.py b/nailgun/nailgun/test/integration/test_node_handler.py index 610d350d5f..d13022c6ab 100644 --- a/nailgun/nailgun/test/integration/test_node_handler.py +++ b/nailgun/nailgun/test/integration/test_node_handler.py @@ -28,7 +28,7 @@ class TestHandlers(BaseIntegrationTest): resp = self.app.get( reverse('NodeHandler', kwargs={'node_id': node.id}), headers=self.default_headers) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(node.id, response['id']) self.assertEquals(node.name, response['name']) @@ -55,7 +55,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True) # we now just ignore 'id' if present - self.assertEquals(201, resp.status) + self.assertEquals(201, resp.status_code) def test_node_deletion(self): node = self.env.create_node(api=False) @@ -65,7 +65,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(resp.status, 204) + self.assertEquals(resp.status_code, 204) def test_node_valid_metadata_gets_updated(self): new_metadata = self.env.default_metadata() @@ -74,7 +74,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeHandler', kwargs={'node_id': node.id}), json.dumps({'meta': new_metadata}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) self.db.refresh(node) nodes = self.db.query(Node).filter( @@ -90,7 +90,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeHandler', kwargs={'node_id': node.id}), json.dumps(params), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) def test_node_action_flags_are_set(self): flags = ['pending_addition', 'pending_deletion'] @@ -101,7 +101,7 @@ class TestHandlers(BaseIntegrationTest): json.dumps({flag: True}), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) self.db.refresh(node) node_from_db = self.db.query(Node).filter( @@ -117,7 +117,7 @@ class TestHandlers(BaseIntegrationTest): "", headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) def test_put_returns_400_if_wrong_status(self): node = self.env.create_node(api=False) @@ -127,4 +127,4 @@ class TestHandlers(BaseIntegrationTest): json.dumps(params), headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) diff --git a/nailgun/nailgun/test/integration/test_node_nic_assignment.py b/nailgun/nailgun/test/integration/test_node_nic_assignment.py index c28ad4ff0d..ed740258e1 100644 --- a/nailgun/nailgun/test/integration/test_node_nic_assignment.py +++ b/nailgun/nailgun/test/integration/test_node_nic_assignment.py @@ -43,7 +43,7 @@ class TestClusterHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) @@ -88,12 +88,12 @@ class TestClusterHandlers(BaseIntegrationTest): json.dumps({'nodes': []}), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) for resp_nic in response: self.assertEquals(resp_nic['assigned_networks'], []) @@ -130,7 +130,7 @@ class TestNodeHandlers(BaseIntegrationTest): resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) for resp_nic in response: net_names = [net['name'] for net in resp_nic['assigned_networks']] @@ -154,12 +154,12 @@ class TestNodeHandlers(BaseIntegrationTest): json.dumps([{'id': node['id'], 'cluster_id': cluster['id']}]), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) for resp_nic in response: net_names = [net['name'] for net in resp_nic['assigned_networks']] @@ -178,7 +178,7 @@ class TestNodeHandlers(BaseIntegrationTest): if net['name'] == 'management': net['vlan_start'] = None resp = self.env.nova_networks_put(cluster['id'], nets) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') @@ -195,12 +195,12 @@ class TestNodeHandlers(BaseIntegrationTest): json.dumps([{'id': node['id'], 'cluster_id': cluster['id']}]), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) net_name_per_nic = [['fuelweb_admin', 'storage', 'fixed'], ['public', 'floating'], @@ -215,7 +215,7 @@ class TestNodeHandlers(BaseIntegrationTest): if net['name'] == 'management': net['vlan_start'] = 112 resp = self.env.nova_networks_put(cluster['id'], nets) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') @@ -232,12 +232,12 @@ class TestNodeHandlers(BaseIntegrationTest): json.dumps([{'id': node['id'], 'cluster_id': cluster['id']}]), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) net_name_per_nic = [['fuelweb_admin', 'storage', 'fixed', 'public', 'floating', 'management'], @@ -256,7 +256,7 @@ class TestNodeHandlers(BaseIntegrationTest): if net['name'] == 'management': net['vlan_start'] = None resp = self.env.neutron_networks_put(cluster['id'], nets) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') @@ -273,12 +273,12 @@ class TestNodeHandlers(BaseIntegrationTest): json.dumps([{'id': node['id'], 'cluster_id': cluster['id']}]), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) net_name_per_nic = [['fuelweb_admin', 'storage', 'private'], ['public'], @@ -293,7 +293,7 @@ class TestNodeHandlers(BaseIntegrationTest): if net['name'] == 'management': net['vlan_start'] = 112 resp = self.env.neutron_networks_put(cluster['id'], nets) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) task = json.loads(resp.body) self.assertEquals(task['status'], 'ready') @@ -310,12 +310,12 @@ class TestNodeHandlers(BaseIntegrationTest): json.dumps([{'id': node['id'], 'cluster_id': cluster['id']}]), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) net_name_per_nic = [['fuelweb_admin', 'storage', 'public', 'management', 'private'], @@ -339,12 +339,12 @@ class TestNodeHandlers(BaseIntegrationTest): json.dumps([{'id': node['id'], 'cluster_id': None}]), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) for resp_nic in response: self.assertEquals(resp_nic['assigned_networks'], []) @@ -367,7 +367,7 @@ class TestNodeHandlers(BaseIntegrationTest): lambda interface: interface["mac"], json.loads(resp.body) ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) self.assertItemsEqual(macs, resp_macs) def test_try_add_node_with_same_mac(self): @@ -454,7 +454,7 @@ class TestNodeNICAdminAssigning(BaseIntegrationTest): 'is_agent': True}]), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) self.db.refresh(node_db) self.assertEquals(node_db.admin_interface.mac, mac2) @@ -466,7 +466,7 @@ class TestNodeNICAdminAssigning(BaseIntegrationTest): 'cluster_id': None}]), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) self.db.refresh(node_db) self.assertEquals(node_db.admin_interface.mac, mac1) @@ -493,7 +493,7 @@ class TestNodePublicNetworkToNICAssignment(BaseIntegrationTest): resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) data = json.loads(resp.body) eth1 = [nic for nic in data if nic['name'] == 'eth1'] self.assertEqual(len(eth1), 1) @@ -511,7 +511,7 @@ class TestNodePublicNetworkToNICAssignment(BaseIntegrationTest): resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) data = json.loads(resp.body) eth1 = [nic for nic in data if nic['name'] == 'eth1'] self.assertEqual(len(eth1), 1) @@ -529,7 +529,7 @@ class TestNodePublicNetworkToNICAssignment(BaseIntegrationTest): resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) data = json.loads(resp.body) eth1 = [nic for nic in data if nic['name'] == 'eth1'] self.assertEqual(len(eth1), 1) @@ -556,7 +556,7 @@ class TestNodeNICsHandlersValidation(BaseIntegrationTest): reverse("NodeNICsHandler", kwargs={"node_id": self.env.nodes[0]["id"]}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) self.data = json.loads(resp.body) self.nics_w_nets = filter(lambda nic: nic.get("assigned_networks"), self.data) @@ -575,7 +575,7 @@ class TestNodeNICsHandlersValidation(BaseIntegrationTest): def node_nics_put_check_error(self, message): for put_func in (self.put_single, self.put_collection): resp = put_func() - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) self.assertEquals(resp.body, message) def test_assignment_change_failed_assigned_network_wo_id(self): 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 135ae8fdbf..412e696be5 100644 --- a/nailgun/nailgun/test/integration/test_node_nic_collection_handler.py +++ b/nailgun/nailgun/test/integration/test_node_nic_collection_handler.py @@ -35,7 +35,7 @@ class TestHandlers(BaseIntegrationTest): resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) a_nets = filter(lambda nic: nic['mac'] == mac, response)[0]['assigned_networks'] @@ -51,6 +51,6 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeCollectionNICsHandler'), json.dumps(nodes_list), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) new_response = json.loads(resp.body) self.assertEquals(new_response, nodes_list) 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 b6f3b64d85..0a9938da21 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): reverse("NodeNICsHandler", kwargs={"node_id": self.env.nodes[0]["id"]}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) self.data = json.loads(resp.body) self.admin_nic, self.other_nic, self.empty_nic = None, None, None for nic in self.data: @@ -75,7 +75,7 @@ class TestNodeNICsBonding(BaseIntegrationTest): def node_nics_put_check_error(self, message): for put_func in (self.put_single, self.put_collection): resp = put_func() - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) self.assertEquals(resp.body, message) def nics_bond_create(self, put_func): @@ -91,10 +91,10 @@ class TestNodeNICsBonding(BaseIntegrationTest): self.other_nic["assigned_networks"] = [] resp = put_func() - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.env.node_nics_get(self.env.nodes[0]["id"]) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) data = json.loads(resp.body) bonds = filter( lambda iface: iface["type"] == NETWORK_INTERFACE_TYPES.bond, @@ -104,7 +104,7 @@ class TestNodeNICsBonding(BaseIntegrationTest): def nics_bond_remove(self, put_func): resp = self.env.node_nics_get(self.env.nodes[0]["id"]) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) self.data = json.loads(resp.body) for nic in self.data: if nic["type"] == NETWORK_INTERFACE_TYPES.bond: @@ -121,7 +121,7 @@ class TestNodeNICsBonding(BaseIntegrationTest): self.data.remove(bond) resp = put_func() - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) def test_nics_bond_delete(self): for put_func in (self.put_single, self.put_collection): @@ -130,7 +130,7 @@ class TestNodeNICsBonding(BaseIntegrationTest): self.nics_bond_remove(put_func) resp = self.env.node_nics_get(self.env.nodes[0]["id"]) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) data = json.loads(resp.body) for nic in data: self.assertNotEqual(nic["type"], NETWORK_INTERFACE_TYPES.bond) diff --git a/nailgun/nailgun/test/integration/test_notification.py b/nailgun/nailgun/test/integration/test_notification.py index 52c2a7fb85..a810fed87c 100644 --- a/nailgun/nailgun/test/integration/test_notification.py +++ b/nailgun/nailgun/test/integration/test_notification.py @@ -95,7 +95,7 @@ class TestNotification(BaseIntegrationTest): 'meta': self.env.default_metadata(), 'status': 'discover'}), headers=self.default_headers) - self.assertEquals(resp.status, 201) + self.assertEquals(resp.status_code, 201) notifications = self.db.query(Notification).all() self.assertEqual(len(notifications), 1) diff --git a/nailgun/nailgun/test/integration/test_orchestrator_handlers.py b/nailgun/nailgun/test/integration/test_orchestrator_handlers.py index 6579cc1397..ec960ed2ae 100644 --- a/nailgun/nailgun/test/integration/test_orchestrator_handlers.py +++ b/nailgun/nailgun/test/integration/test_orchestrator_handlers.py @@ -44,7 +44,7 @@ class TestOrchestratorInfoHandlers(BaseIntegrationTest): json.dumps(orchestrator_data), headers=self.default_headers) - self.assertEquals(put_resp.status, 200) + self.assertEquals(put_resp.status_code, 200) self.assertEquals(get_info(), orchestrator_data) # getting provisioning info @@ -53,7 +53,7 @@ class TestOrchestratorInfoHandlers(BaseIntegrationTest): kwargs={'cluster_id': self.cluster.id}), headers=self.default_headers) - self.assertEquals(get_resp.status, 200) + self.assertEquals(get_resp.status_code, 200) self.datadiff(orchestrator_data, json.loads(get_resp.body)) # deleting provisioning info @@ -62,7 +62,7 @@ class TestOrchestratorInfoHandlers(BaseIntegrationTest): kwargs={'cluster_id': self.cluster.id}), headers=self.default_headers) - self.assertEquals(delete_resp.status, 202) + self.assertEquals(delete_resp.status_code, 202) self.assertEqual(get_info(), {}) def test_cluster_provisioning_info(self): @@ -98,7 +98,7 @@ class TestDefaultOrchestratorInfoHandlers(BaseIntegrationTest): kwargs={'cluster_id': self.cluster.id}), json.dumps(facts), headers=self.default_headers) - self.assertEqual(resp.status, 200) + self.assertEqual(resp.status_code, 200) self.assertTrue(self.cluster.is_customized) self.datadiff(get_info(), facts) @@ -108,7 +108,7 @@ class TestDefaultOrchestratorInfoHandlers(BaseIntegrationTest): kwargs={'cluster_id': self.cluster.id}), headers=self.default_headers) - self.assertEqual(resp.status, 200) + self.assertEqual(resp.status_code, 200) self.assertEqual(3, len(json.loads(resp.body))) def test_default_provisioning_handler(self): @@ -117,7 +117,7 @@ class TestDefaultOrchestratorInfoHandlers(BaseIntegrationTest): kwargs={'cluster_id': self.cluster.id}), headers=self.default_headers) - self.assertEqual(resp.status, 200) + self.assertEqual(resp.status_code, 200) self.assertEqual(3, len(json.loads(resp.body)['nodes'])) def test_default_provisioning_handler_for_selected_nodes(self): @@ -128,7 +128,7 @@ class TestDefaultOrchestratorInfoHandlers(BaseIntegrationTest): nodes_filter_param(node_ids) resp = self.app.get(url, headers=self.default_headers) - self.assertEqual(resp.status, 200) + self.assertEqual(resp.status_code, 200) data = json.loads(resp.body)['nodes'] self.assertEqual(2, len(data)) actual_uids = [node['uid'] for node in data] @@ -142,7 +142,7 @@ class TestDefaultOrchestratorInfoHandlers(BaseIntegrationTest): nodes_filter_param(node_ids) resp = self.app.get(url, headers=self.default_headers) - self.assertEqual(resp.status, 200) + self.assertEqual(resp.status_code, 200) data = json.loads(resp.body) self.assertEqual(2, len(data)) actual_uids = [node['uid'] for node in data] diff --git a/nailgun/nailgun/test/integration/test_redhat.py b/nailgun/nailgun/test/integration/test_redhat.py index 6863c9f90a..10d9a5369e 100644 --- a/nailgun/nailgun/test/integration/test_redhat.py +++ b/nailgun/nailgun/test/integration/test_redhat.py @@ -35,7 +35,7 @@ class TestHandlers(BaseIntegrationTest): 'release_id': self.release.id}), headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) supertask = self.db.query(Task).filter_by( name="redhat_check_credentials" diff --git a/nailgun/nailgun/test/integration/test_roles.py b/nailgun/nailgun/test/integration/test_roles.py index f9b47db029..3126a15a00 100644 --- a/nailgun/nailgun/test/integration/test_roles.py +++ b/nailgun/nailgun/test/integration/test_roles.py @@ -174,7 +174,7 @@ class TestRoles(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEqual(resp.status, 400) + self.assertEqual(resp.status_code, 400) self.assertEqual( resp.body, "Cannot delete roles already assigned to nodes: controller" diff --git a/nailgun/nailgun/test/integration/test_rpc_consumer.py b/nailgun/nailgun/test/integration/test_rpc_consumer.py index 6c80e27100..d3e076c8b7 100644 --- a/nailgun/nailgun/test/integration/test_rpc_consumer.py +++ b/nailgun/nailgun/test/integration/test_rpc_consumer.py @@ -149,7 +149,7 @@ class TestVerifyNetworks(BaseIntegrationTest): reverse('TaskHandler', kwargs={'obj_id': task.id}), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) task = json.loads(resp.body) self.assertEqual(task['status'], "error") error_nodes = [{'uid': node1.id, 'interface': 'eth0', diff --git a/nailgun/nailgun/test/integration/test_task_managers.py b/nailgun/nailgun/test/integration/test_task_managers.py index b267b34c18..5ce2f6e533 100644 --- a/nailgun/nailgun/test/integration/test_task_managers.py +++ b/nailgun/nailgun/test/integration/test_task_managers.py @@ -208,7 +208,7 @@ class TestTaskManagers(BaseIntegrationTest): kwargs={'cluster_id': self.env.clusters[0].id}), headers=self.default_headers ) - self.assertEquals(202, resp.status) + self.assertEquals(202, resp.status_code) timer = time.time() timeout = 15 @@ -249,7 +249,7 @@ class TestTaskManagers(BaseIntegrationTest): kwargs={'cluster_id': cluster_id}), headers=self.default_headers ) - self.assertEquals(202, resp.status) + self.assertEquals(202, resp.status_code) timer = time.time() timeout = 15 @@ -338,7 +338,7 @@ class TestTaskManagers(BaseIntegrationTest): kwargs={'cluster_id': cluster_id}), headers=self.default_headers ) - self.assertEquals(202, resp.status) + self.assertEquals(202, resp.status_code) timer = time.time() timeout = 15 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 09c787babc..738d86412c 100644 --- a/nailgun/nailgun/test/integration/test_verify_networks_task_manager.py +++ b/nailgun/nailgun/test/integration/test_verify_networks_task_manager.py @@ -68,7 +68,7 @@ class TestVerifyNetworkTaskManagers(BaseIntegrationTest): ), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) nets = json.loads(resp.body) nets['networks'][-1]["vlan_start"] = 500 @@ -87,7 +87,7 @@ class TestVerifyNetworkTaskManagers(BaseIntegrationTest): ), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) nets = json.loads(resp.body) admin_ng = self.env.network_manager.get_admin_network_group() @@ -116,7 +116,7 @@ class TestVerifyNetworkTaskManagers(BaseIntegrationTest): ), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) nets = json.loads(resp.body) for net in nets['networks']: @@ -186,7 +186,7 @@ class TestVerifyNetworkTaskManagers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(400, resp.status) + self.assertEquals(400, resp.status_code) class TestVerifyNetworksDisabled(BaseIntegrationTest): @@ -275,7 +275,7 @@ class TestNetworkVerificationWithBonds(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) data = json.loads(resp.body) admin_nic, other_nic, empty_nic = None, None, None for nic in data: @@ -291,7 +291,7 @@ class TestNetworkVerificationWithBonds(BaseIntegrationTest): def verify_bonds(self, node): resp = self.env.node_nics_get(node["id"]) - self.assertEqual(resp.status, 200) + self.assertEqual(resp.status_code, 200) data = json.loads(resp.body) bond = filter(lambda nic: nic["type"] == NETWORK_INTERFACE_TYPES.bond, data) @@ -311,7 +311,7 @@ class TestNetworkVerificationWithBonds(BaseIntegrationTest): }) other_nic["assigned_networks"] = [] resp = self.env.node_nics_put(node['id'], data) - self.assertEqual(resp.status, 200) + self.assertEqual(resp.status_code, 200) @property def expected_args(self): @@ -388,7 +388,7 @@ class TestVerifyNeutronVlan(BaseIntegrationTest): # get nodes NICs for private network resp = self.app.get(reverse('NodeCollectionHandler'), headers=self.default_headers) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) priv_nics = {} for node in json.loads(resp.body): for net in node['network_data']: diff --git a/nailgun/nailgun/test/unit/test_fuel_key_handler.py b/nailgun/nailgun/test/unit/test_fuel_key_handler.py index e89ca6e4be..1d368ccf9b 100644 --- a/nailgun/nailgun/test/unit/test_fuel_key_handler.py +++ b/nailgun/nailgun/test/unit/test_fuel_key_handler.py @@ -43,7 +43,7 @@ class TestFuelKeyHandler(BaseTestCase): signature = base64.b64encode(json.dumps(key_data)) key_data["signature"] = signature - self.assertEqual(200, resp.status) + self.assertEqual(200, resp.status_code) response = json.loads(resp.body) self.assertEqual( diff --git a/nailgun/nailgun/test/unit/test_handlers.py b/nailgun/nailgun/test/unit/test_handlers.py index 1ebac17e39..b9f7067658 100644 --- a/nailgun/nailgun/test/unit/test_handlers.py +++ b/nailgun/nailgun/test/unit/test_handlers.py @@ -29,10 +29,10 @@ class TestHandlers(BaseIntegrationTest): for handler in urls: test_url = reverse(handler, urls[handler]) resp = self.app.get(test_url, expect_errors=True) - self.assertTrue(resp.status in [404, 405]) + self.assertTrue(resp.status_code in [404, 405]) resp = self.app.delete(test_url, expect_errors=True) - self.assertTrue(resp.status in [404, 405]) + self.assertTrue(resp.status_code in [404, 405]) resp = self.app.put(test_url, expect_errors=True) - self.assertTrue(resp.status in [404, 405]) + self.assertTrue(resp.status_code in [404, 405]) resp = self.app.post(test_url, expect_errors=True) - self.assertTrue(resp.status in [404, 405]) + self.assertTrue(resp.status_code in [404, 405]) diff --git a/nailgun/nailgun/test/unit/test_logs_handlers.py b/nailgun/nailgun/test/unit/test_logs_handlers.py index 924e0f8553..68717858c9 100644 --- a/nailgun/nailgun/test/unit/test_logs_handlers.py +++ b/nailgun/nailgun/test/unit/test_logs_handlers.py @@ -77,7 +77,7 @@ class TestLogs(BaseIntegrationTest): reverse('LogSourceCollectionHandler'), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(response, settings.LOGS) @@ -90,7 +90,7 @@ class TestLogs(BaseIntegrationTest): kwargs={'node_id': node.id}), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(response, []) @@ -101,7 +101,7 @@ class TestLogs(BaseIntegrationTest): kwargs={'node_id': node.id}), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(response, [settings.LOGS[1]]) @@ -129,7 +129,7 @@ class TestLogs(BaseIntegrationTest): params={'source': settings.LOGS[0]['id']}, headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) response['entries'].reverse() self.assertEquals(response['entries'], log_entries) @@ -139,7 +139,7 @@ class TestLogs(BaseIntegrationTest): params={'node': node.id, 'source': settings.LOGS[1]['id']}, headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) response['entries'].reverse() self.assertEquals(response['entries'], log_entries) @@ -171,7 +171,7 @@ class TestLogs(BaseIntegrationTest): params={'source': settings.LOGS[0]['id']}, headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) response['entries'].reverse() self.assertEquals(response['entries'], log_entries) @@ -334,7 +334,7 @@ class TestLogs(BaseIntegrationTest): tm_patcher.stop() th_patcher.stop() self.assertEquals(task, resp.body) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) def test_log_package_handler_failed(self): tm_patcher = patch('nailgun.api.handlers.logs.DumpTaskManager') @@ -351,7 +351,7 @@ class TestLogs(BaseIntegrationTest): expect_errors=True ) tm_patcher.stop() - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) def test_log_entry_collection_handler_sensitive(self): account = RedHatAccount() @@ -381,7 +381,7 @@ class TestLogs(BaseIntegrationTest): params={'source': settings.LOGS[0]['id']}, headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) response['entries'].reverse() self.assertEquals(response['entries'], response_log_entries) @@ -403,4 +403,4 @@ class TestLogs(BaseIntegrationTest): reverse('LogPackageHandler'), "[]", headers=self.default_headers, expect_errors=True ) - self.assertEqual(resp.status, 400) + self.assertEqual(resp.status_code, 400) diff --git a/nailgun/nailgun/test/unit/test_node_assignment_handler.py b/nailgun/nailgun/test/unit/test_node_assignment_handler.py index 59eaea60f0..28c5985e00 100644 --- a/nailgun/nailgun/test/unit/test_node_assignment_handler.py +++ b/nailgun/nailgun/test/unit/test_node_assignment_handler.py @@ -44,7 +44,7 @@ class TestAssignmentHandlers(BaseIntegrationTest): json.dumps(assignment_data), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) self.assertEqual(node.cluster, cluster) self.datadiff( node.pending_roles, @@ -60,7 +60,7 @@ class TestAssignmentHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(400, resp.status) + self.assertEquals(400, resp.status_code) def test_unassignment(self): cluster = self.env.create( @@ -77,7 +77,7 @@ class TestAssignmentHandlers(BaseIntegrationTest): json.dumps([{'id': node.id}]), headers=self.default_headers ) - self.assertEqual(200, resp.status) + self.assertEqual(200, resp.status_code) self.assertEqual(node.cluster, None) self.assertEqual(node.pending_roles, []) @@ -92,7 +92,7 @@ class TestAssignmentHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(400, resp.status) + self.assertEqual(400, resp.status_code) #Test with invalid cluster id resp = self.app.post( reverse( @@ -103,7 +103,7 @@ class TestAssignmentHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEqual(resp.status, 404) + self.assertEqual(resp.status_code, 404) # Test with wrong cluster id self.env.create( @@ -120,7 +120,7 @@ class TestAssignmentHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEqual(resp.status, 400) + self.assertEqual(resp.status_code, 400) def test_unassignment_after_deploy(self): cluster = self.env.create( @@ -138,5 +138,5 @@ class TestAssignmentHandlers(BaseIntegrationTest): json.dumps([{'id': node.id}]), headers=self.default_headers ) - self.assertEqual(resp.status, 200) + self.assertEqual(resp.status_code, 200) self.assertEqual(node.pending_deletion, True) diff --git a/nailgun/nailgun/test/unit/test_node_deletion.py b/nailgun/nailgun/test/unit/test_node_deletion.py index 91f7887eb7..8a33314449 100644 --- a/nailgun/nailgun/test/unit/test_node_deletion.py +++ b/nailgun/nailgun/test/unit/test_node_deletion.py @@ -51,7 +51,7 @@ class TestNodeDeletion(BaseIntegrationTest): kwargs={'node_id': node.id}), headers=self.default_headers ) - self.assertEquals(204, resp.status) + self.assertEquals(204, resp.status_code) node_try = self.db.query(Node).filter_by( cluster_id=cluster.id diff --git a/nailgun/nailgun/test/unit/test_node_disks.py b/nailgun/nailgun/test/unit/test_node_disks.py index 4aa3f530cd..e81e0f9506 100644 --- a/nailgun/nailgun/test/unit/test_node_disks.py +++ b/nailgun/nailgun/test/unit/test_node_disks.py @@ -50,7 +50,7 @@ class TestNodeDisksHandlers(BaseIntegrationTest): reverse('NodeDisksHandler', kwargs={'node_id': node_id}), headers=self.default_headers) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) return json.loads(resp.body) def put(self, node_id, data, expect_errors=False): @@ -61,7 +61,7 @@ class TestNodeDisksHandlers(BaseIntegrationTest): expect_errors=expect_errors) if not expect_errors: - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) return json.loads(resp.body) else: return resp @@ -92,7 +92,7 @@ class TestNodeDisksHandlers(BaseIntegrationTest): reverse('NodeCollectionHandler'), json.dumps([{'id': node_db.id, 'pending_roles': roles}]), headers=self.default_headers) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) # adding role update_node_roles(['compute', 'cinder']) @@ -191,7 +191,7 @@ class TestNodeDisksHandlers(BaseIntegrationTest): def test_validator_at_least_one_disk_exists(self): node = self.create_node() response = self.put(node.id, [], True) - self.assertEquals(response.status, 400) + self.assertEquals(response.status_code, 400) self.assertRegexpMatches(response.body, '^Node seems not to have disks') @@ -205,7 +205,7 @@ class TestNodeDisksHandlers(BaseIntegrationTest): volume['size'] = disk['size'] + 1 response = self.put(node.id, disks, True) - self.assertEquals(response.status, 400) + self.assertEquals(response.status_code, 400) self.assertRegexpMatches( response.body, '^Not enough free space on disk: .+') @@ -218,7 +218,7 @@ class TestNodeDisksHandlers(BaseIntegrationTest): del volume['size'] response = self.put(node.id, disks, True) - self.assertEquals(response.status, 400) + self.assertEquals(response.status_code, 400) self.assertRegexpMatches( response.body, "'size' is a required property") @@ -230,7 +230,7 @@ class TestNodeDefaultsDisksHandler(BaseIntegrationTest): reverse('NodeDefaultsDisksHandler', kwargs={'node_id': node_id}), headers=self.default_headers) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) return json.loads(resp.body) def test_node_disk_amount_regenerates_volumes_info_if_new_disk_added(self): @@ -287,7 +287,7 @@ class TestNodeVolumesInformationHandler(BaseIntegrationTest): kwargs={'node_id': node_id}), headers=self.default_headers) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) return json.loads(resp.body) def create_node(self, role): @@ -467,7 +467,7 @@ class TestVolumeManager(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(404, resp.status) + self.assertEquals(404, resp.status_code) def test_allocates_all_free_space_for_os_for_controller_role(self): node = self.create_node('controller') diff --git a/nailgun/nailgun/test/unit/test_node_nic_handler.py b/nailgun/nailgun/test/unit/test_node_nic_handler.py index c8a1506aa4..8121805c92 100644 --- a/nailgun/nailgun/test/unit/test_node_nic_handler.py +++ b/nailgun/nailgun/test/unit/test_node_nic_handler.py @@ -27,7 +27,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeNICsHandler', kwargs={'node_id': 1}), expect_errors=True, headers=self.default_headers) - self.assertEquals(resp.status, 404) + self.assertEquals(resp.status_code, 404) def test_get_handler_with_invalid_data(self): meta = self.env.default_metadata() @@ -48,12 +48,12 @@ class TestHandlers(BaseIntegrationTest): expect_errors=True, headers=self.default_headers ) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) self.assertEquals(response, []) @@ -79,7 +79,7 @@ class TestHandlers(BaseIntegrationTest): expect_errors=True, headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) ifaces = json.loads(resp.body)[0]["meta"]["interfaces"] self.assertEquals(ifaces, []) @@ -113,7 +113,7 @@ class TestHandlers(BaseIntegrationTest): expect_errors=True, headers=self.default_headers ) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) ifaces = json.loads(resp.body)[0]["meta"]["interfaces"] self.assertEquals( ifaces, @@ -130,7 +130,7 @@ class TestHandlers(BaseIntegrationTest): resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) self.assertEquals(response, []) @@ -147,7 +147,7 @@ class TestHandlers(BaseIntegrationTest): resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node_db.id}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) self.assertItemsEqual( map(lambda i: i['id'], response), @@ -181,12 +181,12 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeCollectionHandler'), json.dumps([node_data]), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) self.assertEquals(len(response), 1) resp_nic = response[0] @@ -212,12 +212,12 @@ class TestHandlers(BaseIntegrationTest): reverse('NodeCollectionHandler'), json.dumps([node_data]), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) self.assertEquals(len(response), len(meta['interfaces'])) for nic in meta['interfaces']: @@ -243,7 +243,7 @@ class TestHandlers(BaseIntegrationTest): resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) self.assertNotEquals(response[0]['id'], fake_id) @@ -256,6 +256,6 @@ class TestHandlers(BaseIntegrationTest): resp = self.app.get( reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) self.assertNotEquals(response[0]['mac'], new_mac.lower()) diff --git a/nailgun/nailgun/test/unit/test_notification_collection_handler.py b/nailgun/nailgun/test/unit/test_notification_collection_handler.py index b599c7f7de..0842620340 100644 --- a/nailgun/nailgun/test/unit/test_notification_collection_handler.py +++ b/nailgun/nailgun/test/unit/test_notification_collection_handler.py @@ -28,7 +28,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NotificationCollectionHandler'), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals([], response) @@ -40,7 +40,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NotificationCollectionHandler'), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(len(response), 2) if response[0]['id'] == n0.id: @@ -61,7 +61,7 @@ class TestHandlers(BaseIntegrationTest): reverse('NotificationCollectionHandler'), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) notifications_count = self.db.query(Notification).count() self.assertEquals(notifications_count, 3) @@ -71,7 +71,7 @@ class TestHandlers(BaseIntegrationTest): params={'limit': 2}, headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(len(response), 2) @@ -94,7 +94,7 @@ class TestHandlers(BaseIntegrationTest): json.dumps(notification_update), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(len(response), 2) if response[0]['id'] == n0.id: diff --git a/nailgun/nailgun/test/unit/test_notification_handler.py b/nailgun/nailgun/test/unit/test_notification_handler.py index 36e44f28a1..b40f03b56d 100644 --- a/nailgun/nailgun/test/unit/test_notification_handler.py +++ b/nailgun/nailgun/test/unit/test_notification_handler.py @@ -31,7 +31,7 @@ class TestHandlers(BaseIntegrationTest): ), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertIsNone(response.get('cluster')) self.assertEquals(notification.status, 'unread') @@ -65,7 +65,7 @@ class TestHandlers(BaseIntegrationTest): ), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals(response.get('cluster'), cluster.id) self.assertEquals(notification.status, 'unread') @@ -103,4 +103,4 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(404, resp.status) + self.assertEquals(404, resp.status_code) diff --git a/nailgun/nailgun/test/unit/test_redhat.py b/nailgun/nailgun/test/unit/test_redhat.py index 8675ed2798..bd885f4a58 100644 --- a/nailgun/nailgun/test/unit/test_redhat.py +++ b/nailgun/nailgun/test/unit/test_redhat.py @@ -68,7 +68,7 @@ class TestHandlers(BaseIntegrationTest): 'password': 'password'}), headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) @fake_tasks() def test_redhat_account_validation_success(self): @@ -85,7 +85,7 @@ class TestHandlers(BaseIntegrationTest): 'password': 'password', 'release_id': self.release.id}), headers=self.default_headers) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) @fake_tasks() def test_redhat_account_validation_failure(self): @@ -97,7 +97,7 @@ class TestHandlers(BaseIntegrationTest): 'release_id': self.release.id}), headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 202) + self.assertEquals(resp.status_code, 202) supertask = self.db.query(Task).filter_by( name="redhat_check_credentials" @@ -109,7 +109,7 @@ class TestHandlers(BaseIntegrationTest): resp = self.app.get( reverse('RedHatAccountHandler'), expect_errors=True) - self.assertEquals(resp.status, 404) + self.assertEquals(resp.status_code, 404) resp = self.app.post( reverse('RedHatAccountHandler'), @@ -118,12 +118,12 @@ class TestHandlers(BaseIntegrationTest): 'password': 'password', 'release_id': self.release.id}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) resp = self.app.get( reverse('RedHatAccountHandler'), expect_errors=True) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) response = json.loads(resp.body) @@ -140,7 +140,7 @@ class TestHandlers(BaseIntegrationTest): 'password': 'password', 'release_id': self.release.id}), headers=self.default_headers) - self.assertEquals(resp.status, 200) + self.assertEquals(resp.status_code, 200) query = self.env.db.query(RedHatAccount) self.assertEquals(query.count(), 1) self.assertEquals(query.filter_by(username='rheltest').count(), 1) diff --git a/nailgun/nailgun/test/unit/test_release_collection_handlers.py b/nailgun/nailgun/test/unit/test_release_collection_handlers.py index 1fef1c4420..c5fc2e25d3 100644 --- a/nailgun/nailgun/test/unit/test_release_collection_handlers.py +++ b/nailgun/nailgun/test/unit/test_release_collection_handlers.py @@ -27,7 +27,7 @@ class TestHandlers(BaseIntegrationTest): reverse('ReleaseCollectionHandler'), headers=self.default_headers ) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) self.assertEquals([], response) @@ -41,7 +41,7 @@ class TestHandlers(BaseIntegrationTest): }), headers=self.default_headers ) - self.assertEquals(resp.status, 201) + self.assertEquals(resp.status_code, 201) def test_release_create(self): release_name = "OpenStack" @@ -100,7 +100,7 @@ class TestHandlers(BaseIntegrationTest): }), headers=self.default_headers ) - self.assertEquals(resp.status, 201) + self.assertEquals(resp.status_code, 201) resp = self.app.post( reverse('ReleaseCollectionHandler'), @@ -131,7 +131,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(resp.status, 409) + self.assertEquals(resp.status_code, 409) release_from_db = self.db.query(Release).filter_by( name=release_name, @@ -197,7 +197,7 @@ class TestHandlers(BaseIntegrationTest): }), headers=self.default_headers ) - self.assertEquals(resp.status, 201) + self.assertEquals(resp.status_code, 201) resp = self.app.post( reverse('ReleaseCollectionHandler'), @@ -228,4 +228,4 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(resp.status, 409) + self.assertEquals(resp.status_code, 409) diff --git a/nailgun/nailgun/test/unit/test_release_handler.py b/nailgun/nailgun/test/unit/test_release_handler.py index 583faa05f3..509ae46eb3 100644 --- a/nailgun/nailgun/test/unit/test_release_handler.py +++ b/nailgun/nailgun/test/unit/test_release_handler.py @@ -32,7 +32,7 @@ class TestHandlers(BaseIntegrationTest): }), headers=self.default_headers, expect_errors=True) - self.assertEquals(200, resp.status) + self.assertEquals(200, resp.status_code) response = json.loads(resp.body) release_from_db = self.db.query(Release).one() self.db.refresh(release_from_db) @@ -47,7 +47,7 @@ class TestHandlers(BaseIntegrationTest): "", headers=self.default_headers, expect_errors=True) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) def test_release_delete_returns_400_if_clusters(self): cluster = self.env.create_cluster(api=False) @@ -57,7 +57,7 @@ class TestHandlers(BaseIntegrationTest): headers=self.default_headers, expect_errors=True ) - self.assertEquals(resp.status, 400) + self.assertEquals(resp.status_code, 400) self.assertEquals( resp.body, "Can't delete release with " diff --git a/nailgun/nailgun/test/unit/test_task_handler.py b/nailgun/nailgun/test/unit/test_task_handler.py index c873ae82f4..a373085268 100644 --- a/nailgun/nailgun/test/unit/test_task_handler.py +++ b/nailgun/nailgun/test/unit/test_task_handler.py @@ -42,7 +42,7 @@ class TestTaskHandlers(BaseUnitTest): headers=self.default_headers, expect_errors=True ) - self.assertEqual(resp.status, 400) + self.assertEqual(resp.status_code, 400) resp = self.app.delete( reverse( 'TaskHandler', @@ -50,4 +50,4 @@ class TestTaskHandlers(BaseUnitTest): ) + "?force=1", headers=self.default_headers ) - self.assertEquals(resp.status, 204) + self.assertEquals(resp.status_code, 204) diff --git a/nailgun/nailgun/test/unit/test_version_handler.py b/nailgun/nailgun/test/unit/test_version_handler.py index 4fae475137..8cc8718a21 100644 --- a/nailgun/nailgun/test/unit/test_version_handler.py +++ b/nailgun/nailgun/test/unit/test_version_handler.py @@ -35,7 +35,7 @@ class TestVersionHandler(BaseIntegrationTest): reverse('VersionHandler'), headers=self.default_headers ) - self.assertEqual(200, resp.status) + self.assertEqual(200, resp.status_code) self.assertEqual( json.loads(resp.body), { diff --git a/nailgun/test-requirements.txt b/nailgun/test-requirements.txt index 06ba051432..02b652e563 100644 --- a/nailgun/test-requirements.txt +++ b/nailgun/test-requirements.txt @@ -11,3 +11,4 @@ sphinxcontrib-blockdiag==1.3.0 sphinxcontrib-actdiag==0.6.0 sphinxcontrib-seqdiag==0.6.0 sphinxcontrib-nwdiag==0.7.0 +webtest==2.0.14