deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject [40/65] [partial] Core: Moved all API tests in server/tests into server/tests/deprecated directory
Date Fri, 20 Jul 2012 09:59:22 GMT
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-16a3577f.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-16a3577f.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-16a3577f.yml
new file mode 100644
index 0000000..5cb98e1
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-16a3577f.yml
@@ -0,0 +1,62 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-16a3577f&Signature=llm1UJEVP8jzROmufK2bQkQ3k/I0F76XzBmtddXOY5U=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:16:58 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>3a81309d-68db-48a6-938a-256598c4993e</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-16a3577f</imageId>
+                    <imageLocation>amazon/sles-10-sp3-v1.00.i386</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>013907871322</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>i386</architecture>
+                    <imageType>machine</imageType>
+                    <kernelId>aki-407d9529</kernelId>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>sles-10-sp3-v1.00.i386</name>
+                    <description>SUSE Linux Enterprise Server 10 Service Pack 3 for x86 (v1.00)</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-589a9633</snapshotId>
+                                <volumeSize>15</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-2245994b.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-2245994b.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-2245994b.yml
new file mode 100644
index 0000000..4b99eb9
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-2245994b.yml
@@ -0,0 +1,62 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-2245994b&Signature=87ZDUtiGKt5+5du1STPqX+lkYtBK6jpw5CNH9/nrCpk=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:17:07 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>3cb2143c-d34d-4ab1-b8bb-2bed136774d1</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-2245994b</imageId>
+                    <imageLocation>amazon/suse-sles-11-sp2-rightscale-v1.00.x86_64</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>013907871322</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>x86_64</architecture>
+                    <imageType>machine</imageType>
+                    <kernelId>aki-825ea7eb</kernelId>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>suse-sles-11-sp2-rightscale-v1.00.x86_64</name>
+                    <description>SUSE Linux Enterprise Server 11 Service Pack 2 RightScale-enabled for x86_64 (Build 4.2)</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-f9966c83</snapshotId>
+                                <volumeSize>10</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-3d599754.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-3d599754.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-3d599754.yml
new file mode 100644
index 0000000..29ffd3e
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-3d599754.yml
@@ -0,0 +1,62 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-3d599754&Signature=vTmCI/oTd3jVSey9Yk6sQl2xfPHh3jVwd+q5oqCzvMI=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:17:03 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>ce9aa659-c282-461f-acec-9b120c32ce91</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-3d599754</imageId>
+                    <imageLocation>amazon/suse-sles-11-sp1-v1.01.i386</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>013907871322</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>i386</architecture>
+                    <imageType>machine</imageType>
+                    <kernelId>aki-805ea7e9</kernelId>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>suse-sles-11-sp1-v1.01.i386</name>
+                    <description>SUSE Linux Enterprise Server 11 Service Pack 1 for x86 (Build 4.4)</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-ff4fe09d</snapshotId>
+                                <volumeSize>10</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-6e649707.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-6e649707.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-6e649707.yml
new file mode 100644
index 0000000..7d382f1
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-6e649707.yml
@@ -0,0 +1,61 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-6e649707&Signature=qrXTEcmz2EbrVVNluYoLVsqEG8gR7zDePt2zaWBp29o=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:17:00 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>03eb5d0c-3df9-493a-b78b-a69342015f1c</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-6e649707</imageId>
+                    <imageLocation>amazon/sles-11-sp1-hvm-v1.00.x86_64</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>013907871322</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>x86_64</architecture>
+                    <imageType>machine</imageType>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>sles-11-sp1-hvm-v1.00.x86_64</name>
+                    <description>SUSE Linux Enterprise Server 11 Service Pack 1 for HVM x86_64 (v1.00)</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-6ca71300</snapshotId>
+                                <volumeSize>10</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>hvm</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-a04498c9.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-a04498c9.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-a04498c9.yml
new file mode 100644
index 0000000..3b6b5fb
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-a04498c9.yml
@@ -0,0 +1,62 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-a04498c9&Signature=ic3SdwF493gccQl3CtFu1G/0/6xf5HubziUHU2AVflE=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:17:06 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>cdaf3060-46df-4d93-8a5c-7371168b8d45</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-a04498c9</imageId>
+                    <imageLocation>amazon/suse-sles-11-sp2-rightscale-v1.00.i386</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>013907871322</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>i386</architecture>
+                    <imageType>machine</imageType>
+                    <kernelId>aki-805ea7e9</kernelId>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>suse-sles-11-sp2-rightscale-v1.00.i386</name>
+                    <description>SUSE Linux Enterprise Server 11 Service Pack 2 RightScale-enabled for x86 (Build 4.2)</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-6755ae1d</snapshotId>
+                                <volumeSize>10</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-ab844dc2.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-ab844dc2.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-ab844dc2.yml
new file mode 100644
index 0000000..752becd
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-ab844dc2.yml
@@ -0,0 +1,62 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-ab844dc2&Signature=krzNQ/kfbI8diOVn2aDeXY4jcedGBLJCLeAVmj7HEX4=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:17:05 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>6af3267a-ae60-4170-8744-279118be7db0</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-ab844dc2</imageId>
+                    <imageLocation>amazon/suse-sles-11-sp1-v1.01.x86_64</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>013907871322</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>x86_64</architecture>
+                    <imageType>machine</imageType>
+                    <kernelId>aki-825ea7eb</kernelId>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>suse-sles-11-sp1-v1.01.x86_64</name>
+                    <description>SUSE Linux Enterprise Server 11 Service Pack 1 for x86_64 (Build 4.4)</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-f9da609b</snapshotId>
+                                <volumeSize>10</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-c02df0a9.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-c02df0a9.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-c02df0a9.yml
new file mode 100644
index 0000000..86e90ee
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-c02df0a9.yml
@@ -0,0 +1,61 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-c02df0a9&Signature=rP0+nEosmwvyhW8iT5MPO8lKgUNEmzK9NLOQhFx0Zdc=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:17:06 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>861b4cc2-68ca-4a20-8425-56bcc79b451a</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-c02df0a9</imageId>
+                    <imageLocation>amazon/suse-sles-11-sp2-hvm-v1.00.x86_64</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>013907871322</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>x86_64</architecture>
+                    <imageType>machine</imageType>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>suse-sles-11-sp2-hvm-v1.00.x86_64</name>
+                    <description>SUSE Linux Enterprise Server 11 Service Pack 2 for x86_64 (Build 11.1)</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-d4fb96af</snapshotId>
+                                <volumeSize>10</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>hvm</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e0a35789.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e0a35789.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e0a35789.yml
new file mode 100644
index 0000000..73d7b9a
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e0a35789.yml
@@ -0,0 +1,62 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-e0a35789&Signature=Zup13NGGUsS3lkD+46c5vbhoq9Mf2/yNl8Ntc7Xwrkc=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:17:01 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>0e26a555-4836-4eeb-8173-3b69758111de</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-e0a35789</imageId>
+                    <imageLocation>amazon/sles-11-sp1-v1.00.i386</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>013907871322</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>i386</architecture>
+                    <imageType>machine</imageType>
+                    <kernelId>aki-407d9529</kernelId>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>sles-11-sp1-v1.00.i386</name>
+                    <description>SUSE Linux Enterprise Server 11 Service Pack 1 for x86 (v1.00)</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-64909c0f</snapshotId>
+                                <volumeSize>15</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e4a3578d.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e4a3578d.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e4a3578d.yml
new file mode 100644
index 0000000..8f5d341
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e4a3578d.yml
@@ -0,0 +1,62 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-e4a3578d&Signature=ZHqTUChFfjnHP6sD+QwgZqOJz2OJtzFP7PCzp9HUemA=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:17:02 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>ac29048e-18b4-4416-8787-22b0282e121c</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-e4a3578d</imageId>
+                    <imageLocation>amazon/sles-11-sp1-v1.00.x86_64</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>013907871322</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>x86_64</architecture>
+                    <imageType>machine</imageType>
+                    <kernelId>aki-427d952b</kernelId>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>sles-11-sp1-v1.00.x86_64</name>
+                    <description>SUSE Linux Enterprise Server 11 Service Pack 1 for x86_64 (v1.00)</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-20aaa64b</snapshotId>
+                                <volumeSize>15</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e4a7558d.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e4a7558d.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e4a7558d.yml
new file mode 100644
index 0000000..67c0488
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e4a7558d.yml
@@ -0,0 +1,61 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-e4a7558d&Signature=+TzJdF+tPp5N+G2GNTRL0FFbc61kVGatovU3QEVGLhI=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:17:01 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>42503d77-5924-4c42-8965-5c8b95b2bef8</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-e4a7558d</imageId>
+                    <imageLocation>amazon/sles-11-sp1-hvm-v1.01.x86_64</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>013907871322</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>x86_64</architecture>
+                    <imageType>machine</imageType>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>sles-11-sp1-hvm-v1.01.x86_64</name>
+                    <description>SUSE Linux Enterprise Server 11 Service Pack 1 for HVM x86_64 (v1.01)</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-c07ffeac</snapshotId>
+                                <volumeSize>10</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>hvm</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-eea35787.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-eea35787.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-eea35787.yml
new file mode 100644
index 0000000..6939535
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-eea35787.yml
@@ -0,0 +1,62 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeImages&ImageId.1=ami-eea35787&Signature=5+Q0+c5zAs/Stke7phg7Mo/gUYkH8A9ykm1wlZlEwyw=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:16:59 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>bec3b78f-32f5-437d-8325-a169db62681d</requestId>
+            <imagesSet>
+                <item>
+                    <imageId>ami-eea35787</imageId>
+                    <imageLocation>amazon/sles-10-sp3-v1.00.x86_64</imageLocation>
+                    <imageState>available</imageState>
+                    <imageOwnerId>013907871322</imageOwnerId>
+                    <isPublic>true</isPublic>
+                    <architecture>x86_64</architecture>
+                    <imageType>machine</imageType>
+                    <kernelId>aki-427d952b</kernelId>
+                    <imageOwnerAlias>amazon</imageOwnerAlias>
+                    <name>sles-10-sp3-v1.00.x86_64</name>
+                    <description>SUSE Linux Enterprise Server 10 Service Pack 3 for x86_64 (v1.00)</description>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <snapshotId>snap-8e2729e5</snapshotId>
+                                <volumeSize>15</volumeSize>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                </item>
+            </imagesSet>
+        </DescribeImagesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection.yml
new file mode 100644
index 0000000..504db0e
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection.yml
@@ -0,0 +1,363 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&Signature=OYETyEF7LC0YSVZD7OM6/HMbgTdH7dJydXbtxPRPnvY=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:19:22 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>5838a1b3-1b32-43cc-aaf9-8f5e8301abe8</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-3962675b</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>default</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-ff7a6299</instanceId>
+                            <imageId>ami-db65bab2</imageId>
+                            <instanceState>
+                                <code>48</code>
+                                <name>terminated</name>
+                            </instanceState>
+                            <privateDnsName/>
+                            <dnsName/>
+                            <reason>User initiated (2012-05-31 08:21:55 GMT)</reason>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>m1.small</instanceType>
+                            <launchTime>2012-05-31T08:19:17.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1a</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-b6aa75df</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <stateReason>
+                                <code>Client.UserInitiatedShutdown</code>
+                                <message>Client.UserInitiatedShutdown: User initiated shutdown</message>
+                            </stateReason>
+                            <architecture>i386</architecture>
+                            <rootDeviceType>instance-store</rootDeviceType>
+                            <blockDeviceMapping/>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken/>
+                        </item>
+                    </instancesSet>
+                </item>
+                <item>
+                    <reservationId>r-c96d68ab</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>default</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-3f7c6459</instanceId>
+                            <imageId>ami-db65bab2</imageId>
+                            <instanceState>
+                                <code>48</code>
+                                <name>terminated</name>
+                            </instanceState>
+                            <privateDnsName/>
+                            <dnsName/>
+                            <reason>User initiated (2012-05-31 08:21:34 GMT)</reason>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>m1.small</instanceType>
+                            <launchTime>2012-05-31T08:20:48.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1a</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-b6aa75df</kernelId>
+                            <monitoring>
+                                <state>enabled</state>
+                            </monitoring>
+                            <stateReason>
+                                <code>Client.UserInitiatedShutdown</code>
+                                <message>Client.UserInitiatedShutdown: User initiated shutdown</message>
+                            </stateReason>
+                            <architecture>i386</architecture>
+                            <rootDeviceType>instance-store</rootDeviceType>
+                            <blockDeviceMapping/>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken/>
+                        </item>
+                    </instancesSet>
+                </item>
+                <item>
+                    <reservationId>r-2d12174f</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>default</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-1b352d7d</instanceId>
+                            <imageId>ami-e565ba8c</imageId>
+                            <instanceState>
+                                <code>48</code>
+                                <name>terminated</name>
+                            </instanceState>
+                            <privateDnsName/>
+                            <dnsName/>
+                            <reason>User initiated (2012-05-31 09:10:05 GMT)</reason>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>m1.small</instanceType>
+                            <launchTime>2012-05-31T09:09:37.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1c</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-88aa75e1</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <stateReason>
+                                <code>Client.UserInitiatedShutdown</code>
+                                <message>Client.UserInitiatedShutdown: User initiated shutdown</message>
+                            </stateReason>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/sda1</rootDeviceName>
+                            <blockDeviceMapping/>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken/>
+                        </item>
+                    </instancesSet>
+                </item>
+                <item>
+                    <reservationId>r-e7121785</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>quicklaunch-1</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-df352db9</instanceId>
+                            <imageId>ami-e565ba8c</imageId>
+                            <instanceState>
+                                <code>16</code>
+                                <name>running</name>
+                            </instanceState>
+                            <privateDnsName>ip-10-212-181-44.ec2.internal</privateDnsName>
+                            <dnsName>ec2-107-20-92-81.compute-1.amazonaws.com</dnsName>
+                            <reason/>
+                            <keyName>test1</keyName>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>t1.micro</instanceType>
+                            <launchTime>2012-05-31T09:09:50.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1b</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-88aa75e1</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <privateIpAddress>10.212.181.44</privateIpAddress>
+                            <ipAddress>107.20.92.81</ipAddress>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/sda1</rootDeviceName>
+                            <blockDeviceMapping>
+                                <item>
+                                    <deviceName>/dev/sda1</deviceName>
+                                    <ebs>
+                                        <volumeId>vol-6bcf1405</volumeId>
+                                        <status>attached</status>
+                                        <attachTime>2012-05-31T09:10:24.000Z</attachTime>
+                                        <deleteOnTermination>true</deleteOnTermination>
+                                    </ebs>
+                                </item>
+                            </blockDeviceMapping>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken>ZtNoD1338455390164</clientToken>
+                        </item>
+                    </instancesSet>
+                </item>
+                <item>
+                    <reservationId>r-bf1217dd</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>default</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-7f362e19</instanceId>
+                            <imageId>ami-e565ba8c</imageId>
+                            <instanceState>
+                                <code>48</code>
+                                <name>terminated</name>
+                            </instanceState>
+                            <privateDnsName/>
+                            <dnsName/>
+                            <reason>User initiated (2012-05-31 09:10:37 GMT)</reason>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>m1.small</instanceType>
+                            <launchTime>2012-05-31T09:10:11.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1a</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-88aa75e1</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <stateReason>
+                                <code>Client.UserInitiatedShutdown</code>
+                                <message>Client.UserInitiatedShutdown: User initiated shutdown</message>
+                            </stateReason>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/sda1</rootDeviceName>
+                            <blockDeviceMapping/>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken/>
+                        </item>
+                    </instancesSet>
+                </item>
+                <item>
+                    <reservationId>r-e91d188b</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>default</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-0d372f6b</instanceId>
+                            <imageId>ami-e565ba8c</imageId>
+                            <instanceState>
+                                <code>48</code>
+                                <name>terminated</name>
+                            </instanceState>
+                            <privateDnsName/>
+                            <dnsName/>
+                            <reason>User initiated (2012-05-31 09:11:06 GMT)</reason>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>m1.small</instanceType>
+                            <launchTime>2012-05-31T09:10:39.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1a</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-88aa75e1</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <stateReason>
+                                <code>Client.UserInitiatedShutdown</code>
+                                <message>Client.UserInitiatedShutdown: User initiated shutdown</message>
+                            </stateReason>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/sda1</rootDeviceName>
+                            <blockDeviceMapping/>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken/>
+                        </item>
+                    </instancesSet>
+                </item>
+                <item>
+                    <reservationId>r-73242111</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>default</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-37213951</instanceId>
+                            <imageId>ami-e565ba8c</imageId>
+                            <instanceState>
+                                <code>32</code>
+                                <name>shutting-down</name>
+                            </instanceState>
+                            <privateDnsName>ip-10-122-51-201.ec2.internal</privateDnsName>
+                            <dnsName>ec2-23-21-28-150.compute-1.amazonaws.com</dnsName>
+                            <reason>User initiated (2012-05-31 09:19:10 GMT)</reason>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>m1.small</instanceType>
+                            <launchTime>2012-05-31T09:18:44.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1c</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-88aa75e1</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <privateIpAddress>10.122.51.201</privateIpAddress>
+                            <ipAddress>23.21.28.150</ipAddress>
+                            <stateReason>
+                                <code>Client.UserInitiatedShutdown</code>
+                                <message>Client.UserInitiatedShutdown: User initiated shutdown</message>
+                            </stateReason>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/sda1</rootDeviceName>
+                            <blockDeviceMapping>
+                                <item>
+                                    <deviceName>/dev/sda1</deviceName>
+                                    <ebs>
+                                        <volumeId>vol-f1c01b9f</volumeId>
+                                        <status>attached</status>
+                                        <attachTime>2012-05-31T09:19:00.000Z</attachTime>
+                                        <deleteOnTermination>true</deleteOnTermination>
+                                    </ebs>
+                                </item>
+                            </blockDeviceMapping>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken/>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-0d372f6b.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-0d372f6b.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-0d372f6b.yml
new file mode 100644
index 0000000..3e09ec1
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-0d372f6b.yml
@@ -0,0 +1,80 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&InstanceId.1=i-0d372f6b&Signature=JcrPIL9s/iPrHgl2CsLkMj/AxOvfzEeYZjR0Gsllag4=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:19:28 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>d6da54d6-e6af-48e0-8e75-03d1097e6feb</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-e91d188b</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>default</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-0d372f6b</instanceId>
+                            <imageId>ami-e565ba8c</imageId>
+                            <instanceState>
+                                <code>48</code>
+                                <name>terminated</name>
+                            </instanceState>
+                            <privateDnsName/>
+                            <dnsName/>
+                            <reason>User initiated (2012-05-31 09:11:06 GMT)</reason>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>m1.small</instanceType>
+                            <launchTime>2012-05-31T09:10:39.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1a</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-88aa75e1</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <stateReason>
+                                <code>Client.UserInitiatedShutdown</code>
+                                <message>Client.UserInitiatedShutdown: User initiated shutdown</message>
+                            </stateReason>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/sda1</rootDeviceName>
+                            <blockDeviceMapping/>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken/>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-1b352d7d.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-1b352d7d.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-1b352d7d.yml
new file mode 100644
index 0000000..e595b62
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-1b352d7d.yml
@@ -0,0 +1,80 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&InstanceId.1=i-1b352d7d&Signature=Ac9PUkW/6c0dtioQGg1D1hnVdy/DLDCOEg82pyaeEdc=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:19:26 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>523191a1-ba5c-48b1-b8da-998e7e80e1dc</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-2d12174f</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>default</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-1b352d7d</instanceId>
+                            <imageId>ami-e565ba8c</imageId>
+                            <instanceState>
+                                <code>48</code>
+                                <name>terminated</name>
+                            </instanceState>
+                            <privateDnsName/>
+                            <dnsName/>
+                            <reason>User initiated (2012-05-31 09:10:05 GMT)</reason>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>m1.small</instanceType>
+                            <launchTime>2012-05-31T09:09:37.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1c</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-88aa75e1</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <stateReason>
+                                <code>Client.UserInitiatedShutdown</code>
+                                <message>Client.UserInitiatedShutdown: User initiated shutdown</message>
+                            </stateReason>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/sda1</rootDeviceName>
+                            <blockDeviceMapping/>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken/>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-37213951.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-37213951.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-37213951.yml
new file mode 100644
index 0000000..f035842
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-37213951.yml
@@ -0,0 +1,92 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&InstanceId.1=i-37213951&Signature=2dMaL87jke4yFOFkHWvYfTmriOEZuy890ts2XHNDMm8=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:19:30 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>74f84b76-0980-4b5f-a3e6-6f0eb5a5b91e</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-73242111</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>default</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-37213951</instanceId>
+                            <imageId>ami-e565ba8c</imageId>
+                            <instanceState>
+                                <code>32</code>
+                                <name>shutting-down</name>
+                            </instanceState>
+                            <privateDnsName>ip-10-122-51-201.ec2.internal</privateDnsName>
+                            <dnsName>ec2-23-21-28-150.compute-1.amazonaws.com</dnsName>
+                            <reason>User initiated (2012-05-31 09:19:10 GMT)</reason>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>m1.small</instanceType>
+                            <launchTime>2012-05-31T09:18:44.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1c</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-88aa75e1</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <privateIpAddress>10.122.51.201</privateIpAddress>
+                            <ipAddress>23.21.28.150</ipAddress>
+                            <stateReason>
+                                <code>Client.UserInitiatedShutdown</code>
+                                <message>Client.UserInitiatedShutdown: User initiated shutdown</message>
+                            </stateReason>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/sda1</rootDeviceName>
+                            <blockDeviceMapping>
+                                <item>
+                                    <deviceName>/dev/sda1</deviceName>
+                                    <ebs>
+                                        <volumeId>vol-f1c01b9f</volumeId>
+                                        <status>attached</status>
+                                        <attachTime>2012-05-31T09:19:00.000Z</attachTime>
+                                        <deleteOnTermination>true</deleteOnTermination>
+                                    </ebs>
+                                </item>
+                            </blockDeviceMapping>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken/>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-3f7c6459.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-3f7c6459.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-3f7c6459.yml
new file mode 100644
index 0000000..9ccfae0
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-3f7c6459.yml
@@ -0,0 +1,79 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&InstanceId.1=i-3f7c6459&Signature=R4j1gK8B5cq6K06bsGxwDvo/0oIDhK5LUK2e2ghKvQg=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:19:25 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>a5a45703-f2cf-448a-bf2c-9aad77f39655</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-c96d68ab</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>default</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-3f7c6459</instanceId>
+                            <imageId>ami-db65bab2</imageId>
+                            <instanceState>
+                                <code>48</code>
+                                <name>terminated</name>
+                            </instanceState>
+                            <privateDnsName/>
+                            <dnsName/>
+                            <reason>User initiated (2012-05-31 08:21:34 GMT)</reason>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>m1.small</instanceType>
+                            <launchTime>2012-05-31T08:20:48.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1a</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-b6aa75df</kernelId>
+                            <monitoring>
+                                <state>enabled</state>
+                            </monitoring>
+                            <stateReason>
+                                <code>Client.UserInitiatedShutdown</code>
+                                <message>Client.UserInitiatedShutdown: User initiated shutdown</message>
+                            </stateReason>
+                            <architecture>i386</architecture>
+                            <rootDeviceType>instance-store</rootDeviceType>
+                            <blockDeviceMapping/>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken/>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-7f362e19.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-7f362e19.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-7f362e19.yml
new file mode 100644
index 0000000..24f22b7
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-7f362e19.yml
@@ -0,0 +1,80 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&InstanceId.1=i-7f362e19&Signature=FVJH4CmCuT8CTiYoKxXkwJCyiipjp5iAbXqqMT00opQ=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:19:28 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>7eba4b25-2122-4e5a-b007-ba141e421fee</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-bf1217dd</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>default</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-7f362e19</instanceId>
+                            <imageId>ami-e565ba8c</imageId>
+                            <instanceState>
+                                <code>48</code>
+                                <name>terminated</name>
+                            </instanceState>
+                            <privateDnsName/>
+                            <dnsName/>
+                            <reason>User initiated (2012-05-31 09:10:37 GMT)</reason>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>m1.small</instanceType>
+                            <launchTime>2012-05-31T09:10:11.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1a</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-88aa75e1</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <stateReason>
+                                <code>Client.UserInitiatedShutdown</code>
+                                <message>Client.UserInitiatedShutdown: User initiated shutdown</message>
+                            </stateReason>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/sda1</rootDeviceName>
+                            <blockDeviceMapping/>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken/>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-df352db9.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-df352db9.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-df352db9.yml
new file mode 100644
index 0000000..8bb2350
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-df352db9.yml
@@ -0,0 +1,89 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&InstanceId.1=i-df352db9&Signature=1mHA/gwGIiszOtuX5jdLn2bOlk9s1HV9fsR0OQStxBM=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:19:27 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>58006df4-16a7-475f-abb0-6b6d6bb0103d</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-e7121785</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>quicklaunch-1</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-df352db9</instanceId>
+                            <imageId>ami-e565ba8c</imageId>
+                            <instanceState>
+                                <code>16</code>
+                                <name>running</name>
+                            </instanceState>
+                            <privateDnsName>ip-10-212-181-44.ec2.internal</privateDnsName>
+                            <dnsName>ec2-107-20-92-81.compute-1.amazonaws.com</dnsName>
+                            <reason/>
+                            <keyName>test1</keyName>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>t1.micro</instanceType>
+                            <launchTime>2012-05-31T09:09:50.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1b</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-88aa75e1</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <privateIpAddress>10.212.181.44</privateIpAddress>
+                            <ipAddress>107.20.92.81</ipAddress>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/sda1</rootDeviceName>
+                            <blockDeviceMapping>
+                                <item>
+                                    <deviceName>/dev/sda1</deviceName>
+                                    <ebs>
+                                        <volumeId>vol-6bcf1405</volumeId>
+                                        <status>attached</status>
+                                        <attachTime>2012-05-31T09:10:24.000Z</attachTime>
+                                        <deleteOnTermination>true</deleteOnTermination>
+                                    </ebs>
+                                </item>
+                            </blockDeviceMapping>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken>ZtNoD1338455390164</clientToken>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/570a9a04/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-ff7a6299.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-ff7a6299.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-ff7a6299.yml
new file mode 100644
index 0000000..c458f35
--- /dev/null
+++ b/server/tests/deprecated/drivers/ec2/fixtures/test_0016_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-ff7a6299.yml
@@ -0,0 +1,79 @@
+--- 
+http_interactions: 
+- request: 
+    method: get
+    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&InstanceId.1=i-ff7a6299&Signature=RdVmByqfbRNLSCIYJGWGBHEb14RnrHoxKc8PvgHAmA8=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-05-31T10:58:00.000Z&Version=2010-08-31
+    body: 
+      string: ""
+    headers: 
+      User-Agent: 
+      - ""
+      Accept: 
+      - "*/*"
+  response: 
+    status: 
+      code: 200
+      message: OK
+    headers: 
+      Transfer-Encoding: 
+      - chunked
+      Server: 
+      - AmazonEC2
+      Content-Type: 
+      - text/xml;charset=UTF-8
+      Date: 
+      - Thu, 31 May 2012 09:19:23 GMT
+    body: 
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+            <requestId>835885c3-285f-4da3-a33a-4da93ae1e491</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-3962675b</reservationId>
+                    <ownerId>293787749884</ownerId>
+                    <groupSet>
+                        <item>
+                            <groupId>default</groupId>
+                        </item>
+                    </groupSet>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-ff7a6299</instanceId>
+                            <imageId>ami-db65bab2</imageId>
+                            <instanceState>
+                                <code>48</code>
+                                <name>terminated</name>
+                            </instanceState>
+                            <privateDnsName/>
+                            <dnsName/>
+                            <reason>User initiated (2012-05-31 08:21:55 GMT)</reason>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>m1.small</instanceType>
+                            <launchTime>2012-05-31T08:19:17.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-east-1a</availabilityZone>
+                                <groupName/>
+                            </placement>
+                            <kernelId>aki-b6aa75df</kernelId>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <stateReason>
+                                <code>Client.UserInitiatedShutdown</code>
+                                <message>Client.UserInitiatedShutdown: User initiated shutdown</message>
+                            </stateReason>
+                            <architecture>i386</architecture>
+                            <rootDeviceType>instance-store</rootDeviceType>
+                            <blockDeviceMapping/>
+                            <virtualizationType>paravirtual</virtualizationType>
+                            <clientToken/>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
+    http_version: 
+  recorded_at: Thu, 31 May 2012 10:58:00 GMT
+recorded_with: VCR 2.1.1


Mime
View raw message