[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 a7f99f5d818294456400ccf42a94948fcb55593a
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue Feb 19 17:49:07 2013 -0800

    Port GetGroup

diff --git a/bin/euare-grouplistusers b/bin/euare-grouplistusers
index 98d30ce..f087154 100755
--- a/bin/euare-grouplistusers
+++ b/bin/euare-grouplistusers
@@ -1,7 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euare.getgroup
 
 if __name__ == '__main__':
-    r = euca2ools.commands.euare.getgroup.GetGroup()
-    r.main_cli()
+    euca2ools.commands.euare.getgroup.GetGroup.run()
diff --git a/euca2ools/commands/euare/getgroup.py b/euca2ools/commands/euare/getgroup.py
index ac44356..4840efc 100644
--- a/euca2ools/commands/euare/getgroup.py
+++ b/euca2ools/commands/euare/getgroup.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,63 +27,32 @@
 # 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 GetGroup(AWSQueryRequest):
 
-    ServiceClass = euca2ools.commands.euare.Euare
+class GetGroup(EuareRequest):
+    DESCRIPTION = 'List all the users in a group'
+    ARGS = [Arg('-g', '--group-name', dest='GroupName', metavar='GROUP',
+                required=True, help='name of the group to show info about'),
+            DELEGATE]
+    LIST_MARKERS = ['Users']
 
-    Description = """GetGroup"""
-    Params = [Param(
-        name='GroupName',
-        short_name='g',
-        long_name='group-name',
-        ptype='string',
-        optional=False,
-        doc=""" Name of the group. """,
-        ), 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 User names you want in the response. If there are additional User names 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,), ('Users',))
 
+    def prepare_for_page(self, page):
+        # Pages are defined by markers
+        self.params['Marker'] = page
 
-    def cli_formatter(self, data):
-        print data.Group['Arn']
-        print '\tusers'
-        for user in data.Users:
-            print '\t%s' % user['Arn']
-            
-    def main(self, **args):
-        self.list_markers.append('Users')
-        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):
+        print result['Group']['Arn']
+        print '  ', 'users'
+        for user in result.get('Users', []):
+            print '  ', user['Arn']

-- 
managing cloud instances for Eucalyptus