[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 4c193aa844f47f258d2c4438dfe96f0d8c6169ca
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Feb 18 23:30:30 2013 -0800

    Port UpdateAccessKey

diff --git a/bin/euare-usermodkey b/bin/euare-usermodkey
index c97538c..ff58fbf 100755
--- a/bin/euare-usermodkey
+++ b/bin/euare-usermodkey
@@ -1,7 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euare.updateaccesskey
 
 if __name__ == '__main__':
-    r = euca2ools.commands.euare.updateaccesskey.UpdateAccessKey()
-    r.main_cli()
+    euca2ools.commands.euare.updateaccesskey.UpdateAccessKey.run()
diff --git a/euca2ools/commands/euare/updateaccesskey.py b/euca2ools/commands/euare/updateaccesskey.py
index ecdbc3a..78c6e18 100644
--- a/euca2ools/commands/euare/updateaccesskey.py
+++ b/euca2ools/commands/euare/updateaccesskey.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,58 +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 UpdateAccessKey(AWSQueryRequest):
-
-    ServiceClass = euca2ools.commands.euare.Euare
 
-    Description = """UpdateAccessKey"""
-    Params = [Param(
-        name='UserName',
-        short_name='u',
-        long_name='user-name',
-        ptype='string',
-        optional=True,
-        doc=""" Name of the User whose key you want to update. """,
-        ), Param(
-        name='AccessKeyId',
-        short_name='k',
-        long_name='user-key-id',
-        ptype='string',
-        optional=False,
-        doc=""" The Access Key ID of the Secret Access Key you want to update. """ ,
-        ), Param(
-        name='Status',
-        short_name='s',
-        long_name='status',
-        ptype='enum',
-        choices=['Active', 'Inactive'],
-        optional=False,
-        doc=""" The status you want to assign to the Secret Access Key. Active means the key can be used for API calls to AWS, while Inactive means the key cannot be used. """ ,
-        ), 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):
-        pass
-    
-    def main(self, **args):
-        return self.send(**args)
 
-    def main_cli(self):
-        euca2ools.utils.print_version_if_necessary()
-        self.do_cli()
+class UpdateAccessKey(EuareRequest):
+    DESCRIPTION = ('Change the status of an access key from Active to '
+                   'Inactive, or vice versa')
+    ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
+                help='''user owning the access key to update (default: current
+                        user)'''),
+            Arg('-k', '--user-key-id', dest='AccessKeyId', metavar='KEY_ID',
+                required=True,
+                help='ID of the access key to update (required)'),
+            Arg('-s', '--status', dest='Status', required=True,
+                choices=('Active', 'Inactive'),
+                help='status to assign to the access key'),
+            DELEGATE]

-- 
managing cloud instances for Eucalyptus