deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject [10/50] [abbrv] EC2: Rerecorded test fixtures
Date Mon, 30 Jul 2012 14:29:16 GMT
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/ffbfb658/server/tests/drivers/ec2/fixtures/test_0003_must_allow_to_filter_keys.yml
----------------------------------------------------------------------
diff --git a/server/tests/drivers/ec2/fixtures/test_0003_must_allow_to_filter_keys.yml b/server/tests/drivers/ec2/fixtures/test_0003_must_allow_to_filter_keys.yml
index 072d6cc..0e157de 100644
--- a/server/tests/drivers/ec2/fixtures/test_0003_must_allow_to_filter_keys.yml
+++ b/server/tests/drivers/ec2/fixtures/test_0003_must_allow_to_filter_keys.yml
@@ -1,163 +1,180 @@
----
-http_interactions:
-- request:
+--- 
+http_interactions: 
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeKeyPairs&KeyName.1=test1&Signature=X2DSDB5Q1aZXQpXSU14UPHemqi5PDNB7ltGIuwYXg4A=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeKeyPairs&KeyName.1=test1&Signature=Joj0FkHDH1/SQw+nVTiAQgQKo+uuCmMmRWtKHXLqunI=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
+    headers: 
+      Content-Type: 
       - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:10 GMT
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeKeyPairsResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>909535b1-bded-42f7-9603-b1970de6db64</requestId>\n
-        \   <keySet>\n        <item>\n            <keyName>test1</keyName>\n            <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>\n
-        \       </item>\n    </keySet>\n</DescribeKeyPairsResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:08:01 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>d3a8a58b-2008-46ce-a9fa-ace3d2486a9a</requestId>
+            <keySet>
+                <item>
+                    <keyName>test1</keyName>
+                    <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>
+                </item>
+            </keySet>
+        </DescribeKeyPairsResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeKeyPairs&KeyName.1=test1&Signature=X2DSDB5Q1aZXQpXSU14UPHemqi5PDNB7ltGIuwYXg4A=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeKeyPairs&KeyName.1=test1&Signature=Joj0FkHDH1/SQw+nVTiAQgQKo+uuCmMmRWtKHXLqunI=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
+    headers: 
+      Content-Type: 
       - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:11 GMT
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeKeyPairsResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>7de17cc6-e53a-47bb-8801-348d0d56e8cf</requestId>\n
-        \   <keySet>\n        <item>\n            <keyName>test1</keyName>\n            <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>\n
-        \       </item>\n    </keySet>\n</DescribeKeyPairsResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:08:02 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>6f7b8b4f-8c5b-409c-9315-11df822ef599</requestId>
+            <keySet>
+                <item>
+                    <keyName>test1</keyName>
+                    <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>
+                </item>
+            </keySet>
+        </DescribeKeyPairsResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeKeyPairs&KeyName.1=test1&Signature=X2DSDB5Q1aZXQpXSU14UPHemqi5PDNB7ltGIuwYXg4A=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeKeyPairs&KeyName.1=test1&Signature=Joj0FkHDH1/SQw+nVTiAQgQKo+uuCmMmRWtKHXLqunI=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
+    headers: 
+      Content-Type: 
       - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:11 GMT
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeKeyPairsResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>ec0d3d07-76e5-4df3-8efa-f9fdebf7520c</requestId>\n
-        \   <keySet>\n        <item>\n            <keyName>test1</keyName>\n            <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>\n
-        \       </item>\n    </keySet>\n</DescribeKeyPairsResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:08:03 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>2c4e8280-3795-46ef-97b4-808251b08ed8</requestId>
+            <keySet>
+                <item>
+                    <keyName>test1</keyName>
+                    <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>
+                </item>
+            </keySet>
+        </DescribeKeyPairsResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeKeyPairs&KeyName.1=test1&Signature=X2DSDB5Q1aZXQpXSU14UPHemqi5PDNB7ltGIuwYXg4A=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeKeyPairs&KeyName.1=test1&Signature=Joj0FkHDH1/SQw+nVTiAQgQKo+uuCmMmRWtKHXLqunI=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
+    headers: 
+      Content-Type: 
       - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:12 GMT
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeKeyPairsResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>e5a0c9ef-2510-4358-8645-6e00c92fcf61</requestId>\n
-        \   <keySet>\n        <item>\n            <keyName>test1</keyName>\n            <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>\n
-        \       </item>\n    </keySet>\n</DescribeKeyPairsResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:08:03 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>f6a469f8-d75c-4087-a8df-bab1cf2f6f22</requestId>
+            <keySet>
+                <item>
+                    <keyName>test1</keyName>
+                    <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>
+                </item>
+            </keySet>
+        </DescribeKeyPairsResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeKeyPairs&KeyName.1=unknown&Signature=arkcDAXicuFyUh1HA8Xdnc3dPyDR85xl5R7wo8vOf8s=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeKeyPairs&KeyName.1=unknown&Signature=I7/JtwvxhmqLFQ7CUYy4vyPQxKg6mkPNMpJ3q7vpli4=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 400
       message: Bad Request
