From 9174bc0f021d8401e5bbe17a47cb64298d0bc643 Mon Sep 17 00:00:00 2001 From: Richard Theis Date: Wed, 30 Mar 2016 13:21:45 -0500 Subject: [PATCH] Fix subnet pool prefix length option Fix the --min-prefix-length, --max-prefix-length and --default-prefix-length options for the "os subnet pool create" and "os subnet pool set" commands. Using these options caused the commands to fail with "HttpException: Bad Request" because unrecognized attributes were passed to the REST API. No release note was added since these commands are new and haven't been released. Change-Id: I2f765750f79dc91d6c1f5962f699fbf2ee38657a Closes-Bug: #1564004 --- openstackclient/network/v2/subnet_pool.py | 6 +++--- openstackclient/tests/network/v2/test_subnet_pool.py | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py index d0d8d058..834760fb 100644 --- a/openstackclient/network/v2/subnet_pool.py +++ b/openstackclient/network/v2/subnet_pool.py @@ -39,11 +39,11 @@ def _get_attrs(parsed_args): if parsed_args.prefixes is not None: attrs['prefixes'] = parsed_args.prefixes 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: - 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: - attrs['max_prefix_length'] = parsed_args.max_prefix_length + attrs['max_prefixlen'] = parsed_args.max_prefix_length return attrs diff --git a/openstackclient/tests/network/v2/test_subnet_pool.py b/openstackclient/tests/network/v2/test_subnet_pool.py index ebedaf64..6ed2352d 100644 --- a/openstackclient/tests/network/v2/test_subnet_pool.py +++ b/openstackclient/tests/network/v2/test_subnet_pool.py @@ -119,9 +119,9 @@ class TestCreateSubnetPool(TestSubnetPool): columns, data = (self.cmd.take_action(parsed_args)) self.network.create_subnet_pool.assert_called_once_with(**{ - 'default_prefix_length': self._subnet_pool.default_prefixlen, - 'max_prefix_length': self._subnet_pool.max_prefixlen, - 'min_prefix_length': self._subnet_pool.min_prefixlen, + 'default_prefixlen': self._subnet_pool.default_prefixlen, + 'max_prefixlen': self._subnet_pool.max_prefixlen, + 'min_prefixlen': self._subnet_pool.min_prefixlen, 'name': self._subnet_pool.name, }) self.assertEqual(self.columns, columns) @@ -278,8 +278,8 @@ class TestSetSubnetPool(TestSubnetPool): attrs = { 'name': 'noob', - 'default_prefix_length': '8', - 'min_prefix_length': '8', + 'default_prefixlen': '8', + 'min_prefixlen': '8', } self.network.update_subnet_pool.assert_called_once_with( self._subnet_pool, **attrs) @@ -305,7 +305,7 @@ class TestSetSubnetPool(TestSubnetPool): prefixes.extend(self._subnet_pool.prefixes) attrs = { 'prefixes': prefixes, - 'max_prefix_length': '16', + 'max_prefixlen': '16', } self.network.update_subnet_pool.assert_called_once_with( self._subnet_pool, **attrs)