[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 b139a5d56d4e3db9aa8ba15f0c2986b0e4f573d3
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue Feb 19 16:51:19 2013 -0800

    Port ListMFADevices

diff --git a/bin/euare-userlistmfadevices b/bin/euare-userlistmfadevices
index b95eb66..3cd5c2f 100755
--- a/bin/euare-userlistmfadevices
+++ b/bin/euare-userlistmfadevices
@@ -1,7 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euare.listmfadevices
 
 if __name__ == '__main__':
-    r = euca2ools.commands.euare.listmfadevices.ListMFADevices()
-    r.main_cli()
+    euca2ools.commands.euare.listmfadevices.ListMFADevices.run()
diff --git a/euca2ools/commands/euare/listmfadevices.py b/euca2ools/commands/euare/listmfadevices.py
index 0eecdad..64edf85 100644
--- a/euca2ools/commands/euare/listmfadevices.py
+++ b/euca2ools/commands/euare/listmfadevices.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,56 +27,30 @@
 # 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
 
+from requestbuilder import Arg
+from requestbuilder.response import PaginatedResponse
+from . import EuareRequest, DELEGATE
 
-class ListMFADevices(AWSQueryRequest):
 
-    ServiceClass = euca2ools.commands.euare.Euare
+class ListMFADevices(EuareRequest):
+    DESCRIPTION = "List a user's MFA devices"
+    ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
+                help='user to list MFA devices for (default: current user)'),
+            DELEGATE]
+    LIST_MARKERS = ['MFADevices']
 
-    Description = """ListMFADevices"""
-    Params = [Param(
-        name='UserName',
-        short_name='u',
-        long_name='user-name',
-        ptype='string',
-        optional=False,
-        doc=""" Name of the User whose MFA devices you want to list. """
-            ,
-        ), Param(
-        name='Marker',
-        short_name='m',
-        long_name='marker',
-        ptype='string',
-        optional=True,
-        doc=""" Use this only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the Marker element in the response you just received. """
-            ,
-        ), Param(
-        name='MaxItems',
-        short_name=None,
-        long_name='max-items',
-        ptype='integer',
-        optional=True,
-        doc=""" Use this only when paginating results to indicate the maximum number of keys you want in the response. If there are additional keys beyond the maximum you specify, the IsTruncated response element is true. """
-            ,
-        )]
+    def main(self):
+        return PaginatedResponse(self, (None,), ('MFADevices',))
 
-    def cli_formatter(self, data):
-        for mfa in data.MFADevices:
-            print mfa['SerialNumber']
+    def prepare_for_page(self, page):
+        # Pages are defined by markers
+        self.params['Marker'] = page
 
-    def main(self, **args):
-        self.list_markers.append('MFADevices')
-        self.item_markers.append('member')
-        return self.send(**args)
+    def get_next_page(self, response):
+        if response.get('IsTruncated') == 'true':
+            return response['Marker']
 
-    def main_cli(self):
-        euca2ools.utils.print_version_if_necessary()
-        self.do_cli()
+    def print_result(self, result):
+        for device in result.get('MFADevices', []):
+            print device['SerialNumber']

-- 
managing cloud instances for Eucalyptus