[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 183366cdec48fa3186adb66a8830f6c461f860a5
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sat Apr 21 23:43:41 2012 -0700

    Rewrite DeregisterImage

diff --git a/bin/euca-deregister b/bin/euca-deregister
index 37b0a18..c66e55a 100755
--- a/bin/euca-deregister
+++ b/bin/euca-deregister
@@ -1,42 +1,6 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
+#!/usr/bin/python -tt
 
-# 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
-
-import euca2ools.commands.euca.deregister
+import euca2ools.commands.euca.deregisterimage
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.deregister.Deregister()
-    cmd.main_cli()
-
+    euca2ools.commands.euca.deregisterimage.DeregisterImage().do_cli()
diff --git a/euca2ools/commands/euca/deregister.py b/euca2ools/commands/euca/deregister.py
deleted file mode 100644
index 2768d32..0000000
--- a/euca2ools/commands/euca/deregister.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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
-
-import euca2ools.commands.eucacommand
-from boto.roboto.param import Param
-
-class Deregister(euca2ools.commands.eucacommand.EucaCommand):
-
-    Description = 'Deregisters an image in the cloud.'
-    Args = [Param(name='image_id', ptype='string', optional=False,
-                  doc='unique identifier for image to be deregistered.')]
-
-    def main(self):
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'deregister_image',
-                                     image_id=self.image_id)
-
-    def main_cli(self):
-        status = self.main()
-        if status:
-            print 'IMAGE\t%s' % self.image_id
-        else:
-            self.error_exit()
-
-
diff --git a/euca2ools/commands/euca/deletesecuritygroup.py b/euca2ools/commands/euca/deregisterimage.py
similarity index 87%
copy from euca2ools/commands/euca/deletesecuritygroup.py
copy to euca2ools/commands/euca/deregisterimage.py
index 2bcb548..f602179 100644
--- a/euca2ools/commands/euca/deletesecuritygroup.py
+++ b/euca2ools/commands/euca/deregisterimage.py
@@ -31,9 +31,9 @@
 from requestbuilder import Arg
 from . import EucalyptusRequest
 
-class DeleteSecurityGroup(EucalyptusRequest):
-    Description = 'Delete a security group'
-    Args = [Arg('GroupName', metavar='GROUP')]
+class DeregisterImage(EucalyptusRequest):
+    Description = 'De-register an image'
+    Args = [Arg('ImageId', metavar='IMAGE', help='image to de-register')]
 
     def print_result(self, result):
-        print self.tabify(('RETURN', result.get('return')))
+        print self.tabify(['IMAGE', self.args['ImageId']])

-- 
managing cloud instances for Eucalyptus