-    headers:
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:13 GMT
-      Cneonction:
+    headers: 
+      Cneonction: 
       - close
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! '<?xml version="1.0" encoding="UTF-8"?>
-
-        <Response><Errors><Error><Code>InvalidKeyPair.NotFound</Code><Message>The
-        key pair ''unknown'' does not exist</Message></Error></Errors><RequestID>616ff498-dae8-4708-874b-5aa7516cd42f</RequestID></Response>'
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:08:04 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <Response><Errors><Error><Code>InvalidKeyPair.NotFound</Code><Message>The key pair 'unknown' does not exist</Message></Error></Errors><RequestID>e936912f-c98a-4a08-8e87-7b99d143f048</RequestID></Response>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-recorded_with: VCR 2.1.1
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+recorded_with: VCR 2.2.4

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/ffbfb658/server/tests/drivers/ec2/fixtures/test_0003_must_allow_to_filter_realms.yml
----------------------------------------------------------------------
diff --git a/server/tests/drivers/ec2/fixtures/test_0003_must_allow_to_filter_realms.yml b/server/tests/drivers/ec2/fixtures/test_0003_must_allow_to_filter_realms.yml
index ead9b5c..b1dc8d3 100644
--- a/server/tests/drivers/ec2/fixtures/test_0003_must_allow_to_filter_realms.yml
+++ b/server/tests/drivers/ec2/fixtures/test_0003_must_allow_to_filter_realms.yml
@@ -1,167 +1,188 @@
----
-http_interactions:
-- request:
+--- 
+recorded_with: VCR 2.2.4
+http_interactions: 
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeAvailabilityZones&Signature=h49McV822SFee5Govv94m/ZTu6jwmC265RSJ/lqoIpY=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31&ZoneName.1=us-east-1a
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeAvailabilityZones&Signature=lD6W5nRItiJYqY/W8bWXxZd7Nm0nyXwgc8tSTL86/9c=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31&ZoneName.1=us-east-1a
+    body: 
+      string: ""
+    headers: 
+      Accept: 
+      - "*/*"
+      User-Agent: 
+      - ""
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
-      - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:16 GMT
-      Server:
+    headers: 
+      Date: 
+      - Mon, 30 Jul 2012 11:05:06 GMT
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeAvailabilityZonesResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>7ad35df9-4260-4942-b2c2-8263a022c657</requestId>\n
-        \   <availabilityZoneInfo>\n        <item>\n            <zoneName>us-east-1a</zoneName>\n
-        \           <zoneState>available</zoneState>\n            <regionName>us-east-1</regionName>\n
-        \           <messageSet/>\n        </item>\n    </availabilityZoneInfo>\n</DescribeAvailabilityZonesResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Content-Type: 
+      - text/xml;charset=UTF-8
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeAvailabilityZonesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>038ee6ab-14e8-47d7-a889-5903d54602ce</requestId>
+            <availabilityZoneInfo>
+                <item>
+                    <zoneName>us-east-1a</zoneName>
+                    <zoneState>available</zoneState>
+                    <regionName>us-east-1</regionName>
+                    <messageSet/>
+                </item>
+            </availabilityZoneInfo>
+        </DescribeAvailabilityZonesResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeAvailabilityZones&Signature=h49McV822SFee5Govv94m/ZTu6jwmC265RSJ/lqoIpY=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31&ZoneName.1=us-east-1a
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeAvailabilityZones&Signature=lD6W5nRItiJYqY/W8bWXxZd7Nm0nyXwgc8tSTL86/9c=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31&ZoneName.1=us-east-1a
+    body: 
+      string: ""
+    headers: 
+      Accept: 
+      - "*/*"
+      User-Agent: 
+      - ""
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
-      - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:17 GMT
-      Server:
+    headers: 
+      Date: 
+      - Mon, 30 Jul 2012 11:05:06 GMT
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeAvailabilityZonesResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>36a01cde-3ce0-4045-a211-5abf99297cac</requestId>\n
-        \   <availabilityZoneInfo>\n        <item>\n            <zoneName>us-east-1a</zoneName>\n
-        \           <zoneState>available</zoneState>\n            <regionName>us-east-1</regionName>\n
-        \           <messageSet/>\n        </item>\n    </availabilityZoneInfo>\n</DescribeAvailabilityZonesResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Content-Type: 
+      - text/xml;charset=UTF-8
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeAvailabilityZonesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>1ad4f29d-7afe-411e-8300-61f080a02961</requestId>
+            <availabilityZoneInfo>
+                <item>
+                    <zoneName>us-east-1a</zoneName>
+                    <zoneState>available</zoneState>
+                    <regionName>us-east-1</regionName>
+                    <messageSet/>
+                </item>
+            </availabilityZoneInfo>
+        </DescribeAvailabilityZonesResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeAvailabilityZones&Signature=h49McV822SFee5Govv94m/ZTu6jwmC265RSJ/lqoIpY=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31&ZoneName.1=us-east-1a
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeAvailabilityZones&Signature=lD6W5nRItiJYqY/W8bWXxZd7Nm0nyXwgc8tSTL86/9c=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31&ZoneName.1=us-east-1a
+    body: 
+      string: ""
+    headers: 
+      Accept: 
+      - "*/*"
+      User-Agent: 
+      - ""
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
-      - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:17 GMT
-      Server:
+    headers: 
+      Date: 
+      - Mon, 30 Jul 2012 11:05:07 GMT
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeAvailabilityZonesResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>1644f04f-d709-4123-8dad-716d8bd226ea</requestId>\n
-        \   <availabilityZoneInfo>\n        <item>\n            <zoneName>us-east-1a</zoneName>\n
-        \           <zoneState>available</zoneState>\n            <regionName>us-east-1</regionName>\n
-        \           <messageSet/>\n        </item>\n    </availabilityZoneInfo>\n</DescribeAvailabilityZonesResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Content-Type: 
+      - text/xml;charset=UTF-8
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeAvailabilityZonesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>d27bce5b-e4ae-4586-b035-66a1baa7a300</requestId>
+            <availabilityZoneInfo>
+                <item>
+                    <zoneName>us-east-1a</zoneName>
+                    <zoneState>available</zoneState>
+                    <regionName>us-east-1</regionName>
+                    <messageSet/>
+                </item>
+            </availabilityZoneInfo>
+        </DescribeAvailabilityZonesResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeAvailabilityZones&Signature=h49McV822SFee5Govv94m/ZTu6jwmC265RSJ/lqoIpY=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31&ZoneName.1=us-east-1a
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeAvailabilityZones&Signature=lD6W5nRItiJYqY/W8bWXxZd7Nm0nyXwgc8tSTL86/9c=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31&ZoneName.1=us-east-1a
+    body: 
+      string: ""
+    headers: 
+      Accept: 
+      - "*/*"
+      User-Agent: 
+      - ""
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
-      - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:18 GMT
-      Server:
+    headers: 
+      Date: 
+      - Mon, 30 Jul 2012 11:05:07 GMT
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeAvailabilityZonesResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>5160f3cd-a754-48d5-a203-ce152b1dea50</requestId>\n
-        \   <availabilityZoneInfo>\n        <item>\n            <zoneName>us-east-1a</zoneName>\n
-        \           <zoneState>available</zoneState>\n            <regionName>us-east-1</regionName>\n
-        \           <messageSet/>\n        </item>\n    </availabilityZoneInfo>\n</DescribeAvailabilityZonesResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Content-Type: 
+      - text/xml;charset=UTF-8
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeAvailabilityZonesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>5e47bbee-6218-46d0-b31e-adaa9b0e3560</requestId>
+            <availabilityZoneInfo>
+                <item>
+                    <zoneName>us-east-1a</zoneName>
+                    <zoneState>available</zoneState>
+                    <regionName>us-east-1</regionName>
+                    <messageSet/>
+                </item>
+            </availabilityZoneInfo>
+        </DescribeAvailabilityZonesResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeAvailabilityZones&Signature=pm4d1Vf8bxMiCN+/yn7xXDhevuqk5ZawW8E2sAzaO/s=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31&ZoneName.1=unknown
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeAvailabilityZones&Signature=BOBmQdyCTils3NLI6e4oSxJmIhoEPfxFERnQlce3rJ8=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31&ZoneName.1=unknown
+    body: 
+      string: ""
+    headers: 
+      Accept: 
+      - "*/*"
+      User-Agent: 
+      - ""
+  response: 
+    status: 
       code: 400
       message: Bad Request
