[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 4b34fa3f0f0de91b17a2aebf4a73b975ec0297a2
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue Feb 19 14:46:18 2013 -0800

    Port ListAccountAliases

diff --git a/bin/euare-accountaliaslist b/bin/euare-accountaliaslist
index 7ee70fb..bab36a8 100755
--- a/bin/euare-accountaliaslist
+++ b/bin/euare-accountaliaslist
@@ -1,7 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euare.listaccountaliases
 
 if __name__ == '__main__':
-    r = euca2ools.commands.euare.listaccountaliases.ListAccountAliases()
-    r.main_cli()
+    euca2ools.commands.euare.listaccountaliases.ListAccountAliases.run()
diff --git a/euca2ools/commands/euare/listaccountaliases.py b/euca2ools/commands/euare/listaccountaliases.py
index 3292509..7a54525 100644
--- a/euca2ools/commands/euare/listaccountaliases.py
+++ b/euca2ools/commands/euare/listaccountaliases.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,40 +27,19 @@
 # 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: 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 ListAccountAliases(AWSQueryRequest):
-
-    ServiceClass = euca2ools.commands.euare.Euare
 
-    Name = 'ListAccountAliases'
-    Description = 'List the alias for your account'
-    Params = [
-        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. """)
-        ]
+from requestbuilder import Arg
+from . import EuareRequest, DELEGATE
 
-    def cli_formatter(self, data):
-        if data:
-            for member in data.AccountAliases:
-                print 'Alias: %s' % member
 
-    def main(self, **args):
-        self.list_markers = ['AccountAliases']
-        self.item_markers = ['member']
-        return self.send(**args)
+class ListAccountAliases(EuareRequest):
+    DESCRIPTION = "List your account's aliases"
+    ARGS = [DELEGATE]
+    LIST_MARKERS = ['AccountAliases']
 
-    def main_cli(self):
-        euca2ools.utils.print_version_if_necessary()
-        self.do_cli()
+    def print_result(self, result):
+        # These are technically allowed to paginate, but I haven't seen
+        # accounts with lots of aliases in the wild yet.  If that starts
+        # happening, feel free to implement it.
+        for alias in result.get('AccountAliases', []):
+            print 'Alias:', alias

-- 
managing cloud instances for Eucalyptus