[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 acc480c1965fe7bdf25b2c4569049437c26f10d2
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Apr 23 21:38:56 2012 -0700

    Rewrite DescribeKeyPairs

diff --git a/bin/euca-describe-keypairs b/bin/euca-describe-keypairs
index 95c6978..054ed2f 100755
--- a/bin/euca-describe-keypairs
+++ b/bin/euca-describe-keypairs
@@ -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.describekeypairs
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.describekeypairs.DescribeKeyPairs()
-    cmd.main_cli()
+    euca2ools.commands.euca.describekeypairs.DescribeKeyPairs().do_cli()
diff --git a/euca2ools/commands/euca/describekeypairs.py b/euca2ools/commands/euca/describekeypairs.py
index bce04df..6d6d6ef 100644
--- a/euca2ools/commands/euca/describekeypairs.py
+++ b/euca2ools/commands/euca/describekeypairs.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,21 @@
 # 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 DescribeKeyPairs(euca2ools.commands.eucacommand.EucaCommand):
+from requestbuilder import Arg, Filter
+from . import EucalyptusRequest
 
+class DescribeKeyPairs(EucalyptusRequest):
     APIVersion = '2010-08-31'
-    Description = 'Shows information about keypairs.'
-    Args = [Param(name='keypair', ptype='string',
-                  cardinality='+', optional=True)]
-    Filters = [Param(name='fingerprint', ptype='string',
-                     doc='Fingerprint of the key pair.'),
-               Param(name='key-name', ptype='string',
-                     doc='Name of the keypair.')]
-    
-    def display_keypairs(self, keypairs):
-        for keypair in keypairs:
-            keypair_string = '%s\t%s' % (keypair.name, keypair.fingerprint)
-            print 'KEYPAIR\t%s' % keypair_string
-
-    def main(self):
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'get_all_key_pairs',
-                                     keynames=self.keypair)
-
-    def main_cli(self):
-        keypairs = self.main()
-        self.display_keypairs(keypairs)
+    Description = 'Display information about available key pairs'
+    Args = [Arg('KeyName', nargs='*', metavar='KEYPAIR',
+                help='limit results to specific key pairs')]
+    Filters = [Filter('fingerprint', help='fingerprint of the key pair'),
+               Filter('key-name', help='name of the key pair')]
+    ListMarkers = ['keySet']
+    ItemMarkers = ['item']
 
+    def print_result(self, result):
+        for key in result.get('keySet', []):
+            print self.tabify(('KEYPAIR', key.get('keyName'),
+                               key.get('keyFingerprint')))

-- 
managing cloud instances for Eucalyptus