[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 a6a8b242b7ae9432b877cb53db667bccf17649e8
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sat Apr 21 17:51:05 2012 -0700

    Rewrite ConfirmProductInstance

diff --git a/bin/euca-confirm-product-instance b/bin/euca-confirm-product-instance
index f6129ab..92b3bbb 100755
--- a/bin/euca-confirm-product-instance
+++ b/bin/euca-confirm-product-instance
@@ -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.confirmproductinstance
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.confirmproductinstance.ConfirmProductInstance()
-    cmd.main_cli()
-
+    euca2ools.commands.euca.confirmproductinstance.ConfirmProductInstance().do_cli()
diff --git a/euca2ools/commands/euca/confirmproductinstance.py b/euca2ools/commands/euca/confirmproductinstance.py
index a9ce0cb..e87f567 100644
--- a/euca2ools/commands/euca/confirmproductinstance.py
+++ b/euca2ools/commands/euca/confirmproductinstance.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,34 +27,16 @@
 # 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 ConfirmProductInstance(euca2ools.commands.eucacommand.EucaCommand):
 
-    Description = 'Confirm if instance is running with product code attached.'
-    Options = [Param(name='instance_id', short_name='i', long_name='instance',
-                     optional=False, ptype='string',
-                     doc='Unique identifier for a running instance')]
-    Args = [Param(name='product_code', ptype='string',
-                  doc='The product code to verify',
-                  cardinality=1, optional=False)]
+from requestbuilder import Arg
+from . import EucalyptusRequest
 
-    def main(self):
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'confirm_product_instance',
-                                   product_code=self.product_code,
-                                   instance_id=self.instance_id)
+class ConfirmProductInstance(EucalyptusRequest):
+    Description = 'Verify if a product code is associated with an instance'
+    Args = [Arg('ProductCode', metavar='CODE', help='product code to confirm'),
+            Arg('-i', '--instance', dest='InstanceId', metavar='INSTANCE',
+                required=True, help='instance to confirm')]
 
-    def main_cli(self):
-        rs = self.main()
-        product_string = '%s\t%s\t' % (self.product_code, self.instance_id)
-        if rs and rs[0] is True:
-            product_string += 'true'
-        else:
-            product_string += 'false'
-        print product_string
+    def print_result(self, result):
+        print self.tabify(self.args['ProductCode'], self.args['InstanceId'],
+                          result.get('return'), result.get('ownerId'))

-- 
managing cloud instances for Eucalyptus