[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 60094973211989fe74026b364dbdad7ed74e1ad0
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Wed May 2 23:49:19 2012 -0700

    Rewrite DescribeAvailabilityZones

diff --git a/bin/euca-describe-availability-zones b/bin/euca-describe-availability-zones
index adb7570..0b00a5d 100755
--- a/bin/euca-describe-availability-zones
+++ b/bin/euca-describe-availability-zones
@@ -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.describeavailabilityzones
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.describeavailabilityzones.DescribeAvailabilityZones()
-    cmd.main_cli()
-
+    euca2ools.commands.euca.describeavailabilityzones.DescribeAvailabilityZones().do_cli()
diff --git a/euca2ools/commands/euca/describeavailabilityzones.py b/euca2ools/commands/euca/describeavailabilityzones.py
index 625913b..19f8d06 100644
--- a/euca2ools/commands/euca/describeavailabilityzones.py
+++ b/euca2ools/commands/euca/describeavailabilityzones.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,40 +27,26 @@
 # 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 DescribeAvailabilityZones(euca2ools.commands.eucacommand.EucaCommand):
+from requestbuilder import Arg, Filter
+from . import EucalyptusRequest
 
+class DescribeAvailabilityZones(EucalyptusRequest):
+    Description = 'Display availability zones within the active region'
     APIVersion = '2010-08-31'
-    Description = 'Shows information about availability zones.'
-    Args = [Param(name='zone', ptype='string',
-                  cardinality='+', optional=True)]
-    Filters = [Param(name='message', ptype='string',
-                     doc='Message giving information about the Availability Zone.'),
-               Param(name='region-name', ptype='string',
-                     doc='Region the Availability Zone is in (e.g., us-east-1).'),
-               Param(name='state', ptype='string',
-                     doc='State of the Availability Zone'),
-               Param(name='zone-name', ptype='string',
-                     doc='Name of the zone.')]
-    
-    def display_zones(self, zones):
-        for zone in zones:
-            zone_string = '%s\t%s' % (zone.name, zone.state)
-            print 'AVAILABILITYZONE\t%s' % zone_string
-
-    def main(self):
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'get_all_zones',
-                                      zones=self.zone)
-
-    def main_cli(self):
-        zones = self.main()
-        self.display_zones(zones)
-
+    Args = [Arg('ZoneName', metavar='ZONE', nargs='*',
+                help='limit results to one or more availability zones')]
+    Filters = [Filter('message', help=('message giving information about the'
+                      'availability zone')),
+               Filter('region-name',
+                      help='region the availability zone is in'),
+               Filter('state', help='state of the availability zone'),
+               Filter('zone-name', help='name of the availability zone')]
+    ListMarkers = ['availabilityZoneInfo', 'messageSet']
+    ItemMarkers = ['item']
 
+    def print_result(self, result):
+        for zone in result.get('availabilityZoneInfo', []):
+            msgs = ', '.join(msg for msg in zone.get('messageSet', []))
+            print self.tabify(('AVAILABILITYZONE', zone.get('zoneName'),
+                               zone.get('zoneState'), msgs))

-- 
managing cloud instances for Eucalyptus