openstack/python-openstackclient
Code Issues Proposed changes

identity: Make better use of argparse

Browse Source 
Change-Id: I50d2d28422e609656408b9b59f330d6a78314344
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2024-01-24 12:03:59 +00:00
parent 0fd107e6c7
commit 50c595b6e0
2 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
openstackclient/identity/v3/service.py
View File

@ -52,11 +52,15 @@ class CreateService(command.ShowOne):
enable_group.add_argument( enable_group.add_argument(
'--enable', '--enable',
action='store_true', action='store_true',
dest='is_enabled',
default=True,
help=_('Enable service (default)'), help=_('Enable service (default)'),
) )
enable_group.add_argument( enable_group.add_argument(
'--disable', '--disable',
action='store_true', action='store_false',
dest='is_enabled',
default=True,
help=_('Disable service'), help=_('Disable service'),
) )
return parser return parser
@ -64,15 +68,11 @@ class CreateService(command.ShowOne):
def take_action(self, parsed_args): def take_action(self, parsed_args):
identity_client = self.app.client_manager.identity identity_client = self.app.client_manager.identity
enabled = True
if parsed_args.disable:
enabled = False
service = identity_client.services.create( service = identity_client.services.create(
name=parsed_args.name, name=parsed_args.name,
type=parsed_args.type, type=parsed_args.type,
description=parsed_args.description, description=parsed_args.description,
enabled=enabled, enabled=parsed_args.is_enabled,
) )
service._info.pop('links') service._info.pop('links')
@ -171,11 +171,15 @@ class SetService(command.Command):
enable_group.add_argument( enable_group.add_argument(
'--enable', '--enable',
action='store_true', action='store_true',
dest='is_enabled',
default=None,
help=_('Enable service'), help=_('Enable service'),
) )
enable_group.add_argument( enable_group.add_argument(
'--disable', '--disable',
action='store_true', action='store_false',
dest='is_enabled',
default=None,
help=_('Disable service'), help=_('Disable service'),
) )
return parser return parser
@ -191,10 +195,8 @@ class SetService(command.Command):
kwargs['name'] = parsed_args.name kwargs['name'] = parsed_args.name
if parsed_args.description: if parsed_args.description:
kwargs['description'] = parsed_args.description kwargs['description'] = parsed_args.description
if parsed_args.enable: if parsed_args.is_enabled is not None:
kwargs['enabled'] = True kwargs['enabled'] = parsed_args.is_enabled
if parsed_args.disable:
kwargs['enabled'] = False
identity_client.services.update(service.id, **kwargs) identity_client.services.update(service.id, **kwargs)

30
openstackclient/tests/unit/identity/v3/test_service.py
View File

@ -63,8 +63,7 @@ class TestServiceCreate(TestService):
verifylist = [ verifylist = [
('name', self.service.name), ('name', self.service.name),
('description', None), ('description', None),
('enable', False), ('is_enabled', True),
('disable', False),
('type', self.service.type), ('type', self.service.type),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -94,8 +93,7 @@ class TestServiceCreate(TestService):
verifylist = [ verifylist = [
('name', None), ('name', None),
('description', self.service.description), ('description', self.service.description),
('enable', False), ('is_enabled', True),
('disable', False),
('type', self.service.type), ('type', self.service.type),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -124,8 +122,7 @@ class TestServiceCreate(TestService):
verifylist = [ verifylist = [
('name', None), ('name', None),
('description', None), ('description', None),
('enable', True), ('is_enabled', True),
('disable', False),
('type', self.service.type), ('type', self.service.type),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -154,8 +151,7 @@ class TestServiceCreate(TestService):
verifylist = [ verifylist = [
('name', None), ('name', None),
('description', None), ('description', None),
('enable', False), ('is_enabled', False),
('disable', True),
('type', self.service.type), ('type', self.service.type),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -292,8 +288,7 @@ class TestServiceSet(TestService):
('type', None), ('type', None),
('name', None), ('name', None),
('description', None), ('description', None),
('enable', False), ('is_enabled', None),
('disable', False),
('service', self.service.name), ('service', self.service.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -312,8 +307,7 @@ class TestServiceSet(TestService):
('type', self.service.type), ('type', self.service.type),
('name', None), ('name', None),
('description', None), ('description', None),
('enable', False), ('is_enabled', None),
('disable', False),
('service', self.service.name), ('service', self.service.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -338,8 +332,7 @@ class TestServiceSet(TestService):
('type', None), ('type', None),
('name', self.service.name), ('name', self.service.name),
('description', None), ('description', None),
('enable', False), ('is_enabled', None),
('disable', False),
('service', self.service.name), ('service', self.service.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -364,8 +357,7 @@ class TestServiceSet(TestService):
('type', None), ('type', None),
('name', None), ('name', None),
('description', self.service.description), ('description', self.service.description),
('enable', False), ('is_enabled', None),
('disable', False),
('service', self.service.name), ('service', self.service.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -389,8 +381,7 @@ class TestServiceSet(TestService):
('type', None), ('type', None),
('name', None), ('name', None),
('description', None), ('description', None),
('enable', True), ('is_enabled', True),
('disable', False),
('service', self.service.name), ('service', self.service.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -414,8 +405,7 @@ class TestServiceSet(TestService):
('type', None), ('type', None),
('name', None), ('name', None),
('description', None), ('description', None),
('enable', False), ('is_enabled', False),
('disable', True),
('service', self.service.name), ('service', self.service.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)