identity: Make better use of argparse

Change-Id: I50d2d28422e609656408b9b59f330d6a78314344
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

openstackclient/identity/v3/service.py

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

openstackclient/tests/unit/identity/v3/test_service.py

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