[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 2a280c0162779e8571660a07cd9c52996922e622
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Feb 18 22:49:17 2013 -0800

    Port PutGroupPolicy

diff --git a/bin/euare-groupuploadpolicy b/bin/euare-groupuploadpolicy
index fb0dad9..031966e 100755
--- a/bin/euare-groupuploadpolicy
+++ b/bin/euare-groupuploadpolicy
@@ -1,7 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euare.putgrouppolicy
 
 if __name__ == '__main__':
-    r = euca2ools.commands.euare.putgrouppolicy.PutGroupPolicy()
-    r.main_cli()
+    euca2ools.commands.euare.putgrouppolicy.PutGroupPolicy.run()
diff --git a/euca2ools/commands/euare/putgrouppolicy.py b/euca2ools/commands/euare/putgrouppolicy.py
index 351ff13..22b623a 100644
--- a/euca2ools/commands/euare/putgrouppolicy.py
+++ b/euca2ools/commands/euare/putgrouppolicy.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,64 +27,21 @@
 # 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
-
-
-class PutGroupPolicy(AWSQueryRequest):
-
-    ServiceClass = euca2ools.commands.euare.Euare
 
-    Description = """PutGroupPolicy"""
-    Params = [Param(
-        name='GroupName',
-        short_name='g',
-        long_name='group-name',
-        ptype='string',
-        optional=False,
-        doc=""" Name of the group to associate the policy with. """,
-        ), Param(
-        name='PolicyName',
-        short_name='p',
-        long_name='policy-name',
-        ptype='string',
-        optional=False,
-        doc=""" Name of the policy document. """,
-        ), Param(
-        name='PolicyDocument',
-        short_name='o',
-        long_name='policy-content',
-        ptype='string',
-        optional=True,
-        doc=""" The policy document content. """,
-        ), Param(
-        name='PolicyDocument',
-        short_name='f',
-        long_name='policy-document',
-        ptype='file',
-        optional=True,
-        doc=""" The policy document as file. """,
-        ), 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, MutuallyExclusiveArgList
+from . import EuareRequest, DELEGATE
 
-    def cli_formatter(self, data):
-        pass
-    
-    def main(self, **args):
-        return self.send(**args)
 
-    def main_cli(self):
-        euca2ools.utils.print_version_if_necessary()
-        self.do_cli()
+class PutGroupPolicy(EuareRequest):
+    DESCRIPTION = 'Attach a policy to a group'
+    ARGS = [Arg('-g', '--group-name', dest='GroupName', metavar='GROUP',
+                required=True, help='group to attach the policy to (required)'),
+            Arg('-p', '--policy-name', dest='PolicyName', metavar='POLICY',
+                required=True, help='name of the policy (required)'),
+            MutuallyExclusiveArgList(True,
+                Arg('-o', '--policy-content', dest='PolicyDocument',
+                    metavar='POLICY_CONTENT', help='the policy to attach'),
+                Arg('-f', '--policy-document', dest='PolicyDocument',
+                    metavar='FILE', type=open,
+                    help='file containing the policy to attach')),
+            DELEGATE]

-- 
managing cloud instances for Eucalyptus