openstack/horizon
Code Issues Proposed changes

Display LBaaS pool/member status in the tables

Browse Source 
Change-Id: I5eaf65257add742e5430f3312bf63aab2cd7daae
Closes-Bug: #1242343
This commit is contained in:
Akihiro MOTOKI
2013-10-21 05:12:35 +09:00
parent 1fc6593edd
commit 2fb2189b78
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/api/lbaas.py
View File

@@ -47,6 +47,7 @@ class Pool(neutron.NeutronAPIDictWrapper):
pFormatted = {'id': self.id, pFormatted = {'id': self.id,
'name': self.name, 'name': self.name,
'description': self.description, 'description': self.description,
'status': self.status,
'protocol': self.protocol, 'protocol': self.protocol,
'health_monitors': self.health_monitors, 'health_monitors': self.health_monitors,
'provider': self.provider} 'provider': self.provider}
@@ -88,6 +89,7 @@ class Member(neutron.NeutronAPIDictWrapper):
def readable(self, request): def readable(self, request):
mFormatted = {'id': self.id, mFormatted = {'id': self.id,
'status': self.status,
'address': self.address, 'address': self.address,
'protocol_port': self.protocol_port} 'protocol_port': self.protocol_port}
try: try:

2
openstack_dashboard/dashboards/project/loadbalancers/tables.py
View File

@@ -193,6 +193,7 @@ class PoolsTable(tables.DataTable):
filters=(lambda v: filters.default(v, _('N/A')),)) filters=(lambda v: filters.default(v, _('N/A')),))
subnet_name = tables.Column('subnet_name', verbose_name=_("Subnet")) subnet_name = tables.Column('subnet_name', verbose_name=_("Subnet"))
protocol = tables.Column('protocol', verbose_name=_("Protocol")) protocol = tables.Column('protocol', verbose_name=_("Protocol"))
status = tables.Column('status', verbose_name=_("Status"))
vip_name = tables.Column('vip_name', verbose_name=_("VIP"), vip_name = tables.Column('vip_name', verbose_name=_("VIP"),
link=get_vip_link) link=get_vip_link)
@@ -224,6 +225,7 @@ class MembersTable(tables.DataTable):
verbose_name=_("Protocol Port")) verbose_name=_("Protocol Port"))
pool_name = tables.Column("pool_name", pool_name = tables.Column("pool_name",
verbose_name=_("Pool"), link=get_pool_link) verbose_name=_("Pool"), link=get_pool_link)
status = tables.Column('status', verbose_name=_("Status"))
class Meta: class Meta:
name = "memberstable" name = "memberstable"

4
openstack_dashboard/test/test_data/neutron_data.py
View File

@@ -431,6 +431,7 @@ def data(TEST):
'lb_method': 'ROUND_ROBIN', 'lb_method': 'ROUND_ROBIN',
'health_monitors': ['d4a0500f-db2b-4cc4-afcf-ec026febff96'], 'health_monitors': ['d4a0500f-db2b-4cc4-afcf-ec026febff96'],
'admin_state_up': True, 'admin_state_up': True,
'status': 'ACTIVE',
'provider': 'haproxy'} 'provider': 'haproxy'}
TEST.api_pools.add(pool_dict) TEST.api_pools.add(pool_dict)
TEST.pools.add(lbaas.Pool(pool_dict)) TEST.pools.add(lbaas.Pool(pool_dict))
@@ -480,6 +481,7 @@ def data(TEST):
'address': '10.0.0.11', 'address': '10.0.0.11',
'protocol_port': 80, 'protocol_port': 80,
'weight': 10, 'weight': 10,
'status': 'ACTIVE',
'admin_state_up': True} 'admin_state_up': True}
TEST.api_members.add(member_dict) TEST.api_members.add(member_dict)
TEST.members.add(lbaas.Member(member_dict)) TEST.members.add(lbaas.Member(member_dict))
@@ -491,6 +493,7 @@ def data(TEST):
'address': '10.0.0.12', 'address': '10.0.0.12',
'protocol_port': 80, 'protocol_port': 80,
'weight': 10, 'weight': 10,
'status': 'ACTIVE',
'admin_state_up': True} 'admin_state_up': True}
TEST.api_members.add(member_dict) TEST.api_members.add(member_dict)
TEST.members.add(lbaas.Member(member_dict)) TEST.members.add(lbaas.Member(member_dict))
@@ -505,6 +508,7 @@ def data(TEST):
'protocol': 'HTTPS', 'protocol': 'HTTPS',
'lb_method': 'ROUND_ROBIN', 'lb_method': 'ROUND_ROBIN',
'health_monitors': ['d4a0500f-db2b-4cc4-afcf-ec026febff97'], 'health_monitors': ['d4a0500f-db2b-4cc4-afcf-ec026febff97'],
'status': 'PENDING_CREATE',
'admin_state_up': True} 'admin_state_up': True}
TEST.api_pools.add(pool_dict) TEST.api_pools.add(pool_dict)
TEST.pools.add(lbaas.Pool(pool_dict)) TEST.pools.add(lbaas.Pool(pool_dict))