openstack
/
python-openstackclient
Code Issues Proposed changes

Merge "Support icmp-type and icmp-code to be set as zero"

This commit is contained in:
Jenkins 2017-09-27 05:49:50 +00:00 committed by Gerrit Code Review
parent 2476a995cf 221b7052ab
commit a452c9d825
3 changed files with 177 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/network/v2/security_group_rule.py
View File

@ -294,9 +294,9 @@ class CreateSecurityGroupRule(common.NetworkAndComputeShowOne):
if parsed_args.dst_port and not is_icmp_protocol:
attrs['port_range_min'] = parsed_args.dst_port[0]
attrs['port_range_max'] = parsed_args.dst_port[1]
if parsed_args.icmp_type:
if parsed_args.icmp_type is not None and parsed_args.icmp_type >= 0:
attrs['port_range_min'] = parsed_args.icmp_type
if parsed_args.icmp_code:
if parsed_args.icmp_code is not None and parsed_args.icmp_code >= 0:
attrs['port_range_max'] = parsed_args.icmp_code
# NOTE(dtroyer): --src-ip and --src-group were deprecated in Nov 2016.

170
openstackclient/tests/unit/network/v2/test_security_group_rule_network.py
View File

@ -407,6 +407,78 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
self.assertRaises(exceptions.CommandError, self.cmd.take_action,
parsed_args)
def test_create_icmp_code_zero(self):
self._setup_security_group_rule({
'port_range_min': 15,
'port_range_max': 0,
'protocol': 'icmp',
'remote_ip_prefix': '0.0.0.0/0',
})
arglist = [
'--protocol', self._security_group_rule.protocol,
'--icmp-type', str(self._security_group_rule.port_range_min),
'--icmp-code', str(self._security_group_rule.port_range_max),
self._security_group.id,
]
verifylist = [
('protocol', self._security_group_rule.protocol),
('icmp_code', self._security_group_rule.port_range_max),
('icmp_type', self._security_group_rule.port_range_min),
('group', self._security_group.id),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
self.assertEqual(self.expected_columns, columns)
self.assertEqual(self.expected_data, data)
def test_create_icmp_code_greater_than_zero(self):
self._setup_security_group_rule({
'port_range_min': 15,
'port_range_max': 18,
'protocol': 'icmp',
'remote_ip_prefix': '0.0.0.0/0',
})
arglist = [
'--protocol', self._security_group_rule.protocol,
'--icmp-type', str(self._security_group_rule.port_range_min),
'--icmp-code', str(self._security_group_rule.port_range_max),
self._security_group.id,
]
verifylist = [
('protocol', self._security_group_rule.protocol),
('icmp_type', self._security_group_rule.port_range_min),
('icmp_code', self._security_group_rule.port_range_max),
('group', self._security_group.id),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
self.assertEqual(self.expected_columns, columns)
self.assertEqual(self.expected_data, data)
def test_create_icmp_code_negative_value(self):
self._setup_security_group_rule({
'port_range_min': 15,
'port_range_max': None,
'protocol': 'icmp',
'remote_ip_prefix': '0.0.0.0/0',
})
arglist = [
'--protocol', self._security_group_rule.protocol,
'--icmp-type', str(self._security_group_rule.port_range_min),
'--icmp-code', '-2',
self._security_group.id,
]
verifylist = [
('protocol', self._security_group_rule.protocol),
('icmp_type', self._security_group_rule.port_range_min),
('icmp_code', -2),
('group', self._security_group.id),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
self.assertEqual(self.expected_columns, columns)
self.assertEqual(self.expected_data, data)
def test_create_icmp_type(self):
self._setup_security_group_rule({
'port_range_min': 15,
@ -440,6 +512,104 @@ class TestCreateSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
self.assertEqual(self.expected_columns, columns)
self.assertEqual(self.expected_data, data)
def test_create_icmp_type_zero(self):
self._setup_security_group_rule({
'port_range_min': 0,
'protocol': 'icmp',
'remote_ip_prefix': '0.0.0.0/0',
})
arglist = [
'--icmp-type', str(self._security_group_rule.port_range_min),
'--protocol', self._security_group_rule.protocol,
self._security_group.id,
]
verifylist = [
('dst_port', None),
('icmp_type', self._security_group_rule.port_range_min),
('icmp_code', None),
('protocol', self._security_group_rule.protocol),
('group', self._security_group.id),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
self.network.create_security_group_rule.assert_called_once_with(**{
'direction': self._security_group_rule.direction,
'ethertype': self._security_group_rule.ether_type,
'port_range_min': self._security_group_rule.port_range_min,
'protocol': self._security_group_rule.protocol,
'remote_ip_prefix': self._security_group_rule.remote_ip_prefix,
'security_group_id': self._security_group.id,
})
self.assertEqual(self.expected_columns, columns)
self.assertEqual(self.expected_data, data)
def test_create_icmp_type_greater_than_zero(self):
self._setup_security_group_rule({
'port_range_min': 13, # timestamp
'protocol': 'icmp',
'remote_ip_prefix': '0.0.0.0/0',
})
arglist = [
'--icmp-type', str(self._security_group_rule.port_range_min),
'--protocol', self._security_group_rule.protocol,
self._security_group.id,
]
verifylist = [
('dst_port', None),
('icmp_type', self._security_group_rule.port_range_min),
('icmp_code', None),
('protocol', self._security_group_rule.protocol),
('group', self._security_group.id),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
self.network.create_security_group_rule.assert_called_once_with(**{
'direction': self._security_group_rule.direction,
'ethertype': self._security_group_rule.ether_type,
'port_range_min': self._security_group_rule.port_range_min,
'protocol': self._security_group_rule.protocol,
'remote_ip_prefix': self._security_group_rule.remote_ip_prefix,
'security_group_id': self._security_group.id,
})
self.assertEqual(self.expected_columns, columns)
self.assertEqual(self.expected_data, data)
def test_create_icmp_type_negative_value(self):
self._setup_security_group_rule({
'port_range_min': None, # timestamp
'protocol': 'icmp',
'remote_ip_prefix': '0.0.0.0/0',
})
arglist = [
'--icmp-type', '-13',
'--protocol', self._security_group_rule.protocol,
self._security_group.id,
]
verifylist = [
('dst_port', None),
('icmp_type', -13),
('icmp_code', None),
('protocol', self._security_group_rule.protocol),
('group', self._security_group.id),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
self.network.create_security_group_rule.assert_called_once_with(**{
'direction': self._security_group_rule.direction,
'ethertype': self._security_group_rule.ether_type,
'protocol': self._security_group_rule.protocol,
'remote_ip_prefix': self._security_group_rule.remote_ip_prefix,
'security_group_id': self._security_group.id,
})
self.assertEqual(self.expected_columns, columns)
self.assertEqual(self.expected_data, data)
def test_create_ipv6_icmp_type_code(self):
self._setup_security_group_rule({
'ether_type': 'IPv6',

5
releasenotes/notes/support-icmp-type-code-zero-cbef0a36db2b8123.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Add support to set ``--icmp-type`` and ``--icmp-code`` to 0 in the
``security group rule`` command.
[Bug `1703704 <https://bugs.launchpad.net/python-openstackclient/+bug/1703704>`_]