diff --git a/openstack_dashboard/api/lbaas.py b/openstack_dashboard/api/lbaas.py index bf848020fd..55a5650149 100644 --- a/openstack_dashboard/api/lbaas.py +++ b/openstack_dashboard/api/lbaas.py @@ -47,6 +47,7 @@ class Pool(neutron.NeutronAPIDictWrapper): pFormatted = {'id': self.id, 'name': self.name, 'description': self.description, + 'status': self.status, 'protocol': self.protocol, 'health_monitors': self.health_monitors, 'provider': self.provider} @@ -88,6 +89,7 @@ class Member(neutron.NeutronAPIDictWrapper): def readable(self, request): mFormatted = {'id': self.id, + 'status': self.status, 'address': self.address, 'protocol_port': self.protocol_port} try: diff --git a/openstack_dashboard/dashboards/project/loadbalancers/tables.py b/openstack_dashboard/dashboards/project/loadbalancers/tables.py index e084385463..980d003314 100644 --- a/openstack_dashboard/dashboards/project/loadbalancers/tables.py +++ b/openstack_dashboard/dashboards/project/loadbalancers/tables.py @@ -193,6 +193,7 @@ class PoolsTable(tables.DataTable): filters=(lambda v: filters.default(v, _('N/A')),)) subnet_name = tables.Column('subnet_name', verbose_name=_("Subnet")) protocol = tables.Column('protocol', verbose_name=_("Protocol")) + status = tables.Column('status', verbose_name=_("Status")) vip_name = tables.Column('vip_name', verbose_name=_("VIP"), link=get_vip_link) @@ -224,6 +225,7 @@ class MembersTable(tables.DataTable): verbose_name=_("Protocol Port")) pool_name = tables.Column("pool_name", verbose_name=_("Pool"), link=get_pool_link) + status = tables.Column('status', verbose_name=_("Status")) class Meta: name = "memberstable" diff --git a/openstack_dashboard/test/test_data/neutron_data.py b/openstack_dashboard/test/test_data/neutron_data.py index 7362debc20..0ae55fb364 100644 --- a/openstack_dashboard/test/test_data/neutron_data.py +++ b/openstack_dashboard/test/test_data/neutron_data.py @@ -431,6 +431,7 @@ def data(TEST): 'lb_method': 'ROUND_ROBIN', 'health_monitors': ['d4a0500f-db2b-4cc4-afcf-ec026febff96'], 'admin_state_up': True, + 'status': 'ACTIVE', 'provider': 'haproxy'} TEST.api_pools.add(pool_dict) TEST.pools.add(lbaas.Pool(pool_dict)) @@ -480,6 +481,7 @@ def data(TEST): 'address': '10.0.0.11', 'protocol_port': 80, 'weight': 10, + 'status': 'ACTIVE', 'admin_state_up': True} TEST.api_members.add(member_dict) TEST.members.add(lbaas.Member(member_dict)) @@ -491,6 +493,7 @@ def data(TEST): 'address': '10.0.0.12', 'protocol_port': 80, 'weight': 10, + 'status': 'ACTIVE', 'admin_state_up': True} TEST.api_members.add(member_dict) TEST.members.add(lbaas.Member(member_dict)) @@ -505,6 +508,7 @@ def data(TEST): 'protocol': 'HTTPS', 'lb_method': 'ROUND_ROBIN', 'health_monitors': ['d4a0500f-db2b-4cc4-afcf-ec026febff97'], + 'status': 'PENDING_CREATE', 'admin_state_up': True} TEST.api_pools.add(pool_dict) TEST.pools.add(lbaas.Pool(pool_dict))