[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 2a133a22b42b019389ca9769a61a9ad8203368df
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sun Apr 22 00:06:06 2012 -0700

    Rewrite DescribeAddresses

diff --git a/bin/euca-describe-addresses b/bin/euca-describe-addresses
index a033928..3a11393 100755
--- a/bin/euca-describe-addresses
+++ b/bin/euca-describe-addresses
@@ -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.describeaddresses
 
 if __name__ == '__main__':
-    cmd = euca2ools.commands.euca.describeaddresses.DescribeAddresses()
-    cmd.main_cli()
-
+    euca2ools.commands.euca.describeaddresses.DescribeAddresses().do_cli()
diff --git a/euca2ools/commands/euca/describeaddresses.py b/euca2ools/commands/euca/describeaddresses.py
index 67c47ae..8b01c57 100644
--- a/euca2ools/commands/euca/describeaddresses.py
+++ b/euca2ools/commands/euca/describeaddresses.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,37 +27,42 @@
 # 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 DescribeAddresses(euca2ools.commands.eucacommand.EucaCommand):
+from requestbuilder import Arg, Filter
+from . import EucalyptusRequest
 
+class DescribeAddresses(EucalyptusRequest):
     APIVersion = '2011-01-01'
-    Description = 'Shows information about addresses.'
-    Args = [Param(name='ip', ptype='string',
-                  cardinality='+', optional=True)]
-    Filters = [Param(name='instance-id', ptype='string',
-                     doc='Instance the address is associated with (if any).'),
-               Param(name='public-ip', ptype='string',
-                     doc='The elastic IP address.')]
-
-    def display_addresses(self, addresses):
-        for address in addresses:
-            domain = getattr(address, 'domain', 'standard') or 'standard'
-            address_string = '%s\t%s\t%s' % (address.public_ip,
-                                             address.instance_id,
-                                             domain)
-            print 'ADDRESS\t%s' % address_string
+    Description = 'Show information about elastic IP addresses'
+    Args = [Arg('address', nargs='*', route_to=None,
+                help='''limit results to one or more elastic IP addresses or
+                        allocation IDs''')]
+    Filters = [Filter('domain', choices=['standard', 'vpc'],
+                      help='whether the address is a standard or VPC address'),
+               Filter('instance-id',
+                      help='instance the address is associated with'),
+               Filter('public-ip', help='the elastic IP address'),
+               Filter('allocation-id', help='allocation ID (VPC only)'),
+               Filter('association-id', help='association ID (VPC only)')]
+    ListMarkers = ['addressesSet']
+    ItemMarkers = ['item']
 
     def main(self):
-        conn = self.make_connection_cli()
-        return self.make_request_cli(conn, 'get_all_addresses',
-                                     addresses=self.ip)
+        alloc_ids = set(addr for addr in self.args.get('address', [])
+                        if addr.startswith('eipalloc-'))
+        public_ips = set(self.args.get('address', [])) - alloc_ids
+        self.params = {}
+        if alloc_ids:
+            self.params['AllocationId'] = list(alloc_ids)
+        if public_ips:
+            self.params['PublicIp'] = list(public_ips)
+        return self.send()
 
-    def main_cli(self):
-        addresses = self.main()
-        self.display_addresses(addresses)
+    def print_result(self, result):
+        print result
+        for addr in result.get('addressesSet', []):
+            print self.tabify(['ADDRESS', addr.get('publicIp'),
+                               addr.get('instanceId'),
+                               addr.get('domain', 'standard'),
+                               addr.get('allocationId'),
+                               addr.get('associationId')])

-- 
managing cloud instances for Eucalyptus