x/tuskar-ui
Code Issues Proposed changes

Enable E127 check for line indentation

Browse Source 
E127/E128 checks helps us to keep code more readable, so these rules
should be allowed, when pep8 runs.
Enabled check E127 - continuation line over-indented for visual indent.

Change-Id: I225cad46dceb391793de195e6bfb48e2dd5ee50d
This commit is contained in:
Victor Sergeyev 2013-10-28 10:07:36 +02:00
parent d9fdbe83fa
commit 772aafbce6
18 changed files with 108 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tox.ini
View File

@ -32,11 +32,10 @@ downloadcache = ~/cache/pip
[flake8]
builtins = _
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py
# E127 continuation line over-indented for visual indent
# E128 continuation line under-indented for visual indent
# F403 'from <smth> import *' used; unable to detect undefined names
# F999 syntax error in doctest
# H4xx docstrings
# H701 empty localization string
# H702 Formatting operation should be outside of localization method call
ignore = E127,E128,F403,F999,H4,H701,H702
ignore = E128,F403,F999,H4,H701,H702

5
tuskar_ui/api.py
View File

@ -519,8 +519,9 @@ class Rack(StringIdAPIResourceWrapper):
if not self.resource_class:
return []
added_flavors = tuskarclient(self.request).flavors\
.list(self.resource_class_id)
added_flavors = (tuskarclient(self.request)
.flavors
.list(self.resource_class_id))
self._flavors = []
if added_flavors:
for f in added_flavors:

10
tuskar_ui/infrastructure/resource_management/racks/forms.py
View File

@ -80,11 +80,13 @@ class UploadRack(forms.SelfHandlingForm):
tuskar.ResourceClass.list(request))
for rack in racks:
try:
tuskar.Rack.create(request, name=rack.name,
resource_class_id=
rclass_ids[rack.resource_class],
tuskar.Rack.create(
request,
name=rack.name,
resource_class_id=rclass_ids[rack.resource_class],
location=rack.region,
subnet=rack.subnet)
subnet=rack.subnet,
)
# FIXME: will have to handle nodes once proper attributes
# for nodes are added
successes.append(rack.name)

22
tuskar_ui/infrastructure/resource_management/racks/tables.py
View File

@ -70,6 +70,12 @@ class UpdateRow(tables.Row):
return rack
def _usage_filter(vm_capacity):
if vm_capacity and vm_capacity.value:
return "{0:.0f} %".format(
round((100.0 / vm_capacity.value) * vm_capacity.usage))
class RacksTable(tables.DataTable):
STATUS_CHOICES = (
("unprovisioned", False),
@ -82,24 +88,22 @@ class RacksTable(tables.DataTable):
":racks:detail"),
verbose_name=_("Rack Name"))
subnet = tables.Column('subnet', verbose_name=_("IP Subnet"))
resource_class = tables.Column('resource_class',
resource_class = tables.Column(
'resource_class',
verbose_name=_("Class"),
filters=(lambda resource_class:
(resource_class and
resource_class.name)
or None,))
filters=(lambda resource_class: getattr(resource_class, 'name', None),)
)
node_count = tables.Column('nodes_count', verbose_name=_("Nodes"))
state = tables.Column('state',
verbose_name=_("State"),
status=True,
status_choices=STATUS_CHOICES)
usage = tables.Column(
'vm_capacity',
verbose_name=_("Usage"),
filters=(lambda vm_capacity:
(vm_capacity and vm_capacity.value and
"%s %%" % int(round((100 / float(vm_capacity.value)) *
vm_capacity.usage, 0))) or None,))
filters=(_usage_filter,),
)
class Meta:
name = "racks"

6
tuskar_ui/infrastructure/resource_management/resource_classes/tests.py
View File

@ -457,8 +457,7 @@ class ResourceClassViewTests(test.BaseAdminViewTests):
glance.image_list_detailed(mox.IsA(http.HttpRequest)).AndReturn(
(self.images.list(), False))
tuskar.ResourceClass.get(mox.IsA(http.HttpRequest),
resource_class.id).\
AndReturn(resource_class)
resource_class.id).AndReturn(resource_class)
# get_flavors_data in workflows.py
tuskar.ResourceClass.get(
@ -562,8 +561,7 @@ class ResourceClassViewTests(test.BaseAdminViewTests):
glance.image_list_detailed(mox.IsA(http.HttpRequest)).AndReturn(
(self.images.list(), False))
tuskar.ResourceClass.get(mox.IsA(http.HttpRequest),
resource_class.id).\
AndReturn(resource_class)
resource_class.id).AndReturn(resource_class)
# get_flavors_data in workflows.py
tuskar.ResourceClass.get(

3
tuskar_ui/infrastructure/resource_management/resource_classes/views.py
View File

@ -114,8 +114,7 @@ class DetailView(horizon_tabs.TabView):
exceptions.handle(self.request,
_('Unable to retrieve details for '
'resource class "%s".')
% resource_class_id,
redirect=redirect)
% resource_class_id, redirect=redirect)
self._resource_class = resource_class
return self._resource_class

4
tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py
View File

@ -224,8 +224,8 @@ class ResourceClassWorkflowMixin:
resource_class_name = data['name']
for flavor in data.get('flavors') or []:
capacities = []
for name, (label,
unit, required) in flavors_forms.CAPACITIES.items():
for name, info in flavors_forms.CAPACITIES.items():
label, unit, required = info
value = flavor.get(name, '')
if value is None:
value = ''

20
tuskar_ui/test/test_data/tuskar_data.py
View File

@ -29,8 +29,8 @@ def data(TEST):
{'id': '1',
'name': 'nano',
'max_vms': 100,
'capacities':
[{"name": "cpu",
'capacities': [
{"name": "cpu",
"value": 64,
"unit": "CPU"},
{"name": "memory",
@ -81,13 +81,13 @@ def data(TEST):
'location': 'location',
'subnet': '192.168.1.0/24',
'state': 'active',
'nodes':
[{'id': '1'},
'nodes': [
{'id': '1'},
{'id': '2'},
{'id': '3'},
{'id': '4'}],
'capacities':
[{"name": "total_cpu",
'capacities': [
{"name": "total_cpu",
"value": "64",
"unit": "CPU"},
{"name": "total_memory",
@ -101,8 +101,8 @@ def data(TEST):
'subnet': '192.168.1.0/25',
'state': 'provisioning',
'nodes': [],
'capacities':
[{"name": "total_cpu",
'capacities': [
{"name": "total_cpu",
"value": "1",
"unit": "CPU"},
{"name": "total_memory",
@ -116,8 +116,8 @@ def data(TEST):
'subnet': '192.168.1.0/26',
'state': 'inactive',
'nodes': [],
'capacities':
[{"name": "total_cpu",
'capacities': [
{"name": "total_cpu",
"value": "1",
"unit": "CPU"},
{"name": "total_memory",