[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 8936fbedceca1adebdbb3ee47695ad18bdcf4283
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sat Apr 14 19:04:41 2012 -0700

    Rewrite CreateSecurityGroup

diff --git a/bin/euca-create-group b/bin/euca-create-group
index d2c9b2b..4343abf 100755
--- a/bin/euca-create-group
+++ b/bin/euca-create-group
@@ -1,42 +1,6 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms, with or
-# without modification, are permitted provided that the following conditions
-# are met:
-#
-#   Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-#   Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer in the documentation and/or other
-#   materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# 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
+#!/usr/bin/python -tt
 
 import euca2ools.commands.euca.createsecuritygroup
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.createsecuritygroup.CreateSecurityGroup()
-    cmd.main_cli()
-
+    euca2ools.commands.euca.createsecuritygroup.CreateSecurityGroup().do_cli()
diff --git a/euca2ools/commands/euca/createsecuritygroup.py b/euca2ools/commands/euca/createsecuritygroup.py
index 18eaa54..afc8b43 100644
--- a/euca2ools/commands/euca/createsecuritygroup.py
+++ b/euca2ools/commands/euca/createsecuritygroup.py
@@ -1,6 +1,6 @@
 # Software License Agreement (BSD License)
 #
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
+# Copyright (c) 2009-2012, Eucalyptus Systems, Inc.
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms, with or
@@ -27,35 +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
-
-import euca2ools.commands.eucacommand
-from boto.roboto.param import Param
-
-class CreateSecurityGroup(euca2ools.commands.eucacommand.EucaCommand):
-
-    Description = 'Creates a new security group.'
-    Options = [Param(name='group_description', short_name='d',
-                     long_name='description',
-                     optional=False, ptype='string',
-                     doc='Description for the group to be created')]
-    Args = [Param(name='group_name', ptype='string',
-                  doc='unique name for the group to be created',
-                  cardinality=1, optional=False)]
-
-    def display_group(self, group):
-        print 'GROUP\t%s\t%s' % (group.name, group.description)
-
-    def main(self):
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'create_security_group',
-                                     name=self.group_name,
-                                     description=self.group_description)
 
-    def main_cli(self):
-        group = self.main()
-        self.display_group(group)
+from requestbuilder import Arg
+from . import EucalyptusRequest
 
+class CreateSecurityGroup(EucalyptusRequest):
+    Description = 'Create a new security group'
+    Args = [Arg('-d', '--description', dest='GroupDescription', metavar='DESC',
+                required=True),
+            Arg('GroupName', metavar='GROUP', help='name of the new group')]
 
+    def print_result(self, result):
+        print self.tabify(('GROUP', result.get('groupId'),
+                           self.args['GroupName'],
+                           self.args['GroupDescription']))
diff --git a/euca2ools/commands/euca/deletegroup.py b/euca2ools/commands/euca/deletesecuritygroup.py
similarity index 100%
rename from euca2ools/commands/euca/deletegroup.py
rename to euca2ools/commands/euca/deletesecuritygroup.py
diff --git a/euca2ools/commands/euca/modgroup.py b/euca2ools/commands/euca/modgroup.py
index b789148..8caa355 100644
--- a/euca2ools/commands/euca/modgroup.py
+++ b/euca2ools/commands/euca/modgroup.py
@@ -28,9 +28,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from . import EucalyptusRequest
 from requestbuilder import Arg, MutuallyExclusiveArgList
 import sys
+from . import EucalyptusRequest
 
 class ModifySecurityGroupRequest(EucalyptusRequest):
     '''

-- 
managing cloud instances for Eucalyptus