deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject [31/54] [partial] Core: Removed deprecated tests from server/tests directory
Date Mon, 20 Aug 2012 08:53:45 GMT
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-16a3577f.yml
deleted file mode 100644
index aeece88..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-16a3577f.yml
+++ /dev/null
@@ -1,62 +0,0 @@
---- 
-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:15:31 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>643fde5a-4e01-4b3e-86a6-45027fb60979</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-2245994b.yml
deleted file mode 100644
index b8b114f..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-2245994b.yml
+++ /dev/null
@@ -1,62 +0,0 @@
---- 
-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:15:39 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>eb3b162a-0874-4cbe-8181-cb6129a0f020</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-3d599754.yml
deleted file mode 100644
index 57b0ad5..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-3d599754.yml
+++ /dev/null
@@ -1,62 +0,0 @@
---- 
-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:15:36 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>b0139273-91c3-419f-8449-97ce488a8568</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-6e649707.yml
deleted file mode 100644
index 5dee814..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-6e649707.yml
+++ /dev/null
@@ -1,61 +0,0 @@
---- 
-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:15:33 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>6b8e743a-ef4d-47ef-a294-d1bc1bc3cdea</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-a04498c9.yml
deleted file mode 100644
index a7e30c3..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-a04498c9.yml
+++ /dev/null
@@ -1,62 +0,0 @@
---- 
-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:15:38 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>9715e9a7-2128-486d-bde4-ec7601e04aac</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-ab844dc2.yml
deleted file mode 100644
index 104e521..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-ab844dc2.yml
+++ /dev/null
@@ -1,62 +0,0 @@
---- 
-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:15:37 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>9a7ad9a3-b93f-4e98-ae36-228f92862495</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-c02df0a9.yml
deleted file mode 100644
index a1946c9..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-c02df0a9.yml
+++ /dev/null
@@ -1,61 +0,0 @@
---- 
-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:15:38 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>086786fa-0ba2-465d-8657-e50fd7937a27</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e0a35789.yml
deleted file mode 100644
index 9b4026a..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e0a35789.yml
+++ /dev/null
@@ -1,62 +0,0 @@
---- 
-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:15:35 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>a22003ad-7c9f-45d4-800a-db43d3de9e10</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e4a3578d.yml
deleted file mode 100644
index c05ba54..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e4a3578d.yml
+++ /dev/null
@@ -1,62 +0,0 @@
---- 
-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:15:36 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>af77c191-44b4-4b79-9f26-cfa69aa6c496</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e4a7558d.yml
deleted file mode 100644
index d10a940..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-e4a7558d.yml
+++ /dev/null
@@ -1,61 +0,0 @@
---- 
-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:15:34 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>0beac804-d24f-4802-9eb0-c583c1965df0</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-eea35787.yml
deleted file mode 100644
index 374b654..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_image_and_it_should_match_with_the_one_in_collection_image_ami-eea35787.yml
+++ /dev/null
@@ -1,62 +0,0 @@
---- 
-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:15:32 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>4b072c60-341a-4ef4-9fb2-540cbeba531d</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection.yml
deleted file mode 100644
index 0ad5304..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection.yml
+++ /dev/null
@@ -1,307 +0,0 @@
---- 
-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:18:22 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>a0f05f65-a736-4b16-9071-3724fec3ceb5</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>
-            </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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-0d372f6b.yml
deleted file mode 100644
index 87c639f..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-0d372f6b.yml
+++ /dev/null
@@ -1,80 +0,0 @@
---- 
-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:18:29 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>a34f65df-cc5b-40d9-bb78-9999b493e616</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-1b352d7d.yml
deleted file mode 100644
index 18bd1f1..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-1b352d7d.yml
+++ /dev/null
@@ -1,80 +0,0 @@
---- 
-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:18:25 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>2e89d5a1-f84a-4d76-b80f-7fa86216de91</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-3f7c6459.yml
deleted file mode 100644
index 16133e3..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-3f7c6459.yml
+++ /dev/null
@@ -1,79 +0,0 @@
---- 
-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:18:24 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>44a35a2d-a937-41ac-b4be-da527b3ab241</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-7f362e19.yml
deleted file mode 100644
index 28487bd..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-7f362e19.yml
+++ /dev/null
@@ -1,80 +0,0 @@
---- 
-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:18:28 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>2e7979fc-abbb-4844-b7c8-856fd5e9ce97</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-df352db9.yml
deleted file mode 100644
index be0cd80..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-df352db9.yml
+++ /dev/null
@@ -1,89 +0,0 @@
---- 
-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:18:27 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>24c7929f-fecb-45cb-ab53-9ff1ffca9508</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_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_0017_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_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-ff7a6299.yml
deleted file mode 100644
index 1ce0125..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_instance_and_it_should_match_with_the_one_in_collection_instance_i-ff7a6299.yml
+++ /dev/null
@@ -1,79 +0,0 @@
---- 
-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:18:23 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>1da823f4-f2b8-4378-8ad9-b86e8d2d8060</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

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_key_and_it_should_match_with_the_one_in_collection.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_key_and_it_should_match_with_the_one_in_collection.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_key_and_it_should_match_with_the_one_in_collection.yml
deleted file mode 100644
index 1d52eaf..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_key_and_it_should_match_with_the_one_in_collection.yml
+++ /dev/null
@@ -1,44 +0,0 @@
---- 
-http_interactions: 
-- request: 
-    method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeKeyPairs&Signature=oL+M5SWV3VxzzJHvI/QEhBQ9rdRPLjvWL6XNCMQf+pI=&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:25 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>f79da12b-e842-4aaf-ac16-008d3fc0ce98</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>
-                <item>
-                    <keyName>test2</keyName>
-                    <keyFingerprint>8d:34:a2:2a:71:ce:51:17:0b:a8:86:1a:bf:d8:b0:b2:ad:90:79:49</keyFingerprint>
-                </item>
-            </keySet>
-        </DescribeKeyPairsResponse>
-    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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_key_and_it_should_match_with_the_one_in_collection_key_test1.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_key_and_it_should_match_with_the_one_in_collection_key_test1.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_key_and_it_should_match_with_the_one_in_collection_key_test1.yml
deleted file mode 100644
index 8e910c9..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_key_and_it_should_match_with_the_one_in_collection_key_test1.yml
+++ /dev/null
@@ -1,40 +0,0 @@
---- 
-http_interactions: 
-- request: 
-    method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeKeyPairs&KeyName.1=test1&Signature=M9Rvx+39oSr8dzYtz/QBq76O9aY0srxTxvigNvDEccs=&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:26 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>8586763e-6425-4361-b8f9-07722857d563</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: Thu, 31 May 2012 10:58:00 GMT
-recorded_with: VCR 2.1.1

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_key_and_it_should_match_with_the_one_in_collection_key_test2.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_key_and_it_should_match_with_the_one_in_collection_key_test2.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_key_and_it_should_match_with_the_one_in_collection_key_test2.yml
deleted file mode 100644
index 0dde54e..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0017_must_have_the_name_element_for_the_key_and_it_should_match_with_the_one_in_collection_key_test2.yml
+++ /dev/null
@@ -1,40 +0,0 @@
---- 
-http_interactions: 
-- request: 
-    method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeKeyPairs&KeyName.1=test2&Signature=x4FwKoszcHgndrc3H8T4NyJFmeqHApDz9BWpCs2L5Tg=&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:27 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>5dd6358d-a75c-49ee-ae04-afbab1350477</requestId>
-            <keySet>
-                <item>
-                    <keyName>test2</keyName>
-                    <keyFingerprint>8d:34:a2:2a:71:ce:51:17:0b:a8:86:1a:bf:d8:b0:b2:ad:90:79:49</keyFingerprint>
-                </item>
-            </keySet>
-        </DescribeKeyPairsResponse>
-    http_version: 
-  recorded_at: Thu, 31 May 2012 10:58:00 GMT
-recorded_with: VCR 2.1.1


Mime
View raw message