deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject [39/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_0020_should_have_the_architecture_element_for_each_image_image_ami-16a3577f.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-16a3577f.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-16a3577f.yml
deleted file mode 100644
index 6b9700d..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_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:13:38 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>d0cbb698-bb11-4a03-b5cc-8ac1677a81f2</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_0020_should_have_the_architecture_element_for_each_image_image_ami-2245994b.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-2245994b.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-2245994b.yml
deleted file mode 100644
index 9d1e894..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_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:13:47 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>7ecaa69a-c768-474e-9b7f-0826895ef54a</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_0020_should_have_the_architecture_element_for_each_image_image_ami-3d599754.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-3d599754.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-3d599754.yml
deleted file mode 100644
index 090152f..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_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:13:44 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>6c52e181-6e43-41ec-ba33-2c79d345378f</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_0020_should_have_the_architecture_element_for_each_image_image_ami-6e649707.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-6e649707.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-6e649707.yml
deleted file mode 100644
index a9cf5bd..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_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:13:41 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>e4501aed-16db-437d-8070-e66938f5e567</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_0020_should_have_the_architecture_element_for_each_image_image_ami-a04498c9.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-a04498c9.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-a04498c9.yml
deleted file mode 100644
index 17e7ce3..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_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:13:47 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>e47a798c-3f0e-4394-969d-b3672a794d07</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_0020_should_have_the_architecture_element_for_each_image_image_ami-ab844dc2.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-ab844dc2.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-ab844dc2.yml
deleted file mode 100644
index 2a1cd20..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_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:13:45 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>bb21dcb8-24d9-419f-b2c2-647c17f8a45b</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_0020_should_have_the_architecture_element_for_each_image_image_ami-c02df0a9.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-c02df0a9.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-c02df0a9.yml
deleted file mode 100644
index 8c891ef..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_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:13:46 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>eeff5cfc-7a1c-45ba-b468-7f41735b9978</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_0020_should_have_the_architecture_element_for_each_image_image_ami-e0a35789.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-e0a35789.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-e0a35789.yml
deleted file mode 100644
index 32920c5..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_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:13:42 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>92385a9d-8f17-43bd-80fc-ff989789eb71</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_0020_should_have_the_architecture_element_for_each_image_image_ami-e4a3578d.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-e4a3578d.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-e4a3578d.yml
deleted file mode 100644
index 8094e12..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_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:13:43 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>bc3f0018-04bd-43b6-a272-7b4cc80400c4</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_0020_should_have_the_architecture_element_for_each_image_image_ami-e4a7558d.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-e4a7558d.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-e4a7558d.yml
deleted file mode 100644
index 51d62a7..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_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:13:41 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>1111e152-135e-4831-aa67-5b835a8b5c55</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_0020_should_have_the_architecture_element_for_each_image_image_ami-eea35787.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-eea35787.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_image_ami-eea35787.yml
deleted file mode 100644
index 7c5b36d..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0020_should_have_the_architecture_element_for_each_image_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:13:38 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>06167a0d-dd32-44d0-8b30-98744882a037</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_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation.yml
deleted file mode 100644
index ea98a34..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation.yml
+++ /dev/null
@@ -1,463 +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:21:23 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>ec2448a1-4cb7-4abc-b882-849174d74aed</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>
-                <item>
-                    <reservationId>r-d52421b7</reservationId>
-                    <ownerId>293787749884</ownerId>
-                    <groupSet>
-                        <item>
-                            <groupId>default</groupId>
-                        </item>
-                    </groupSet>
-                    <instancesSet>
-                        <item>
-                            <instanceId>i-79223a1f</instanceId>
-                            <imageId>ami-e565ba8c</imageId>
-                            <instanceState>
-                                <code>48</code>
-                                <name>terminated</name>
-                            </instanceState>
-                            <privateDnsName/>
-                            <dnsName/>
-                            <reason>User initiated (2012-05-31 09:20:10 GMT)</reason>
-                            <amiLaunchIndex>0</amiLaunchIndex>
-                            <productCodes/>
-                            <instanceType>m1.small</instanceType>
-                            <launchTime>2012-05-31T09:19:32.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-dd2722bf</reservationId>
-                    <ownerId>293787749884</ownerId>
-                    <groupSet>
-                        <item>
-                            <groupId>default</groupId>
-                        </item>
-                    </groupSet>
-                    <instancesSet>
-                        <item>
-                            <instanceId>i-6f243c09</instanceId>
-                            <imageId>ami-e565ba8c</imageId>
-                            <instanceState>
-                                <code>32</code>
-                                <name>shutting-down</name>
-                            </instanceState>
-                            <privateDnsName>ip-10-46-162-142.ec2.internal</privateDnsName>
-                            <dnsName>ec2-107-20-104-8.compute-1.amazonaws.com</dnsName>
-                            <reason>User initiated (2012-05-31 09:21:08 GMT)</reason>
-                            <amiLaunchIndex>0</amiLaunchIndex>
-                            <productCodes/>
-                            <instanceType>m1.small</instanceType>
-                            <launchTime>2012-05-31T09:20:40.000Z</launchTime>
-                            <placement>
-                                <availabilityZone>us-east-1a</availabilityZone>
-                                <groupName/>
-                            </placement>
-                            <kernelId>aki-88aa75e1</kernelId>
-                            <monitoring>
-                                <state>disabled</state>
-                            </monitoring>
-                            <privateIpAddress>10.46.162.142</privateIpAddress>
-                            <ipAddress>107.20.104.8</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-6bc61d05</volumeId>
-                                        <status>attached</status>
-                                        <attachTime>2012-05-31T09:21:02.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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-0d372f6b.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-0d372f6b.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-0d372f6b.yml
deleted file mode 100644
index b17b82c..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_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:21:30 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>d6b98a82-bb19-49d9-a19d-b9047a19fb65</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_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-1b352d7d.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-1b352d7d.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-1b352d7d.yml
deleted file mode 100644
index 0cbf5a9..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_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:21:27 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>31b63ca6-ec04-4e5d-9d61-b5c67f15e166</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_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-37213951.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-37213951.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-37213951.yml
deleted file mode 100644
index 2b12c2f..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-37213951.yml
+++ /dev/null
@@ -1,92 +0,0 @@
---- 
-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:21:31 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>34fa2209-7cd8-4b5f-a9ab-10154372ec13</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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-3f7c6459.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-3f7c6459.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-3f7c6459.yml
deleted file mode 100644
index bf0a0bb..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_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:21:25 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>9fdcde33-0cef-42be-8a05-8b51998a27ae</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_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-6f243c09.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-6f243c09.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-6f243c09.yml
deleted file mode 100644
index 36a2ec1..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-6f243c09.yml
+++ /dev/null
@@ -1,92 +0,0 @@
---- 
-http_interactions: 
-- request: 
-    method: get
-    uri: https://ec2.us-east-1.amazonaws.com/?AWSAccessKeyId=AKIAIZ63KHGXIWDMBY6Q&Action=DescribeInstances&InstanceId.1=i-6f243c09&Signature=YIKo9nFbpwGUfLCLo9ls1r6Q4uV/EW6Kc3+tYXdmY4Q=&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:21:33 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>1b1603f2-7e91-4bba-8767-816ab179436a</requestId>
-            <reservationSet>
-                <item>
-                    <reservationId>r-dd2722bf</reservationId>
-                    <ownerId>293787749884</ownerId>
-                    <groupSet>
-                        <item>
-                            <groupId>default</groupId>
-                        </item>
-                    </groupSet>
-                    <instancesSet>
-                        <item>
-                            <instanceId>i-6f243c09</instanceId>
-                            <imageId>ami-e565ba8c</imageId>
-                            <instanceState>
-                                <code>32</code>
-                                <name>shutting-down</name>
-                            </instanceState>
-                            <privateDnsName>ip-10-46-162-142.ec2.internal</privateDnsName>
-                            <dnsName>ec2-107-20-104-8.compute-1.amazonaws.com</dnsName>
-                            <reason>User initiated (2012-05-31 09:21:08 GMT)</reason>
-                            <amiLaunchIndex>0</amiLaunchIndex>
-                            <productCodes/>
-                            <instanceType>m1.small</instanceType>
-                            <launchTime>2012-05-31T09:20:40.000Z</launchTime>
-                            <placement>
-                                <availabilityZone>us-east-1a</availabilityZone>
-                                <groupName/>
-                            </placement>
-                            <kernelId>aki-88aa75e1</kernelId>
-                            <monitoring>
-                                <state>disabled</state>
-                            </monitoring>
-                            <privateIpAddress>10.46.162.142</privateIpAddress>
-                            <ipAddress>107.20.104.8</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-6bc61d05</volumeId>
-                                        <status>attached</status>
-                                        <attachTime>2012-05-31T09:21:02.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/73b5c596/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-79223a1f.yml
----------------------------------------------------------------------
diff --git a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-79223a1f.yml b/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-79223a1f.yml
deleted file mode 100644
index 9ca0c4d..0000000
--- a/server/tests/deprecated/drivers/ec2/fixtures/test_0021_must_link_to_the_hardware_profile_that_was_used_to_during_instance_creation_instance_i-79223a1f.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-79223a1f&Signature=wqUZ+ZzA8XwPXGzzOUM8YFYYZdMzH/7WCa87AczwvHc=&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:21:32 GMT
-    body: 
-      string: |-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
-            <requestId>2e87dcbe-f3ac-4a50-925a-8d3ca0b6147f</requestId>
-            <reservationSet>
-                <item>
-                    <reservationId>r-d52421b7</reservationId>
-                    <ownerId>293787749884</ownerId>
-                    <groupSet>
-                        <item>
-                            <groupId>default</groupId>
-                        </item>
-                    </groupSet>
-                    <instancesSet>
-                        <item>
-                            <instanceId>i-79223a1f</instanceId>
-                            <imageId>ami-e565ba8c</imageId>
-                            <instanceState>
-                                <code>48</code>
-                                <name>terminated</name>
-                            </instanceState>
-                            <privateDnsName/>
-                            <dnsName/>
-                            <reason>User initiated (2012-05-31 09:20:10 GMT)</reason>
-                            <amiLaunchIndex>0</amiLaunchIndex>
-                            <productCodes/>
-                            <instanceType>m1.small</instanceType>
-                            <launchTime>2012-05-31T09:19:32.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


Mime
View raw message