Merge lp:~therve/txaws/volume-zone into lp:txaws

[Thomas Herve]

[Thomas Herve (therve)]

Fairly trivial change, I think, although will break code using Volume directly.

[lp:~therve/txaws/volume-zone]

24. By Thomas Herve on 2009-09-24

Also move the snapshot id

25. By Thomas Herve on 2009-09-24

Add a test for the device

26. By Thomas Herve on 2009-09-29

Merge from trunk, resolve conflicts

[Duncan McGreggor (oubiwann)]

> Fairly trivial change, I think, although will break code using Volume
> directly.

+1

Due to the fact that we're basically in the process of developing the txAWS API, I think it's fine to be breaking usage that was only added a few weeks ago. Once we're feature-complete, we can worry about backwards compatibility with previous versions of txAWS.

[Duncan McGreggor (oubiwann)]

Woops -- forgot to set the "approve" status.

review: Approve

=== modified file 'txaws/ec2/client.py'
--- txaws/ec2/client.py	2009-09-25 05:26:19 +0000
+++ txaws/ec2/client.py	2009-09-29 14:11:55 +0000
@@ -423,23 +423,24 @@
             volume_id = volume_data.findtext("volumeId")
             size = int(volume_data.findtext("size"))
             status = volume_data.findtext("status")
+            availability_zone = volume_data.findtext("availabilityZone")
+            snapshot_id = volume_data.findtext("snapshotId")
             create_time = volume_data.findtext("createTime")
             create_time = datetime.strptime(
                 create_time[:19], "%Y-%m-%dT%H:%M:%S")
-            volume = model.Volume(volume_id, size, status, create_time)
+            volume = model.Volume(
+                volume_id, size, status, create_time, availability_zone,
+                snapshot_id)
             result.append(volume)
             for attachment_data in volume_data.find("attachmentSet"):
                 instance_id = attachment_data.findtext("instanceId")
-                snapshot_id = attachment_data.findtext("snapshotId")
-                availability_zone = attachment_data.findtext(
-                    "availabilityZone")
                 status = attachment_data.findtext("status")
+                device = attachment_data.findtext("device")
                 attach_time = attachment_data.findtext("attachTime")
                 attach_time = datetime.strptime(
                     attach_time[:19], "%Y-%m-%dT%H:%M:%S")
                 attachment = model.Attachment(
-                    instance_id, snapshot_id, availability_zone, status,
-                    attach_time)
+                    instance_id, device, status, attach_time)
                 volume.attachments.append(attachment)
         return result
 
@@ -464,9 +465,13 @@
         size = int(root.findtext("size"))
         status = root.findtext("status")
         create_time = root.findtext("createTime")
+        availability_zone = root.findtext("availabilityZone")
+        snapshot_id = root.findtext("snapshotId")
         create_time = datetime.strptime(
             create_time[:19], "%Y-%m-%dT%H:%M:%S")
-        volume = model.Volume(volume_id, size, status, create_time)
+        volume = model.Volume(
+            volume_id, size, status, create_time, availability_zone,
+            snapshot_id)
         return volume
 
     def delete_volume(self, volume_id):
@@ -579,7 +584,6 @@
         return d.addCallback(self._parse_create_keypair)
 
     def _parse_create_keypair(self, xml_bytes):
-        results = []
         keypair_data = XML(xml_bytes)
         key_name = keypair_data.findtext("keyName")
         key_fingerprint = keypair_data.findtext("keyFingerprint")

=== modified file 'txaws/ec2/model.py'
--- txaws/ec2/model.py	2009-09-15 20:59:43 +0000
+++ txaws/ec2/model.py	2009-09-29 14:11:55 +0000
@@ -103,22 +103,23 @@
 class Volume(object):
     """An EBS volume instance."""
 
-    def __init__(self, id, size, status, create_time):
+    def __init__(self, id, size, status, create_time, availability_zone,
+                 snapshot_id):
         self.id = id
         self.size = size
         self.status = status
         self.create_time = create_time
+        self.availability_zone = availability_zone
+        self.snapshot_id = snapshot_id
         self.attachments = []
 
 
 class Attachment(object):
     """An attachment of a L{Volume}."""
 
-    def __init__(self, instance_id, snapshot_id, availability_zone, status,
-                 attach_time):
+    def __init__(self, instance_id, device, status, attach_time):
         self.instance_id = instance_id
