[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 cbe180dc079991ecf6798de89b97d7db18d1f57d
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue Apr 24 22:43:44 2012 -0700

    Rewrite GetConsoleOutput

diff --git a/bin/euca-get-console-output b/bin/euca-get-console-output
index d84e73c..ace7b6c 100755
--- a/bin/euca-get-console-output
+++ b/bin/euca-get-console-output
@@ -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.getconsoleoutput
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.getconsoleoutput.GetConsoleOutput()
-    cmd.main_cli()
-
+    euca2ools.commands.euca.getconsoleoutput.GetConsoleOutput().do_cli()
diff --git a/euca2ools/commands/euca/getconsoleoutput.py b/euca2ools/commands/euca/getconsoleoutput.py
index 6dbf9a7..0505188 100644
--- a/euca2ools/commands/euca/getconsoleoutput.py
+++ b/euca2ools/commands/euca/getconsoleoutput.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,31 +27,17 @@
 # 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 GetConsoleOutput(euca2ools.commands.eucacommand.EucaCommand):
-
-    Description = 'Prints console output from a running instance.'
-    Args = [Param(name='instance_id', ptype='string', optional=False,
-                  doc="""unique identifier for instance
-                  to show the console output for.""")]
 
-    def display_console_output(self, console_output):
-        print console_output.instance_id
-        print console_output.timestamp
-        print console_output.output
-        
-    def main(self):
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'get_console_output',
-                                   instance_id=self.instance_id)
+import base64
+from requestbuilder import Arg
+from . import EucalyptusRequest
 
-    def main_cli(self):
-        co = self.main()
-        self.display_console_output(co)
+class GetConsoleOutput(EucalyptusRequest):
+    Description = 'Retrieve console output for the specified instance'
+    Args = [Arg('InstanceId', metavar='INSTANCE',
+                help='instance to obtain console output from')]
 
+    def print_result(self, result):
+        print result.get('instanceId', '')
+        print result.get('timestamp', '')
+        print base64.b64decode(result.get('output', ''))

-- 
managing cloud instances for Eucalyptus