diff --git a/openstack_dashboard/api/lbaas.py b/openstack_dashboard/api/lbaas.py index 5d3b5c8ff9..b91fb9f8e6 100644 --- a/openstack_dashboard/api/lbaas.py +++ b/openstack_dashboard/api/lbaas.py @@ -37,6 +37,8 @@ class Pool(neutron.NeutronAPIDictWrapper): def __init__(self, apiresource): if 'provider' not in apiresource: apiresource['provider'] = None + apiresource['admin_state'] = \ + 'UP' if apiresource['admin_state_up'] else 'DOWN' super(Pool, self).__init__(apiresource) @@ -44,6 +46,8 @@ class Member(neutron.NeutronAPIDictWrapper): """Wrapper for neutron load balancer member.""" def __init__(self, apiresource): + apiresource['admin_state'] = \ + 'UP' if apiresource['admin_state_up'] else 'DOWN' super(Member, self).__init__(apiresource) @@ -58,6 +62,8 @@ class PoolMonitor(neutron.NeutronAPIDictWrapper): """Wrapper for neutron load balancer pool health monitor.""" def __init__(self, apiresource): + apiresource['admin_state'] = \ + 'UP' if apiresource['admin_state_up'] else 'DOWN' super(PoolMonitor, self).__init__(apiresource) diff --git a/openstack_dashboard/dashboards/project/loadbalancers/tables.py b/openstack_dashboard/dashboards/project/loadbalancers/tables.py index 8828a6f903..1dbdf100cd 100644 --- a/openstack_dashboard/dashboards/project/loadbalancers/tables.py +++ b/openstack_dashboard/dashboards/project/loadbalancers/tables.py @@ -304,6 +304,12 @@ STATUS_DISPLAY_CHOICES = ( ) +ADMIN_STATE_DISPLAY_CHOICES = ( + ("UP", pgettext_lazy("Admin state of a Load balancer", u"UP")), + ("DOWN", pgettext_lazy("Admin state of a Load balancer", u"DOWN")), +) + + def get_vip_name(pool): if hasattr(pool, "vip") and pool.vip: template_name = 'project/loadbalancers/_pool_table_vip_cell.html' @@ -340,6 +346,9 @@ class PoolsTable(tables.DataTable): status_choices=STATUS_CHOICES, display_choices=STATUS_DISPLAY_CHOICES) vip_name = tables.Column(get_vip_name, verbose_name=_("VIP")) + admin_state = tables.Column("admin_state", + verbose_name=_("Admin State"), + display_choices=ADMIN_STATE_DISPLAY_CHOICES) class Meta(object): name = "poolstable" @@ -391,6 +400,9 @@ class MembersTable(tables.DataTable): status=True, status_choices=STATUS_CHOICES, display_choices=STATUS_DISPLAY_CHOICES) + admin_state = tables.Column("admin_state", + verbose_name=_("Admin State"), + display_choices=ADMIN_STATE_DISPLAY_CHOICES) class Meta(object): name = "memberstable" @@ -419,6 +431,9 @@ class MonitorsTable(tables.DataTable): timeout = tables.Column("timeout", verbose_name=_("Timeout")) max_retries = tables.Column("max_retries", verbose_name=_("Max Retries")) details = tables.Column(get_monitor_details, verbose_name=_("Details")) + admin_state = tables.Column("admin_state", + verbose_name=_("Admin State"), + display_choices=ADMIN_STATE_DISPLAY_CHOICES) class Meta(object): name = "monitorstable"