[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 e047f42ff1098add1f8fe157235b3290d4480026
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Feb 18 17:27:08 2013 -0800

    Port DeactivateMFADevice

diff --git a/bin/euare-userdeactivatemfadevice b/bin/euare-userdeactivatemfadevice
index 2d0a5c9..c70645b 100755
--- a/bin/euare-userdeactivatemfadevice
+++ b/bin/euare-userdeactivatemfadevice
@@ -1,7 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euare.deactivatemfadevice
 
 if __name__ == '__main__':
-    r = euca2ools.commands.euare.deactivatemfadevice.DeactivateMFADevice()
-    r.main_cli()
+    euca2ools.commands.euare.deactivatemfadevice.DeactivateMFADevice.run()
diff --git a/euca2ools/commands/euare/deactivatemfadevice.py b/euca2ools/commands/euare/deactivatemfadevice.py
index 4689dfa..33b7533 100644
--- a/euca2ools/commands/euare/deactivatemfadevice.py
+++ b/euca2ools/commands/euare/deactivatemfadevice.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,45 +27,17 @@
 # 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 DeactivateMFADevice(AWSQueryRequest):
-
-    ServiceClass = euca2ools.commands.euare.Euare
 
-    Description = """DeactivateMFADevice"""
-    Params = [Param(
-        name='UserName',
-        short_name='u',
-        long_name='user-name',
-        ptype='string',
-        optional=False,
-        doc=""" Name of the User whose MFA device you want to deactivate. """
-            ,
-        ), Param(
-        name='SerialNumber',
-        short_name='s',
-        long_name='serial-number',
-        ptype='string',
-        optional=False,
-        doc=""" The serial number that uniquely identifies the MFA device. """
-            ,
-        )]
+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 DeactivateMFADevice(EuareRequest):
+    DESCRIPTION = 'Deactivate an MFA device'
+    ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
+                required=True,
+                help='user whose MFA device to deactivate (required)'),
+            Arg('-s', '--serial-number', dest='SerialNumber', metavar='SERIAL',
+                required=True, help='''serial number of the MFA device to
+                                       deactivate (required)'''),
+            DELEGATE]

-- 
managing cloud instances for Eucalyptus