-        self.snapshot_id = snapshot_id
-        self.availability_zone = availability_zone
+        self.device = device
         self.status = status
         self.attach_time = attach_time
 

=== modified file 'txaws/ec2/tests/test_client.py'
--- txaws/ec2/tests/test_client.py	2009-09-25 05:20:01 +0000
+++ txaws/ec2/tests/test_client.py	2009-09-29 14:11:55 +0000
@@ -445,7 +445,7 @@
                 "WebServers", ip_protocol="tcp", from_port="22")
         except Exception, error:
             self.assertEquals(
-                str(error), 
+                str(error),
                 ("You must specify either both group parameters or all the "
                  "ip parameters."))
 
@@ -575,7 +575,7 @@
                 "WebServers", ip_protocol="tcp", from_port="22")
         except Exception, error:
             self.assertEquals(
-                str(error), 
+                str(error),
                 ("You must specify either both group parameters or all the "
                  "ip parameters."))
 
@@ -645,14 +645,15 @@
         self.assertEquals(volume.id, "vol-4282672b")
         self.assertEquals(volume.size, 800)
         self.assertEquals(volume.status, "in-use")
+        self.assertEquals(volume.availability_zone, "us-east-1a")
+        self.assertEquals(volume.snapshot_id, "snap-12345678")
         create_time = datetime(2008, 05, 07, 11, 51, 50)
         self.assertEquals(volume.create_time, create_time)
         self.assertEquals(len(volume.attachments), 1)
         attachment = volume.attachments[0]
         self.assertEquals(attachment.instance_id, "i-6058a509")
-        self.assertEquals(attachment.snapshot_id, "snap-12345678")
-        self.assertEquals(attachment.availability_zone, "us-east-1a")
         self.assertEquals(attachment.status, "attached")
+        self.assertEquals(attachment.device, u"/dev/sdh")
         attach_time = datetime(2008, 05, 07, 12, 51, 50)
         self.assertEquals(attachment.attach_time, attach_time)
 
@@ -759,6 +760,7 @@
         def check_parsed_volume(volume):
             self.assertEquals(volume.id, "vol-4d826724")
             self.assertEquals(volume.size, 800)
+            self.assertEquals(volume.snapshot_id, "")
             create_time = datetime(2008, 05, 07, 11, 51, 50)
             self.assertEquals(volume.create_time, create_time)
 
@@ -1222,7 +1224,7 @@
                 "Message for Error.Code")
             self.assertEquals(error.status, status)
             self.assertEquals(error.response, payload.sample_ec2_error_message)
-        
+
         query = client.Query(
             'BadQuery', self.creds, self.endpoint,
             time_tuple=(2009,8,15,13,14,15,0,0,0))
@@ -1248,7 +1250,7 @@
             self.assertFalse(isinstance(error, EC2Error))
             self.assertEquals(error.status, status)
             self.assertEquals(str(error), "500 There's been an error")
-        
+
         query = client.Query(
             'BadQuery', self.creds, self.endpoint,
             time_tuple=(2009,8,15,13,14,15,0,0,0))

=== modified file 'txaws/testing/payload.py'
--- txaws/testing/payload.py	2009-09-25 20:17:52 +0000
+++ txaws/testing/payload.py	2009-09-29 14:11:55 +0000
@@ -233,7 +233,7 @@
   </Errors>
   <RequestID>89c977b5-22da-4c68-9148-9e0ebce5f68e</RequestID>
 </Response>
-""" 
+"""
 
 sample_delete_security_group = """\
 <DeleteSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/%s/">
@@ -279,13 +279,14 @@
       <size>800</size>
       <status>in-use</status>
       <createTime>2008-05-07T11:51:50.000Z</createTime>
+      <availabilityZone>us-east-1a</availabilityZone>
+      <snapshotId>snap-12345678</snapshotId>
       <attachmentSet>
         <item>
           <volumeId>vol-4282672b</volumeId>
           <instanceId>i-6058a509</instanceId>
           <size>800</size>
-          <snapshotId>snap-12345678</snapshotId>
-          <availabilityZone>us-east-1a</availabilityZone>
+          <device>/dev/sdh</device>
           <status>attached</status>
           <attachTime>2008-05-07T12:51:50.000Z</attachTime>
         </item>