diff --git a/blazar_dashboard/api/client.py b/blazar_dashboard/api/client.py index be57fe3..44e3e26 100644 --- a/blazar_dashboard/api/client.py +++ b/blazar_dashboard/api/client.py @@ -33,7 +33,8 @@ class Lease(base.APIDictWrapper): ) = ('IN_PROGRESS', 'FAILED', 'COMPLETE') _attrs = ['id', 'name', 'start_date', 'end_date', 'user_id', 'project_id', - 'before_end_date', 'action', 'status', 'status_reason'] + 'before_end_date', 'action', 'status', 'status_reason', + 'degraded'] def __init__(self, apiresource): super(Lease, self).__init__(apiresource) diff --git a/blazar_dashboard/content/leases/tables.py b/blazar_dashboard/content/leases/tables.py index d6b447e..735ff14 100644 --- a/blazar_dashboard/content/leases/tables.py +++ b/blazar_dashboard/content/leases/tables.py @@ -87,6 +87,9 @@ class LeasesTable(tables.DataTable): action = tables.Column("action", verbose_name=_("Action"),) status = tables.Column("status", verbose_name=_("Status"),) status_reason = tables.Column("status_reason", verbose_name=_("Reason"),) + degraded = tables.Column("degraded", verbose_name=_("Degraded"), + filters=(django_filters.yesno, + django_filters.capfirst),) class Meta(object): name = "leases" diff --git a/blazar_dashboard/content/leases/templates/leases/_detail_overview.html b/blazar_dashboard/content/leases/templates/leases/_detail_overview.html index a37270a..c18aca6 100644 --- a/blazar_dashboard/content/leases/templates/leases/_detail_overview.html +++ b/blazar_dashboard/content/leases/templates/leases/_detail_overview.html @@ -21,6 +21,8 @@
{{ lease.status|default:"-" }}
{% trans "Status Reason" %}
{{ lease.status_reason|default:"-" }}
+
{% trans "Degraded" %}
+
{{ lease.degraded|yesno|capfirst }}
diff --git a/blazar_dashboard/test/test_data/blazar_data.py b/blazar_dashboard/test/test_data/blazar_data.py index 6ffad9e..a0c809e 100644 --- a/blazar_dashboard/test/test_data/blazar_data.py +++ b/blazar_dashboard/test/test_data/blazar_data.py @@ -32,7 +32,9 @@ lease_sample1 = { 'created_at': '2017-06-27 15:00:00', 'updated_at': None, 'id': '087bc740-6d2d-410b-9d47-c7b2b55a9d36', - 'resource_type': 'physical:host' + 'resource_type': 'physical:host', + 'missing_resources': False, + 'resources_changed': False } ], 'created_at': '2017-06-27 15:00:00', @@ -71,7 +73,8 @@ lease_sample1 = { 'project_id': 'aa45f56901ef45ee95e3d211097c0ea3', 'status_reason': None, 'start_date': '2017-06-27T18:00:00.000000', - 'trust_id': 'b442a580b9504ababf305bf2b4c49512' + 'trust_id': 'b442a580b9504ababf305bf2b4c49512', + 'degraded': False } lease_sample2 = { @@ -91,7 +94,9 @@ lease_sample2 = { 'created_at': '2017-06-27 15:00:00', 'updated_at': None, 'id': '1b05370e-d92a-452d-80db-89842666b604', - 'resource_type': 'physical:host' + 'resource_type': 'physical:host', + 'missing_resources': False, + 'resources_changed': False } ], 'created_at': '2017-06-27 15:00:00', @@ -130,7 +135,8 @@ lease_sample2 = { 'project_id': 'aa45f56901ef45ee95e3d211097c0ea3', 'status_reason': None, 'start_date': '2017-06-27T18:00:00.000000', - 'trust_id': 'b442a580b9504ababf305bf2b4c49512' + 'trust_id': 'b442a580b9504ababf305bf2b4c49512', + 'degraded': False } host_sample1 = {