Permalink
Browse files

Rewrite TerminateInstances

  • Loading branch information...
1 parent d1c4d7f commit 816379b2f6489f4c4cc853c3e3264f066287e5fd @gholms committed May 3, 2012
Showing with 16 additions and 62 deletions.
  1. +2 −38 bin/euca-terminate-instances
  2. +14 −24 euca2ools/commands/euca/terminateinstances.py
@@ -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@eucalyptus.com
-# Mitch Garnaat mgarnaat@eucalyptus.com
+#!/usr/bin/python -tt
import euca2ools.commands.euca.terminateinstances
if __name__ == '__main__':
- cmd = euca2ools.commands.euca.terminateinstances.TerminateInstances()
- cmd.main_cli()
-
+ euca2ools.commands.euca.terminateinstances.TerminateInstances().do_cli()
@@ -1,6 +1,6 @@
# Software License Agreement (BSD License)
#
-# Copyright (c) 20092011, 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,29 +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@eucalyptus.com
-# Mitch Garnaat mgarnaat@eucalyptus.com
-
-import euca2ools.commands.eucacommand
-from boto.roboto.param import Param
-
-class TerminateInstances(euca2ools.commands.eucacommand.EucaCommand):
- Description = 'Terminates the specified instances.'
- Args = [Param(name='instance_id', ptype='string',
- optional=False, cardinality='+',
- doc='unique identifier for instance to terminate')]
+from requestbuilder import Arg
+from . import EucalyptusRequest
- def display_instances(self, instances):
- for instance in instances:
- print 'INSTANCE\t%s' % instance.id
-
- def main(self):
- conn = self.make_connection_cli()
- return self.make_request_cli(conn, 'terminate_instances',
- instance_ids=self.instance_id)
+class TerminateInstances(EucalyptusRequest):
+ Description = 'Terminate one or more instances'
+ Args = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
+ help='instance(s) to terminate')]
+ ListMarkers = ['instancesSet']
+ ItemMarkers = ['item']
- def main_cli(self):
- instances = self.main()
- self.display_instances(instances)
+ def print_result(self, result):
+ for instance in result.get('instancesSet', []):
+ print self.tabify(('INSTANCE', instance.get('instanceId'),
+ instance.get('previousState', {}).get('name'),
+ instance.get('currentState', {}).get('name')))

0 comments on commit 816379b

Please sign in to comment.