[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 edf360a89f546b8822a56e65bb704d9ce8b21cd7
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue Feb 19 00:23:42 2013 -0800

    Humor dfed

diff --git a/euca2ools/commands/euca/describeavailabilityzones.py b/euca2ools/commands/euca/describeavailabilityzones.py
index 024c927..4b4c098 100644
--- a/euca2ools/commands/euca/describeavailabilityzones.py
+++ b/euca2ools/commands/euca/describeavailabilityzones.py
@@ -28,6 +28,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import euca2ools.utils
 from requestbuilder import Arg, Filter
 from . import EucalyptusRequest
 
@@ -44,6 +45,17 @@ class DescribeAvailabilityZones(EucalyptusRequest):
                Filter('zone-name', help='name of the availability zone')]
     LIST_MARKERS = ['availabilityZoneInfo', 'messageSet']
 
+    def send(self):
+        try:
+            response = EucalyptusRequest.send(self)
+            return response
+        except:
+            response = None
+            raise
+        finally:
+            euca2ools.utils.handle_availability_zones(self.args['ZoneName'],
+                                                      response)
+
     def print_result(self, result):
         for zone in result.get('availabilityZoneInfo', []):
             msgs = ', '.join(msg for msg in zone.get('messageSet', []))
diff --git a/euca2ools/utils.py b/euca2ools/utils.py
index bbecefc..743cf67 100644
--- a/euca2ools/utils.py
+++ b/euca2ools/utils.py
@@ -1,6 +1,6 @@
 # Software License Agreement (BSD License)
 #
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
+# Copyright (c) 2009-2013, Eucalyptus Systems, Inc.
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms, with or
@@ -31,10 +31,11 @@
 # Author: Neil Soman neil at eucalyptus.com
 #         Mitch Garnaat mgarnaat at eucalyptus.com
 
+import base64
 import os.path
 import subprocess
 import sys
-from euca2ools import exceptions, __version__, __codename__
+from euca2ools import exceptions, __version__
 
 def check_prerequisite_command(command):
     cmd = [command]
@@ -126,8 +127,24 @@ def print_version_if_necessary():
     This is a hackish workaround for a roboto limitation in boto 2.1.1.
     """
     if '--version' in sys.argv:
-        print 'euca2ools %s (%s)' % (__version__, __codename__)
+        print 'euca2ools %s (Sparta)' % __version__
         if os.path.isfile('/etc/eucalyptus/eucalyptus-version'):
             with open('/etc/eucalyptus/eucalyptus-version') as version_file:
                 print 'eucalyptus %s' % version_file.readline().strip()
         sys.exit()
+
+
+def handle_availability_zones(requested_zones, response=None):
+    msg = base64.b64decode(
+        'ICAgICAgICAgICAgICAgICAgX19fXyAgICAKICAgICAgLi0tLS0tLS0tLS0nI'
+        'CAgICctLgogICAgIC8gIC4gICAgICAnICAgICAuICAgXCAgCiAgICAvICAgIC'
+        'AgICAnICAgIC4gICAgICAvfAogICAvICAgICAgLiAgICAgICAgICAgICBcIC8'
+        'gICAgIAogIC8gICcgLiAgICAgICAuICAgICAuICB8fCB8IAogLy5fX19fX19f'
+        'X19fXyAgICAnICAgIC8gLy8KIHwuXyAgICAgICAgICAnLS0tLS0tJ3wgL3wKI'
+        'CcuLi4uLi4uLi4uLi4uX19fX19fLi0nIC8KIHwtLiAgICAgICAgICAgICAgIC'
+        'AgIHwgLyAgICAgCiBgIiIiIiIiIiIiIiIiIi0uLi4uLi0n')
+    if ((response is None or
+         len(response.get('availabilityZoneInfo', [])) == 0) and
+        'sandwich' in requested_zones):
+        # humor dfed
+        print >> sys.stderr, msg

-- 
managing cloud instances for Eucalyptus