[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 1f91ee430910c2f91dfcb4e71f22ee9dcf7a0c72
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Feb 18 21:56:21 2013 -0800

    Port GetServerCertificate

diff --git a/bin/euare-servercertgetattributes b/bin/euare-servercertgetattributes
index 30a2d51..2be6611 100755
--- a/bin/euare-servercertgetattributes
+++ b/bin/euare-servercertgetattributes
@@ -1,7 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euare.getservercertificate
 
 if __name__ == '__main__':
-    r = euca2ools.commands.euare.getservercertificate.GetServerCertificate()
-    r.main_cli()
+    euca2ools.commands.euare.getservercertificate.GetServerCertificate.run()
diff --git a/euca2ools/commands/euare/getservercertificate.py b/euca2ools/commands/euare/getservercertificate.py
index dbb9420..93842b8 100644
--- a/euca2ools/commands/euare/getservercertificate.py
+++ b/euca2ools/commands/euare/getservercertificate.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,37 +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 GetServerCertificate(AWSQueryRequest):
-
-    ServiceClass = euca2ools.commands.euare.Euare
 
-    Description = """GetServerCertificate"""
-    Params = [Param(
-        name='ServerCertificateName',
-        short_name='s',
-        long_name='server-certificate-name',
-        ptype='string',
-        optional=False,
-        doc=""" The name of the server certificate you want to retrieve information about. """
-            ,
-        )]
+from requestbuilder import Arg
+from . import EuareRequest, DELEGATE
 
-    def cli_formatter(self, data):
-        pass
 
-    def main(self, **args):
-        return self.send(**args)
+class GetServerCertificate(EuareRequest):
+    DESCRIPTION = 'Show the ARN and GUID of a server certificate'
+    ARGS = [Arg('-s', '--server-certificate-name', dest='ServerCertificateName',
+                metavar='CERT', required=True, help='''name of the server
+                certificate to retrieve info about (required)'''),
+            DELEGATE]
 
-    def main_cli(self):
-        euca2ools.utils.print_version_if_necessary()
-        self.do_cli()
+    def print_result(self, result):
+        metadata = result.get('ServerCertificate', {}) \
+                         .get('ServerCertificateMetadata', {})
+        print metadata.get('Arn')
+        print metadata.get('ServerCertificateId')

-- 
managing cloud instances for Eucalyptus