Merge "Add --owner to image create"

Author: Jenkins

doc/source/command-objects/image.rst

@@ -57,8 +57,6 @@ Create/upload an image
 
     Image owner project name or ID
 
-    *Image version 1 only.*
-
 .. option:: --size <size>
 
     Image size, in bytes (only used with --location and --copy-from)

openstackclient/image/v2/image.py

@@ -112,15 +112,14 @@ class CreateImage(show.ShowOne):
     """Create/upload an image"""
 
     log = logging.getLogger(__name__ + ".CreateImage")
-    deadopts = ('owner', 'size', 'location', 'copy-from', 'checksum', 'store')
+    deadopts = ('size', 'location', 'copy-from', 'checksum', 'store')
 
     def get_parser(self, prog_name):
         parser = super(CreateImage, self).get_parser(prog_name)
         # TODO(mordred): add --volume and --force parameters and support
         # TODO(bunting): There are additional arguments that v1 supported
         # that v2 either doesn't support or supports weirdly.
         # --checksum - could be faked clientside perhaps?
-        # --owner - could be set as an update after the put?
         # --location - maybe location add?
         # --size - passing image size is actually broken in python-glanceclient
         # --copy-from - does not exist in v2
@@ -149,6 +148,11 @@ def get_parser(self, prog_name):
             help="Image disk format "
                  "(default: %s)" % DEFAULT_DISK_FORMAT,
         )
+        parser.add_argument(
+            "--owner",
+            metavar="<owner>",
+            help="Image owner project name or ID",
+        )
         parser.add_argument(
             "--min-disk",
             metavar="<disk-gb>",
@@ -229,7 +233,7 @@ def take_action(self, parsed_args):
         copy_attrs = ('name', 'id',
                       'container_format', 'disk_format',
                       'min_disk', 'min_ram',
-                      'tags')
+                      'tags', 'owner')
         for attr in copy_attrs:
             if attr in parsed_args:
                 val = getattr(parsed_args, attr, None)

openstackclient/tests/image/v2/test_image.py

@@ -112,6 +112,7 @@ def test_image_reserve_options(self, mock_open):
             '--disk-format', 'fs',
             '--min-disk', '10',
             '--min-ram', '4',
+            '--owner', '123456',
             '--protected',
             '--private',
             image_fakes.image_name,
@@ -121,6 +122,7 @@ def test_image_reserve_options(self, mock_open):
             ('disk_format', 'fs'),
             ('min_disk', 10),
             ('min_ram', 4),
+            ('owner', '123456'),
             ('protected', True),
             ('unprotected', False),
             ('public', False),
@@ -139,6 +141,7 @@ def test_image_reserve_options(self, mock_open):
             disk_format='fs',
             min_disk=10,
             min_ram=4,
+            owner='123456',
             protected=True,
             visibility='private',
         )
@@ -213,11 +216,10 @@ def test_image_create_file(self, mock_open):
     def test_image_create_dead_options(self):
 
         arglist = [
-            '--owner', 'nobody',
+            '--store', 'somewhere',
             image_fakes.image_name,
         ]
         verifylist = [
-            ('owner', 'nobody'),
             ('name', image_fakes.image_name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)