Merge "Fix the variable name for "Admin State""

This commit is contained in:
Zuul 2025-05-06 14:12:53 +00:00 committed by Gerrit Code Review
commit 6d81c16196
5 changed files with 13 additions and 4 deletions

View File

@ -92,7 +92,7 @@ class NetworksTable(tables.DataTable):
status = tables.Column(
"status", verbose_name=_("Status"),
display_choices=project_tables.STATUS_DISPLAY_CHOICES)
admin_state = tables.Column("is_admin_state_up",
admin_state = tables.Column("admin_state",
verbose_name=_("Admin State"),
display_choices=DISPLAY_CHOICES)
availability_zones = tables.Column(get_availability_zones,

View File

@ -144,7 +144,7 @@ class PortsTable(tables.DataTable):
status = tables.Column("status",
verbose_name=_("Status"),
display_choices=STATUS_DISPLAY_CHOICES)
admin_state = tables.Column("is_admin_state_up",
admin_state = tables.Column("admin_state",
verbose_name=_("Admin State"),
display_choices=DISPLAY_CHOICES)
mac_state = tables.Column("mac_state", empty_value=api.neutron.OFF_STATE,

View File

@ -199,7 +199,7 @@ class NetworksTable(tables.DataTable):
filters=(filters.yesno, filters.capfirst))
status = tables.Column("status", verbose_name=_("Status"),
display_choices=STATUS_DISPLAY_CHOICES)
admin_state = tables.Column("is_admin_state_up",
admin_state = tables.Column("admin_state",
verbose_name=_("Admin State"),
display_choices=DISPLAY_CHOICES)
availability_zones = tables.Column(get_availability_zones,

View File

@ -192,6 +192,10 @@ def get_availability_zones(router):
return _("-")
def get_admin_state(router):
return _("UP") if router.is_admin_state_up else _("DOWN")
class RoutersFilterAction(tables.FilterAction):
name = 'filter_project_routers'
filter_type = 'server'
@ -228,7 +232,7 @@ class RoutersTable(tables.DataTable):
verbose_name=_("HA mode"))
ext_net = tables.Column(get_external_network,
verbose_name=_("External Network"))
admin_state = tables.Column("is_admin_state_up",
admin_state = tables.Column(get_admin_state,
verbose_name=_("Admin State"),
display_choices=ADMIN_STATE_DISPLAY_CHOICES)
availability_zones = tables.Column(get_availability_zones,

View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fix an error, when an "Admin State" status is displayed
as variable (true or false) instead of "UP/DOWN" [:bug: `2099694`]