From 7b47906118e155a30923a76524ca67a6d29e0f1a Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Tue, 30 Sep 2014 21:36:48 +0900 Subject: [PATCH] Fix E127 errors in openstack_dashboard/dashboards/admin/ E127 continuation line over-indented for visual indent Partial-Bug: #1375931 Change-Id: I0c3a95633e267294fc3b5576be2fc3c374b4b5d8 --- .../dashboards/admin/aggregates/forms.py | 4 +- .../dashboards/admin/aggregates/tests.py | 32 +++++----- .../dashboards/admin/defaults/tests.py | 6 +- .../dashboards/admin/flavors/tests.py | 64 +++++++++---------- .../dashboards/admin/hypervisors/tests.py | 2 +- .../dashboards/admin/images/tests.py | 26 +++----- .../dashboards/admin/instances/forms.py | 4 +- .../dashboards/admin/instances/tables.py | 14 ++-- .../dashboards/admin/instances/tests.py | 64 +++++++++---------- .../dashboards/admin/networks/tests.py | 2 +- .../dashboards/admin/networks/views.py | 2 +- .../dashboards/admin/overview/tests.py | 12 ++-- .../dashboards/admin/routers/tests.py | 4 +- .../dashboards/admin/volumes/tests.py | 4 +- .../volumes/volume_types/extras/tests.py | 8 +-- .../admin/volumes/volume_types/forms.py | 4 +- .../volumes/volume_types/qos_specs/tests.py | 12 ++-- .../volumes/volume_types/qos_specs/urls.py | 4 +- .../admin/volumes/volume_types/tests.py | 4 +- .../admin/volumes/volume_types/urls.py | 16 ++--- .../admin/volumes/volume_types/views.py | 2 +- .../dashboards/admin/volumes/volumes/forms.py | 9 +-- 22 files changed, 146 insertions(+), 153 deletions(-) diff --git a/openstack_dashboard/dashboards/admin/aggregates/forms.py b/openstack_dashboard/dashboards/admin/aggregates/forms.py index ac6e292a08..bd261868c6 100644 --- a/openstack_dashboard/dashboards/admin/aggregates/forms.py +++ b/openstack_dashboard/dashboards/admin/aggregates/forms.py @@ -42,8 +42,8 @@ class UpdateAggregateForm(forms.SelfHandlingForm): aggregate['availability_zone'] = availability_zone try: api.nova.aggregate_update(request, id, aggregate) - message = _('Successfully updated aggregate: "%s."') \ - % data['name'] + message = (_('Successfully updated aggregate: "%s."') + % data['name']) messages.success(request, message) except Exception: exceptions.handle(request, diff --git a/openstack_dashboard/dashboards/admin/aggregates/tests.py b/openstack_dashboard/dashboards/admin/aggregates/tests.py index 012b71a09e..35025d9a35 100644 --- a/openstack_dashboard/dashboards/admin/aggregates/tests.py +++ b/openstack_dashboard/dashboards/admin/aggregates/tests.py @@ -387,9 +387,9 @@ class ManageHostsTests(test.BaseAdminViewTests): form_data = {'manageaggregatehostsaction_role_member': [host.host_name]} self._test_manage_hosts_update(host, - aggregate, - form_data, - addAggregate=False) + aggregate, + form_data, + addAggregate=False) def test_manage_hosts_update_nothing_empty_aggregate(self): aggregate = self.aggregates.first() @@ -397,9 +397,9 @@ class ManageHostsTests(test.BaseAdminViewTests): form_data = {'manageaggregatehostsaction_role_member': []} self._test_manage_hosts_update(None, - aggregate, - form_data, - addAggregate=False) + aggregate, + form_data, + addAggregate=False) def test_manage_hosts_update_add_empty_aggregate(self): aggregate = self.aggregates.first() @@ -408,9 +408,9 @@ class ManageHostsTests(test.BaseAdminViewTests): form_data = {'manageaggregatehostsaction_role_member': [host.host_name]} self._test_manage_hosts_update(host, - aggregate, - form_data, - addAggregate=True) + aggregate, + form_data, + addAggregate=True) def test_manage_hosts_update_add_not_empty_aggregate(self): aggregate = self.aggregates.first() @@ -420,9 +420,9 @@ class ManageHostsTests(test.BaseAdminViewTests): form_data = {'manageaggregatehostsaction_role_member': [host1.host_name, host3.host_name]} self._test_manage_hosts_update(host3, - aggregate, - form_data, - addAggregate=True) + aggregate, + form_data, + addAggregate=True) def test_manage_hosts_update_clean_not_empty_aggregate(self): aggregate = self.aggregates.first() @@ -430,10 +430,10 @@ class ManageHostsTests(test.BaseAdminViewTests): form_data = {'manageaggregatehostsaction_role_member': []} self._test_manage_hosts_update(None, - aggregate, - form_data, - addAggregate=False, - cleanAggregates=True) + aggregate, + form_data, + addAggregate=False, + cleanAggregates=True) class HostAggregateMetadataTests(test.BaseAdminViewTests): diff --git a/openstack_dashboard/dashboards/admin/defaults/tests.py b/openstack_dashboard/dashboards/admin/defaults/tests.py index b1faa88eb9..8995674bab 100644 --- a/openstack_dashboard/dashboards/admin/defaults/tests.py +++ b/openstack_dashboard/dashboards/admin/defaults/tests.py @@ -45,14 +45,14 @@ class ServicesViewTests(test.BaseAdminViewTests): self.mox.StubOutWithMock(api.neutron, 'is_extension_supported') api.base.is_service_enabled(IsA(http.HttpRequest), 'volume') \ - .AndReturn(True) + .AndReturn(True) api.base.is_service_enabled(IsA(http.HttpRequest), 'network') \ - .MultipleTimes().AndReturn(neutron_enabled) + .MultipleTimes().AndReturn(neutron_enabled) api.nova.default_quota_get(IsA(http.HttpRequest), self.tenant.id).AndReturn(self.quotas.nova) api.cinder.default_quota_get(IsA(http.HttpRequest), self.tenant.id) \ - .AndReturn(self.cinder_quotas.first()) + .AndReturn(self.cinder_quotas.first()) if neutron_enabled: api.neutron.is_extension_supported( IsA(http.HttpRequest), diff --git a/openstack_dashboard/dashboards/admin/flavors/tests.py b/openstack_dashboard/dashboards/admin/flavors/tests.py index 6aa89c4be8..b34b78786a 100644 --- a/openstack_dashboard/dashboards/admin/flavors/tests.py +++ b/openstack_dashboard/dashboards/admin/flavors/tests.py @@ -30,7 +30,7 @@ class FlavorsViewTests(test.BaseAdminViewTests): flavors.Flavor: ('get_keys',), }) def test_index(self): api.nova.flavor_list(IsA(http.HttpRequest), None) \ - .AndReturn(self.flavors.list()) + .AndReturn(self.flavors.list()) flavors.Flavor.get_keys().MultipleTimes().AndReturn({}) self.mox.ReplayAll() @@ -109,7 +109,7 @@ class CreateFlavorWorkflowTests(BaseFlavorWorkflowTests): # handle params = self._flavor_create_params(flavor, id='auto') api.nova.flavor_create(IsA(http.HttpRequest), **params) \ - .AndReturn(flavor) + .AndReturn(flavor) self.mox.ReplayAll() @@ -139,7 +139,7 @@ class CreateFlavorWorkflowTests(BaseFlavorWorkflowTests): params = self._flavor_create_params(flavor, id='auto') params['is_public'] = False api.nova.flavor_create(IsA(http.HttpRequest), **params) \ - .AndReturn(flavor) + .AndReturn(flavor) for project in projects: api.nova.add_tenant_to_flavor(IsA(http.HttpRequest), flavor.id, project.id) @@ -219,7 +219,7 @@ class CreateFlavorWorkflowTests(BaseFlavorWorkflowTests): params = self._flavor_create_params(flavor, id='auto') params['is_public'] = False api.nova.flavor_create(IsA(http.HttpRequest), **params) \ - .AndReturn(flavor) + .AndReturn(flavor) for project in projects: expect = api.nova.add_tenant_to_flavor(IsA(http.HttpRequest), flavor.id, project.id) @@ -274,7 +274,7 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): api.keystone.tenant_list(IsA(http.HttpRequest)).AndReturn([projects, False]) api.nova.flavor_access_list(IsA(http.HttpRequest), flavor.id) \ - .AndReturn(flavor_access) + .AndReturn(flavor_access) # Put all mocks created by mox into replay mode self.mox.ReplayAll() @@ -311,7 +311,7 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): flavor = self.flavors.first() api.nova.flavor_get(IsA(http.HttpRequest), flavor.id) \ - .AndRaise(self.exceptions.nova) + .AndRaise(self.exceptions.nova) self.mox.ReplayAll() @@ -345,16 +345,16 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): # GET/init, set up expected behavior api.nova.flavor_get(IsA(http.HttpRequest), flavor.id) \ - .MultipleTimes().AndReturn(flavor) + .MultipleTimes().AndReturn(flavor) api.keystone.tenant_list(IsA(http.HttpRequest)) \ - .MultipleTimes().AndReturn([projects, False]) + .MultipleTimes().AndReturn([projects, False]) api.nova.flavor_list(IsA(http.HttpRequest), None) \ - .AndReturn(self.flavors.list()) + .AndReturn(self.flavors.list()) # POST/init api.nova.flavor_get_extras(IsA(http.HttpRequest), flavor.id, raw=True) \ - .AndReturn(extra_specs) + .AndReturn(extra_specs) api.nova.flavor_delete(IsA(http.HttpRequest), flavor.id) api.nova.flavor_create(IsA(http.HttpRequest), new_flavor.name, @@ -415,16 +415,16 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): # GET/init, set up expected behavior api.nova.flavor_get(IsA(http.HttpRequest), flavor.id) \ - .MultipleTimes().AndReturn(flavor) + .MultipleTimes().AndReturn(flavor) api.keystone.tenant_list(IsA(http.HttpRequest)) \ - .MultipleTimes().AndReturn([projects, False]) + .MultipleTimes().AndReturn([projects, False]) # POST/init api.nova.flavor_list(IsA(http.HttpRequest), None) \ - .AndReturn(self.flavors.list()) + .AndReturn(self.flavors.list()) api.nova.flavor_get_extras(IsA(http.HttpRequest), flavor.id, raw=True) \ - .AndReturn(extra_specs) + .AndReturn(extra_specs) api.nova.flavor_delete(IsA(http.HttpRequest), flavor.id) api.nova.flavor_create(IsA(http.HttpRequest), new_flavor.name, @@ -485,9 +485,9 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): # GET/init, set up expected behavior api.nova.flavor_get(IsA(http.HttpRequest), flavor.id) \ - .MultipleTimes().AndReturn(flavor) + .MultipleTimes().AndReturn(flavor) api.keystone.tenant_list(IsA(http.HttpRequest)) \ - .MultipleTimes().AndReturn([projects, False]) + .MultipleTimes().AndReturn([projects, False]) # POST api.nova.flavor_list(IsA(http.HttpRequest), None) \ @@ -496,7 +496,7 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): # POST/init api.nova.flavor_get_extras(IsA(http.HttpRequest), flavor.id, raw=True) \ - .AndReturn(extra_specs) + .AndReturn(extra_specs) api.nova.flavor_delete(IsA(http.HttpRequest), flavor.id) api.nova.flavor_create(IsA(http.HttpRequest), new_flavor.name, @@ -506,7 +506,7 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): swap=new_flavor.swap, ephemeral=eph, is_public=True)\ - .AndRaise(self.exceptions.nova) + .AndRaise(self.exceptions.nova) # Put mocks in replay mode self.mox.ReplayAll() @@ -562,16 +562,16 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): # GET/init, set up expected behavior api.nova.flavor_get(IsA(http.HttpRequest), flavor.id) \ - .MultipleTimes().AndReturn(flavor) + .MultipleTimes().AndReturn(flavor) api.keystone.tenant_list(IsA(http.HttpRequest)) \ - .MultipleTimes().AndReturn([projects, False]) + .MultipleTimes().AndReturn([projects, False]) # POST/init api.nova.flavor_list(IsA(http.HttpRequest), None) \ - .AndReturn(self.flavors.list()) + .AndReturn(self.flavors.list()) api.nova.flavor_get_extras(IsA(http.HttpRequest), flavor.id, raw=True) \ - .AndReturn(extra_specs) + .AndReturn(extra_specs) api.nova.flavor_delete(IsA(http.HttpRequest), flavor.id) api.nova.flavor_create(IsA(http.HttpRequest), @@ -582,7 +582,7 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): swap=new_flavor.swap, ephemeral=eph, is_public=new_flavor.is_public) \ - .AndReturn(new_flavor) + .AndReturn(new_flavor) new_flavor_projects = flavor_projects for project in new_flavor_projects: @@ -620,11 +620,11 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): # init api.nova.flavor_get(IsA(http.HttpRequest), flavor.id) \ - .MultipleTimes().AndReturn(flavor) + .MultipleTimes().AndReturn(flavor) api.keystone.tenant_list(IsA(http.HttpRequest)) \ - .MultipleTimes().AndReturn([projects, False]) + .MultipleTimes().AndReturn([projects, False]) api.nova.flavor_list(IsA(http.HttpRequest), None) \ - .AndReturn(self.flavors.list()) + .AndReturn(self.flavors.list()) self.mox.ReplayAll() @@ -668,13 +668,13 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): # GET api.nova.flavor_get(IsA(http.HttpRequest), flavor_a.id) \ - .MultipleTimes().AndReturn(flavor_a) + .MultipleTimes().AndReturn(flavor_a) api.keystone.tenant_list(IsA(http.HttpRequest)) \ - .MultipleTimes().AndReturn([projects, False]) + .MultipleTimes().AndReturn([projects, False]) # POST api.nova.flavor_list(IsA(http.HttpRequest), None) \ - .AndReturn(self.flavors.list()) + .AndReturn(self.flavors.list()) self.mox.ReplayAll() # get test @@ -706,11 +706,11 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): eph = getattr(flavor, 'OS-FLV-EXT-DATA:ephemeral') api.nova.flavor_get(IsA(http.HttpRequest), flavor.id) \ - .MultipleTimes().AndReturn(flavor) + .MultipleTimes().AndReturn(flavor) api.keystone.tenant_list(IsA(http.HttpRequest)) \ - .MultipleTimes().AndReturn([projects, False]) + .MultipleTimes().AndReturn([projects, False]) api.nova.flavor_list(IsA(http.HttpRequest), None) \ - .AndReturn(self.flavors.list()) + .AndReturn(self.flavors.list()) self.mox.ReplayAll() diff --git a/openstack_dashboard/dashboards/admin/hypervisors/tests.py b/openstack_dashboard/dashboards/admin/hypervisors/tests.py index 88c57f55c2..e8671b6504 100644 --- a/openstack_dashboard/dashboards/admin/hypervisors/tests.py +++ b/openstack_dashboard/dashboards/admin/hypervisors/tests.py @@ -42,7 +42,7 @@ class HypervisorViewTest(test.BaseAdminViewTests): hypervisors_tab = res.context['tab_group'].get_tab('hypervisor') self.assertItemsEqual(hypervisors_tab._tables['hypervisors'].data, - hypervisors) + hypervisors) host_tab = res.context['tab_group'].get_tab('compute_host') host_table = host_tab._tables['compute_host'] diff --git a/openstack_dashboard/dashboards/admin/images/tests.py b/openstack_dashboard/dashboards/admin/images/tests.py index b87f54738f..e81a4c9bee 100644 --- a/openstack_dashboard/dashboards/admin/images/tests.py +++ b/openstack_dashboard/dashboards/admin/images/tests.py @@ -67,29 +67,25 @@ class ImagesViewTest(test.BaseAdminViewTests): paginate=True, filters=filters, sort_dir='desc') \ - .AndReturn([images, - True, True]) + .AndReturn([images, True, True]) api.glance.image_list_detailed(IsA(http.HttpRequest), marker=None, paginate=True, filters=filters, sort_dir='desc') \ - .AndReturn([images[:2], - True, True]) + .AndReturn([images[:2], True, True]) api.glance.image_list_detailed(IsA(http.HttpRequest), marker=images[2].id, paginate=True, filters=filters, sort_dir='desc') \ - .AndReturn([images[2:4], - True, True]) + .AndReturn([images[2:4], True, True]) api.glance.image_list_detailed(IsA(http.HttpRequest), marker=images[4].id, paginate=True, filters=filters, sort_dir='desc') \ - .AndReturn([images[4:], - True, True]) + .AndReturn([images[4:], True, True]) self.mox.ReplayAll() url = reverse('horizon:admin:images:index') @@ -188,29 +184,25 @@ class ImagesViewTest(test.BaseAdminViewTests): paginate=True, filters=filters, sort_dir='desc') \ - .AndReturn([images, - True, False]) + .AndReturn([images, True, False]) api.glance.image_list_detailed(IsA(http.HttpRequest), marker=None, paginate=True, filters=filters, sort_dir='desc') \ - .AndReturn([images[:2], - True, True]) + .AndReturn([images[:2], True, True]) api.glance.image_list_detailed(IsA(http.HttpRequest), marker=images[2].id, paginate=True, filters=filters, sort_dir='desc') \ - .AndReturn([images[2:], - True, True]) + .AndReturn([images[2:], True, True]) api.glance.image_list_detailed(IsA(http.HttpRequest), marker=images[2].id, paginate=True, filters=filters, sort_dir='asc') \ - .AndReturn([images[:2], - True, True]) + .AndReturn([images[:2], True, True]) self.mox.ReplayAll() url = reverse('horizon:admin:images:index') @@ -227,7 +219,7 @@ class ImagesViewTest(test.BaseAdminViewTests): url = "?".join([reverse('horizon:admin:images:index'), "=".join([tables.AdminImagesTable._meta.pagination_param, - images[2].id])]) + images[2].id])]) res = self.client.get(url) # get second page (item 3) self.assertEqual(len(res.context['images_table'].data), 1) diff --git a/openstack_dashboard/dashboards/admin/instances/forms.py b/openstack_dashboard/dashboards/admin/instances/forms.py index e1107f9200..92a0c193c7 100644 --- a/openstack_dashboard/dashboards/admin/instances/forms.py +++ b/openstack_dashboard/dashboards/admin/instances/forms.py @@ -50,8 +50,8 @@ class LiveMigrateForm(forms.SelfHandlingForm): host_list = [(host.host_name, host.host_name) for host in hosts - if host.service.startswith('compute') and - host.host_name != current_host] + if (host.service.startswith('compute') and + host.host_name != current_host)] if host_list: host_list.insert(0, ("", _("Select a new host"))) else: diff --git a/openstack_dashboard/dashboards/admin/instances/tables.py b/openstack_dashboard/dashboards/admin/instances/tables.py index 6e7504748d..8347d4796a 100644 --- a/openstack_dashboard/dashboards/admin/instances/tables.py +++ b/openstack_dashboard/dashboards/admin/instances/tables.py @@ -132,13 +132,13 @@ class AdminInstancesTable(tables.DataTable): verbose_name=_("Size"), classes=('nowrap-col',), attrs={'data-type': 'size'}) - status = tables.Column("status", - filters=(title, filters.replace_underscores), - verbose_name=_("Status"), - status=True, - status_choices=STATUS_CHOICES, - display_choices= - project_tables.STATUS_DISPLAY_CHOICES) + status = tables.Column( + "status", + filters=(title, filters.replace_underscores), + verbose_name=_("Status"), + status=True, + status_choices=STATUS_CHOICES, + display_choices=project_tables.STATUS_DISPLAY_CHOICES) task = tables.Column("OS-EXT-STS:task_state", verbose_name=_("Task"), filters=(title, filters.replace_underscores), diff --git a/openstack_dashboard/dashboards/admin/instances/tests.py b/openstack_dashboard/dashboards/admin/instances/tests.py index a1910ba904..66b94e35e8 100644 --- a/openstack_dashboard/dashboards/admin/instances/tests.py +++ b/openstack_dashboard/dashboards/admin/instances/tests.py @@ -40,11 +40,11 @@ class InstanceViewTest(test.BaseAdminViewTests): api.nova.extension_supported('AdminActions', IsA(http.HttpRequest)) \ .MultipleTimes().AndReturn(True) api.keystone.tenant_list(IsA(http.HttpRequest)).\ - AndReturn([tenants, False]) + AndReturn([tenants, False]) search_opts = {'marker': None, 'paginate': True} api.nova.server_list(IsA(http.HttpRequest), all_tenants=True, search_opts=search_opts) \ - .AndReturn([servers, False]) + .AndReturn([servers, False]) api.network.servers_update_addresses(IsA(http.HttpRequest), servers, all_tenants=True) api.nova.flavor_list(IsA(http.HttpRequest)).AndReturn(flavors) @@ -56,7 +56,7 @@ class InstanceViewTest(test.BaseAdminViewTests): self.assertItemsEqual(instances, servers) @test.create_stubs({api.nova: ('flavor_list', 'flavor_get', - 'server_list', 'extension_supported',), + 'server_list', 'extension_supported',), api.keystone: ('tenant_list',), api.network: ('servers_update_addresses',)}) def test_index_flavor_list_exception(self): @@ -68,15 +68,15 @@ class InstanceViewTest(test.BaseAdminViewTests): search_opts = {'marker': None, 'paginate': True} api.nova.server_list(IsA(http.HttpRequest), all_tenants=True, search_opts=search_opts) \ - .AndReturn([servers, False]) + .AndReturn([servers, False]) api.network.servers_update_addresses(IsA(http.HttpRequest), servers, all_tenants=True) api.nova.extension_supported('AdminActions', IsA(http.HttpRequest)) \ .MultipleTimes().AndReturn(True) api.nova.flavor_list(IsA(http.HttpRequest)). \ - AndRaise(self.exceptions.nova) + AndRaise(self.exceptions.nova) api.keystone.tenant_list(IsA(http.HttpRequest)).\ - AndReturn([tenants, False]) + AndReturn([tenants, False]) for server in servers: api.nova.flavor_get(IsA(http.HttpRequest), server.flavor["id"]). \ AndReturn(full_flavors[server.flavor["id"]]) @@ -89,7 +89,7 @@ class InstanceViewTest(test.BaseAdminViewTests): self.assertItemsEqual(instances, servers) @test.create_stubs({api.nova: ('flavor_list', 'flavor_get', - 'server_list', 'extension_supported', ), + 'server_list', 'extension_supported', ), api.keystone: ('tenant_list',), api.network: ('servers_update_addresses',)}) def test_index_flavor_get_exception(self): @@ -104,15 +104,15 @@ class InstanceViewTest(test.BaseAdminViewTests): search_opts = {'marker': None, 'paginate': True} api.nova.server_list(IsA(http.HttpRequest), all_tenants=True, search_opts=search_opts) \ - .AndReturn([servers, False]) + .AndReturn([servers, False]) api.network.servers_update_addresses(IsA(http.HttpRequest), servers, all_tenants=True) api.nova.extension_supported('AdminActions', IsA(http.HttpRequest)) \ .MultipleTimes().AndReturn(True) api.nova.flavor_list(IsA(http.HttpRequest)). \ - AndReturn(flavors) + AndReturn(flavors) api.keystone.tenant_list(IsA(http.HttpRequest)).\ - AndReturn([tenants, False]) + AndReturn([tenants, False]) for server in servers: api.nova.flavor_get(IsA(http.HttpRequest), server.flavor["id"]). \ AndRaise(self.exceptions.nova) @@ -132,7 +132,7 @@ class InstanceViewTest(test.BaseAdminViewTests): search_opts = {'marker': None, 'paginate': True} api.nova.server_list(IsA(http.HttpRequest), all_tenants=True, search_opts=search_opts) \ - .AndRaise(self.exceptions.nova) + .AndRaise(self.exceptions.nova) self.mox.ReplayAll() @@ -157,11 +157,11 @@ class InstanceViewTest(test.BaseAdminViewTests): admin=True).AndReturn(tenant) self.mox.ReplayAll() - url = INDEX_URL + \ - "?action=row_update&table=instances&obj_id=" + server.id + url = (INDEX_URL + + "?action=row_update&table=instances&obj_id=" + server.id) res = self.client.get(url, {}, - HTTP_X_REQUESTED_WITH='XMLHttpRequest') + HTTP_X_REQUESTED_WITH='XMLHttpRequest') self.assertTemplateUsed(res, "horizon/common/_data_table_row.html") self.assertContains(res, "test_tenant", 1, 200) @@ -186,7 +186,7 @@ class InstanceViewTest(test.BaseAdminViewTests): search_opts = {'marker': None, 'paginate': True} api.nova.server_list(IsA(http.HttpRequest), all_tenants=True, search_opts=search_opts) \ - .AndReturn([servers, False]) + .AndReturn([servers, False]) api.network.servers_update_addresses(IsA(http.HttpRequest), servers, all_tenants=True) api.nova.extension_supported('AdminActions', IsA(http.HttpRequest)) \ @@ -211,17 +211,17 @@ class InstanceViewTest(test.BaseAdminViewTests): server2 = servers[2] server2.status = "VERIFY_RESIZE" api.keystone.tenant_list(IsA(http.HttpRequest)) \ - .AndReturn([self.tenants.list(), False]) + .AndReturn([self.tenants.list(), False]) search_opts = {'marker': None, 'paginate': True} api.nova.extension_supported('AdminActions', IsA(http.HttpRequest)) \ .MultipleTimes().AndReturn(True) api.nova.server_list(IsA(http.HttpRequest), all_tenants=True, search_opts=search_opts) \ - .AndReturn([servers, False]) + .AndReturn([servers, False]) api.network.servers_update_addresses(IsA(http.HttpRequest), servers, all_tenants=True) api.nova.flavor_list(IsA(http.HttpRequest)).\ - AndReturn(self.flavors.list()) + AndReturn(self.flavors.list()) self.mox.ReplayAll() res = self.client.get(INDEX_URL) @@ -234,9 +234,9 @@ class InstanceViewTest(test.BaseAdminViewTests): def test_instance_live_migrate_get(self): server = self.servers.first() api.nova.server_get(IsA(http.HttpRequest), server.id) \ - .AndReturn(server) + .AndReturn(server) api.nova.host_list(IsA(http.HttpRequest)) \ - .AndReturn(self.hosts.list()) + .AndReturn(self.hosts.list()) self.mox.ReplayAll() @@ -250,7 +250,7 @@ class InstanceViewTest(test.BaseAdminViewTests): def test_instance_live_migrate_get_server_get_exception(self): server = self.servers.first() api.nova.server_get(IsA(http.HttpRequest), server.id) \ - .AndRaise(self.exceptions.nova) + .AndRaise(self.exceptions.nova) self.mox.ReplayAll() @@ -265,9 +265,9 @@ class InstanceViewTest(test.BaseAdminViewTests): def test_instance_live_migrate_list_hypervisor_get_exception(self): server = self.servers.first() api.nova.server_get(IsA(http.HttpRequest), server.id) \ - .AndReturn(server) + .AndReturn(server) api.nova.host_list(IsA(http.HttpRequest)) \ - .AndRaise(self.exceptions.nova) + .AndRaise(self.exceptions.nova) self.mox.ReplayAll() url = reverse('horizon:admin:instances:live_migrate', @@ -281,9 +281,9 @@ class InstanceViewTest(test.BaseAdminViewTests): def test_instance_live_migrate_list_hypervisor_without_current(self): server = self.servers.first() api.nova.server_get(IsA(http.HttpRequest), server.id) \ - .AndReturn(server) + .AndReturn(server) api.nova.host_list(IsA(http.HttpRequest)) \ - .AndReturn(self.hosts.list()) + .AndReturn(self.hosts.list()) self.mox.ReplayAll() @@ -307,13 +307,13 @@ class InstanceViewTest(test.BaseAdminViewTests): host = self.hosts.first().host_name api.nova.server_get(IsA(http.HttpRequest), server.id) \ - .AndReturn(server) + .AndReturn(server) api.nova.host_list(IsA(http.HttpRequest)) \ - .AndReturn(self.hosts.list()) + .AndReturn(self.hosts.list()) api.nova.server_live_migrate(IsA(http.HttpRequest), server.id, host, block_migration=False, disk_over_commit=False) \ - .AndReturn([]) + .AndReturn([]) self.mox.ReplayAll() @@ -331,13 +331,13 @@ class InstanceViewTest(test.BaseAdminViewTests): host = self.hosts.first().host_name api.nova.server_get(IsA(http.HttpRequest), server.id) \ - .AndReturn(server) + .AndReturn(server) api.nova.host_list(IsA(http.HttpRequest)) \ - .AndReturn(self.hosts.list()) + .AndReturn(self.hosts.list()) api.nova.server_live_migrate(IsA(http.HttpRequest), server.id, host, block_migration=False, disk_over_commit=False) \ - .AndRaise(self.exceptions.nova) + .AndRaise(self.exceptions.nova) self.mox.ReplayAll() @@ -351,7 +351,7 @@ class InstanceViewTest(test.BaseAdminViewTests): server = self.servers.first() api.nova.server_get(IsA(http.HttpRequest), server.id) \ - .AndRaise(self.exceptions.nova) + .AndRaise(self.exceptions.nova) self.mox.ReplayAll() diff --git a/openstack_dashboard/dashboards/admin/networks/tests.py b/openstack_dashboard/dashboards/admin/networks/tests.py index b7f5c930bc..fc47ec21f4 100644 --- a/openstack_dashboard/dashboards/admin/networks/tests.py +++ b/openstack_dashboard/dashboards/admin/networks/tests.py @@ -657,7 +657,7 @@ class NetworkSubnetTests(test.BaseAdminViewTests): self.mox.ReplayAll() url = reverse('horizon:admin:networks:subnets:detail', - args=[subnet.id]) + args=[subnet.id]) res = self.client.get(url) # admin DetailView is shared with userpanel one, so diff --git a/openstack_dashboard/dashboards/admin/networks/views.py b/openstack_dashboard/dashboards/admin/networks/views.py index ab294786f9..a22455032a 100644 --- a/openstack_dashboard/dashboards/admin/networks/views.py +++ b/openstack_dashboard/dashboards/admin/networks/views.py @@ -152,7 +152,7 @@ class DetailView(tables.MultiTableView): exceptions.handle(self.request, _('Unable to retrieve details for ' 'network "%s".') % network_id, - redirect=redirect) + redirect=redirect) return network def get_context_data(self, **kwargs): diff --git a/openstack_dashboard/dashboards/admin/overview/tests.py b/openstack_dashboard/dashboards/admin/overview/tests.py index 4a1dd972e7..19e16a1d66 100644 --- a/openstack_dashboard/dashboards/admin/overview/tests.py +++ b/openstack_dashboard/dashboards/admin/overview/tests.py @@ -91,11 +91,11 @@ class UsageViewTests(test.BaseAdminViewTests): api.network.floating_ip_supported(IsA(http.HttpRequest)) \ .AndReturn(True) api.network.tenant_floating_ip_list(IsA(http.HttpRequest)) \ - .AndReturn(self.floating_ips.list()) + .AndReturn(self.floating_ips.list()) api.network.security_group_list(IsA(http.HttpRequest)) \ - .AndReturn(self.q_secgroups.list()) + .AndReturn(self.q_secgroups.list()) api.cinder.tenant_absolute_limits(IsA(http.HttpRequest)) \ - .AndReturn(self.cinder_limits['absolute']) + .AndReturn(self.cinder_limits['absolute']) self.mox.ReplayAll() res = self.client.get(reverse('horizon:admin:overview:index')) @@ -177,11 +177,11 @@ class UsageViewTests(test.BaseAdminViewTests): api.network.floating_ip_supported(IsA(http.HttpRequest)) \ .AndReturn(True) api.network.tenant_floating_ip_list(IsA(http.HttpRequest)) \ - .AndReturn(self.floating_ips.list()) + .AndReturn(self.floating_ips.list()) api.network.security_group_list(IsA(http.HttpRequest)) \ - .AndReturn(self.q_secgroups.list()) + .AndReturn(self.q_secgroups.list()) api.cinder.tenant_absolute_limits(IsA(http.HttpRequest)) \ - .AndReturn(self.cinder_limits['absolute']) + .AndReturn(self.cinder_limits['absolute']) self.mox.ReplayAll() csv_url = reverse('horizon:admin:overview:index') + "?format=csv" diff --git a/openstack_dashboard/dashboards/admin/routers/tests.py b/openstack_dashboard/dashboards/admin/routers/tests.py index cbff5e7f26..dcdf9ec274 100644 --- a/openstack_dashboard/dashboards/admin/routers/tests.py +++ b/openstack_dashboard/dashboards/admin/routers/tests.py @@ -35,7 +35,7 @@ class RouterTests(test.BaseAdminViewTests, r_test.RouterTests): IsA(http.HttpRequest), search_opts=None).AndReturn(self.routers.list()) api.keystone.tenant_list(IsA(http.HttpRequest))\ - .AndReturn([tenants, False]) + .AndReturn([tenants, False]) self._mock_external_network_list() self.mox.ReplayAll() @@ -68,7 +68,7 @@ class RouterTests(test.BaseAdminViewTests, r_test.RouterTests): IsA(http.HttpRequest), search_opts=None).AndReturn([router]) api.keystone.tenant_list(IsA(http.HttpRequest))\ - .AndReturn([self.tenants.list(), False]) + .AndReturn([self.tenants.list(), False]) self._mock_external_network_list(alter_ids=True) self.mox.ReplayAll() diff --git a/openstack_dashboard/dashboards/admin/volumes/tests.py b/openstack_dashboard/dashboards/admin/volumes/tests.py index 7d9d9d9c34..ff7880cbc0 100644 --- a/openstack_dashboard/dashboards/admin/volumes/tests.py +++ b/openstack_dashboard/dashboards/admin/volumes/tests.py @@ -31,9 +31,9 @@ class VolumeTests(test.BaseAdminViewTests): 'all_tenants': True}).AndReturn(self.cinder_volumes.list()) api.nova.server_list(IsA(http.HttpRequest), search_opts={ 'all_tenants': True}) \ - .AndReturn([self.servers.list(), False]) + .AndReturn([self.servers.list(), False]) keystone.tenant_list(IsA(http.HttpRequest)) \ - .AndReturn([self.tenants.list(), False]) + .AndReturn([self.tenants.list(), False]) self.mox.ReplayAll() res = self.client.get(reverse('horizon:admin:volumes:index')) diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/extras/tests.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/extras/tests.py index 11501c92f2..c2a19fd05f 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/extras/tests.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/extras/tests.py @@ -30,7 +30,7 @@ class VolTypeExtrasTests(test.BaseAdminViewTests): api.cinder.volume_type_get(IsA(http.HttpRequest), vol_type.id).AndReturn(vol_type) api.cinder.volume_type_extra_get(IsA(http.HttpRequest), - vol_type.id).AndReturn(extras) + vol_type.id).AndReturn(extras) self.mox.ReplayAll() url = reverse('horizon:admin:volumes:volume_types:extras:index', args=[vol_type.id]) @@ -101,7 +101,7 @@ class VolTypeExtrasTests(test.BaseAdminViewTests): vol_type = self.cinder_volume_types.first() key = 'foo' edit_url = reverse('horizon:admin:volumes:volume_types:extras:edit', - args=[vol_type.id, key]) + args=[vol_type.id, key]) index_url = reverse('horizon:admin:volumes:volume_types:extras:index', args=[vol_type.id]) @@ -128,10 +128,10 @@ class VolTypeExtrasTests(test.BaseAdminViewTests): extras = [api.cinder.VolTypeExtraSpec(vol_type.id, 'k1', 'v1')] formData = {'action': 'extras__delete__k1'} index_url = reverse('horizon:admin:volumes:volume_types:extras:index', - args=[vol_type.id]) + args=[vol_type.id]) api.cinder.volume_type_extra_get(IsA(http.HttpRequest), - vol_type.id).AndReturn(extras) + vol_type.id).AndReturn(extras) api.cinder.volume_type_extra_delete(IsA(http.HttpRequest), vol_type.id, 'k1').AndReturn(vol_type) diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/forms.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/forms.py index 4a80944193..9cb6e94849 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/forms.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/forms.py @@ -44,7 +44,7 @@ class ManageQosSpecAssociation(forms.SelfHandlingForm): # populate qos spec list box qos_specs = self.initial["qos_specs"] qos_spec_list = [(qos_spec.id, qos_spec.name) - for qos_spec in qos_specs] + for qos_spec in qos_specs] # 'none' is always listed first qos_spec_list.insert(0, ("-1", _("None"))) @@ -100,7 +100,7 @@ class ManageQosSpecAssociation(forms.SelfHandlingForm): vol_type_id) messages.success(request, - _('Successfully updated QOS Spec association.')) + _('Successfully updated QOS Spec association.')) return True except Exception: exceptions.handle(request, diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/tests.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/tests.py index 889f5abd4a..ef0bf87f4c 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/tests.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/tests.py @@ -50,9 +50,9 @@ class QosSpecsTests(test.BaseAdminViewTests): formData = {'name': 'qos-spec-1', 'consumer': 'back-end'} api.cinder.qos_spec_create(IsA(http.HttpRequest), - formData['name'], - {'consumer': formData['consumer']}).\ - AndReturn(self.cinder_qos_specs.first()) + formData['name'], + {'consumer': formData['consumer']}).\ + AndReturn(self.cinder_qos_specs.first()) self.mox.ReplayAll() res = self.client.post( @@ -75,7 +75,7 @@ class QosSpecsTests(test.BaseAdminViewTests): IsA(http.HttpRequest)).\ AndReturn(self.volume_types.list()) api.cinder.qos_spec_list(IsA(http.HttpRequest)).\ - AndReturn(self.cinder_qos_specs.list()) + AndReturn(self.cinder_qos_specs.list()) api.cinder.qos_spec_delete(IsA(http.HttpRequest), str(qos_spec.id)) self.mox.ReplayAll() @@ -96,7 +96,7 @@ class QosSpecsTests(test.BaseAdminViewTests): qos_spec = self.cinder_qos_specs.first() key = 'minIOPS' edit_url = reverse('horizon:admin:volumes:volume_types:qos_specs:edit', - args=[qos_spec.id, key]) + args=[qos_spec.id, key]) index_url = reverse( 'horizon:admin:volumes:volume_types:qos_specs:index', args=[qos_spec.id]) @@ -105,7 +105,7 @@ class QosSpecsTests(test.BaseAdminViewTests): qos_spec.specs[key] = data['value'] api.cinder.qos_spec_get(IsA(http.HttpRequest), - qos_spec.id)\ + qos_spec.id)\ .AndReturn(qos_spec) api.cinder.qos_spec_get_keys(IsA(http.HttpRequest), qos_spec.id, raw=True)\ diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/urls.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/urls.py index 8b074185f2..4b898b56d1 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/urls.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/urls.py @@ -18,8 +18,8 @@ from openstack_dashboard.dashboards.admin.volumes.volume_types.qos_specs \ urlpatterns = patterns('', url(r'^(?P[^/]+)/create/$', - views.CreateKeyValuePairView.as_view(), name='create'), + views.CreateKeyValuePairView.as_view(), name='create'), url(r'^(?P[^/]+)/$', views.IndexView.as_view(), name='index'), url(r'^(?P[^/]+)/key/(?P[^/]+)/edit/$', - views.EditKeyValuePairView.as_view(), name='edit') + views.EditKeyValuePairView.as_view(), name='edit') ) diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/tests.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/tests.py index e3a535f595..b58142f6d5 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/tests.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/tests.py @@ -26,7 +26,7 @@ class VolumeTypeTests(test.BaseAdminViewTests): formData = {'name': 'volume type 1'} cinder.volume_type_create(IsA(http.HttpRequest), formData['name']).\ - AndReturn(self.volume_types.first()) + AndReturn(self.volume_types.first()) self.mox.ReplayAll() res = self.client.post( @@ -51,7 +51,7 @@ class VolumeTypeTests(test.BaseAdminViewTests): IsA(http.HttpRequest)).\ AndReturn(self.volume_types.list()) cinder.qos_spec_list(IsA(http.HttpRequest)).\ - AndReturn(self.cinder_qos_specs.list()) + AndReturn(self.cinder_qos_specs.list()) cinder.volume_type_delete(IsA(http.HttpRequest), str(volume_type.id)) self.mox.ReplayAll() diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/urls.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/urls.py index 6afcf5e458..a0f71e3f59 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/urls.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/urls.py @@ -25,17 +25,17 @@ VIEWS_MOD = ('openstack_dashboard.dashboards.admin.volumes.volume_types.views') urlpatterns = patterns('VIEWS_MOD', url(r'^create_type$', views.CreateVolumeTypeView.as_view(), - name='create_type'), + name='create_type'), url(r'^create_qos_spec$', views.CreateQosSpecView.as_view(), - name='create_qos_spec'), + name='create_qos_spec'), url(r'^(?P[^/]+)/manage_qos_spec_association/$', - views.ManageQosSpecAssociationView.as_view(), - name='manage_qos_spec_association'), + views.ManageQosSpecAssociationView.as_view(), + name='manage_qos_spec_association'), url(r'^(?P[^/]+)/edit_qos_spec_consumer/$', - views.EditQosSpecConsumerView.as_view(), - name='edit_qos_spec_consumer'), + views.EditQosSpecConsumerView.as_view(), + name='edit_qos_spec_consumer'), url(r'^(?P[^/]+)/extras/', - include(extras_urls, namespace='extras')), + include(extras_urls, namespace='extras')), url(r'^qos_specs/', - include(qos_specs_urls, namespace='qos_specs')), + include(qos_specs_urls, namespace='qos_specs')), ) diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/views.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/views.py index b1d1faa831..3f2226b341 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/views.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/views.py @@ -120,7 +120,7 @@ class ManageQosSpecAssociationView(forms.ModalFormView): for qos_spec in qos_specs: type_ids = \ api.cinder.qos_spec_get_associations(self.request, - qos_spec.id) + qos_spec.id) for vtype in type_ids: if vtype.id == vol_type_id: return qos_spec diff --git a/openstack_dashboard/dashboards/admin/volumes/volumes/forms.py b/openstack_dashboard/dashboards/admin/volumes/volumes/forms.py index cb7d539106..16f0811975 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volumes/forms.py +++ b/openstack_dashboard/dashboards/admin/volumes/volumes/forms.py @@ -34,7 +34,7 @@ class CreateVolumeType(forms.SelfHandlingForm): volume_type = cinder.volume_type_create(request, data['name']) messages.success(request, _('Successfully created volume type: %s') - % data['name']) + % data['name']) return volume_type except Exception: exceptions.handle(request, @@ -94,10 +94,11 @@ class CreateQosSpec(forms.SelfHandlingForm): qos_spec = cinder.qos_spec_create(request, data['name'], {'consumer': data['consumer']}) - messages.success(request, _('Successfully created QOS Spec: %s') - % data['name']) + messages.success(request, + _('Successfully created QOS Spec: %s') + % data['name']) return qos_spec except Exception: exceptions.handle(request, _('Unable to create QOS Spec.')) - return False \ No newline at end of file + return False