-    headers:
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:19 GMT
-      Cneonction:
+    headers: 
+      Cneonction: 
       - close
-      Server:
+      Date: 
+      - Mon, 30 Jul 2012 11:05:08 GMT
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! '<?xml version="1.0" encoding="UTF-8"?>
-
-        <Response><Errors><Error><Code>InvalidParameterValue</Code><Message>Invalid
-        availability zone: [unknown]</Message></Error></Errors><RequestID>e1ec63f0-c2b2-4b60-8d5a-e3164704edc3</RequestID></Response>'
+      Transfer-Encoding: 
+      - chunked
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <Response><Errors><Error><Code>InvalidParameterValue</Code><Message>Invalid availability zone: [unknown]</Message></Error></Errors><RequestID>665f8e18-3098-497a-a946-3a7d1cb3280e</RequestID></Response>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-recorded_with: VCR 2.1.1
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/ffbfb658/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_image.yml
----------------------------------------------------------------------
diff --git a/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_image.yml b/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_image.yml
index 8f1f3df..281d64d 100644
--- a/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_image.yml
+++ b/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_image.yml
@@ -1,199 +1,238 @@
----
-http_interactions:
-- request:
+--- 
+recorded_with: VCR 2.2.4
+http_interactions: 
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-aecd60c7&Signature=KLzLL4dy5UUeBWFUDbYUZ38wvyCr2jGXq++7Qdpcb2k=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeImages&ImageId.1=ami-aecd60c7&Signature=7xtiwWEIAuEU3TfSKWNtSMr8NxrkBEGMdy0t8enC/ec=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
-      - text/xml;charset=UTF-8
-      Transfer-Encoding:
+    headers: 
+      Transfer-Encoding: 
       - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:23:33 GMT
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeImagesResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>3c9e52d9-856d-4575-90e3-9b0def3aab01</requestId>\n
-        \   <imagesSet>\n        <item>\n            <imageId>ami-aecd60c7</imageId>\n
-        \           <imageLocation>amazon/amzn-ami-pv-2012.03.3.x86_64-ebs</imageLocation>\n
-        \           <imageState>available</imageState>\n            <imageOwnerId>137112412989</imageOwnerId>\n
-        \           <isPublic>true</isPublic>\n            <architecture>x86_64</architecture>\n
-        \           <imageType>machine</imageType>\n            <kernelId>aki-88aa75e1</kernelId>\n
-        \           <imageOwnerAlias>amazon</imageOwnerAlias>\n            <name>amzn-ami-pv-2012.03.3.x86_64-ebs</name>\n
-        \           <description>Amazon Linux AMI x86_64 EBS</description>\n            <rootDeviceType>ebs</rootDeviceType>\n
-        \           <rootDeviceName>/dev/sda1</rootDeviceName>\n            <blockDeviceMapping>\n
-        \               <item>\n                    <deviceName>/dev/sda1</deviceName>\n
-        \                   <ebs>\n                        <snapshotId>snap-b4f064ca</snapshotId>\n
-        \                       <volumeSize>8</volumeSize>\n                        <deleteOnTermination>true</deleteOnTermination>\n
-        \                   </ebs>\n                </item>\n            </blockDeviceMapping>\n
-        \           <virtualizationType>paravirtual</virtualizationType>\n        </item>\n
-        \   </imagesSet>\n</DescribeImagesResponse>"
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Mon, 30 Jul 2012 11:05:32 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>5e65215c-8871-41f3-98b9-d661472a0f75</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-aecd60c7</imageId>
+                    <imageLocation>amazon/amzn-ami-pv-2012.03.3.x86_64-ebs</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>137112412989</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>x86_64</architecture>
+                    <imageType>machine</imageType>
+                    <kernelId>aki-88aa75e1</kernelId>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>amzn-ami-pv-2012.03.3.x86_64-ebs</name>
+                    <description>Amazon Linux AMI x86_64 EBS</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-b4f064ca</snapshotId>
+                                <volumeSize>8</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-aecd60c7&Signature=KLzLL4dy5UUeBWFUDbYUZ38wvyCr2jGXq++7Qdpcb2k=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeImages&ImageId.1=ami-aecd60c7&Signature=7xtiwWEIAuEU3TfSKWNtSMr8NxrkBEGMdy0t8enC/ec=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
-      - text/xml;charset=UTF-8
-      Transfer-Encoding:
+    headers: 
+      Transfer-Encoding: 
       - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:23:34 GMT
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeImagesResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>666f70a4-37d7-4157-8ff7-66a1d36ef11f</requestId>\n
-        \   <imagesSet>\n        <item>\n            <imageId>ami-aecd60c7</imageId>\n
-        \           <imageLocation>amazon/amzn-ami-pv-2012.03.3.x86_64-ebs</imageLocation>\n
-        \           <imageState>available</imageState>\n            <imageOwnerId>137112412989</imageOwnerId>\n
-        \           <isPublic>true</isPublic>\n            <architecture>x86_64</architecture>\n
-        \           <imageType>machine</imageType>\n            <kernelId>aki-88aa75e1</kernelId>\n
-        \           <imageOwnerAlias>amazon</imageOwnerAlias>\n            <name>amzn-ami-pv-2012.03.3.x86_64-ebs</name>\n
-        \           <description>Amazon Linux AMI x86_64 EBS</description>\n            <rootDeviceType>ebs</rootDeviceType>\n
-        \           <rootDeviceName>/dev/sda1</rootDeviceName>\n            <blockDeviceMapping>\n
-        \               <item>\n                    <deviceName>/dev/sda1</deviceName>\n
-        \                   <ebs>\n                        <snapshotId>snap-b4f064ca</snapshotId>\n
-        \                       <volumeSize>8</volumeSize>\n                        <deleteOnTermination>true</deleteOnTermination>\n
-        \                   </ebs>\n                </item>\n            </blockDeviceMapping>\n
-        \           <virtualizationType>paravirtual</virtualizationType>\n        </item>\n
-        \   </imagesSet>\n</DescribeImagesResponse>"
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Mon, 30 Jul 2012 11:05:32 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>fc31fcc6-916f-40d2-9fea-5692ec975714</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-aecd60c7</imageId>
+                    <imageLocation>amazon/amzn-ami-pv-2012.03.3.x86_64-ebs</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>137112412989</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>x86_64</architecture>
+                    <imageType>machine</imageType>
+                    <kernelId>aki-88aa75e1</kernelId>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>amzn-ami-pv-2012.03.3.x86_64-ebs</name>
+                    <description>Amazon Linux AMI x86_64 EBS</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-b4f064ca</snapshotId>
+                                <volumeSize>8</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-aecd60c7&Signature=KLzLL4dy5UUeBWFUDbYUZ38wvyCr2jGXq++7Qdpcb2k=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeImages&ImageId.1=ami-aecd60c7&Signature=7xtiwWEIAuEU3TfSKWNtSMr8NxrkBEGMdy0t8enC/ec=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
-      - text/xml;charset=UTF-8
-      Transfer-Encoding:
+    headers: 
+      Transfer-Encoding: 
       - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:23:34 GMT
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeImagesResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>8bcad4f3-5b7a-47e2-8073-7c1a5486700c</requestId>\n
-        \   <imagesSet>\n        <item>\n            <imageId>ami-aecd60c7</imageId>\n
-        \           <imageLocation>amazon/amzn-ami-pv-2012.03.3.x86_64-ebs</imageLocation>\n
-        \           <imageState>available</imageState>\n            <imageOwnerId>137112412989</imageOwnerId>\n
-        \           <isPublic>true</isPublic>\n            <architecture>x86_64</architecture>\n
-        \           <imageType>machine</imageType>\n            <kernelId>aki-88aa75e1</kernelId>\n
-        \           <imageOwnerAlias>amazon</imageOwnerAlias>\n            <name>amzn-ami-pv-2012.03.3.x86_64-ebs</name>\n
-        \           <description>Amazon Linux AMI x86_64 EBS</description>\n            <rootDeviceType>ebs</rootDeviceType>\n
-        \           <rootDeviceName>/dev/sda1</rootDeviceName>\n            <blockDeviceMapping>\n
-        \               <item>\n                    <deviceName>/dev/sda1</deviceName>\n
-        \                   <ebs>\n                        <snapshotId>snap-b4f064ca</snapshotId>\n
-        \                       <volumeSize>8</volumeSize>\n                        <deleteOnTermination>true</deleteOnTermination>\n
-        \                   </ebs>\n                </item>\n            </blockDeviceMapping>\n
-        \           <virtualizationType>paravirtual</virtualizationType>\n        </item>\n
-        \   </imagesSet>\n</DescribeImagesResponse>"
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Mon, 30 Jul 2012 11:05:33 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>eb0b67d1-23ea-4d73-817e-9a1997d6700c</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-aecd60c7</imageId>
+                    <imageLocation>amazon/amzn-ami-pv-2012.03.3.x86_64-ebs</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>137112412989</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>x86_64</architecture>
+                    <imageType>machine</imageType>
+                    <kernelId>aki-88aa75e1</kernelId>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>amzn-ami-pv-2012.03.3.x86_64-ebs</name>
+                    <description>Amazon Linux AMI x86_64 EBS</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-b4f064ca</snapshotId>
+                                <volumeSize>8</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-aaaaaaaa&Signature=XnTroSWZuVj9NK7+nugXloczy0LL4HiuZTFssXi0X3o=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeImages&ImageId.1=ami-aaaaaaaa&Signature=HMdPYtsGfqWVjDV3CUbKTyE8CFum+ewKw5uYYsPhO+o=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 400
       message: Bad Request
