You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/04/02 11:14:14 UTC

[02/25] forking jclouds ec2 api

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/amzn_images.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/amzn_images.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/amzn_images.xml
new file mode 100644
index 0000000..0b1a767
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/amzn_images.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <requestId>6104eee1-affd-49d7-92a0-516cab8a8ba6</requestId>
+    <imagesSet>
+        <item>
+            <imageId>ami-82e4b5c7</imageId>
+            <imageLocation>137112412989/amzn-ami-0.9.7-beta.i386-ebs</imageLocation>
+            <imageState>available</imageState>
+            <imageOwnerId>137112412989</imageOwnerId>
+            <isPublic>true</isPublic>
+            <architecture>i386</architecture>
+            <imageType>machine</imageType>
+            <kernelId>aki-99a0f1dc</kernelId>
+            <name>amzn-ami-0.9.7-beta.i386-ebs</name>
+            <description>Amazon</description>
+            <rootDeviceType>ebs</rootDeviceType>
+            <rootDeviceName>/dev/sda1</rootDeviceName>
+            <blockDeviceMapping>
+                <item>
+                    <deviceName>/dev/sda1</deviceName>
+                    <ebs>
+                        <snapshotId>snap-e98b7b82</snapshotId>
+                        <volumeSize>10</volumeSize>
+                        <deleteOnTermination>true</deleteOnTermination>
+                    </ebs>
+                </item>
+            </blockDeviceMapping>
+            <virtualizationType>paravirtual</virtualizationType>
+        </item>
+        <item>
+            <imageId>ami-8ce4b5c9</imageId>
+            <imageLocation>137112412989/amzn-ami-0.9.7-beta.x86_64-ebs</imageLocation>
+            <imageState>available</imageState>
+            <imageOwnerId>137112412989</imageOwnerId>
+            <isPublic>true</isPublic>
+            <architecture>x86_64</architecture>
+            <imageType>machine</imageType>
+            <kernelId>aki-9ba0f1de</kernelId>
+            <name>amzn-ami-0.9.7-beta.x86_64-ebs</name>
+            <description>Amazon</description>
+            <rootDeviceType>ebs</rootDeviceType>
+            <rootDeviceName>/dev/sda1</rootDeviceName>
+            <blockDeviceMapping>
+                <item>
+                    <deviceName>/dev/sda1</deviceName>
+                    <ebs>
+                        <snapshotId>snap-8d8b7be6</snapshotId>
+                        <volumeSize>10</volumeSize>
+                        <deleteOnTermination>true</deleteOnTermination>
+                    </ebs>
+                </item>
+            </blockDeviceMapping>
+            <virtualizationType>paravirtual</virtualizationType>
+        </item>
+        <item>
+            <imageId>ami-f0e4b5b5</imageId>
+            <imageLocation>amzn-ami-us-west-1/amzn-ami-0.9.7-beta.i386.manifest.xml</imageLocation>
+            <imageState>available</imageState>
+            <imageOwnerId>137112412989</imageOwnerId>
+            <isPublic>true</isPublic>
+            <architecture>i386</architecture>
+            <imageType>machine</imageType>
+            <kernelId>aki-99a0f1dc</kernelId>
+            <name>amzn-ami-0.9.7-beta.i386-S3</name>
+            <description>Amazon Linux AMI i386 S3</description>
+            <rootDeviceType>instance-store</rootDeviceType>
+            <blockDeviceMapping/>
+            <virtualizationType>paravirtual</virtualizationType>
+        </item>
+        <item>
+            <imageId>ami-f2e4b5b7</imageId>
+            <imageLocation>amzn-ami-us-west-1/amzn-ami-0.9.7-beta.x86_64.manifest.xml</imageLocation>
+            <imageState>available</imageState>
+            <imageOwnerId>137112412989</imageOwnerId>
+            <isPublic>true</isPublic>
+            <architecture>x86_64</architecture>
+            <imageType>machine</imageType>
+            <kernelId>aki-9ba0f1de</kernelId>
+            <name>amzn-ami-0.9.7-beta.x86_64-S3</name>
+            <description>Amazon Linux AMI x86_64 S3</description>
+            <rootDeviceType>instance-store</rootDeviceType>
+            <blockDeviceMapping/>
+            <virtualizationType>paravirtual</virtualizationType>
+        </item>
+        <item>
+            <imageId>ami-85457ff1</imageId>
+            <imageLocation>amazon/NameGivesNoClue_Server-2008-R2_SP1-Language_Packs-64Bit-Base-2012.05.10</imageLocation>
+            <imageState>available</imageState>
+            <imageOwnerId>801119661308</imageOwnerId>
+            <isPublic>true</isPublic>
+            <architecture>x86_64</architecture>
+            <imageType>machine</imageType>
+            <platform>windows</platform>
+            <imageOwnerAlias>amazon</imageOwnerAlias>
+            <name>NameGivesNoClue_Server-2008-R2_SP1-Language_Packs-64Bit-Base-2012.05.10</name>
+            <description>Microsoft Windows Server 2008 R2 SP1 Datacenter 64-bit Multi-language AMI provided by Amazon</description>
+            <rootDeviceType>ebs</rootDeviceType>
+            <rootDeviceName>/dev/sda1</rootDeviceName>
+            <blockDeviceMapping>
+                <item>
+                    <deviceName>/dev/sda1</deviceName>
+                    <ebs>
+                        <snapshotId>snap-84a433ef</snapshotId>
+                        <volumeSize>30</volumeSize>
+                        <deleteOnTermination>true</deleteOnTermination>
+                    </ebs>
+                </item>
+            </blockDeviceMapping>
+            <virtualizationType>hvm</virtualizationType>
+            <hypervisor>xen</hypervisor>
+        </item>
+    </imagesSet>
+</DescribeImagesResponse>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/attach.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/attach.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/attach.xml
new file mode 100644
index 0000000..b41fe91
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/attach.xml
@@ -0,0 +1,7 @@
+<AttachVolumeResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <volumeId>vol-4d826724</volumeId>
+    <instanceId>i-6058a509</instanceId>
+    <device>/dev/sdh</device>
+    <status>attaching</status>
+    <attachTime>2008-05-07T11:51:50.000Z</attachTime>
+</AttachVolumeResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/authorize_securitygroup_ingress_response.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/authorize_securitygroup_ingress_response.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/authorize_securitygroup_ingress_response.xml
new file mode 100644
index 0000000..34ffe20
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/authorize_securitygroup_ingress_response.xml
@@ -0,0 +1,4 @@
+<AuthorizeSecurityGroupIngressResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>9b6a9df1-bc19-4e56-9d11-7f8382538667</requestId>
+    <return>true</return>
+</AuthorizeSecurityGroupIngressResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-ap-northeast-1.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-ap-northeast-1.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-ap-northeast-1.xml
new file mode 100644
index 0000000..129daf5
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-ap-northeast-1.xml
@@ -0,0 +1,17 @@
+<DescribeAvailabilityZonesResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>24251909-7fb6-4080-8ca3-fbb5a1ddb02d</requestId>
+    <availabilityZoneInfo>
+        <item>
+            <zoneName>ap-northeast-1a</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>ap-northeast-1</regionName>
+            <messageSet/>
+        </item>
+        <item>
+            <zoneName>ap-northeast-1b</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>ap-northeast-1</regionName>
+            <messageSet/>
+        </item>
+    </availabilityZoneInfo>
+</DescribeAvailabilityZonesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-ap-southeast-1.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-ap-southeast-1.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-ap-southeast-1.xml
new file mode 100644
index 0000000..47b33ec
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-ap-southeast-1.xml
@@ -0,0 +1,17 @@
+<DescribeAvailabilityZonesResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>22c5332d-c331-4310-b695-e21e76c3fdb0</requestId>
+    <availabilityZoneInfo>
+        <item>
+            <zoneName>ap-southeast-1a</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>ap-southeast-1</regionName>
+            <messageSet/>
+        </item>
+        <item>
+            <zoneName>ap-southeast-1b</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>ap-southeast-1</regionName>
+            <messageSet/>
+        </item>
+    </availabilityZoneInfo>
+</DescribeAvailabilityZonesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-eu-west-1.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-eu-west-1.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-eu-west-1.xml
new file mode 100644
index 0000000..921216c
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-eu-west-1.xml
@@ -0,0 +1,23 @@
+<DescribeAvailabilityZonesResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>386c8215-6ec8-4495-aaa6-8c4175688093</requestId>
+    <availabilityZoneInfo>
+        <item>
+            <zoneName>eu-west-1a</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>eu-west-1</regionName>
+            <messageSet/>
+        </item>
+        <item>
+            <zoneName>eu-west-1b</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>eu-west-1</regionName>
+            <messageSet/>
+        </item>
+        <item>
+            <zoneName>eu-west-1c</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>eu-west-1</regionName>
+            <messageSet/>
+        </item>
+    </availabilityZoneInfo>
+</DescribeAvailabilityZonesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-sa-east-1.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-sa-east-1.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-sa-east-1.xml
new file mode 100644
index 0000000..d6f97c6
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-sa-east-1.xml
@@ -0,0 +1,17 @@
+<DescribeAvailabilityZonesResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>d2e09bd5-b2ec-4c6b-aac9-6bf1fa217cb5</requestId>
+    <availabilityZoneInfo>
+        <item>
+            <zoneName>sa-east-1a</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>sa-east-1</regionName>
+            <messageSet/>
+        </item>
+        <item>
+            <zoneName>sa-east-1b</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>sa-east-1</regionName>
+            <messageSet/>
+        </item>
+    </availabilityZoneInfo>
+</DescribeAvailabilityZonesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-us-east-1.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-us-east-1.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-us-east-1.xml
new file mode 100644
index 0000000..52b521e
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-us-east-1.xml
@@ -0,0 +1,35 @@
+<DescribeAvailabilityZonesResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>ed825abf-edbb-4677-83d5-0fbd86ce5a5d</requestId>
+    <availabilityZoneInfo>
+        <item>
+            <zoneName>us-east-1a</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-east-1</regionName>
+            <messageSet/>
+        </item>
+        <item>
+            <zoneName>us-east-1b</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-east-1</regionName>
+            <messageSet/>
+        </item>
+        <item>
+            <zoneName>us-east-1c</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-east-1</regionName>
+            <messageSet/>
+        </item>
+        <item>
+            <zoneName>us-east-1d</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-east-1</regionName>
+            <messageSet/>
+        </item>
+        <item>
+            <zoneName>us-east-1e</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-east-1</regionName>
+            <messageSet/>
+        </item>
+    </availabilityZoneInfo>
+</DescribeAvailabilityZonesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-us-west-1.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-us-west-1.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-us-west-1.xml
new file mode 100644
index 0000000..c74ce18
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-us-west-1.xml
@@ -0,0 +1,23 @@
+<DescribeAvailabilityZonesResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>dbfb2a5f-ce75-49fb-846b-e2cf2fc5cdbb</requestId>
+    <availabilityZoneInfo>
+        <item>
+            <zoneName>us-west-1a</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-west-1</regionName>
+            <messageSet/>
+        </item>
+        <item>
+            <zoneName>us-west-1b</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-west-1</regionName>
+            <messageSet/>
+        </item>
+        <item>
+            <zoneName>us-west-1c</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-west-1</regionName>
+            <messageSet/>
+        </item>
+    </availabilityZoneInfo>
+</DescribeAvailabilityZonesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-us-west-2.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-us-west-2.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-us-west-2.xml
new file mode 100644
index 0000000..a782705
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones-us-west-2.xml
@@ -0,0 +1,23 @@
+<DescribeAvailabilityZonesResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>e40c2bc4-7231-4df1-a604-202bb8333332</requestId>
+    <availabilityZoneInfo>
+        <item>
+            <zoneName>us-west-2a</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-west-2</regionName>
+            <messageSet/>
+        </item>
+        <item>
+            <zoneName>us-west-2b</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-west-2</regionName>
+            <messageSet/>
+        </item>
+        <item>
+            <zoneName>us-west-2c</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-west-2</regionName>
+            <messageSet/>
+        </item>
+    </availabilityZoneInfo>
+</DescribeAvailabilityZonesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones.xml
new file mode 100644
index 0000000..be08a7a
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/availabilityZones.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<DescribeAvailabilityZonesResponse
+    xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <requestId>ec786fbb-338a-4f6f-a479-293773911366</requestId>
+    <availabilityZoneInfo>
+        <item>
+            <zoneName>us-east-1a</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-east-1</regionName>
+            <messageSet />
+        </item>
+        <item>
+            <zoneName>us-east-1b</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-east-1</regionName>
+            <messageSet />
+        </item>
+        <item>
+            <zoneName>us-east-1c</zoneName>
+            <zoneState>available</zoneState>
+            <regionName>us-east-1</regionName>
+            <messageSet>
+                <item>
+                    <message>our service is awesome</message>
+                </item>
+            </messageSet>
+        </item>
+        <item>
+            <zoneName>us-east-1d</zoneName>
+            <zoneState>downlikeaclown</zoneState>
+            <regionName>us-east-1</regionName>
+            <messageSet />
+        </item>
+    </availabilityZoneInfo>
+</DescribeAvailabilityZonesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/bundle_instance.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/bundle_instance.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/bundle_instance.xml
new file mode 100644
index 0000000..326b8ba
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/bundle_instance.xml
@@ -0,0 +1,18 @@
+<BundleInstanceResponse xmlns="http://ec2.amazonaws.com/doc/2009-04-04/">
+	<requestId>bun-c1a540a8</requestId>
+	<bundleInstanceTask>
+		<instanceId>i-12345678</instanceId>
+		<bundleId>bun-c1a540a8</bundleId>
+		<state>bundling</state>
+		<startTime>2008-10-07T11:41:50.000Z</startTime>
+		<updateTime>2008-10-07T11:51:50.000Z</updateTime>
+		<progress>70%</progress>
+		<storage>
+			<S3>
+				<bucket>my-bucket</bucket>
+				<prefix>winami</prefix>
+			</S3>
+		</storage>
+	</bundleInstanceTask>
+</BundleInstanceResponse>
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/cancel_bundle_task.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/cancel_bundle_task.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/cancel_bundle_task.xml
new file mode 100644
index 0000000..da737f2
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/cancel_bundle_task.xml
@@ -0,0 +1,16 @@
+<CancelBundleTaskResponse xmlns="http://ec2.amazonaws.com/doc/2009-04-04/">
+	<bundleInstanceTask>
+		<instanceId>i-12345678</instanceId>
+		<bundleId>bun-cla322b9</bundleId>
+		<state>canceling</state>
+		<startTime>2008-10-07T11:41:50.000Z</startTime>
+		<updateTime>2008-10-07T11:51:50.000Z</updateTime>
+		<progress>20%</progress>
+		<storage>
+			<S3>
+				<bucket>my-bucket</bucket>
+				<prefix>my-new-image</prefix>
+			</S3>
+		</storage>
+	</bundleInstanceTask>
+</CancelBundleTaskResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/create_keypair.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/create_keypair.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/create_keypair.xml
new file mode 100644
index 0000000..1641b1e
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/create_keypair.xml
@@ -0,0 +1,28 @@
+<CreateKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>bb5e3a3c-e254-454d-ba29-d607cdf6357a</requestId>
+    <keyName>jclouds#test#0</keyName>
+    <keyFingerprint>13:36:74:b9:56:bb:07:96:c0:19:ab:00:7f:9f:06:d2:16:a0:45:32</keyFingerprint>
+    <keyMaterial>-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA0CbFlhSdbMdad2ux2BVqk6Ut5fLKb0CdbqubGcEBfwsSz9Rp4Ile76P90MpV
+W1BGKL5V4MO+flG6dZnRWPVmgrNVyDTmEsALiMGjfEwbACEZ1A8C6mPa36wWO7MlxuyMjg8OczTB
+EXnHNDpxE5a6KowJtzFlmgjHk2Y+Q42UIqPx47lQUv5bdMDCnfNNomSzTVRjOZLUkDja+ybCKdux
+gqTsuInhuBRMx+wxff8Z43ECdJV6UPoXK3der1dlZunxGCFkCeYq0kCX7FZ7PV35X744jqhD8P+7
+y5prO4W+M3DWgChUx0OlbDbSHtDVlcfdbj/+4AKYKU6rQOqh+4DPDQIDAQABAoIBAHjQuEiXKJSV
+1U2RZcVtENInws9AL/2I/Jfa5Qh6vTqXG9EjklywfzkK72x7tDVvD3ngmAoAs5WwLFDL+fXvYhOk
+sbql8ZCahVdYRWME7XsSu2IZYHDZipXe1XzLS7b9X8uos5Ns4E8bZuNKtI1RJDdD1vPMqRNR2z0T
+0Dn3eC7t+t+t7PWaK5AXu2ot7DoOeG1QhqJbwd5pMkIn2ydBILytgmDk/2P3EtJGePIJIeQBicmw
+Z0KrJFa/K2cC8AtmMJUoZMo+mh1yemDbDLCZW30PjFHbZtcszS2cydAgq/HDFkZynvZG0zhbx/To
+jzcNza1AyypYwOwb2/9/ulXZp0UCgYEA+QFgWDfYLH2zwjU5b6e0UbIyd/X/yRZ+L8lOEBd0Bbu8
+qO3txaDbwi7o2mG7pJENHJ3u62CHjgTGDNW9V9Q8eNoGtj3uHvMvi7FdDEK8B6izdZyR7hmZmQ/5
+MIldelyiGZlz1KBSoy4FsCpA7hV7cI6H6x+Im24NxG90/wd/EgMCgYEA1f+cUyUisIO3yKOCf0hQ
+aL289q2//F2cbvBxtki6I8JzTg1H3oTO2WVrXQeCA3a/yiuRUatgGH4mxrpCF6byVJyqrEWAj4kU
+uTbhMgIYhLGoaF1e+vMirCRXUXox0i5X976ASzHn64V9JSd1B+UbKfpcFTYYnChmrRDzmhKN1a8C
+gYBTvIHAyO7ab18/BRUOllAOVSWhr8lXv0eqHEEzKh/rOaoFCRY3qpOcZpgJsGogumK1Z+sLnoeX
+W8WaVVp6KbY4UeGF8aedItyvVnLbB6ohzTqkZ4Wvk05S6cs75kXYO0SL5U3NiCiiFXz2NA9nwTOk
+s1nD2PPgiQ76Kx0mEkhKLwKBgFhHEJqv+AZu37Kx2NRe5WS/2KK9/DPD/hM5tv7mM3sq7Nvm2J3v
+lVDS6J5AyZ5aLzXcER9qncKcz6wtC7SsFs1Wr4VPSoBroRPikrVJbgnXK8yZr+O/xq7Scv7WdJTq
+rzkw6cWbObvLnltkUn/GQBVqBPBvF2nbtLdyBbuqKb5bAoGBAI1+aoJnvXEXxT4UHrMkQcY0eXRz
+3UdbzJmtjMW9CR6l9s11mV6PcZP4qnODp3nd6a+lPeL3wVYQ47DsTJ/Bx5dI17zA5mU57n6mV0a3
+DbSoPKSdaKTQdo2THnVE9P9sPKZWueAcsE4Yw/qcTjoxrtUnAH/AXN250v0tkKIOvMhu
+-----END RSA PRIVATE KEY-----</keyMaterial>
+</CreateKeyPairResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/created_securitygroup.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/created_securitygroup.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/created_securitygroup.xml
new file mode 100644
index 0000000..baa7887
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/created_securitygroup.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CreateSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>8bf8a888-33af-459a-8424-13d4da0c2341</requestId>
+    <return>true</return>
+    <groupId>sg-3c6ef654</groupId>
+</CreateSecurityGroupResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/created_snapshot.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/created_snapshot.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/created_snapshot.xml
new file mode 100644
index 0000000..5cd0d6b
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/created_snapshot.xml
@@ -0,0 +1,10 @@
+<CreateSnapshotResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+  <snapshotId>snap-78a54011</snapshotId>
+  <volumeId>vol-4d826724</volumeId>
+  <volumeSize>10</volumeSize>
+  <status>pending</status>
+  <startTime>2008-05-07T12:51:50.000Z</startTime>
+  <progress>60%</progress>
+  <ownerId>213457642086</ownerId>
+  <description>Daily Backup</description>
+</CreateSnapshotResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/created_volume.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/created_volume.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/created_volume.xml
new file mode 100644
index 0000000..acca927
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/created_volume.xml
@@ -0,0 +1,9 @@
+<CreateVolumeResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <requestId>0c67a4c9-d7ec-45ef-8016-bf7944668962</requestId>
+    <volumeId>vol-2a21e543</volumeId>
+    <size>1</size>
+    <snapshotId/>
+    <availabilityZone>us-east-1a</availabilityZone>
+    <status>creating</status>
+    <createTime>2009-12-28T05:42:53.000Z</createTime>
+</CreateVolumeResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/delete_securitygroup.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/delete_securitygroup.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/delete_securitygroup.xml
new file mode 100644
index 0000000..9545778
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/delete_securitygroup.xml
@@ -0,0 +1,4 @@
+<DeleteSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2013-02-01/">
+  <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId> 
+  <return>true</return>
+</DeleteSecurityGroupResponse>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_addresses.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_addresses.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_addresses.xml
new file mode 100644
index 0000000..36d3d1f
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_addresses.xml
@@ -0,0 +1,11 @@
+<DescribeAddressesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <addressesSet>
+        <item>
+            <instanceId>i-f15ebb98</instanceId>
+            <publicIp>67.202.55.255</publicIp>
+        </item>
+        <item>
+            <publicIp>67.202.55.233</publicIp>
+        </item>
+    </addressesSet>
+</DescribeAddressesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_addresses_single.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_addresses_single.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_addresses_single.xml
new file mode 100644
index 0000000..d9179bd
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_addresses_single.xml
@@ -0,0 +1,8 @@
+<DescribeAddressesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <addressesSet>
+        <item>
+            <instanceId>i-f15ebb98</instanceId>
+            <publicIp>67.202.55.255</publicIp>
+        </item>
+    </addressesSet>
+</DescribeAddressesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_bundle_tasks.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_bundle_tasks.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_bundle_tasks.xml
new file mode 100644
index 0000000..d45e8f6
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_bundle_tasks.xml
@@ -0,0 +1,18 @@
+<DescribeBundleTasksResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+	<bundleInstanceTasksSet>
+		<item>
+			<instanceId>i-12345678</instanceId>
+			<bundleId>bun-c1a540a8</bundleId>
+			<state>canceling</state>
+			<startTime>2008-10-07T11:41:50.000Z</startTime>
+			<updateTime>2008-10-07T11:51:50.000Z</updateTime>
+			<progress>20%</progress>
+			<storage>
+				<S3>
+					<bucket>my-bucket</bucket>
+					<prefix>winami</prefix>
+				</S3>
+			</storage>
+		</item>
+	</bundleInstanceTasksSet>
+</DescribeBundleTasksResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_image_attribute_blockDeviceMapping.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_image_attribute_blockDeviceMapping.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_image_attribute_blockDeviceMapping.xml
new file mode 100644
index 0000000..21f0476
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_image_attribute_blockDeviceMapping.xml
@@ -0,0 +1,24 @@
+<DescribeInstanceAttributeResponse
+   xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <instanceId>i-7f629614</instanceId>
+    <blockDeviceMapping>
+        <item>
+            <deviceName>/dev/sda1</deviceName>
+            <ebs>
+                <volumeId>vol-d74b82be</volumeId>
+                <status>attached</status>
+                <attachTime>2010-02-20T18:25:26.000Z</attachTime>
+                <deleteOnTermination>true</deleteOnTermination>
+            </ebs>
+        </item>
+        <item>
+            <deviceName>/dev/sdf</deviceName>
+            <ebs>
+                <volumeId>vol-another</volumeId>
+                <status>detached</status>
+                <attachTime>2010-02-20T19:26:26.000Z</attachTime>
+                <deleteOnTermination>false</deleteOnTermination>
+            </ebs>
+        </item>
+    </blockDeviceMapping>
+</DescribeInstanceAttributeResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_image_attribute_launchPermission.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_image_attribute_launchPermission.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_image_attribute_launchPermission.xml
new file mode 100644
index 0000000..fa062f7
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_image_attribute_launchPermission.xml
@@ -0,0 +1,11 @@
+<DescribeImageAttributeResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+  <imageId>ami-61a54008</imageId>
+  <launchPermission>
+    <item>
+      <group>all</group>
+    </item>
+    <item>
+      <userId>495219933132</userId>
+    </item>
+  </launchPermission>
+</DescribeImageAttributeResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images.xml
new file mode 100644
index 0000000..72d8260
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images.xml
@@ -0,0 +1,23 @@
+<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <imagesSet>
+        <item>
+            <imageId>ami-be3adfd7</imageId>
+            <imageLocation>ec2-public-images/fedora-8-i386-base-v1.04.manifest.xml</imageLocation>
+            <imageState>available</imageState>
+            <imageOwnerId>206029621532</imageOwnerId>
+            <isPublic>false</isPublic>
+            <productCodes>
+                <item>
+                    <productCode>9961934F</productCode>
+                </item>
+            </productCodes>
+            <architecture>i386</architecture>
+            <imageType>machine</imageType>
+            <kernelId>aki-4438dd2d</kernelId>
+            <ramdiskId>ari-4538dd2c</ramdiskId>
+            <rootDeviceType>instance-store</rootDeviceType>
+            <blockDeviceMapping />
+            <virtualizationType>paravirtual</virtualizationType>
+        </item>
+    </imagesSet>
+</DescribeImagesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_ebs.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_ebs.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_ebs.xml
new file mode 100644
index 0000000..12830ab
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_ebs.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <requestId>c952eb86-3a28-4987-8df5-dd08e3e8e502</requestId>
+    <imagesSet>
+        <item>
+            <imageId>ami-246f8d4d</imageId>
+            <imageLocation>706093390852/websrv_2009-12-10
+            </imageLocation>
+            <imageState>available</imageState>
+            <imageOwnerId>706093390852</imageOwnerId>
+            <isPublic>true</isPublic>
+            <architecture>i386</architecture>
+            <imageType>machine</imageType>
+            <platform>windows</platform>
+            <name>websrv_2009-12-10</name>
+            <description>Web Server AMI</description>
+            <rootDeviceType>ebs</rootDeviceType>
+            <rootDeviceName>/dev/sda1</rootDeviceName>
+            <blockDeviceMapping>
+                <item>
+                    <deviceName>/dev/sda1</deviceName>
+                    <ebs>
+                        <snapshotId>snap-d01272b9</snapshotId>
+                        <volumeSize>30</volumeSize>
+                        <deleteOnTermination>true</deleteOnTermination>
+                    </ebs>
+                </item>
+                <item>
+                    <deviceName>xvdf</deviceName>
+                    <ebs>
+                        <snapshotId>snap-d31272ba</snapshotId>
+                        <volumeSize>250</volumeSize>
+                        <deleteOnTermination>false</deleteOnTermination>
+                    </ebs>
+                </item>
+            </blockDeviceMapping>
+            <virtualizationType>hvm</virtualizationType>
+        </item>
+    </imagesSet>
+</DescribeImagesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_imageextension0.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_imageextension0.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_imageextension0.xml
new file mode 100644
index 0000000..fde8b1d
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_imageextension0.xml
@@ -0,0 +1,24 @@
+<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+  <imagesSet>
+    <item>
+      <imageId>ami-0</imageId>
+      <imageLocation>ec2-public-images/fedora-8-i386-base-v1.04.manifest.xml
+      </imageLocation>
+      <imageState>available</imageState>
+      <imageOwnerId>206029621532</imageOwnerId>
+      <isPublic>false</isPublic>
+      <productCodes>
+        <item>
+          <productCode>9961934F</productCode>
+        </item>
+      </productCodes>
+      <architecture>i386</architecture>
+      <imageType>machine</imageType>
+      <kernelId>aki-4438dd2d</kernelId>
+      <ramdiskId>ari-4538dd2c</ramdiskId>
+      <rootDeviceType>instance-store</rootDeviceType>
+      <blockDeviceMapping />
+      <virtualizationType>paravirtual</virtualizationType>
+    </item>
+  </imagesSet>
+</DescribeImagesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_imageextension1.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_imageextension1.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_imageextension1.xml
new file mode 100644
index 0000000..5b2bc97
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_imageextension1.xml
@@ -0,0 +1,24 @@
+<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+  <imagesSet>
+    <item>
+      <imageId>ami-1</imageId>
+      <imageLocation>ec2-public-images/fedora-8-i386-base-v1.04.manifest.xml
+      </imageLocation>
+      <imageState>deregistered</imageState>
+      <imageOwnerId>206029621532</imageOwnerId>
+      <isPublic>false</isPublic>
+      <productCodes>
+        <item>
+          <productCode>9961934F</productCode>
+        </item>
+      </productCodes>
+      <architecture>i386</architecture>
+      <imageType>machine</imageType>
+      <kernelId>aki-4438dd2d</kernelId>
+      <ramdiskId>ari-4538dd2c</ramdiskId>
+      <rootDeviceType>instance-store</rootDeviceType>
+      <blockDeviceMapping />
+      <virtualizationType>paravirtual</virtualizationType>
+    </item>
+  </imagesSet>
+</DescribeImagesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_imageextension2.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_imageextension2.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_imageextension2.xml
new file mode 100644
index 0000000..bef5c03
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_imageextension2.xml
@@ -0,0 +1,24 @@
+<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+  <imagesSet>
+    <item>
+      <imageId>ami-2</imageId>
+      <imageLocation>ec2-public-images/fedora-8-i386-base-v1.04.manifest.xml
+      </imageLocation>
+      <imageState>unrecognized</imageState>
+      <imageOwnerId>206029621532</imageOwnerId>
+      <isPublic>false</isPublic>
+      <productCodes>
+        <item>
+          <productCode>9961934F</productCode>
+        </item>
+      </productCodes>
+      <architecture>i386</architecture>
+      <imageType>machine</imageType>
+      <kernelId>aki-4438dd2d</kernelId>
+      <ramdiskId>ari-4538dd2c</ramdiskId>
+      <rootDeviceType>instance-store</rootDeviceType>
+      <blockDeviceMapping />
+      <virtualizationType>paravirtual</virtualizationType>
+    </item>
+  </imagesSet>
+</DescribeImagesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_nova.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_nova.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_nova.xml
new file mode 100644
index 0000000..673d1f4
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_nova.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2009-04-04/">
+    <requestId>f3daebdd-c435-4af4-86fc-d467e4530e57</requestId>
+    <imagesSet>
+        <item>
+            <displayName>CentOS 6.2 Server 64-bit 20120125</displayName>
+            <description />
+            <imageOwnerId />
+            <isPublic>true</isPublic>
+            <imageId>ami-0000054e</imageId>
+            <imageState>available</imageState>
+            <rootDeviceType>instance-store</rootDeviceType>
+            <architecture>x86_64</architecture>
+            <imageLocation>local (CentOS 6.2 Server 64-bit 20120125)</imageLocation>
+            <kernelId>aki-0000054c</kernelId>
+            <ramdiskId>ari-0000054d</ramdiskId>
+            <rootDeviceName>/dev/sda1</rootDeviceName>
+            <imageType>machine</imageType>
+        </item>
+    </imagesSet>
+</DescribeImagesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_tags.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_tags.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_tags.xml
new file mode 100644
index 0000000..ab22d1d
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_tags.xml
@@ -0,0 +1,33 @@
+<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <imagesSet>
+        <item>
+            <imageId>ami-be3adfd7</imageId>
+            <imageLocation>ec2-public-images/fedora-8-i386-base-v1.04.manifest.xml</imageLocation>
+            <imageState>available</imageState>
+            <imageOwnerId>206029621532</imageOwnerId>
+            <isPublic>false</isPublic>
+            <productCodes>
+                <item>
+                    <productCode>9961934F</productCode>
+                </item>
+            </productCodes>
+            <architecture>i386</architecture>
+            <imageType>machine</imageType>
+            <kernelId>aki-4438dd2d</kernelId>
+            <ramdiskId>ari-4538dd2c</ramdiskId>
+            <rootDeviceType>instance-store</rootDeviceType>
+            <blockDeviceMapping />
+            <virtualizationType>paravirtual</virtualizationType>
+            <tagSet>
+                <item>
+                    <key>Name</key>
+                    <value>Some machine name</value>
+                </item>
+                <item>
+                    <key>Second</key>
+                    <value>Second value</value>
+                </item>
+            </tagSet>
+        </item>
+    </imagesSet>
+</DescribeImagesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_windows.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_windows.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_windows.xml
new file mode 100644
index 0000000..4b9107c
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_images_windows.xml
@@ -0,0 +1,22 @@
+<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <imagesSet>
+        <item>
+            <imageId>ami-02eb086b</imageId>
+            <imageLocation>aws-solutions-amis/SqlSvrStd2003r2-x86_64-Win_SFWBasic5.1-v1.0.manifest.xml</imageLocation>
+            <imageState>available</imageState>
+            <imageOwnerId>771350841976</imageOwnerId>            
+            <isPublic>true</isPublic>
+            <productCodes>
+                <item>
+                    <productCode>5771E9A6</productCode>
+                </item>
+            </productCodes>
+            <architecture>x86_64</architecture>
+            <imageType>machine</imageType>
+            <platform>windows</platform>
+            <rootDeviceType>instance-store</rootDeviceType>
+            <blockDeviceMapping/>
+            <virtualizationType>paravirtual</virtualizationType>
+        </item>
+    </imagesSet>
+</DescribeImagesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances.xml
new file mode 100644
index 0000000..ac146ed
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances.xml
@@ -0,0 +1,85 @@
+<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <reservationSet>
+        <item>
+            <reservationId>r-44a5402d</reservationId>
+            <ownerId>UYY3TLBUXIEON5NQVUUX6OMPWBZIQNFM</ownerId>
+            <groupSet>
+                <item>
+                    <groupId>default</groupId>
+                </item>
+            </groupSet>
+            <instancesSet>
+                <item>
+                    <instanceId>i-28a64341</instanceId>
+                    <imageId>ami-6ea54007</imageId>
+                    <instanceState>
+                        <code>0</code>
+                        <name>running</name>
+                    </instanceState>
+                    <privateDnsName>10-251-50-132.ec2.internal
+                    </privateDnsName>
+                    <dnsName>ec2-72-44-33-4.compute-1.amazonaws.com
+                    </dnsName>
+                    <keyName>example-key-name</keyName>
+                    <amiLaunchIndex>23</amiLaunchIndex>
+                    <productCodesSet>
+                        <item>
+                            <productCode>774F4FF8</productCode>
+                        </item>
+                    </productCodesSet>
+                    <instanceType>m1.large</instanceType>
+                    <launchTime>2007-08-07T11:54:42.000Z</launchTime>
+                    <placement>
+                        <availabilityZone>us-east-1b</availabilityZone>
+                    </placement>
+                    <monitoring>
+                        <state>disabled</state>
+                    </monitoring>
+                    <kernelId>aki-ba3adfd3</kernelId>
+                    <ramdiskId>ari-badbad00</ramdiskId>
+                    <hypervisor>xen</hypervisor>
+                    <tagSet>
+                       <item>
+                           <key>Name</key>
+                           <value>ec2-o</value>
+                       </item>
+                       <item>
+                           <key>Empty</key>
+                           <value />
+                       </item>
+                    </tagSet>
+                </item>
+                <item>
+                    <instanceId>i-28a64435</instanceId>
+                    <imageId>ami-6ea54007</imageId>
+                    <instanceState>
+                        <code>0</code>
+                        <name>running</name>
+                    </instanceState>
+                    <privateDnsName>10-251-50-134.ec2.internal
+                    </privateDnsName>
+                    <dnsName>ec2-72-44-33-6.compute-1.amazonaws.com
+                    </dnsName>
+                    <keyName>example-key-name</keyName>
+                    <amiLaunchIndex>23</amiLaunchIndex>
+                    <productCodesSet>
+                        <item>
+                            <productCode>774F4FF8</productCode>
+                        </item>
+                    </productCodesSet>
+                    <instanceType>m1.large</instanceType>
+                    <launchTime>2007-08-07T11:54:42.000Z</launchTime>
+                    <placement>
+                        <availabilityZone>us-east-1b</availabilityZone>
+                    </placement>
+                    <monitoring>
+                        <state>disabled</state>
+                    </monitoring>
+                    <kernelId>aki-ba3adfd3</kernelId>
+                    <ramdiskId>ari-badbad00</ramdiskId>
+                    <hypervisor>xen</hypervisor>
+                </item>
+            </instancesSet>
+        </item>
+    </reservationSet>
+</DescribeInstancesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_ebs.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_ebs.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_ebs.xml
new file mode 100644
index 0000000..d73877f
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_ebs.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <requestId>423068c0-523e-41a7-877c-7123e91d85e2</requestId>
+    <reservationSet>
+        <item>
+            <reservationId>r-596dd731</reservationId>
+            <ownerId>993194456877</ownerId>
+            <groupSet>
+                <item>
+                    <groupId>adriancole.ec2ebsingress</groupId>
+                </item>
+            </groupSet>
+            <instancesSet>
+                <item>
+                    <instanceId>i-e564438d</instanceId>
+                    <imageId>ami-849875ed</imageId>
+                    <instanceState>
+                        <code>16</code>
+                        <name>running</name>
+                    </instanceState>
+                    <privateDnsName>domU-12-31-39-09-CE-53.compute-1.internal
+                    </privateDnsName>
+                    <dnsName>ec2-75-101-203-146.compute-1.amazonaws.com
+                    </dnsName>
+                    <reason />
+                    <keyName>adriancole.ec2ebs1</keyName>
+                    <amiLaunchIndex>0</amiLaunchIndex>
+                    <productCodes />
+                    <instanceType>m1.small</instanceType>
+                    <launchTime>2009-12-30T04:06:23.000Z</launchTime>
+                    <placement>
+                        <availabilityZone>us-east-1b</availabilityZone>
+                        <groupName>placement</groupName>
+                    </placement>
+                    <kernelId>aki-a71cf9ce</kernelId>
+                    <ramdiskId>ari-a51cf9cc</ramdiskId>
+                    <monitoring>
+                        <state>disabled</state>
+                    </monitoring>
+                    <virtualizationType>hvm</virtualizationType>
+                    <privateIpAddress>10.210.209.157</privateIpAddress>
+                    <ipAddress>75.101.203.146</ipAddress>
+                    <hypervisor>xen</hypervisor>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <volumeId>vol-dc6ca8b5</volumeId>
+                                <status>attached</status>
+                                <attachTime>2009-12-30T04:06:29.000Z
+                                </attachTime>
+                                <deleteOnTermination>true
+                                </deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                </item>
+            </instancesSet>
+        </item>
+    </reservationSet>
+</DescribeInstancesResponse>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_multiple.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_multiple.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_multiple.xml
new file mode 100644
index 0000000..6b48db4
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_multiple.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>f6d3252e-35e5-4ef5-b2c5-62da95dd829b</requestId>
+    <reservationSet>
+        <item>
+            <reservationId>r-205ad944</reservationId>
+            <ownerId>993194456877</ownerId>
+            <groupSet>
+                <item>
+                    <groupId>sg-3c6ef654</groupId>
+                    <groupName>jclouds#mygroup2</groupName>
+                </item>
+            </groupSet>
+            <instancesSet>
+                <item>
+                    <instanceId>i-2baa5550</instanceId>
+                    <imageId>ami-aecd60c7</imageId>
+                    <instanceState>
+                        <code>16</code>
+                        <name>running</name>
+                    </instanceState>
+                    <privateDnsName>ip-10-28-89-195.ec2.internal</privateDnsName>
+                    <dnsName>ec2-50-16-1-166.compute-1.amazonaws.com</dnsName>
+                    <reason/>
+                    <keyName>jclouds#mygroup2#81</keyName>
+                    <amiLaunchIndex>0</amiLaunchIndex>
+                    <productCodes/>
+                    <instanceType>t1.micro</instanceType>
+                    <launchTime>2012-08-02T04:28:30.000Z</launchTime>
+                    <placement>
+                        <availabilityZone>us-east-1e</availabilityZone>
+                        <groupName/>
+                        <tenancy>default</tenancy>
+                    </placement>
+                    <kernelId>aki-88aa75e1</kernelId>
+                    <monitoring>
+                        <state>disabled</state>
+                    </monitoring>
+                    <privateIpAddress>10.28.89.195</privateIpAddress>
+                    <ipAddress>50.16.1.166</ipAddress>
+                    <groupSet>
+                        <item>
+                            <groupId>sg-3c6ef654</groupId>
+                            <groupName>jclouds#mygroup2</groupName>
+                        </item>
+                    </groupSet>
+                    <architecture>x86_64</architecture>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <volumeId>vol-f2d7c993</volumeId>
+                                <status>attached</status>
+                                <attachTime>2012-08-02T04:28:56.000Z</attachTime>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                    <clientToken/>
+                    <tagSet>
+                        <item>
+                            <key>Name</key>
+                            <value>mygroup2-2baa5550</value>
+                        </item>
+                    </tagSet>
+                    <hypervisor>xen</hypervisor>
+                </item>
+                <item>
+                    <instanceId>i-abcd1234</instanceId>
+                    <imageId>ami-aecd60c7</imageId>
+                    <instanceState>
+                        <code>16</code>
+                        <name>running</name>
+                    </instanceState>
+                    <privateDnsName>ip-10-28-89-100.ec2.internal</privateDnsName>
+                    <dnsName>ec2-50-16-1-100.compute-1.amazonaws.com</dnsName>
+                    <reason/>
+                    <keyName>jclouds#mygroup2#82</keyName>
+                    <amiLaunchIndex>0</amiLaunchIndex>
+                    <productCodes/>
+                    <instanceType>t1.micro</instanceType>
+                    <launchTime>2012-08-01T04:28:30.000Z</launchTime>
+                    <placement>
+                        <availabilityZone>us-east-1e</availabilityZone>
+                        <groupName/>
+                        <tenancy>default</tenancy>
+                    </placement>
+                    <kernelId>aki-88aa75e1</kernelId>
+                    <monitoring>
+                        <state>disabled</state>
+                    </monitoring>
+                    <privateIpAddress>10.28.89.100</privateIpAddress>
+                    <ipAddress>50.16.1.100</ipAddress>
+                    <groupSet>
+                        <item>
+                            <groupId>sg-3c6ef654</groupId>
+                            <groupName>jclouds#mygroup2</groupName>
+                        </item>
+                    </groupSet>
+                    <architecture>x86_64</architecture>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <volumeId>vol-f2d7c900</volumeId>
+                                <status>attached</status>
+                                <attachTime>2012-08-01T04:28:56.000Z</attachTime>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                    <clientToken/>
+                    <tagSet>
+                        <item>
+                            <key>Name</key>
+                            <value>mygroup2-abcd1234</value>
+                        </item>
+                    </tagSet>
+                    <hypervisor>xen</hypervisor>
+                </item>
+            </instancesSet>
+        </item>
+    </reservationSet>
+</DescribeInstancesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running-1.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running-1.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running-1.xml
new file mode 100644
index 0000000..9a974c5
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running-1.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>f6d3252e-35e5-4ef5-b2c5-62da95dd829b</requestId>
+    <reservationSet>
+        <item>
+            <reservationId>r-205ad944</reservationId>
+            <ownerId>993194456877</ownerId>
+            <groupSet>
+                <item>
+                    <groupId>sg-3c6ef654</groupId>
+                    <groupName>jclouds#mygroup2</groupName>
+                </item>
+            </groupSet>
+            <instancesSet>
+                <item>
+                    <instanceId>i-2baa5550</instanceId>
+                    <imageId>ami-aecd60c7</imageId>
+                    <instanceState>
+                        <code>16</code>
+                        <name>running</name>
+                    </instanceState>
+                    <privateDnsName>ip-10-28-89-195.ec2.internal</privateDnsName>
+                    <dnsName>ec2-50-16-1-166.compute-1.amazonaws.com</dnsName>
+                    <reason/>
+                    <keyName>jclouds#mygroup2#81</keyName>
+                    <amiLaunchIndex>0</amiLaunchIndex>
+                    <productCodes/>
+                    <instanceType>t1.micro</instanceType>
+                    <launchTime>2012-08-02T04:28:30.000Z</launchTime>
+                    <placement>
+                        <availabilityZone>us-east-1e</availabilityZone>
+                        <groupName/>
+                        <tenancy>default</tenancy>
+                    </placement>
+                    <kernelId>aki-88aa75e1</kernelId>
+                    <monitoring>
+                        <state>disabled</state>
+                    </monitoring>
+                    <privateIpAddress>10.28.89.195</privateIpAddress>
+                    <ipAddress>50.16.1.166</ipAddress>
+                    <groupSet>
+                        <item>
+                            <groupId>sg-3c6ef654</groupId>
+                            <groupName>jclouds#mygroup2</groupName>
+                        </item>
+                    </groupSet>
+                    <architecture>x86_64</architecture>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <volumeId>vol-f2d7c993</volumeId>
+                                <status>attached</status>
+                                <attachTime>2012-08-02T04:28:56.000Z</attachTime>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                    <clientToken/>
+                    <tagSet>
+                        <item>
+                            <key>Name</key>
+                            <value>mygroup2-2baa5550</value>
+                        </item>
+                    </tagSet>
+                    <hypervisor>xen</hypervisor>
+                </item>
+            </instancesSet>
+        </item>
+    </reservationSet>
+</DescribeInstancesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running-named.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running-named.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running-named.xml
new file mode 100644
index 0000000..4f46ada
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running-named.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>f6d3252e-35e5-4ef5-b2c5-62da95dd829b</requestId>
+    <reservationSet>
+        <item>
+            <reservationId>r-205ad944</reservationId>
+            <ownerId>993194456877</ownerId>
+            <groupSet>
+                <item>
+                    <groupId>sg-3c6ef654</groupId>
+                    <groupName>jclouds#mygroup2</groupName>
+                </item>
+            </groupSet>
+            <instancesSet>
+                <item>
+                    <instanceId>i-2baa5550</instanceId>
+                    <imageId>ami-aecd60c7</imageId>
+                    <instanceState>
+                        <code>16</code>
+                        <name>running</name>
+                    </instanceState>
+                    <privateDnsName>ip-10-28-89-195.ec2.internal</privateDnsName>
+                    <dnsName>ec2-50-16-1-166.compute-1.amazonaws.com</dnsName>
+                    <reason/>
+                    <keyName>jclouds#mygroup2#81</keyName>
+                    <amiLaunchIndex>0</amiLaunchIndex>
+                    <productCodes/>
+                    <instanceType>t1.micro</instanceType>
+                    <launchTime>2012-08-02T04:28:30.000Z</launchTime>
+                    <placement>
+                        <availabilityZone>us-east-1e</availabilityZone>
+                        <groupName/>
+                        <tenancy>default</tenancy>
+                    </placement>
+                    <kernelId>aki-88aa75e1</kernelId>
+                    <monitoring>
+                        <state>disabled</state>
+                    </monitoring>
+                    <privateIpAddress>10.28.89.195</privateIpAddress>
+                    <ipAddress>50.16.1.166</ipAddress>
+                    <groupSet>
+                        <item>
+                            <groupId>sg-3c6ef654</groupId>
+                            <groupName>jclouds#mygroup2</groupName>
+                        </item>
+                    </groupSet>
+                    <architecture>x86_64</architecture>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <volumeId>vol-f2d7c993</volumeId>
+                                <status>attached</status>
+                                <attachTime>2012-08-02T04:28:56.000Z</attachTime>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                    <clientToken/>
+                    <tagSet>
+                        <item>
+                            <key>Name</key>
+                            <value>test-node</value>
+                        </item>
+                    </tagSet>
+                    <hypervisor>xen</hypervisor>
+                </item>
+            </instancesSet>
+        </item>
+    </reservationSet>
+</DescribeInstancesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running.xml
new file mode 100644
index 0000000..5f15e85
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running.xml
@@ -0,0 +1,45 @@
+<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <requestId>ae75a8cc-b707-4a20-b130-61ad6f20de61</requestId>
+    <reservationSet>
+        <item>
+            <reservationId>r-a3c508cb</reservationId>
+            <ownerId>993194456877</ownerId>
+            <groupSet>
+                <item>
+                    <groupId>adriancole.ec2ingress</groupId>
+                </item>
+            </groupSet>
+            <instancesSet>
+                <item>
+                    <instanceId>i-0799056f</instanceId>
+                    <imageId>ami-82e4b5c7</imageId>
+                    <instanceState>
+                        <code>16</code>
+                        <name>running</name>
+                    </instanceState>
+                    <privateDnsName>ip-10-243-42-70.ec2.internal
+                    </privateDnsName>
+                    <dnsName>ec2-174-129-81-68.compute-1.amazonaws.com
+                    </dnsName>
+                    <reason />
+                    <keyName>adriancole.ec21</keyName>
+                    <amiLaunchIndex>0</amiLaunchIndex>
+                    <productCodes />
+                    <instanceType>m1.small</instanceType>
+                    <launchTime>2009-11-09T03:00:34.000Z</launchTime>
+                    <placement>
+                        <availabilityZone>us-east-1c</availabilityZone>
+                    </placement>
+                    <kernelId>aki-a71cf9ce</kernelId>
+                    <ramdiskId>ari-a51cf9cc</ramdiskId>
+                    <monitoring>
+                        <state>disabled</state>
+                    </monitoring>
+                    <privateIpAddress>10.243.42.70</privateIpAddress>
+                    <ipAddress>174.129.81.68</ipAddress>
+                    <hypervisor>xen</hypervisor>                    
+                </item>
+            </instancesSet>
+        </item>
+    </reservationSet>
+</DescribeInstancesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running_securitygroups.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running_securitygroups.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running_securitygroups.xml
new file mode 100644
index 0000000..4c07ed2
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_instances_running_securitygroups.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2011-05-15/">
+    <requestId>f6d3252e-35e5-4ef5-b2c5-62da95dd829b</requestId>
+    <reservationSet>
+        <item>
+            <reservationId>r-205ad944</reservationId>
+            <ownerId>993194456877</ownerId>
+            <groupSet>
+                <item>
+                    <groupId>sg-3c6ef654</groupId>
+                    <groupName>jclouds#some-group</groupName>
+                </item>
+            </groupSet>
+            <instancesSet>
+                <item>
+                    <instanceId>i-2baa5550</instanceId>
+                    <imageId>ami-aecd60c7</imageId>
+                    <instanceState>
+                        <code>16</code>
+                        <name>running</name>
+                    </instanceState>
+                    <privateDnsName>ip-10-28-89-195.ec2.internal</privateDnsName>
+                    <dnsName>ec2-50-16-1-166.compute-1.amazonaws.com</dnsName>
+                    <reason/>
+                    <keyName>jclouds#mygroup2#81</keyName>
+                    <amiLaunchIndex>0</amiLaunchIndex>
+                    <productCodes/>
+                    <instanceType>t1.micro</instanceType>
+                    <launchTime>2012-08-02T04:28:30.000Z</launchTime>
+                    <placement>
+                        <availabilityZone>us-east-1e</availabilityZone>
+                        <groupName/>
+                        <tenancy>default</tenancy>
+                    </placement>
+                    <kernelId>aki-88aa75e1</kernelId>
+                    <monitoring>
+                        <state>disabled</state>
+                    </monitoring>
+                    <privateIpAddress>10.28.89.195</privateIpAddress>
+                    <ipAddress>50.16.1.166</ipAddress>
+                    <groupSet>
+                        <item>
+                          <groupId>sg-3c6ef654</groupId>
+                          <groupName>jclouds#some-group</groupName>
+                        </item>
+                    </groupSet>
+                    <architecture>x86_64</architecture>
+                    <rootDeviceType>ebs</rootDeviceType>
+                    <rootDeviceName>/dev/sda1</rootDeviceName>
+                    <blockDeviceMapping>
+                        <item>
+                            <deviceName>/dev/sda1</deviceName>
+                            <ebs>
+                                <volumeId>vol-f2d7c993</volumeId>
+                                <status>attached</status>
+                                <attachTime>2012-08-02T04:28:56.000Z</attachTime>
+                                <deleteOnTermination>true</deleteOnTermination>
+                            </ebs>
+                        </item>
+                    </blockDeviceMapping>
+                    <virtualizationType>paravirtual</virtualizationType>
+                    <clientToken/>
+                    <tagSet>
+                        <item>
+                            <key>Name</key>
+                            <value>mygroup2-2baa5550</value>
+                        </item>
+                    </tagSet>
+                    <hypervisor>xen</hypervisor>
+                </item>
+            </instancesSet>
+        </item>
+    </reservationSet>
+</DescribeInstancesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_keypairs.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_keypairs.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_keypairs.xml
new file mode 100644
index 0000000..7a9d73f
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_keypairs.xml
@@ -0,0 +1,8 @@
+<DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+  <keySet>
+    <item>
+      <keyName>gsg-keypair</keyName>
+      <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca:9f:f5:f1:6f</keyFingerprint>
+    </item>
+  </keySet>
+</DescribeKeyPairsResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups.xml
new file mode 100644
index 0000000..b703afa
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups.xml
@@ -0,0 +1,39 @@
+<DescribeSecurityGroupsResponse
+	xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+	<securityGroupInfo>
+		<item>
+			<ownerId>UYY3TLBUXIEON5NQVUUX6OMPWBZIQNFM</ownerId>
+                        <groupId>sg-3c6ef654</groupId>
+			<groupName>WebServers</groupName>
+			<groupDescription>Web Servers</groupDescription>
+			<ipPermissions>
+				<item>
+					<ipProtocol>tcp</ipProtocol>
+					<fromPort>80</fromPort>
+					<toPort>80</toPort>
+					<groups />
+					<ipRanges>
+						<item>
+							<cidrIp>0.0.0.0/0</cidrIp>
+						</item>
+					</ipRanges>
+				</item>
+			</ipPermissions>
+		</item>
+		<item>
+			<ownerId>UYY3TLBUXIEON5NQVUUX6OMPWBZIQNFM</ownerId>
+                        <groupId>sg-867309ab</groupId>
+                        <groupName>RangedPortsBySource</groupName>
+			<groupDescription>Group A</groupDescription>
+			<ipPermissions>
+				<item>
+					<ipProtocol>tcp</ipProtocol>
+					<fromPort>6000</fromPort>
+					<toPort>7000</toPort>
+					<groups />
+					<ipRanges />
+				</item>
+			</ipPermissions>
+		</item>
+	</securityGroupInfo>
+</DescribeSecurityGroupsResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_empty.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_empty.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_empty.xml
new file mode 100644
index 0000000..e3336a7
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_empty.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<DescribeSecurityGroupsResponse
+	xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+	<requestId>L6EFIZVPJS76T3K5-0UV</requestId>
+	<securityGroupInfo>
+		<item>
+			<ipPermissions>
+				<item>
+					<toPort>22</toPort>
+					<ipProtocol>tcp</ipProtocol>
+					<ipRanges>
+						<item>
+							<cidrIp>0.0.0.0/0</cidrIp>
+						</item>
+					</ipRanges>
+					<groups />
+					<fromPort>22</fromPort>
+				</item>
+
+				<item>
+					<toPort />
+					<ipProtocol />
+					<ipRanges />
+					<groups>
+						<item>
+                                                  <groupId>sg-3c6ef654</groupId>
+							<groupName>jclouds#cluster#world</groupName>
+							<userId>UYY3TLBUXIEON5NQVUUX6OMPWBZIQNFM</userId>
+						</item>
+					</groups>
+					<fromPort />
+				</item>
+			</ipPermissions>
+			<groupName>jclouds#cluster#world</groupName>
+                        <groupId>sg-3c6ef654</groupId>
+			<groupDescription>Cluster</groupDescription>
+			<ownerId>UYY3TLBUXIEON5NQVUUX6OMPWBZIQNFM</ownerId>
+		</item>
+
+	</securityGroupInfo>
+</DescribeSecurityGroupsResponse>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_cidr.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_cidr.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_cidr.xml
new file mode 100644
index 0000000..f6a6f9e
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_cidr.xml
@@ -0,0 +1,24 @@
+<DescribeSecurityGroupsResponse
+	xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+	<securityGroupInfo>
+		<item>
+                  <ownerId>993194456877</ownerId>
+                  <groupId>sg-3c6ef654</groupId>
+                  <groupName>jclouds#some-group</groupName>
+                  <groupDescription>jclouds#some-group</groupDescription>
+                  <ipPermissions>
+                    <item>
+                      <ipProtocol>tcp</ipProtocol>
+                      <fromPort>22</fromPort>
+                      <toPort>40</toPort>
+                      <groups />
+                      <ipRanges>
+                        <item>
+                          <cidrIp>0.0.0.0/0</cidrIp>
+                        </item>
+                      </ipRanges>
+                    </item>
+                  </ipPermissions>
+		</item>
+	</securityGroupInfo>
+</DescribeSecurityGroupsResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_group.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_group.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_group.xml
new file mode 100644
index 0000000..126d45c
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_group.xml
@@ -0,0 +1,26 @@
+<DescribeSecurityGroupsResponse
+	xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+	<securityGroupInfo>
+		<item>
+                  <ownerId>993194456877</ownerId>
+                  <groupName>jclouds#some-group</groupName>
+                  <groupDescription>jclouds#some-group</groupDescription>
+                  <groupId>sg-3c6ef654</groupId>
+                  <ipPermissions>
+                    <item>
+                      <ipProtocol>tcp</ipProtocol>
+                      <fromPort>22</fromPort>
+                      <toPort>40</toPort>
+                      <groups>
+                        <item>
+                          <userId>993194456877</userId>
+                          <groupId>sg-3c6ef654</groupId>
+                          <groupName>jclouds#some-group</groupName>
+                        </item>
+                      </groups>
+                      <ipRanges/>
+                    </item>
+                  </ipPermissions>
+		</item>
+	</securityGroupInfo>
+</DescribeSecurityGroupsResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_new.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_new.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_new.xml
new file mode 100644
index 0000000..7d2c211
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_new.xml
@@ -0,0 +1,27 @@
+<DescribeSecurityGroupsResponse
+	xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+	<securityGroupInfo>
+		<item>
+                  <ownerId>993194456877</ownerId>
+                  <groupName>jclouds#some-group</groupName>
+                  <groupDescription>jclouds#some-group</groupDescription>
+                  <groupId>sg-3c6ef654</groupId>
+                  <ipPermissions/>
+		</item>
+		<item>
+                  <ownerId>993194456877</ownerId>
+                  <groupId>sg-3a2b3c4d</groupId>
+                  <groupName>group-a</groupName>
+                  <groupDescription>Group A</groupDescription>
+                  <ipPermissions>
+                    <item>
+                      <ipProtocol>tcp</ipProtocol>
+                      <fromPort>6000</fromPort>
+                      <toPort>7000</toPort>
+                      <groups />
+                      <ipRanges />
+                    </item>
+                  </ipPermissions>
+		</item>
+	</securityGroupInfo>
+</DescribeSecurityGroupsResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_single.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_single.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_single.xml
new file mode 100644
index 0000000..f66e4c6
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_securitygroups_extension_single.xml
@@ -0,0 +1,12 @@
+<DescribeSecurityGroupsResponse
+	xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+	<securityGroupInfo>
+		<item>
+                  <ownerId>993194456877</ownerId>
+                  <groupName>jclouds#some-group</groupName>
+                  <groupDescription>jclouds#some-group</groupDescription>
+                  <groupId>sg-3c6ef654</groupId>
+                  <ipPermissions/>
+		</item>
+	</securityGroupInfo>
+</DescribeSecurityGroupsResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/58fe66df/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_snapshots.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_snapshots.xml b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_snapshots.xml
new file mode 100644
index 0000000..44e2c36
--- /dev/null
+++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/resources/describe_snapshots.xml
@@ -0,0 +1,20 @@
+<DescribeSnapshotsResponse xmlns="http://ec2.amazonaws.com/doc/2009-11-30/">
+    <snapshotSet>
+        <item>
+            <snapshotId>snap-78a54011</snapshotId>
+            <volumeId>vol-4d826724</volumeId>
+            <status>pending</status>
+            <startTime>2008-05-07T12:51:50.000Z</startTime>
+            <progress>80%</progress>
+            <ownerId>218213537122</ownerId>
+            <volumeSize>10</volumeSize>
+            <description>Daily Backup</description>
+            <tagSet>
+                <item>
+                    <key>Name</key>
+                    <value>example_name_tag</value>
+                </item>
+            </tagSet>
+        </item>
+    </snapshotSet>
+</DescribeSnapshotsResponse>
\ No newline at end of file