Merge "Show AZ for instances"
This commit is contained in:
commit
5ee38058a4
@ -72,9 +72,9 @@ class Server(base.APIResourceWrapper):
|
||||
_attrs = ['addresses', 'attrs', 'id', 'image', 'links',
|
||||
'metadata', 'name', 'private_ip', 'public_ip', 'status', 'uuid',
|
||||
'image_name', 'VirtualInterfaces', 'flavor', 'key_name', 'fault',
|
||||
'tenant_id', 'user_id', 'OS-EXT-STS:power_state',
|
||||
'tenant_id', 'user_id', 'created', 'OS-EXT-STS:power_state',
|
||||
'OS-EXT-STS:task_state', 'OS-EXT-SRV-ATTR:instance_name',
|
||||
'OS-EXT-SRV-ATTR:host', 'created']
|
||||
'OS-EXT-SRV-ATTR:host', 'OS-EXT-AZ:availability_zone']
|
||||
|
||||
def __init__(self, apiresource, request):
|
||||
super(Server, self).__init__(apiresource)
|
||||
@ -102,6 +102,10 @@ class Server(base.APIResourceWrapper):
|
||||
def internal_name(self):
|
||||
return getattr(self, 'OS-EXT-SRV-ATTR:instance_name', "")
|
||||
|
||||
@property
|
||||
def availability_zone(self):
|
||||
return getattr(self, 'OS-EXT-AZ:availability_zone', "")
|
||||
|
||||
|
||||
class NovaUsage(base.APIResourceWrapper):
|
||||
"""Simple wrapper around contrib/simple_usage.py."""
|
||||
|
@ -584,6 +584,8 @@ class InstancesTable(tables.DataTable):
|
||||
status=True,
|
||||
status_choices=STATUS_CHOICES,
|
||||
display_choices=STATUS_DISPLAY_CHOICES)
|
||||
az = tables.Column("availability_zone",
|
||||
verbose_name=_("Availability Zone"))
|
||||
task = tables.Column("OS-EXT-STS:task_state",
|
||||
verbose_name=_("Task"),
|
||||
filters=(title, filters.replace_underscores),
|
||||
|
@ -13,6 +13,8 @@
|
||||
<dd>{{ instance.id }}</dd>
|
||||
<dt>{% trans "Status" %}</dt>
|
||||
<dd>{{ instance.status|title }}</dd>
|
||||
<dt>{% trans "Availability Zone" %}</dt>
|
||||
<dd>{{ instance.availability_zone|default:"-" }}</dd>
|
||||
<dt>{% trans "Created" %}</dt>
|
||||
<dd>{{ instance.created|parse_isotime }}</dd>
|
||||
<dt>{% trans "Uptime" %}</dt>
|
||||
|
Loading…
Reference in New Issue
Block a user