[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 f3a7fae161b601acadcc7ca573672030d81b5e5c
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Feb 18 15:20:40 2013 -0800

    Port CreateAccount

diff --git a/bin/euare-accountcreate b/bin/euare-accountcreate
index f6469d2..c28d576 100755
--- a/bin/euare-accountcreate
+++ b/bin/euare-accountcreate
@@ -1,7 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euare.createaccount
 
 if __name__ == '__main__':
-    r = euca2ools.commands.euare.createaccount.CreateAccount()
-    r.main_cli()
+    euca2ools.commands.euare.createaccount.CreateAccount.run()
diff --git a/euca2ools/commands/euare/createaccount.py b/euca2ools/commands/euare/createaccount.py
index b2ae6bc..fcee92d 100644
--- a/euca2ools/commands/euare/createaccount.py
+++ b/euca2ools/commands/euare/createaccount.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,37 +27,18 @@
 # 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 CreateAccount(AWSQueryRequest):
-
-    ServiceClass = euca2ools.commands.euare.Euare
 
-    Name = 'CreateAccount'
-    Description = 'Create a new account'
-    Params = [
-        Param(name='AccountName',
-              short_name='a',
-              long_name='account-name',
-              ptype='string',
-              optional=False,
-              doc="""The name of the new account.""")
-        ]
+from requestbuilder import Arg
+from requestbuilder.mixins import TabifyingCommand
+from . import EuareRequest
 
-    def cli_formatter(self, data):
-        print data.Account['AccountName'], '\t', data.Account['AccountId']
 
-    def main(self, **args):
-        return self.send(**args)
+class CreateAccount(EuareRequest, TabifyingCommand):
+    DESCRIPTION = ('[Eucalyptus only] Create a new 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 create (required)')]
 
-    def main_cli(self):
-        euca2ools.utils.print_version_if_necessary()
-        self.do_cli()
+    def print_result(self, result):
+        print self.tabify((result.get('Account', {}).get('AccountName'),
+                           result.get('Account', {}).get('AccountId')))

-- 
managing cloud instances for Eucalyptus