[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 98a02ccf4c25a72d439156d718be6b5a654e2aee
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue Feb 19 13:01:39 2013 -0800

    Port UploadSigningCertificate

diff --git a/bin/euare-useraddcert b/bin/euare-useraddcert
index 199e084..1227bf0 100755
--- a/bin/euare-useraddcert
+++ b/bin/euare-useraddcert
@@ -1,7 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euare.uploadsigningcertificate
 
 if __name__ == '__main__':
-    r = euca2ools.commands.euare.uploadsigningcertificate.UploadSigningCertificate()
-    r.main_cli()
+    euca2ools.commands.euare.uploadsigningcertificate.UploadSigningCertificate.run()
diff --git a/euca2ools/commands/euare/uploadsigningcertificate.py b/euca2ools/commands/euare/uploadsigningcertificate.py
index a10205d..b92f5a7 100644
--- a/euca2ools/commands/euare/uploadsigningcertificate.py
+++ b/euca2ools/commands/euare/uploadsigningcertificate.py
@@ -1,6 +1,6 @@
 # Software License Agreement (BSD License)
 #
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
+# Copyright (c) 2009-2013, Eucalyptus Systems, Inc.
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms, with or
@@ -27,57 +27,20 @@
 # 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
-
-from boto.roboto.awsqueryrequest import AWSQueryRequest
-from boto.roboto.param import Param
-import euca2ools.commands.euare
-import euca2ools.utils
-
-
-class UploadSigningCertificate(AWSQueryRequest):
-
-    ServiceClass = euca2ools.commands.euare.Euare
-
-    Description = """UploadSigningCertificate"""
-    Params = [Param(
-        name='CertificateBody',
-        short_name='c',
-        long_name='certificate-body',
-        ptype='string',
-        optional=True,
-        doc=""" The contents of the signing certificate. """,
-        ), Param(
-        name='CertificateBody',
-        short_name='f',
-        long_name='certificate-file',
-        ptype='file',
-        optional=True,
-        doc="""A file containing the signing certificate. """,
-        ), Param(
-        name='UserName',
-        short_name='u',
-        long_name='user-name',
-        ptype='string',
-        optional=True,
-        doc=""" Name of the User the signing certificate is for. """,
-        ), Param(
-        name='DelegateAccount',
-        short_name=None,
-        long_name='delegate',
-        ptype='string',
-        optional=True,
-        doc=""" [Eucalyptus extension] Process this command as if the administrator of the specified account had run it. This option is only usable by cloud administrators. """,
-        )]
-
-    def cli_formatter(self, data):
-        print data.Certificate['CertificateId']
-
-    def main(self, **args):
-        return self.send(**args)
 
-    def main_cli(self):
-        euca2ools.utils.print_version_if_necessary()
-        self.do_cli()
+from requestbuilder import Arg, MutuallyExclusiveArgList
+from . import EuareRequest, DELEGATE
+
+
+class UploadSigningCertificate(EuareRequest):
+    DESCRIPTION = 'Upload a signing certificate'
+    ARGS = [MutuallyExclusiveArgList(True,
+                Arg('-c', '--certificate-body', dest='CertificateBody',
+                    metavar='CERT', help='contents of the new certificate'),
+                Arg('-f', '--certificate-file', dest='CertificateBody',
+                    metavar='FILE', type=open,
+                    help='file containing the new certificate')),
+            Arg('-u', '--user-name', dest='UserName', metavar='USER',
+                help='''user the signing certificate is for (default: current
+                        user)'''),
+            DELEGATE]

-- 
managing cloud instances for Eucalyptus