Move server image create command to its own resource file.

Change-Id: If37e82072bd7a32b81bfb1a8bb048f018dd5b04f

2 files changed, 111 insertions, 74 deletions

diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 27abbe63..16384074 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -164,23 +164,6 @@ def _prep_server_detail(compute_client, server):
     return info
 
 
-def _prep_image_detail(image_client, image_id):
-    """Prepare the detailed image dict for printing
-
-    :param image_client: an image client instance
-    :param image_id: id of image created
-    :rtype: a dict of image details
-    """
-
-    info = utils.find_resource(
-        image_client.images,
-        image_id,
-    )
-    # Glance client V2 doesn't have _info attribute
-    # The following condition deals with it.
-    return getattr(info, "_info", info)
-
-
 def _show_progress(progress):
     if progress:
         sys.stdout.write('\rProgress: %s' % progress)
@@ -597,63 +580,6 @@ class CreateServerDump(command.Command):
             ).trigger_crash_dump()
 
 
-class CreateServerImage(command.ShowOne):
-    """Create a new disk image from a running server"""
-
-    def get_parser(self, prog_name):
-        parser = super(CreateServerImage, self).get_parser(prog_name)
-        parser.add_argument(
-            'server',
-            metavar='<server>',
-            help=_('Server (name or ID)'),
-        )
-        parser.add_argument(
-            '--name',
-            metavar='<image-name>',
-            help=_('Name of new image (default is server name)'),
-        )
-        parser.add_argument(
-            '--wait',
-            action='store_true',
-            help=_('Wait for image create to complete'),
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
-        image_client = self.app.client_manager.image
-        server = utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
-        )
-        if parsed_args.name:
-            name = parsed_args.name
-        else:
-            name = server.name
-
-        image_id = compute_client.servers.create_image(
-            server,
-            name,
-        )
-
-        if parsed_args.wait:
-            if utils.wait_for_status(
-                image_client.images.get,
-                image_id,
-                callback=_show_progress,
-            ):
-                sys.stdout.write('\n')
-            else:
-                self.log.error(_('Error creating snapshot of server: %s'),
-                               parsed_args.server)
-                sys.stdout.write(_('Error creating server snapshot\n'))
-                raise SystemExit
-
-        image = _prep_image_detail(image_client, image_id)
-
-        return zip(*sorted(six.iteritems(image)))
-
-
 class DeleteServer(command.Command):
     """Delete server(s)"""
 
diff --git a/openstackclient/compute/v2/server_image.py b/openstackclient/compute/v2/server_image.py
new file mode 100644
index 00000000..85ee7f2d
--- /dev/null
+++ b/openstackclient/compute/v2/server_image.py
@@ -0,0 +1,111 @@
+#   Copyright 2012-2013 OpenStack Foundation
+#
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+"""Compute v2 Server action implementations"""
+
+import sys
+
+from oslo_utils import importutils
+import six
+
+from openstackclient.common import command
+from openstackclient.common import exceptions
+from openstackclient.common import utils
+from openstackclient.i18n import _
+
+
+def _show_progress(progress):
+    if progress:
+        sys.stdout.write('\rProgress: %s' % progress)
+        sys.stdout.flush()
+
+
+class CreateServerImage(command.ShowOne):
+    """Create a new server disk image from an existing server"""
+
+    IMAGE_API_VERSIONS = {
+        "1": "openstackclient.image.v1.image",
+        "2": "openstackclient.image.v2.image",
+    }
+
+    def get_parser(self, prog_name):
+        parser = super(CreateServerImage, self).get_parser(prog_name)
+        parser.add_argument(
+            'server',
+            metavar='<server>',
+            help=_('Server to create image (name or ID)'),
+        )
+        parser.add_argument(
+            '--name',
+            metavar='<image-name>',
+            help=_('Name of new disk image (default: server name)'),
+        )
+        parser.add_argument(
+            '--wait',
+            action='store_true',
+            help=_('Wait for operation to complete'),
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        compute_client = self.app.client_manager.compute
+
+        server = utils.find_resource(
+            compute_client.servers,
+            parsed_args.server,
+        )
+        if parsed_args.name:
+            image_name = parsed_args.name
+        else:
+            image_name = server.name
+
+        image_id = compute_client.servers.create_image(
+            server.id,
+            image_name,
+        )
+
+        image_client = self.app.client_manager.image
+        image = utils.find_resource(
+            image_client.images,
+            image_id,
+        )
+
+        if parsed_args.wait:
+            if utils.wait_for_status(
+                image_client.images.get,
+                image_id,
+                callback=_show_progress,
+            ):
+                sys.stdout.write('\n')
+            else:
+                self.log.error(
+                    _('Error creating server image: %s') %
+                    parsed_args.server,
+                )
+                raise exceptions.CommandError
+
+        if self.app.client_manager._api_version['image'] == '1':
+            info = {}
+            info.update(image._info)
+            info['properties'] = utils.format_dict(info.get('properties', {}))
+        else:
+            # Get the right image module to format the output
+            image_module = importutils.import_module(
+                self.IMAGE_API_VERSIONS[
+                    self.app.client_manager._api_version['image']
+                ]
+            )
+            info = image_module._format_image(image)
+        return zip(*sorted(six.iteritems(info)))