-    headers:
-      Transfer-Encoding:
+    headers: 
+      Transfer-Encoding: 
       - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:23:35 GMT
-      Cneonction:
-      - close
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! '<?xml version="1.0" encoding="UTF-8"?>
-
-        <Response><Errors><Error><Code>InvalidAMIID.NotFound</Code><Message>The AMI
-        ID ''ami-aaaaaaaa'' does not exist</Message></Error></Errors><RequestID>38941f2e-7ac1-49a2-ba9c-47c749229e78</RequestID></Response>'
+      Cneonction: 
+      - close
+      Date: 
+      - Mon, 30 Jul 2012 11:05:34 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <Response><Errors><Error><Code>InvalidAMIID.NotFound</Code><Message>The AMI ID 'ami-aaaaaaaa' does not exist</Message></Error></Errors><RequestID>00b4797f-febb-43cf-9ea5-7c6836fb6446</RequestID></Response>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=unknown&Signature=UOe9PfwQjIeQ98xUXppbrjn7dMtgE8ADUBtyBe6rLMo=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeImages&ImageId.1=unknown&Signature=cd/Dufs0Id6k4OzWMsgkmxstPNsWiv3YtAKgr0jZSME=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 400
       message: Bad Request
-    headers:
-      Transfer-Encoding:
+    headers: 
+      Transfer-Encoding: 
       - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:23:35 GMT
