[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 8bade7b10f3d2c2ab81ee514cf3ac9c2c78aa5df
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Apr 23 23:39:29 2012 -0700

    Rewrite DescribeTags

diff --git a/bin/euca-describe-tags b/bin/euca-describe-tags
index f2e0ac9..a6bafa8 100755
--- a/bin/euca-describe-tags
+++ b/bin/euca-describe-tags
@@ -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.describetags
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.describetags.DescribeTags()
-    cmd.main_cli()
-
+    euca2ools.commands.euca.describetags.DescribeTags().do_cli()
diff --git a/euca2ools/commands/euca/describetags.py b/euca2ools/commands/euca/describetags.py
index 5201960..31b9075 100644
--- a/euca2ools/commands/euca/describetags.py
+++ b/euca2ools/commands/euca/describetags.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,23 @@
 # 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 DescribeTags(euca2ools.commands.eucacommand.EucaCommand):
+from requestbuilder import Filter
+from . import EucalyptusRequest, RESOURCE_TYPE_MAP
 
+class DescribeTags(EucalyptusRequest):
     APIVersion = '2010-08-31'
-    Description = 'List tags associated with your account.'
-    Filters = [Param(name='key', ptype='string',
-                     doc='Tag key.'),
-               Param(name='resource-id', ptype='string',
-                     doc='Resource ID.'),
-               Param(name='resource-type', ptype='string',
-                     doc="""Resource type.
-                     Valid Values: customer-gateway | dhcp-options | image |
-                     instance | reserved-instances | snapshot |
-                     spot-instances-request | subnet | volume |
-                     vpc | vpn-connection | vpn-gateway"""),
-               Param(name='value', ptype='string',
-                     doc='Tag value.')]
-    
-    def display_tags(self, tags):
-        for tag in tags:
-            tag_string = '%s\t%s\t%s\t%s' % (tag.res_id, tag.res_type,
-                                             tag.name, tag.value)
-            print 'TAG\t%s' % tag_string
-            
-    def main(self):
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'get_all_tags')
+    Description = 'List tags associated with your account'
+    Filters = [Filter('key'),
+               Filter('resource-id'),
+               Filter('resource-type',
+                      choices=sorted(tuple(RESOURCE_TYPE_MAP))),
+               Filter('value')]
+    ListMarkers = ['tagSet']
+    ItemMarkers = ['item']
 
-    def main_cli(self):
-        tags = self.main()
-        self.display_tags(tags)
+    def print_result(self, result):
+        for tag in result.get('tagSet', []):
+            print self.tabify(['TAG', tag.get('resourceId'),
+                               tag.get('resourceType'), tag.get('key'),
+                               tag.get('value')])

-- 
managing cloud instances for Eucalyptus