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

    Port DeleteAccount

diff --git a/bin/euare-accountdel b/bin/euare-accountdel
index 9dd8a24..1236517 100755
--- a/bin/euare-accountdel
+++ b/bin/euare-accountdel
@@ -1,7 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euare.deleteaccount
 
 if __name__ == '__main__':
-    r = euca2ools.commands.euare.deleteaccount.DeleteAccount()
-    r.main_cli()
+    euca2ools.commands.euare.deleteaccount.DeleteAccount.run()
diff --git a/euca2ools/commands/euare/deleteaccount.py b/euca2ools/commands/euare/deleteaccount.py
index 10c6451..35fb6ee 100644
--- a/euca2ools/commands/euare/deleteaccount.py
+++ b/euca2ools/commands/euare/deleteaccount.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,43 +27,16 @@
 # 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 DeleteAccount(AWSQueryRequest):
-
-    ServiceClass = euca2ools.commands.euare.Euare
 
-    Name = 'DeleteAccount'
-    Description = 'Delete an account'
-    Params = [
-        Param(name='AccountName',
-              short_name='a',
-              long_name='account-name',
-              ptype='string',
-              optional=False,
-              doc="""The name of the account to delete."""),
-        Param(name='Recursive',
-              short_name='r',
-              long_name='recursive',
-              ptype='boolean',
-              optional=True,
-              doc="""True if to delete the account recursively."""),
-        ]
+from requestbuilder import Arg
+from . import EuareRequest
 
-    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 DeleteAccount(EuareRequest):
+    DESCRIPTION = ('[Eucalyptus only] Delete an account. This command is only '
+                   'usable by cloud administrators.')
+    ARGS = [Arg('-a', '--account-name', dest='AccountName', metavar='ACCOUNT',
+                required=True, help='name of the account to delete (required)'),
+            Arg('-r', '--recursive', dest='Recursive', action='store_const',
+                const='true', help='''delete all users, groups, and policies
+                                      associated with the account as well''')]

-- 
managing cloud instances for Eucalyptus