Upgrade gsutil to 3.4

third_party/gsutil/boto/boto/ec2/volume.py

 # Copyright (c) 2006-2010 Mitch Garnaat http://garnaat.org/
 # Copyright (c) 2010, Eucalyptus Systems, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
@@ skipping 66 matching lines @@
         """
         Update the data associated with this volume by querying EC2.
 
         :type validate: bool
         :param validate: By default, if EC2 returns no data about the
                          volume the update method returns quietly.  If
                          the validate param is True, however, it will
                          raise a ValueError exception if no data is
                          returned from EC2.
         """
-        rs = self.connection.get_all_volumes([self.id])
+        # Check the resultset since Eucalyptus ignores the volumeId param
+        unfiltered_rs = self.connection.get_all_volumes([self.id])
+        rs = [ x for x in unfiltered_rs if x.id == self.id ]
         if len(rs) > 0:
             self._update(rs[0])
         elif validate:
             raise ValueError('%s is not a valid Volume ID' % self.id)
         return self.status
 
     def delete(self):
         """
         Delete this EBS volume.
 
         :rtype: bool
         :return: True if successful
         """
         return self.connection.delete_volume(self.id)
 
     def attach(self, instance_id, device):
         """
         Attach this EBS volume to an EC2 instance.
 
         :type instance_id: str
         :param instance_id: The ID of the EC2 instance to which it will
                             be attached.
 
         :type device: str
         :param device: The device on the instance through which the
-                       volume will be exposted (e.g. /dev/sdh)
+                       volume will be exposed (e.g. /dev/sdh)
 
         :rtype: bool
         :return: True if successful
         """
         return self.connection.attach_volume(self.id, instance_id, device)
 
     def detach(self, force=False):
         """
         Detach this EBS volume from an EC2 instance.
 
@@ skipping 16 matching lines @@
         if self.attach_data:
             device = self.attach_data.device
         return self.connection.detach_volume(self.id, instance_id, device, force)
 
     def create_snapshot(self, description=None):
         """
         Create a snapshot of this EBS Volume.
 
         :type description: str
         :param description: A description of the snapshot.  Limited to 256 characters.
-        
-        :rtype: bool
-        :return: True if successful
+
+        :rtype: :class:`boto.ec2.snapshot.Snapshot`
+        :return: The created Snapshot object
         """
         return self.connection.create_snapshot(self.id, description)
 
     def volume_state(self):
         """
         Returns the state of the volume.  Same value as the status attribute.
         """
         return self.status
 
     def attachment_state(self):
@@ skipping 55 matching lines @@
             self.instance_id = value
         elif name == 'status':
             self.status = value
         elif name == 'attachTime':
             self.attach_time = value
         elif name == 'device':
             self.device = value
         else:
             setattr(self, name, value)
 
+class VolumeAttribute:
+
+    def __init__(self, parent=None):
+        self.id = None
+        self._key_name = None
+        self.attrs = {}
+
+    def startElement(self, name, attrs, connection):
+        if name == 'autoEnableIO':
+            self._key_name = name
+        return None
+
+    def endElement(self, name, value, connection):
+        if name == 'value':
+            if value.lower() == 'true':
+                self.attrs[self._key_name] = True
+            else:
+                self.attrs[self._key_name] = False
+        elif name == 'volumeId':
+            self.id = value
+        else:
+            setattr(self, name, value)
+
+