openstack/python-openstackclient
Code Issues Proposed changes

Merge "Fix subnet pool prefix length option"

Browse Source
This commit is contained in:
Jenkins 2016-03-30 22:10:30 +00:00 committed by Gerrit Code Review
commit a73926556f
2 changed files with 9 additions and 9 deletions
openstackclient
network/v2
subnet_pool.py
tests/network/v2
test_subnet_pool.py

6
openstackclient/network/v2/subnet_pool.py

@ -39,11 +39,11 @@ def _get_attrs(parsed_args):
if parsed_args.prefixes is not None: if parsed_args.prefixes is not None:
attrs['prefixes'] = parsed_args.prefixes attrs['prefixes'] = parsed_args.prefixes
if parsed_args.default_prefix_length is not None: if parsed_args.default_prefix_length is not None:
attrs['default_prefix_length'] = parsed_args.default_prefix_length attrs['default_prefixlen'] = parsed_args.default_prefix_length
if parsed_args.min_prefix_length is not None: if parsed_args.min_prefix_length is not None:
attrs['min_prefix_length'] = parsed_args.min_prefix_length attrs['min_prefixlen'] = parsed_args.min_prefix_length
if parsed_args.max_prefix_length is not None: if parsed_args.max_prefix_length is not None:
attrs['max_prefix_length'] = parsed_args.max_prefix_length attrs['max_prefixlen'] = parsed_args.max_prefix_length
return attrs return attrs

12
openstackclient/tests/network/v2/test_subnet_pool.py

@ -119,9 +119,9 @@ class TestCreateSubnetPool(TestSubnetPool):
columns, data = (self.cmd.take_action(parsed_args)) columns, data = (self.cmd.take_action(parsed_args))
self.network.create_subnet_pool.assert_called_once_with(**{ self.network.create_subnet_pool.assert_called_once_with(**{
'default_prefix_length': self._subnet_pool.default_prefixlen, 'default_prefixlen': self._subnet_pool.default_prefixlen,
'max_prefix_length': self._subnet_pool.max_prefixlen, 'max_prefixlen': self._subnet_pool.max_prefixlen,
'min_prefix_length': self._subnet_pool.min_prefixlen, 'min_prefixlen': self._subnet_pool.min_prefixlen,
'name': self._subnet_pool.name, 'name': self._subnet_pool.name,
}) })
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
@ -278,8 +278,8 @@ class TestSetSubnetPool(TestSubnetPool):
attrs = { attrs = {
'name': 'noob', 'name': 'noob',
'default_prefix_length': '8', 'default_prefixlen': '8',
'min_prefix_length': '8', 'min_prefixlen': '8',
} }
self.network.update_subnet_pool.assert_called_once_with( self.network.update_subnet_pool.assert_called_once_with(
self._subnet_pool, **attrs) self._subnet_pool, **attrs)
@ -305,7 +305,7 @@ class TestSetSubnetPool(TestSubnetPool):
prefixes.extend(self._subnet_pool.prefixes) prefixes.extend(self._subnet_pool.prefixes)
attrs = { attrs = {
'prefixes': prefixes, 'prefixes': prefixes,
'max_prefix_length': '16', 'max_prefixlen': '16',
} }
self.network.update_subnet_pool.assert_called_once_with( self.network.update_subnet_pool.assert_called_once_with(
self._subnet_pool, **attrs) self._subnet_pool, **attrs)