-      Cneonction:
-      - close
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! '<?xml version="1.0" encoding="UTF-8"?>
-
-        <Response><Errors><Error><Code>InvalidAMIID.Malformed</Code><Message>Invalid
-        id: "unknown" (expecting "ami-...")</Message></Error></Errors><RequestID>9d705f37-8d3a-44f6-9aed-73e2c23d8863</RequestID></Response>'
+      Cneonction: 
+      - close
+      Date: 
+      - Mon, 30 Jul 2012 11:05:34 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <Response><Errors><Error><Code>InvalidAMIID.Malformed</Code><Message>Invalid id: "unknown" (expecting "ami-...")</Message></Error></Errors><RequestID>cdcb40af-9bec-4e04-b38f-848841db4f9a</RequestID></Response>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-recorded_with: VCR 2.1.1
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/ffbfb658/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_instance.yml
----------------------------------------------------------------------
diff --git a/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_instance.yml b/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_instance.yml
index 0b21a2e..8d53835 100644
--- a/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_instance.yml
+++ b/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_instance.yml
@@ -1,244 +1,319 @@
----
-http_interactions:
-- request:
+--- 
+http_interactions: 
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&InstanceId.1=i-4cdcf034&Signature=ZJw35KE/PFNiBAmaMVQaYrBjB1oI+8byZDxdq1JEjEo=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeInstances&InstanceId.1=i-4d15f036&Signature=xePzugFxFj+0Q+CZD1brO+hQJW3B57cTN/UymCXxzXM=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
+    headers: 
+      Content-Type: 
       - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:25:58 GMT
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeInstancesResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>40c62a91-1128-4584-8bf1-d8f3c5a412b0</requestId>\n
-        \   <reservationSet>\n        <item>\n            <reservationId>r-c4eb20a0</reservationId>\n
-        \           <ownerId>293787749884</ownerId>\n            <groupSet>\n                <item>\n
-        \                   <groupId>default</groupId>\n                </item>\n
-        \           </groupSet>\n            <instancesSet>\n                <item>\n
-        \                   <instanceId>i-4cdcf034</instanceId>\n                    <imageId>ami-aecd60c7</imageId>\n
-        \                   <instanceState>\n                        <code>16</code>\n
-        \                       <name>running</name>\n                    </instanceState>\n
-        \                   <privateDnsName>ip-10-243-89-48.ec2.internal</privateDnsName>\n
-        \                   <dnsName>ec2-107-22-89-56.compute-1.amazonaws.com</dnsName>\n
-        \                   <reason/>\n                    <keyName>test1</keyName>\n
-        \                   <amiLaunchIndex>0</amiLaunchIndex>\n                    <productCodes/>\n
-        \                   <instanceType>t1.micro</instanceType>\n                    <launchTime>2012-07-23T09:50:10.000Z</launchTime>\n
-        \                   <placement>\n                        <availabilityZone>us-east-1b</availabilityZone>\n
-        \                       <groupName/>\n                    </placement>\n                    <kernelId>aki-88aa75e1</kernelId>\n
-        \                   <monitoring>\n                        <state>disabled</state>\n
-        \                   </monitoring>\n                    <privateIpAddress>10.243.89.48</privateIpAddress>\n
-        \                   <ipAddress>107.22.89.56</ipAddress>\n                    <architecture>x86_64</architecture>\n
-        \                   <rootDeviceType>ebs</rootDeviceType>\n                    <rootDeviceName>/dev/sda1</rootDeviceName>\n
-        \                   <blockDeviceMapping>\n                        <item>\n
-        \                           <deviceName>/dev/sda1</deviceName>\n                            <ebs>\n
-        \                               <volumeId>vol-fc550e9d</volumeId>\n                                <status>attached</status>\n
-        \                               <attachTime>2012-07-23T09:50:37.000Z</attachTime>\n
-        \                               <deleteOnTermination>true</deleteOnTermination>\n
-        \                           </ebs>\n                        </item>\n                    </blockDeviceMapping>\n
-        \                   <virtualizationType>paravirtual</virtualizationType>\n
-        \                   <clientToken>GFrhH1343037009640</clientToken>\n                    <tagSet>\n
-        \                       <item>\n                            <key>Name</key>\n
-        \                           <value/>\n                        </item>\n                    </tagSet>\n
-        \               </item>\n            </instancesSet>\n        </item>\n    </reservationSet>\n</DescribeInstancesResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:06:31 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>91737562-ccd7-4569-a2df-bda561de653c</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-d03786b4</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>quicklaunch-1</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-4d15f036</instanceId>
+                            <imageId>ami-aecd60c7</imageId>
+                            <instanceState>
+                                <code>16</code>
+                                <name>running</name>
+                            </instanceState>
+                            <privateDnsName>ip-10-244-129-68.ec2.internal</privateDnsName>
+                            <dnsName>ec2-50-16-22-176.compute-1.amazonaws.com</dnsName>
+                            <reason/>
+                            <keyName>test1</keyName>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>t1.micro</instanceType>
+                            <launchTime>2012-07-30T10:42:06.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1b</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-88aa75e1</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <privateIpAddress>10.244.129.68</privateIpAddress>
+                            <ipAddress>50.16.22.176</ipAddress>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/sda1</rootDeviceName>
+                            <blockDeviceMapping>
+                                <item>
+                                    <deviceName>/dev/sda1</deviceName>
+                                    <ebs>
+                                        <volumeId>vol-e0464981</volumeId>
+                                        <status>attached</status>
+                                        <attachTime>2012-07-30T10:42:29.000Z</attachTime>
+                                        <deleteOnTermination>true</deleteOnTermination>
+                                    </ebs>
+                                </item>
+                            </blockDeviceMapping>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken>ESSjW1343644926272</clientToken>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&InstanceId.1=i-4cdcf034&Signature=ZJw35KE/PFNiBAmaMVQaYrBjB1oI+8byZDxdq1JEjEo=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeInstances&InstanceId.1=i-4d15f036&Signature=xePzugFxFj+0Q+CZD1brO+hQJW3B57cTN/UymCXxzXM=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
+    headers: 
+      Content-Type: 
       - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:25:59 GMT
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeInstancesResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>da0b8c78-1aae-4661-8855-6b3bf730b0ee</requestId>\n
-        \   <reservationSet>\n        <item>\n            <reservationId>r-c4eb20a0</reservationId>\n
-        \           <ownerId>293787749884</ownerId>\n            <groupSet>\n                <item>\n
-        \                   <groupId>default</groupId>\n                </item>\n
-        \           </groupSet>\n            <instancesSet>\n                <item>\n
-        \                   <instanceId>i-4cdcf034</instanceId>\n                    <imageId>ami-aecd60c7</imageId>\n
-        \                   <instanceState>\n                        <code>16</code>\n
-        \                       <name>running</name>\n                    </instanceState>\n
-        \                   <privateDnsName>ip-10-243-89-48.ec2.internal</privateDnsName>\n
-        \                   <dnsName>ec2-107-22-89-56.compute-1.amazonaws.com</dnsName>\n
-        \                   <reason/>\n                    <keyName>test1</keyName>\n
-        \                   <amiLaunchIndex>0</amiLaunchIndex>\n                    <productCodes/>\n
-        \                   <instanceType>t1.micro</instanceType>\n                    <launchTime>2012-07-23T09:50:10.000Z</launchTime>\n
-        \                   <placement>\n                        <availabilityZone>us-east-1b</availabilityZone>\n
-        \                       <groupName/>\n                    </placement>\n                    <kernelId>aki-88aa75e1</kernelId>\n
-        \                   <monitoring>\n                        <state>disabled</state>\n
-        \                   </monitoring>\n                    <privateIpAddress>10.243.89.48</privateIpAddress>\n
-        \                   <ipAddress>107.22.89.56</ipAddress>\n                    <architecture>x86_64</architecture>\n
-        \                   <rootDeviceType>ebs</rootDeviceType>\n                    <rootDeviceName>/dev/sda1</rootDeviceName>\n
-        \                   <blockDeviceMapping>\n                        <item>\n
-        \                           <deviceName>/dev/sda1</deviceName>\n                            <ebs>\n
-        \                               <volumeId>vol-fc550e9d</volumeId>\n                                <status>attached</status>\n
-        \                               <attachTime>2012-07-23T09:50:37.000Z</attachTime>\n
-        \                               <deleteOnTermination>true</deleteOnTermination>\n
-        \                           </ebs>\n                        </item>\n                    </blockDeviceMapping>\n
-        \                   <virtualizationType>paravirtual</virtualizationType>\n
-        \                   <clientToken>GFrhH1343037009640</clientToken>\n                    <tagSet>\n
-        \                       <item>\n                            <key>Name</key>\n
-        \                           <value/>\n                        </item>\n                    </tagSet>\n
-        \               </item>\n            </instancesSet>\n        </item>\n    </reservationSet>\n</DescribeInstancesResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:06:32 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>e982aba4-719d-4139-b2a3-0095c25b4d92</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-d03786b4</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>quicklaunch-1</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-4d15f036</instanceId>
+                            <imageId>ami-aecd60c7</imageId>
+                            <instanceState>
+                                <code>16</code>
+                                <name>running</name>
+                            </instanceState>
+                            <privateDnsName>ip-10-244-129-68.ec2.internal</privateDnsName>
+                            <dnsName>ec2-50-16-22-176.compute-1.amazonaws.com</dnsName>
+                            <reason/>
+                            <keyName>test1</keyName>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>t1.micro</instanceType>
+                            <launchTime>2012-07-30T10:42:06.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1b</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-88aa75e1</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <privateIpAddress>10.244.129.68</privateIpAddress>
+                            <ipAddress>50.16.22.176</ipAddress>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/sda1</rootDeviceName>
+                            <blockDeviceMapping>
+                                <item>
+                                    <deviceName>/dev/sda1</deviceName>
+                                    <ebs>
+                                        <volumeId>vol-e0464981</volumeId>
+                                        <status>attached</status>
+                                        <attachTime>2012-07-30T10:42:29.000Z</attachTime>
+                                        <deleteOnTermination>true</deleteOnTermination>
+                                    </ebs>
+                                </item>
+                            </blockDeviceMapping>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken>ESSjW1343644926272</clientToken>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&InstanceId.1=i-4cdcf034&Signature=ZJw35KE/PFNiBAmaMVQaYrBjB1oI+8byZDxdq1JEjEo=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeInstances&InstanceId.1=i-4d15f036&Signature=xePzugFxFj+0Q+CZD1brO+hQJW3B57cTN/UymCXxzXM=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
+    headers: 
+      Content-Type: 
       - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:00 GMT
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeInstancesResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>234a78be-fa08-49e9-ba61-985cd3bb9fad</requestId>\n
-        \   <reservationSet>\n        <item>\n            <reservationId>r-c4eb20a0</reservationId>\n
-        \           <ownerId>293787749884</ownerId>\n            <groupSet>\n                <item>\n
-        \                   <groupId>default</groupId>\n                </item>\n
-        \           </groupSet>\n            <instancesSet>\n                <item>\n
-        \                   <instanceId>i-4cdcf034</instanceId>\n                    <imageId>ami-aecd60c7</imageId>\n
-        \                   <instanceState>\n                        <code>16</code>\n
-        \                       <name>running</name>\n                    </instanceState>\n
-        \                   <privateDnsName>ip-10-243-89-48.ec2.internal</privateDnsName>\n
-        \                   <dnsName>ec2-107-22-89-56.compute-1.amazonaws.com</dnsName>\n
-        \                   <reason/>\n                    <keyName>test1</keyName>\n
-        \                   <amiLaunchIndex>0</amiLaunchIndex>\n                    <productCodes/>\n
-        \                   <instanceType>t1.micro</instanceType>\n                    <launchTime>2012-07-23T09:50:10.000Z</launchTime>\n
-        \                   <placement>\n                        <availabilityZone>us-east-1b</availabilityZone>\n
-        \                       <groupName/>\n                    </placement>\n                    <kernelId>aki-88aa75e1</kernelId>\n
-        \                   <monitoring>\n                        <state>disabled</state>\n
-        \                   </monitoring>\n                    <privateIpAddress>10.243.89.48</privateIpAddress>\n
-        \                   <ipAddress>107.22.89.56</ipAddress>\n                    <architecture>x86_64</architecture>\n
-        \                   <rootDeviceType>ebs</rootDeviceType>\n                    <rootDeviceName>/dev/sda1</rootDeviceName>\n
-        \                   <blockDeviceMapping>\n                        <item>\n
-        \                           <deviceName>/dev/sda1</deviceName>\n                            <ebs>\n
-        \                               <volumeId>vol-fc550e9d</volumeId>\n                                <status>attached</status>\n
-        \                               <attachTime>2012-07-23T09:50:37.000Z</attachTime>\n
-        \                               <deleteOnTermination>true</deleteOnTermination>\n
-        \                           </ebs>\n                        </item>\n                    </blockDeviceMapping>\n
-        \                   <virtualizationType>paravirtual</virtualizationType>\n
-        \                   <clientToken>GFrhH1343037009640</clientToken>\n                    <tagSet>\n
-        \                       <item>\n                            <key>Name</key>\n
-        \                           <value/>\n                        </item>\n                    </tagSet>\n
-        \               </item>\n            </instancesSet>\n        </item>\n    </reservationSet>\n</DescribeInstancesResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:06:32 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>96f6c0f5-6e5f-4f4d-97b9-c2a1f3cbc1b4</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-d03786b4</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>quicklaunch-1</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-4d15f036</instanceId>
+                            <imageId>ami-aecd60c7</imageId>
+                            <instanceState>
+                                <code>16</code>
+                                <name>running</name>
+                            </instanceState>
+                            <privateDnsName>ip-10-244-129-68.ec2.internal</privateDnsName>
+                            <dnsName>ec2-50-16-22-176.compute-1.amazonaws.com</dnsName>
+                            <reason/>
+                            <keyName>test1</keyName>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>t1.micro</instanceType>
+                            <launchTime>2012-07-30T10:42:06.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1b</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-88aa75e1</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <privateIpAddress>10.244.129.68</privateIpAddress>
+                            <ipAddress>50.16.22.176</ipAddress>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/sda1</rootDeviceName>
+                            <blockDeviceMapping>
+                                <item>
+                                    <deviceName>/dev/sda1</deviceName>
+                                    <ebs>
+                                        <volumeId>vol-e0464981</volumeId>
+                                        <status>attached</status>
+                                        <attachTime>2012-07-30T10:42:29.000Z</attachTime>
+                                        <deleteOnTermination>true</deleteOnTermination>
+                                    </ebs>
+                                </item>
+                            </blockDeviceMapping>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken>ESSjW1343644926272</clientToken>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&InstanceId.1=i-00000000&Signature=3Yp7LtnVNjf+Rns2ekiE6fXW529eM67+RmsL1iLGcqs=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeInstances&InstanceId.1=i-00000000&Signature=9Ysu0P/7MAsoTeehZ1RdahqoDbALad8mSNUNZXQwQE0=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 400
       message: Bad Request
