openstack/python-neutronclient
Code Issues Proposed changes

Merge "Fix a column name "protocol/port" to "port/protocol""

Browse Source
This commit is contained in:
Jenkins
2015-12-03 10:58:32 +00:00
committed by Gerrit Code Review
parent 4667f32103 50311ab537
commit 20012b7174
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
neutronclient/neutron/v2_0/securitygroup.py
View File

@@ -167,15 +167,20 @@ class ListSecurityGroupRule(neutronV20.ListCommand):
resource = 'security_group_rule' resource = 'security_group_rule'
list_columns = ['id', 'security_group_id', 'direction', list_columns = ['id', 'security_group_id', 'direction',
'ethertype', 'protocol/port', 'remote'] 'ethertype', 'port/protocol', 'remote']
# replace_rules: key is an attribute name in Neutron API and # replace_rules: key is an attribute name in Neutron API and
# corresponding value is a display name shown by CLI. # corresponding value is a display name shown by CLI.
replace_rules = {'security_group_id': 'security_group', replace_rules = {'security_group_id': 'security_group',
'remote_group_id': 'remote_group'} 'remote_group_id': 'remote_group'}
digest_fields = { digest_fields = {
# The entry 'protocol/port' is leaving deliberetely for keep
# compatibility,
'remote': { 'remote': {
'method': _get_remote, 'method': _get_remote,
'depends_on': ['remote_ip_prefix', 'remote_group_id']}, 'depends_on': ['remote_ip_prefix', 'remote_group_id']},
'port/protocol': {
'method': _get_protocol_port,
'depends_on': ['protocol', 'port_range_min', 'port_range_max']},
'protocol/port': { 'protocol/port': {
'method': _get_protocol_port, 'method': _get_protocol_port,
'depends_on': ['protocol', 'port_range_min', 'port_range_max']}} 'depends_on': ['protocol', 'port_range_min', 'port_range_max']}}

2
neutronclient/tests/functional/core/test_readonly_neutron.py
View File

@@ -116,7 +116,7 @@ class SimpleReadOnlyNeutronClientTest(base.ClientTestBase):
('security-group-rule-list')) ('security-group-rule-list'))
self.assertTableStruct(security_grp, ['id', 'security_group', self.assertTableStruct(security_grp, ['id', 'security_group',
'direction', 'ethertype', 'direction', 'ethertype',
'protocol/port', 'remote']) 'port/protocol', 'remote'])
def test_neutron_subnet_list(self): def test_neutron_subnet_list(self):
subnet_list = self.parser.listing(self.neutron('subnet-list')) subnet_list = self.parser.listing(self.neutron('subnet-list'))

2
neutronclient/tests/unit/test_cli20_securitygroup.py
View File

@@ -492,7 +492,7 @@ class CLITestV20SecurityGroupsJSON(test_cli20.CLITestV20Base):
remote_ip_prefix='10.2.0.0/16')] remote_ip_prefix='10.2.0.0/16')]
expected = { expected = {
'cols': ['id', 'security_group', 'direction', 'ethertype', 'cols': ['id', 'security_group', 'direction', 'ethertype',
'protocol/port', 'remote'], 'port/protocol', 'remote'],
'data': [ 'data': [
('ruleid1', 'group1', 'ingress', 'IPv4', '22/tcp', 'any'), ('ruleid1', 'group1', 'ingress', 'IPv4', '22/tcp', 'any'),
('ruleid2', 'group2', 'egress', 'IPv6', '80-81/udp', 'any'), ('ruleid2', 'group2', 'egress', 'IPv6', '80-81/udp', 'any'),