stackforge-attic/tuskar-ui-extras
Code Issues Proposed changes

Don't count autodiscovered nodes as available

Browse Source 
Also some small fixes:
* include architecture when comparing nodes to flavors
* display architecture when displaying flavors
* call flavors "Flavors" and not "Node Profiles"
* missing translation

Change-Id: I1ff5c9974736606b851c10f01b2e186faf24c6a9
This commit is contained in:
Radomir Dopieralski 2014-10-15 14:49:18 +02:00
parent 4184f6df9d
commit 9724ccdf83
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tuskar_boxes/overview/views.py
View File

@ -19,12 +19,12 @@ from tuskar_boxes.overview import forms
def flavor_nodes(request, flavor): def flavor_nodes(request, flavor):
"""Lists all nodes that match the given flavor exactly.""" """Lists all nodes that match the given flavor exactly."""
for node in api.node.Node.list(request): for node in api.node.Node.list(request, maintenance=False):
if all([ if all([
int(node.cpus) == int(flavor.vcpus), int(node.cpus) == int(flavor.vcpus),
int(node.memory_mb) == int(flavor.ram), int(node.memory_mb) == int(flavor.ram),
int(node.local_gb) == int(flavor.disk), int(node.local_gb) == int(flavor.disk),
# TODO(rdopieralski) add architecture when available node.cpu_arch == flavor.cpu_arch,
]): ]):
yield node yield node
@ -52,6 +52,7 @@ class IndexView(views.IndexView):
'vcpus': flavor.vcpus, 'vcpus': flavor.vcpus,
'ram': flavor.ram, 'ram': flavor.ram,
'disk': flavor.disk, 'disk': flavor.disk,
'cpu_arch': flavor.cpu_arch,
'nodes': nodes, 'nodes': nodes,
'roles': roles, 'roles': roles,
} }

5
tuskar_boxes/templates/tuskar_boxes/overview/role_nodes_edit.html
View File

@ -16,12 +16,13 @@
{% endspaceless %}{% endfor %} {% endspaceless %}{% endfor %}
</div> </div>
<h4>{% trans "Available Node Profiles" %}</h4> <h4>{% trans "Available Flavors" %}</h4>
{% for flavor in flavors %} {% for flavor in flavors %}
<div class="boxes-flavor" data-flavor="{{ flavor.name }}"> <div class="boxes-flavor" data-flavor="{{ flavor.name }}">
<p> <p>
<strong>Node Profile:</strong> <strong>{% trans "Flavor:" %}</strong>
<i>{{ flavor.name }}</i> <i>{{ flavor.name }}</i>
{{ flavor.cpu_arch }},
{{ flavor.vcpus }} CPU, {{ flavor.vcpus }} CPU,
{{ flavor.ram }}MB RAM, {{ flavor.ram }}MB RAM,
{{ flavor.disk }}GB Disk {{ flavor.disk }}GB Disk