-    headers:
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:00 GMT
-      Cneonction:
+    headers: 
+      Cneonction: 
       - close
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! '<?xml version="1.0" encoding="UTF-8"?>
-
-        <Response><Errors><Error><Code>InvalidInstanceID.NotFound</Code><Message>The
-        instance ID ''i-00000000'' does not exist</Message></Error></Errors><RequestID>305b8bfc-cab7-4d2b-88b4-a1483e1db586</RequestID></Response>'
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:06:33 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <Response><Errors><Error><Code>InvalidInstanceID.NotFound</Code><Message>The instance ID 'i-00000000' does not exist</Message></Error></Errors><RequestID>f9ad310b-1d52-4df3-bb87-d5e1e781473b</RequestID></Response>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&InstanceId.1=unknown&Signature=d/JnFHwLvTttdo/7MOqk0SE6KEBKKhRWGUg3Hhqv7Yw=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeInstances&InstanceId.1=unknown&Signature=NK8b+Zk73UYuFwrZK7yUDs2LDmsLERpAADvWPV8OZK8=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 400
       message: Bad Request
-    headers:
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:01 GMT
-      Cneonction:
+    headers: 
+      Cneonction: 
       - close
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! '<?xml version="1.0" encoding="UTF-8"?>
-
-        <Response><Errors><Error><Code>InvalidInstanceID.Malformed</Code><Message>Invalid
-        id: "unknown"</Message></Error></Errors><RequestID>f59239fe-9b95-4e59-b753-686a112a1f01</RequestID></Response>'
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:06:34 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <Response><Errors><Error><Code>InvalidInstanceID.Malformed</Code><Message>Invalid id: "unknown"</Message></Error></Errors><RequestID>9b72817f-0a30-4f8e-b93b-6eca287d2773</RequestID></Response>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-recorded_with: VCR 2.1.1
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+recorded_with: VCR 2.2.4

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/ffbfb658/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_key.yml
----------------------------------------------------------------------
diff --git a/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_key.yml b/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_key.yml
index e25261b..8684694 100644
--- a/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_key.yml
+++ b/server/tests/drivers/ec2/fixtures/test_0004_must_allow_to_retrieve_single_key.yml
@@ -1,131 +1,143 @@
----
-http_interactions:
-- request:
+--- 
+http_interactions: 
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeKeyPairs&KeyName.1=test1&Signature=X2DSDB5Q1aZXQpXSU14UPHemqi5PDNB7ltGIuwYXg4A=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeKeyPairs&KeyName.1=test1&Signature=Joj0FkHDH1/SQw+nVTiAQgQKo+uuCmMmRWtKHXLqunI=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
+    headers: 
+      Content-Type: 
       - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:07 GMT
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeKeyPairsResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>511426f4-6a5e-4b1a-85f8-9e775d7072b8</requestId>\n
-        \   <keySet>\n        <item>\n            <keyName>test1</keyName>\n            <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>\n
-        \       </item>\n    </keySet>\n</DescribeKeyPairsResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:08:04 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>37827313-68b5-4e04-ad6f-c8df03a11b56</requestId>
+            <keySet>
+                <item>
+                    <keyName>test1</keyName>
+                    <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>
+                </item>
+            </keySet>
+        </DescribeKeyPairsResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeKeyPairs&KeyName.1=test1&Signature=X2DSDB5Q1aZXQpXSU14UPHemqi5PDNB7ltGIuwYXg4A=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeKeyPairs&KeyName.1=test1&Signature=Joj0FkHDH1/SQw+nVTiAQgQKo+uuCmMmRWtKHXLqunI=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
+    headers: 
+      Content-Type: 
       - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:08 GMT
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeKeyPairsResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>d1e87e42-79bb-4259-be5b-023442dcbb61</requestId>\n
-        \   <keySet>\n        <item>\n            <keyName>test1</keyName>\n            <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>\n
-        \       </item>\n    </keySet>\n</DescribeKeyPairsResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:08:05 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>f68149c6-b518-4d01-934f-1b977ce1332b</requestId>
+            <keySet>
+                <item>
+                    <keyName>test1</keyName>
+                    <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>
+                </item>
+            </keySet>
+        </DescribeKeyPairsResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeKeyPairs&KeyName.1=test1&Signature=X2DSDB5Q1aZXQpXSU14UPHemqi5PDNB7ltGIuwYXg4A=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeKeyPairs&KeyName.1=test1&Signature=Joj0FkHDH1/SQw+nVTiAQgQKo+uuCmMmRWtKHXLqunI=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      Content-Type:
+    headers: 
+      Content-Type: 
       - text/xml;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:08 GMT
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<DescribeKeyPairsResponse
-        xmlns=\"http://ec2.amazonaws.com/doc/2010-08-31/\">\n    <requestId>bd4c435e-5ced-4fad-9ba0-75bd18dbb9ab</requestId>\n
-        \   <keySet>\n        <item>\n            <keyName>test1</keyName>\n            <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>\n
-        \       </item>\n    </keySet>\n</DescribeKeyPairsResponse>"
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:08:05 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>4da24b46-974f-4020-bf15-de3c232616f2</requestId>
+            <keySet>
+                <item>
+                    <keyName>test1</keyName>
+                    <keyFingerprint>3d:22:8e:63:63:45:53:fa:50:3b:e7:00:09:aa:c0:7f:95:8c:2c:b5</keyFingerprint>
+                </item>
+            </keySet>
+        </DescribeKeyPairsResponse>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-- request:
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+- request: 
     method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeKeyPairs&KeyName.1=unknown&Signature=arkcDAXicuFyUh1HA8Xdnc3dPyDR85xl5R7wo8vOf8s=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-23T12:21:00.000Z&Version=2010-08-31
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - ''
-  response:
-    status:
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAJYOQYLLOIWN5LQ3A&Action=DescribeKeyPairs&KeyName.1=unknown&Signature=I7/JtwvxhmqLFQ7CUYy4vyPQxKg6mkPNMpJ3q7vpli4=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-07-30T11:05:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
       code: 400
       message: Bad Request
-    headers:
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Mon, 23 Jul 2012 12:26:09 GMT
-      Cneonction:
+    headers: 
+      Cneonction: 
       - close
-      Server:
+      Server: 
       - AmazonEC2
-    body:
-      encoding: US-ASCII
-      string: ! '<?xml version="1.0" encoding="UTF-8"?>
-
-        <Response><Errors><Error><Code>InvalidKeyPair.NotFound</Code><Message>The
-        key pair ''unknown'' does not exist</Message></Error></Errors><RequestID>12b9682f-a6b2-4902-aa7c-68f5d09e7887</RequestID></Response>'
+      Transfer-Encoding: 
+      - chunked
+      Date: 
+      - Mon, 30 Jul 2012 11:08:06 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <Response><Errors><Error><Code>InvalidKeyPair.NotFound</Code><Message>The key pair 'unknown' does not exist</Message></Error></Errors><RequestID>9e5a2780-a3ca-454b-bf19-ec9784b202e8</RequestID></Response>
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
-recorded_with: VCR 2.1.1
+  recorded_at: Mon, 30 Jul 2012 11:05:00 GMT
+recorded_with: VCR 2.2.4


Mime
View raw message