openstack/horizon
Code Issues Proposed changes

Merge "Display protocol in security group rules"

Browse Source
This commit is contained in:
Jenkins 2015-06-01 20:00:26 +00:00 committed by Gerrit Code Review
commit 961cc1dc4d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_dashboard/api/nova.py
View File

@ -227,13 +227,17 @@ class SecurityGroupRule(base.APIResourceWrapper):
if 'name' in self.group:
vals = {'from': self.from_port,
'to': self.to_port,
'ip_protocol': self.ip_protocol,
'group': self.group['name']}
return _('ALLOW %(from)s:%(to)s from %(group)s') % vals
return (_('ALLOW %(from)s:%(to)s/%(ip_protocol)s from %(group)s') %
vals)
else:
vals = {'from': self.from_port,
'to': self.to_port,
'ip_protocol': self.ip_protocol,
'cidr': self.ip_range['cidr']}
return _('ALLOW %(from)s:%(to)s from %(cidr)s') % vals
return (_('ALLOW %(from)s:%(to)s/%(ip_protocol)s from %(cidr)s') %
vals)
# The following attributes are defined to keep compatibility with Neutron
@property