[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 21b75ad8fbc0d7f45e1c6e4192c2887e6e74cb22
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sat Apr 21 22:45:55 2012 -0700

    Rewrite CreateVolume

diff --git a/bin/euca-create-volume b/bin/euca-create-volume
index 296677a..1e5af92 100755
--- a/bin/euca-create-volume
+++ b/bin/euca-create-volume
@@ -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.createvolume
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.createvolume.CreateVolume()
-    cmd.main_cli()
-
+    euca2ools.commands.euca.createvolume.CreateVolume().do_cli()
diff --git a/euca2ools/commands/euca/createvolume.py b/euca2ools/commands/euca/createvolume.py
index 8debd31..210e169 100644
--- a/euca2ools/commands/euca/createvolume.py
+++ b/euca2ools/commands/euca/createvolume.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,52 +27,29 @@
 # 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 CreateVolume(euca2ools.commands.eucacommand.EucaCommand):
+from requestbuilder import Arg
+from . import EucalyptusRequest
 
-    Description = 'Creates a volume in a specified availability zone.'
-    Options = [Param(name='size', short_name='s', long_name='size',
-                     optional=True, ptype='integer',
-                     doc='size of the volume (in GiB).'),
-               Param(name='snapshot', long_name='snapshot',
-                     optional=True, ptype='string',
-                     doc="""snapshot id to create the volume from.
-                     Either size or snapshot can be specified (not both)."""),
-               Param(name='zone', short_name='z', long_name='zone',
-                     optional=False, ptype='string',
-                     doc='availability zone to create the volume in')]
-
-    def display_volume(self, volume):
-        if not volume.id:
-            return
-        volume_string = '%s' % volume.id
-        if volume.size:
-            volume_string += '\t%d' % volume.size
-        if volume.snapshot_id:
-            volume_string += '\t%s' % volume.snapshot_id
-        if volume.zone:
-            volume_string += '\t%s' % volume.zone
-        volume_string += '\t%s\t%s' % (volume.status, volume.create_time)
-        print 'VOLUME\t%s' % volume_string
+class CreateVolume(EucalyptusRequest):
+    Description = 'Create a new volume'
+    Args = [Arg('-s', '--size', dest='Size', type=int,
+                help='''size of the new volume in GiB.  Required unless
+                        --snapshot is used'''),
+            Arg('--snapshot', dest='SnapshotId', metavar='SNAPSHOT',
+                help='snapshot from which to create the new volume'),
+            Arg('-z', '--zone', dest='AvailabilityZone', metavar='ZONE',
+                required=True,
+                help='availability zone in which to create the new volume')]
 
     def main(self):
-        if (self.size or self.snapshot) and self.zone:
-            conn = self.make_connection_cli()
-            return self.make_request_cli(conn, 'create_volume',
-                                         size=self.size, zone=self.zone,
-                                         snapshot=self.snapshot)
-        else:
-            msg = 'Either size or snapshot_id must be specified'
-            self.display_error_and_exit(msg)
-
-    def main_cli(self):
-        volume = self.main()
-        if volume:
-            self.display_volume(volume)
+        if not self.args.get('Size') and not self.args.get('SnapshotId'):
+            self._cli_parser.error('at least one of -s/--size and --snapshot '
+                                   'must be specified')
+        return self.send()
 
+    def print_result(self, result):
+        print self.tabify(['VOLUME', result.get('volumeId'),
+                           result.get('size'), result.get('snapshotId'),
+                           result.get('availabilityZone'),
+                           result.get('status'), result.get('createTime')])

-- 
managing cloud instances for Eucalyptus