[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

Garrett Holmstrom gholms at fedoraproject.org
Sun Jun 16 02:30:20 UTC 2013


The following commit has been merged in the master branch:
commit aaaf67bc0b464a412c83cb53eb64f69ec502b714
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue Feb 19 16:45:06 2013 -0800

    Port ListGroupsForUser

diff --git a/bin/euare-userlistgroups b/bin/euare-userlistgroups
index 78bc6fc..3eb084a 100755
--- a/bin/euare-userlistgroups
+++ b/bin/euare-userlistgroups
@@ -1,7 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euare.listgroupsforuser
 
 if __name__ == '__main__':
-    r = euca2ools.commands.euare.listgroupsforuser.ListGroupsForUser()
-    r.main_cli()
+    euca2ools.commands.euare.listgroupsforuser.ListGroupsForUser.run()
diff --git a/euca2ools/commands/euare/listgroupsforuser.py b/euca2ools/commands/euare/listgroupsforuser.py
index ad554ce..9f4e54c 100644
--- a/euca2ools/commands/euare/listgroupsforuser.py
+++ b/euca2ools/commands/euare/listgroupsforuser.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,60 +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 ListGroupsForUser(AWSQueryRequest):
 
-    ServiceClass = euca2ools.commands.euare.Euare
+class ListGroupsForUser(EuareRequest):
+    DESCRIPTION = 'List all groups a user is a member of'
+    ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
+                required=True, help='user to list membership for (required)'),
+            DELEGATE]
+    LIST_MARKERS = ['Groups']
 
-    Description = """ListGroupsForUser"""
-    Params = [Param(
-        name='UserName',
-        short_name='u',
-        long_name='user-name',
-        ptype='string',
-        optional=False,
-        doc=""" The name of the User to list groups for. """,
-        ), 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 groups you want in the response. If there are additional groups beyond the maximum you specify, the IsTruncated response element is true. """ ,
-        ), 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 main(self):
+        return PaginatedResponse(self, (None,), ('Groups',))
 
-    def cli_formatter(self, data):
-        for group in data.Groups:
-            print group['Arn']
+    def prepare_for_page(self, page):
+        # Pages are defined by markers
+        self.params['Marker'] = page
 
-    def main(self, **args):
-        self.list_markers.append('Groups')
-        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 group in result.get('Groups', []):
+            print group['Arn']

-- 
managing cloud instances for Eucalyptus



More information about the pkg-eucalyptus-commits mailing list