Merge "Add "--project" option to "volume type create" command"

2 files changed, 46 insertions, 1 deletions

diff --git a/openstackclient/tests/volume/v2/test_type.py b/openstackclient/tests/volume/v2/test_type.py
index 174f33f2..a7db2e49 100644
--- a/openstackclient/tests/volume/v2/test_type.py
+++ b/openstackclient/tests/volume/v2/test_type.py
@@ -14,6 +14,7 @@
 
 import copy
 
+from osc_lib import exceptions
 from osc_lib import utils
 
 from openstackclient.tests import fakes
@@ -41,6 +42,7 @@ class TestType(volume_fakes.TestVolume):
 
 class TestTypeCreate(TestType):
 
+    project = identity_fakes.FakeProject.create_one_project()
     columns = (
         'description',
         'id',
@@ -58,6 +60,7 @@ class TestTypeCreate(TestType):
         )
 
         self.types_mock.create.return_value = self.new_volume_type
+        self.projects_mock.get.return_value = self.project
         # Get the command object to test
         self.cmd = volume_type.CreateVolumeType(self.app, None)
 
@@ -89,12 +92,14 @@ class TestTypeCreate(TestType):
         arglist = [
             "--description", self.new_volume_type.description,
             "--private",
+            "--project", self.project.id,
             self.new_volume_type.name,
         ]
         verifylist = [
             ("description", self.new_volume_type.description),
             ("public", False),
             ("private", True),
+            ("project", self.project.id),
             ("name", self.new_volume_type.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -109,6 +114,21 @@ class TestTypeCreate(TestType):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
+    def test_public_type_create_with_project(self):
+        arglist = [
+            '--project', self.project.id,
+            self.new_volume_type.name,
+        ]
+        verifylist = [
+            ('project', self.project.id),
+            ('name', self.new_volume_type.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.assertRaises(exceptions.CommandError,
+                          self.cmd.take_action,
+                          parsed_args)
+
 
 class TestTypeDelete(TestType):
 
diff --git a/openstackclient/volume/v2/volume_type.py b/openstackclient/volume/v2/volume_type.py
index 91ac17a1..ac11785c 100644
--- a/openstackclient/volume/v2/volume_type.py
+++ b/openstackclient/volume/v2/volume_type.py
@@ -64,12 +64,23 @@ class CreateVolumeType(command.ShowOne):
             help=_('Set a property on this volume type '
                    '(repeat option to set multiple properties)'),
         )
+        parser.add_argument(
+            '--project',
+            metavar='<project>',
+            help=_("Allow <project> to access private type (name or ID) "
+                   "(Must be used with --private option)"),
+        )
+        identity_common.add_project_domain_option_to_parser(parser)
         return parser
 
     def take_action(self, parsed_args):
-
+        identity_client = self.app.client_manager.identity
         volume_client = self.app.client_manager.volume
 
+        if parsed_args.project and not parsed_args.private:
+            msg = _("--project is only allowed with --private")
+            raise exceptions.CommandError(msg)
+
         kwargs = {}
         if parsed_args.public:
             kwargs['is_public'] = True
@@ -82,6 +93,20 @@ class CreateVolumeType(command.ShowOne):
             **kwargs
         )
         volume_type._info.pop('extra_specs')
+
+        if parsed_args.project:
+            try:
+                project_id = identity_common.find_project(
+                    identity_client,
+                    parsed_args.project,
+                    parsed_args.project_domain,
+                ).id
+                volume_client.volume_type_access.add_project_access(
+                    volume_type.id, project_id)
+            except Exception as e:
+                msg = _("Failed to add project %(project)s access to "
+                        "type: %(e)s")
+                LOG.error(msg % {'project': parsed_args.project, 'e': e})
         if parsed_args.property:
             result = volume_type.set_keys(parsed_args.property)
             volume_type._info.update({'properties': utils.format_dict(result)})