openstack/python-neutronclient
Code Issues Proposed changes

Merge "Adding a generate_default_ethertype_function"

Browse Source
This commit is contained in:
Jenkins
2015-10-23 21:11:41 +00:00
committed by Gerrit Code Review
parent 51b2e71add 8e741981b1
commit 34a6a93cf1
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,6 +91,12 @@ def _format_sg_rules(secgroup):
return '' return ''
def generate_default_ethertype(protocol):
if protocol == 'icmpv6':
return 'IPv6'
return 'IPv4'
class ListSecurityGroup(neutronV20.ListCommand): class ListSecurityGroup(neutronV20.ListCommand):
"""List security groups that belong to a given tenant.""" """List security groups that belong to a given tenant."""
@@ -303,7 +309,6 @@ class CreateSecurityGroupRule(neutronV20.CreateCommand):
help=_('Direction of traffic: ingress/egress.')) help=_('Direction of traffic: ingress/egress.'))
parser.add_argument( parser.add_argument(
'--ethertype', '--ethertype',
default='IPv4',
help=_('IPv4/IPv6')) help=_('IPv4/IPv6'))
parser.add_argument( parser.add_argument(
'--protocol', '--protocol',
@@ -338,7 +343,8 @@ class CreateSecurityGroupRule(neutronV20.CreateCommand):
self.get_client(), 'security_group', parsed_args.security_group_id) self.get_client(), 'security_group', parsed_args.security_group_id)
body = {'security_group_id': _security_group_id, body = {'security_group_id': _security_group_id,
'direction': parsed_args.direction, 'direction': parsed_args.direction,
'ethertype': parsed_args.ethertype} 'ethertype': parsed_args.ethertype or
generate_default_ethertype(parsed_args.protocol)}
neutronV20.update_dict(parsed_args, body, neutronV20.update_dict(parsed_args, body,
['protocol', 'port_range_min', 'port_range_max', ['protocol', 'port_range_min', 'port_range_max',
'remote_ip_prefix', 'tenant_id']) 'remote_ip_prefix', 'tenant_id'])

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

@@ -570,6 +570,14 @@ class CLITestV20SecurityGroupsJSON(test_cli20.CLITestV20Base):
sg_rule = self._prepare_rule(protocol='icmp') sg_rule = self._prepare_rule(protocol='icmp')
self.assertEqual('icmp', securitygroup._get_protocol_port(sg_rule)) self.assertEqual('icmp', securitygroup._get_protocol_port(sg_rule))
def test_get_ethertype_for_protocol_icmpv6(self):
self.assertEqual('IPv6',
securitygroup.generate_default_ethertype('icmpv6'))
def test_get_ethertype_for_protocol_icmp(self):
self.assertEqual('IPv4',
securitygroup.generate_default_ethertype('icmp'))
def test__get_protocol_port_udp_code_type(self): def test__get_protocol_port_udp_code_type(self):
sg_rule = self._prepare_rule(protocol='icmp', sg_rule = self._prepare_rule(protocol='icmp',
port_range_min=1, port_range_max=8) port_range_min=1, port_range_max=8)