[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 44f49cf41b3caa53e4009d1e3f50f54b00e2ec92
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sat Apr 21 18:13:13 2012 -0700

    Rewrite CreateSnapshot

diff --git a/bin/euca-create-snapshot b/bin/euca-create-snapshot
index 774196c..188d7d8 100755
--- a/bin/euca-create-snapshot
+++ b/bin/euca-create-snapshot
@@ -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.createsnapshot
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.createsnapshot.CreateSnapshot()
-    cmd.main_cli()
-
+    euca2ools.commands.euca.createsnapshot.CreateSnapshot().do_cli()
diff --git a/euca2ools/commands/euca/createsnapshot.py b/euca2ools/commands/euca/createsnapshot.py
index 6d21bbc..e975c38 100644
--- a/euca2ools/commands/euca/createsnapshot.py
+++ b/euca2ools/commands/euca/createsnapshot.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,39 +27,19 @@
 # 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 CreateSnapshot(euca2ools.commands.eucacommand.EucaCommand):
-
-    Description = 'Creates a snapshot from an existing volume.'
-    Options = [Param(name='description',
-                     short_name='d', long_name='description',
-                     optional=True, ptype='string',
-                     doc='A description of the new snapshot')]
-    Args = [Param(name='volume_id', ptype='string',
-                  doc='unique name for a volume to snapshot.',
-                  cardinality=1, optional=False)]
-
-    def display_snapshot(self, snapshot):
-        if not snapshot.id:
-            return
-        snapshot_string = '%s\t%s\t%s\t%s\t%s\t%s' % (snapshot.id,
-                snapshot.volume_id, snapshot.status, snapshot.start_time,
-                snapshot.progress, snapshot.description)
-        print 'SNAPSHOT\t%s' % snapshot_string
 
-    def main(self):
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'create_snapshot',
-                                     volume_id=self.volume_id,
-                                     description=self.description)
+from requestbuilder import Arg
+from . import EucalyptusRequest
 
-    def main_cli(self):
-        snapshot = self.main()
-        self.display_snapshot(snapshot)
+class CreateSnapshot(EucalyptusRequest):
+    Description = 'Create a snapshot of a volume'
+    Args = [Arg('VolumeId', metavar='VOLUME', help='volume to snapshot'),
+            Arg('-d', '--description', metavar='DESC', dest='Description',
+                help='snapshot description')]
 
+    def print_result(self, result):
+        print self.tabify(['SNAPSHOT',              result.get('snapshotId'),
+                           result.get('volumeId'),  result.get('status'),
+                           result.get('startTime'), result.get('ownerId'),
+                           result.get('volumeSize'),
+                           result.get('description')])

-- 
managing cloud instances for Eucalyptus