[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit ef32a135b093544a00e476f666974d3d62874b5b
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Thu May 3 00:03:13 2012 -0700

    Rewrite DescribeBundleTasks

diff --git a/bin/euca-describe-bundle-tasks b/bin/euca-describe-bundle-tasks
index e09fee3..4dfa055 100755
--- a/bin/euca-describe-bundle-tasks
+++ b/bin/euca-describe-bundle-tasks
@@ -1,41 +1,6 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms, with or
-# without modification, are permitted provided that the following conditions
-# are met:
-#
-#   Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-#   Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer in the documentation and/or other
-#   materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-#         Mitch Garnaat mgarnaat at eucalyptus.com
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euca.describebundletasks
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.describebundletasks.DescribeBundleTasks()
-    cmd.main_cli()
+    euca2ools.commands.euca.describebundletasks.DescribeBundleTasks().do_cli()
diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index 79e711a..900b784 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -251,7 +251,7 @@ class EucalyptusRequest(Euca2oolsRequest, TabifyingCommand):
                            task.get('storage', {}).get('S3', {}).get('bucket'),
                            task.get('storage', {}).get('S3', {}).get('prefix'),
                            task.get('startTime'), task.get('updateTime'),
-                           task.get('state')])
+                           task.get('state'),     task.get('progress')])
 
 
 class _ResourceTypeMap(object):
diff --git a/euca2ools/commands/euca/describebundletasks.py b/euca2ools/commands/euca/describebundletasks.py
index cb31f31..83b5085 100644
--- a/euca2ools/commands/euca/describebundletasks.py
+++ b/euca2ools/commands/euca/describebundletasks.py
@@ -1,6 +1,6 @@
 # Software License Agreement (BSD License)
 #
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
+# Copyright (c) 2009-2012, Eucalyptus Systems, Inc.
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms, with or
@@ -27,62 +27,33 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-#         Mitch Garnaat mgarnaat at eucalyptus.com
-
-import euca2ools.commands.eucacommand
-from boto.roboto.param import Param
 
-class DescribeBundleTasks(euca2ools.commands.eucacommand.EucaCommand):
+from requestbuilder import Arg, Filter
+from . import EucalyptusRequest
 
+class DescribeBundleTasks(EucalyptusRequest):
+    Description = 'Describe current instance-bundling tasks'
     APIVersion = '2010-08-31'
-    Description = 'Retrieves previously submitted bundle tasks.'
-    Args = [Param(name='bundle_id', ptype='string',
-                  doc="""Identifiers of bundle tasks to describe.
-                  If no bundle task ids are specified
-                  all bundle tasks are returned.""",
-                  cardinality='+', optional=True)]
-    Filters = [Param(name='bundle-id', ptype='string',
-                     doc='ID of the bundle task.'),
-               Param(name='error-code', ptype='string',
-                     doc='If the task failed, the error code returned'),
-               Param(name='error-message', ptype='string',
-                     doc='If the task failed, the error message returned.'),
-               Param(name='instance-id', ptype='string',
-                     doc='ID of the instance that was bundled.'),
-               Param(name='progress', ptype='string',
-                     doc='Level of task completion, in percent (e.g., 20%).'),
-               Param(name='s3-bucket', ptype='string',
-                     doc='bucket where the AMI will be stored'),
-               Param(name='s3-prefix', ptype='string',
-                     doc='Beginning of the AMI name.'),
-               Param(name='start-time', ptype='string',
-                     doc='Time the task started.'),
-               Param(name='state', ptype='string',
-                     doc='State of the task.'),
-               Param(name='update-time', ptype='string',
-                     doc='Time of the most recent update for the task.')]
-    
-    def display_bundles(self, bundles):
-        for bundle in bundles:
-            bundle_string = '%s\t%s\t%s\t%s\t%s\t%s\t%s' % (
-                bundle.id,
-                bundle.instance_id,
-                bundle.bucket,
-                bundle.prefix,
-                bundle.state,
-                bundle.start_time,
-                bundle.update_time)
-            print 'BUNDLE\t%s' % bundle_string
-
-    def main(self):
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'get_all_bundle_tasks',
-                                     bundle_ids=self.bundle_id)
-
-    def main_cli(self):
-        bundles = self.main()
-        self.display_bundles(bundles)
-
+    Args = [Arg('BundleId', metavar='BUNDLE', nargs='*',
+                help='limit results to one or more bundle tasks')]
+    Filters = [Filter('bundle-id', help='bundle task ID'),
+               Filter('error-code',
+                      help='if the task failed, the error code returned'),
+               Filter('error-message',
+                      help='if the task failed, the error message returned'),
+               Filter('instance-id', help='ID of the bundled instance'),
+               Filter('progress', help='level of task completion, in percent'),
+               Filter('s3-bucket',
+                      help='bucket where the image will be stored'),
+               Filter('s3-prefix', help='beginning of the bundle name'),
+               Filter('start-time', help='task start time'),
+               Filter('state', help='task state',
+                      choices=('pending', 'waiting-for-shutdown', 'bundling',
+                               'storing', 'cancelling', 'complete', 'failed')),
+               Filter('update-time', help='most recent task update time')]
+    ListMarkers = ['bundleInstanceTasksSet']
+    ItemMarkers = ['item']
 
+    def print_result(self, result):
+        for task in result.get('bundleInstanceTasksSet', []):
+            self.print_bundle_task(task)

-- 
managing cloud instances for Eucalyptus