[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 942ecdb1970f10fe8f9535f563e86b697779dc58
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sat Apr 21 17:06:28 2012 -0700

    Rewrite CancelBundleTask

diff --git a/bin/euca-cancel-bundle-task b/bin/euca-cancel-bundle-task
index 3cfbae1..cc3ced8 100755
--- a/bin/euca-cancel-bundle-task
+++ b/bin/euca-cancel-bundle-task
@@ -1,42 +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.cancelbundletask
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.cancelbundletask.CancelBundleTask()
-    cmd.main_cli()
-
+    euca2ools.commands.euca.cancelbundletask.CancelBundleTask().do_cli()
diff --git a/euca2ools/commands/euca/cancelbundletask.py b/euca2ools/commands/euca/cancelbundletask.py
index e6c83af..7ff2b0a 100644
--- a/euca2ools/commands/euca/cancelbundletask.py
+++ b/euca2ools/commands/euca/cancelbundletask.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,35 +27,14 @@
 # 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 CancelBundleTask(euca2ools.commands.eucacommand.EucaCommand):
-
-    Description = 'Cancels a previously submitted bundle task.'
-    Args = [Param(name='bundle_id', ptype='string', optional=False,
-                  doc='Identifier of the bundle task to be cancelled.')]
 
-    def display_bundle(self, bundle):
-        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
+from requestbuilder import Arg
+from . import EucalyptusRequest
 
-    def main(self):
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'cancel_bundle_task',
-                                     bundle_id=self.bundle_id)
+class CancelBundleTask(EucalyptusRequest):
+    Description = 'Cancel an instance bundling operation'
+    Args = [Arg('BundleId', metavar='TASK-ID',
+                help='ID of the bundle task to cancel')]
 
-    def main_cli(self):
-        bundle_task = self.main()
-        self.display_bundle(bundle_task)
+    def print_result(self, result):
+        self.print_bundle_task(result.get('bundleInstanceTask'))

-- 
managing cloud instances for Eucalyptus