[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 1cf1f1cf18516dcd9ab8a6a7fb04f0a0b780019d
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Wed Apr 25 00:00:10 2012 -0700

    Rewrite ImportKeyPair

diff --git a/bin/euca-import-keypair b/bin/euca-import-keypair
index ac2f20d..6218bbf 100755
--- a/bin/euca-import-keypair
+++ b/bin/euca-import-keypair
@@ -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.importkeypair
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.importkeypair.ImportKeyPair()
-    cmd.main_cli()
+    euca2ools.commands.euca.importkeypair.ImportKeyPair().do_cli()
diff --git a/euca2ools/commands/euca/importkeypair.py b/euca2ools/commands/euca/importkeypair.py
index f29c640..d754f32 100644
--- a/euca2ools/commands/euca/importkeypair.py
+++ b/euca2ools/commands/euca/importkeypair.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,36 +27,26 @@
 # 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 ImportKeyPair(euca2ools.commands.eucacommand.EucaCommand):
+import base64
+from requestbuilder import Arg
+from . import EucalyptusRequest
+from .argtypes import file_contents
 
+class ImportKeyPair(EucalyptusRequest):
     APIVersion = '2010-08-31'
-    Description = 'Import a public key created with 3rd party tool'
-    Options = [Param(name='file_name',
-                     short_name='f', long_name='public-key-file',
-                     optional=False, ptype='file',
-                     doc='Path to file containing the public key.')]
-    Args = [Param(name='key_name', ptype='string',
-                  doc='A unique name for the key pair.',
-                  optional=False)]
-    
-    def main(self):
-        fp = open(self.file_name)
-        key_material = fp.read()
-        fp.close()
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'import_key_pair',
-                                     key_name=self.key_name,
-                                     public_key_material=key_material)
+    Description = 'Import a public RSA key'
+    Args = [Arg('KeyName', metavar='KEYPAIR',
+                help='name for the new key pair'),
+            Arg('-f', '--public-key-file', dest='pubkey', metavar='PUBKEY',
+                type=file_contents, required=True, route_to=None,
+                help='file name of the public key to import')]
 
-    def main_cli(self):
-        keypair = self.main()
-        if keypair:
-            print 'KEYPAIR\t%s\t%s' % (keypair.name, keypair.fingerprint)
+    def main(self):
+        self.params = {'PublicKeyMaterial':
+                        base64.b64encode(self.args['pubkey'])}
+        return self.send()
 
+    def print_result(self, result):
+        print self.tabify(['KEYPAIR', result.get('keyName'),
+                           result.get('keyFingerprint')])

-- 
managing cloud instances for Eucalyptus