Merge "volume: Make better use of argparse"

openstackclient/tests/unit/volume/v2/test_volume_type.py

@@ -80,8 +80,7 @@ class TestTypeCreate(TestType):
         ]
         verifylist = [
             ("description", self.new_volume_type.description),
-            ("public", True),
+            ("is_public", True),
-            ("private", False),
             ("name", self.new_volume_type.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -107,8 +106,7 @@ class TestTypeCreate(TestType):
         ]
         verifylist = [
             ("description", self.new_volume_type.description),
-            ("public", False),
+            ("is_public", False),
-            ("private", True),
             ("project", self.project.id),
             ("name", self.new_volume_type.name),
         ]
@@ -325,8 +323,7 @@ class TestTypeList(TestType):
         arglist = []
         verifylist = [
             ("long", False),
-            ("private", False),
+            ("is_public", None),
-            ("public", False),
             ("default", False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -343,8 +340,7 @@ class TestTypeList(TestType):
         ]
         verifylist = [
             ("long", True),
-            ("private", False),
+            ("is_public", True),
-            ("public", True),
             ("default", False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -360,8 +356,7 @@ class TestTypeList(TestType):
         ]
         verifylist = [
             ("long", False),
-            ("private", True),
+            ("is_public", False),
-            ("public", False),
             ("default", False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -378,8 +373,7 @@ class TestTypeList(TestType):
         verifylist = [
             ("encryption_type", False),
             ("long", False),
-            ("private", False),
+            ("is_public", None),
-            ("public", False),
             ("default", True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)

openstackclient/volume/v2/volume_type.py

@@ -124,13 +124,15 @@ class CreateVolumeType(command.ShowOne):
         public_group.add_argument(
             "--public",
             action="store_true",
-            default=False,
+            dest="is_public",
+            default=None,
             help=_("Volume type is accessible to the public"),
         )
         public_group.add_argument(
             "--private",
-            action="store_true",
+            action="store_false",
-            default=False,
+            dest="is_public",
+            default=None,
             help=_("Volume type is not accessible to the public"),
         )
         parser.add_argument(
@@ -201,15 +203,13 @@ class CreateVolumeType(command.ShowOne):
         identity_client = self.app.client_manager.identity
         volume_client = self.app.client_manager.volume
 
-        if parsed_args.project and not parsed_args.private:
+        if parsed_args.project and parsed_args.is_public is not False:
             msg = _("--project is only allowed with --private")
             raise exceptions.CommandError(msg)
 
         kwargs = {}
-        if parsed_args.public:
+        if parsed_args.is_public is not None:
-            kwargs['is_public'] = True
+            kwargs['is_public'] = parsed_args.is_public
-        if parsed_args.private:
-            kwargs['is_public'] = False
 
         volume_type = volume_client.volume_types.create(
             parsed_args.name, description=parsed_args.description, **kwargs
@@ -329,11 +329,15 @@ class ListVolumeType(command.Lister):
         public_group.add_argument(
             "--public",
             action="store_true",
+            dest="is_public",
+            default=None,
             help=_("List only public types"),
         )
         public_group.add_argument(
             "--private",
-            action="store_true",
+            action="store_false",
+            dest="is_public",
+            default=None,
             help=_("List only private types (admin only)"),
         )
         parser.add_argument(
@@ -348,8 +352,15 @@ class ListVolumeType(command.Lister):
 
     def take_action(self, parsed_args):
         volume_client = self.app.client_manager.volume
+
         if parsed_args.long:
-            columns = ['ID', 'Name', 'Is Public', 'Description', 'Extra Specs']
+            columns = [
+                'ID',
+                'Name',
+                'Is Public',
+                'Description',
+                'Extra Specs',
+            ]
             column_headers = [
                 'ID',
                 'Name',
@@ -360,15 +371,13 @@ class ListVolumeType(command.Lister):
         else:
             columns = ['ID', 'Name', 'Is Public']
             column_headers = ['ID', 'Name', 'Is Public']
+
         if parsed_args.default:
             data = [volume_client.volume_types.default()]
         else:
-            is_public = None
+            data = volume_client.volume_types.list(
-            if parsed_args.public:
+                is_public=parsed_args.is_public
-                is_public = True
+            )
-            if parsed_args.private:
-                is_public = False
-            data = volume_client.volume_types.list(is_public=is_public)
 
         formatters = {'Extra Specs': format_columns.DictColumn}