http://git-wip-us.apache.org/repos/asf/libcloud/blob/bb1b8104/libcloud/test/compute/fixtures/dimensiondata/2.4/image_osImage.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/2.4/image_osImage.xml 
b/libcloud/test/compute/fixtures/dimensiondata/2.4/image_osImage.xml
new file mode 100644
index 0000000..1f884a9
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/2.4/image_osImage.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<osImages xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="47" 
totalCount="47" pageSize="250">
+    <osImage id="c14b1a46-2428-44c1-9c1a-b20e6418d08c" datacenterId="NA9">
+        <name>RedHat 6 64-bit 2 CPU</name>
+        <description>RedHat 6.6 Enterprise (Santiago) 64-bit</description>
+        <operatingSystem id="REDHAT664" displayName="REDHAT6/64" family="UNIX" 
/>
+        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
+        <memoryGb>4</memoryGb>
+        <disk id="a02b7244-99d8-4889-84a5-5e4373c1bb26" scsiId="0" sizeGb="10" 
speed="STANDARD" />
+        <createTime>2015-09-17T11:23:48.000Z</createTime>
+        <osImageKey>T-RHEL-6-64-2-4-10</osImageKey>
+    </osImage>
+    <osImage id="6b4fb0c7-a57b-4f58-b59c-9958f94f971a" datacenterId="NA9">
+        <name>Win2012 DC 2 CPU</name>
+        <description>Windows 2012 Datacenter</description>
+        <operatingSystem id="WIN2012DC64" displayName="WIN2012DC/64" 
family="WINDOWS" />
+        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
+        <memoryGb>4</memoryGb>
+        <disk id="f5e01854-a211-4ec6-96d6-2753b6d47877" scsiId="0" sizeGb="50" 
speed="STANDARD" />
+        <createTime>2015-09-17T11:44:43.000Z</createTime>
+        <osImageKey>T-WIN-2012-DATACTR-64-2-4-50</osImageKey>
+    </osImage>
+    <osImage id="3ebf3c0f-90fe-4a8b-8585-6e65b316592c" datacenterId="NA9">
+        <name>Win2008 Std 32-bit 2 CPU</name>
+        <description>Windows 2008 Enterprise R2 32-bit installed with 
Microsoft SQL Server 2012 Standard Edition</description>
+        <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" 
family="WINDOWS" />
+        <cpu count="2" speed="STANDARD" coresPerSocket="1" />
+        <memoryGb>4</memoryGb>
+        <disk id="6e5b5112-0eae-44eb-83cd-1bd0d58fbeab" scsiId="0" sizeGb="50" 
speed="STANDARD" />
+        <softwareLabel>MSSQL2008R2S</softwareLabel>
+        <createTime>2014-11-20T12:54:22.000Z</createTime>
+        <osImageKey>T-WIN-2008-ENT-32-2-4-50</osImageKey>
+    </osImage>
+</osImages>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/bb1b8104/libcloud/test/compute/fixtures/dimensiondata/2.4/image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/dimensiondata/2.4/image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
 
b/libcloud/test/compute/fixtures/dimensiondata/2.4/image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
new file mode 100644
index 0000000..1631137
--- /dev/null
+++ 
b/libcloud/test/compute/fixtures/dimensiondata/2.4/image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+  <osImage xmlns="urn:didata.com:api:cloud:types" 
id="6b4fb0c7-a57b-4f58-b59c-9958f94f971a" datacenterId="NA9">
+    <name>Win2012 DC 2 CPU</name>
+    <description>Windows 2012 Datacenter</description>
+    <operatingSystem id="WIN2012DC64" displayName="WIN2012DC/64" 
family="WINDOWS" />
+    <cpu count="2" speed="STANDARD" coresPerSocket="1" />
+    <memoryGb>4</memoryGb>
+    <disk id="f5e01854-a211-4ec6-96d6-2753b6d47877" scsiId="0" sizeGb="50" 
speed="STANDARD" />
+    <createTime>2015-09-17T11:44:43.000Z</createTime>
+    <osImageKey>T-WIN-2012-DATACTR-64-2-4-50</osImageKey>
+  </osImage>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/bb1b8104/libcloud/test/compute/fixtures/dimensiondata/2.4/image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/dimensiondata/2.4/image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
 
b/libcloud/test/compute/fixtures/dimensiondata/2.4/image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
new file mode 100644
index 0000000..27d6c25
--- /dev/null
+++ 
b/libcloud/test/compute/fixtures/dimensiondata/2.4/image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+  <osImage xmlns="urn:didata.com:api:cloud:types" 
id="c14b1a46-2428-44c1-9c1a-b20e6418d08c" datacenterId="NA9">
+    <name>RedHat 6 64-bit 2 CPU</name>
+    <description>RedHat 6.6 Enterprise (Santiago) 64-bit</description>
+    <operatingSystem id="REDHAT664" displayName="REDHAT6/64" family="UNIX" />
+    <cpu count="2" speed="STANDARD" coresPerSocket="1" />
+    <memoryGb>4</memoryGb>
+    <disk id="a02b7244-99d8-4889-84a5-5e4373c1bb26" scsiId="0" sizeGb="10" 
speed="STANDARD" />
+    <createTime>2015-09-17T11:23:48.000Z</createTime>
+    <osImageKey>T-RHEL-6-64-2-4-10</osImageKey>
+  </osImage>
+

http://git-wip-us.apache.org/repos/asf/libcloud/blob/bb1b8104/libcloud/test/compute/fixtures/dimensiondata/image_customerImage.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage.xml 
b/libcloud/test/compute/fixtures/dimensiondata/image_customerImage.xml
deleted file mode 100644
index 0415d65..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<customerImages xmlns="urn:didata.com:api:cloud:types" pageNumber="1" 
pageCount="35" totalCount="35" pageSize="250">
-    <customerImage id="5234e5c7-01de-4411-8b6e-baeb8d91cf5d" 
datacenterId="NA9">
-        <name>ImportedCustomerImage</name>
-        <description />
-        <cpu count="4" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>2</memoryGb>
-        <disk id="1a82316f-23ed-4fe9-b6d8-6b92ac467423" scsiId="0" sizeGb="12" 
speed="STANDARD" />
-        <createTime>2015-11-19T14:29:02.000Z</createTime>
-        <source type="IMPORT">
-            <artifact type="MF" value="ImportedCustomerImage.mf" 
date="2015-1119T14:28:54.000Z" />
-            <artifact type="OVF" value="ImportedCustomerImage.ovf" 
date="2015-1119T14:28:05.000Z" />
-            <artifact type="VMDK" value="ImportedCustomerImage-disk1.vmdk" 
date="2015-11-19T12:22:31.000Z" />
-        </source>
-        <virtualHardware version="vmx-10" upToDate="true" />
-        <state>NORMAL</state>
-        <guest osCustomization="true">
-            <operatingSystem id="REDHAT664" displayName="REDHAT6/64" 
family="UNIX"/>
-            <vmTools type="vmx-08" versionStatus="NEED_UPGRADE" 
runningStatus="NOT_RUNNING" apiVersion="8389"/>
-        </guest>
-    </customerImage>
-    <customerImage id="2ffa36c8-1848-49eb-b4fa-9d908775f68c" 
datacenterId="NA9">
-        <name>CustomerImageWithPricedSoftwareLabels</name>
-        <description />
-        <cpu count="1" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>1</memoryGb>
-        <disk id="29455efc-51af-4b4d-91b3-d81ca0dff7d8" scsiId="0" sizeGb="50" 
speed="STANDARD" />
-        <softwareLabel>MSSQL2008R2S</softwareLabel>
-        <createTime>2015-11-03T15:25:34.000Z</createTime>
-        <source type="CLONE">
-            <artifact type="SERVER_ID" 
value="7c9c2551-269d-4274-a247126ba7c6215c" />
-        </source>
-        <state>NORMAL</state>
-        <virtualHardware version="vmx-08" upToDate="false" />
-        <guest osCustomization="true">
-            <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" 
family="WINDOWS" />
-            <vmTools type="vmx-08" versionStatus="CURRENT"
-                     runningStatus="NOT_RUNNING" />
-        </guest>
-    </customerImage>
-    <customerImage id="1fc1844f-45d6-4364-b447-f7c7645b47de" 
datacenterId="NA9">
-        <name>CopiedCustomerImage</name>
-        <description />
-        <cpu count="1" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>2</memoryGb>
-        <disk id="42b20819-c161-4dec-aa94-73ec370a6e37" scsiId="0" sizeGb="10" 
speed="STANDARD" />
-        <createTime>2015-11-11T17:17:00.000Z</createTime>
-        <source type="COPY">
-            <artifact type="IMAGE_ID" 
value="0b8357b6-f156-4b27-b4fd-b81d09c15efc" />
-        </source>
-        <state>NORMAL</state>
-        <virtualHardware version="vmx-10" upToDate="true" />
-        <guest osCustomization="true">
-            <operatingSystem id="REDHAT664" displayName="REDHAT6/64" 
family="UNIX" />
-            <vmTools type="vmx-08" versionStatus="NEED_UPGRADE"
-                     runningStatus="NOT_RUNNING" apiVersion="9355" />
-        </guest>
-    </customerImage>
-</customerImages>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/bb1b8104/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml
 
b/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml
deleted file mode 100644
index 20627e1..0000000
--- 
a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <customerImage xmlns="urn:didata.com:api:cloud:types"
-                   id="2ffa36c8-1848-49eb-b4fa-9d908775f68c" 
datacenterId="NA9">
-        <name>CustomerImageWithPricedSoftwareLabels</name>
-        <description />
-        <cpu count="1" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>1</memoryGb>
-        <disk id="29455efc-51af-4b4d-91b3-d81ca0dff7d8" scsiId="0" sizeGb="50" 
speed="STANDARD" />
-        <softwareLabel>MSSQL2008R2S</softwareLabel>
-        <createTime>2015-11-03T15:25:34.000Z</createTime>
-        <source type="CLONE">
-            <artifact type="SERVER_ID" 
value="7c9c2551-269d-4274-a247126ba7c6215c" />
-        </source>
-        <state>NORMAL</state>
-        <virtualHardware version="vmx-08" upToDate="false" />
-        <guest osCustomization="true">
-            <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" 
family="WINDOWS" />
-            <vmTools type="vmx-08" versionStatus="CURRENT"
-                     runningStatus="NOT_RUNNING" />
-        </guest>
-    </customerImage>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/bb1b8104/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml
 
b/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml
deleted file mode 100644
index f8ba258..0000000
--- 
a/libcloud/test/compute/fixtures/dimensiondata/image_customerImage_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<customerImage  xmlns="urn:didata.com:api:cloud:types"
-                id="5234e5c7-01de-4411-8b6e-baeb8d91cf5d" datacenterId="NA9">
-        <name>ImportedCustomerImage</name>
-        <description />
-        <cpu count="4" speed="STANDARD" coresPerSocket="1" />
-        <memoryGb>2</memoryGb>
-        <disk id="1a82316f-23ed-4fe9-b6d8-6b92ac467423" scsiId="0" sizeGb="12" 
speed="STANDARD" />
-        <createTime>2015-11-19T14:29:02.000Z</createTime>
-        <source type="IMPORT">
-            <artifact type="MF" value="ImportedCustomerImage.mf" 
date="2015-1119T14:28:54.000Z" />
-            <artifact type="OVF" value="ImportedCustomerImage.ovf" 
date="2015-1119T14:28:05.000Z" />
-            <artifact type="VMDK" value="ImportedCustomerImage-disk1.vmdk" 
date="2015-11-19T12:22:31.000Z" />
-        </source>
-        <virtualHardware version="vmx-10" upToDate="true" />
-        <state>NORMAL</state>
-        <guest osCustomization="true">
-            <operatingSystem id="REDHAT664" displayName="REDHAT6/64" 
family="UNIX"/>
-            <vmTools type="vmx-08" versionStatus="NEED_UPGRADE" 
runningStatus="NOT_RUNNING" apiVersion="8389"/>
-        </guest>
-</customerImage>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/bb1b8104/libcloud/test/compute/fixtures/dimensiondata/image_osImage.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/dimensiondata/image_osImage.xml 
b/libcloud/test/compute/fixtures/dimensiondata/image_osImage.xml
deleted file mode 100644
index 4af7e09..0000000
--- a/libcloud/test/compute/fixtures/dimensiondata/image_osImage.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<osImages xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="47" 
totalCount="47" pageSize="250">
-    <osImage id="c14b1a46-2428-44c1-9c1a-b20e6418d08c" datacenterId="NA9">
-        <name>RedHat 6 64-bit 2 CPU</name>
-        <description>RedHat 6.6 Enterprise (Santiago) 64-bit</description>
-        <cpu count="2" speed="STANDARD" coresPerSocket="1"/>
-        <memoryGb>4</memoryGb>
-        <disk id="5f709ffe-ae38-4d3b-8aeb-57cbc5036627" scsiId="0" sizeGb="10" 
speed="STANDARD"/>
-        <createTime>2015-09-23T10:17:28.000Z</createTime>
-        <osImageKey>T-RHEL-6-64-2-4-10</osImageKey>
-        <sortOrder>0</sortOrder>
-        <guest osCustomization="true">
-            <operatingSystem id="REDHAT664" displayName="REDHAT6/64" 
family="UNIX"/>
-        </guest>
-    </osImage>
-    <osImage id="6b4fb0c7-a57b-4f58-b59c-9958f94f971a" datacenterId="NA9">
-        <name>Win2012 DC 2 CPU</name>
-        <description>Windows 2012 Datacenter</description>
-        <cpu count="2" speed="STANDARD" coresPerSocket="1"/>
-        <memoryGb>4</memoryGb>
-        <disk id="b74a54e6-f90a-4619-a232-4b7522cf0055" scsiId="0" sizeGb="50" 
speed="STANDARD"/>
-        <createTime>2015-09-23T10:19:51.000Z</createTime>
-        <osImageKey>T-WIN-2012-DATACTR-64-2-4-50</osImageKey>
-        <sortOrder>0</sortOrder>
-        <guest osCustomization="true">
-            <operatingSystem id="WIN2012DC64" displayName="WIN2012DC/64" 
family="WINDOWS"/>
-        </guest>
-    </osImage>
-    <osImage id="3ebf3c0f-90fe-4a8b-8585-6e65b316592c" datacenterId="NA9">
-        <name>Win2008 Std 32-bit 2 CPU</name>
-        <description>Windows 2008 Enterprise R2 32-bit installed with 
Microsoft SQL Server 2012 Standard Edition</description>
-        <cluster id="QA1_N2_VMWARE_1-01" name="QA1_N2_VMWARE_1-01"/>
-        <cpu count="2" speed="STANDARD" coresPerSocket="1"/>
-        <memoryGb>4</memoryGb>
-        <disk id="3ee8ecd1-cae6-4bb3-81b2-1294b7763d24" scsiId="0" sizeGb="50" 
speed="STANDARD"/>
-        <createTime>2015-06-16T14:22:41.000Z</createTime>
-        <osImageKey>T-WIN-2008-ENT-32-2-4-50</osImageKey>
-        <sortOrder>0</sortOrder>
-        <guest osCustomization="true">
-            <operatingSystem id="WIN2008S32" displayName="WIN2008S/32" 
family="WINDOWS"/>
-        </guest>
-    </osImage>
-</osImages>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/bb1b8104/libcloud/test/compute/fixtures/dimensiondata/image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/dimensiondata/image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
 
b/libcloud/test/compute/fixtures/dimensiondata/image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
deleted file mode 100644
index a2ea8cb..0000000
--- 
a/libcloud/test/compute/fixtures/dimensiondata/image_osImage_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<osImage xmlns="urn:didata.com:api:cloud:types" 
id="6b4fb0c7-a57b-4f58-b59c-9958f94f971a" datacenterId="NA9">
-    <name>Win2012 DC 2 CPU</name>
-    <description>Windows 2012 Datacenter</description>
-        <cpu count="2" speed="STANDARD" coresPerSocket="1"/>
-        <memoryGb>4</memoryGb>
-        <disk id="b74a54e6-f90a-4619-a232-4b7522cf0055" scsiId="0" sizeGb="50" 
speed="STANDARD"/>
-        <createTime>2015-09-23T10:19:51.000Z</createTime>
-        <osImageKey>T-WIN-2012-DATACTR-64-2-4-50</osImageKey>
-        <sortOrder>0</sortOrder>
-        <guest osCustomization="true">
-            <operatingSystem id="WIN2012DC64" displayName="WIN2012DC/64" 
family="WINDOWS"/>
-        </guest>
-</osImage>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/bb1b8104/libcloud/test/compute/fixtures/dimensiondata/image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/dimensiondata/image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
 
b/libcloud/test/compute/fixtures/dimensiondata/image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
deleted file mode 100644
index 62fa6b0..0000000
--- 
a/libcloud/test/compute/fixtures/dimensiondata/image_osImage_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<osImage xmlns="urn:didata.com:api:cloud:types"
-         id="c14b1a46-2428-44c1-9c1a-b20e6418d08c" datacenterId="NA9">
-    <name>RedHat 6 64-bit 2 CPU</name>
-    <description>RedHat 6.6 Enterprise (Santiago) 64-bit</description>
-    <cpu count="2" speed="STANDARD" coresPerSocket="1" />
-    <memoryGb>4</memoryGb>
-    <disk id="5f709ffe-ae38-4d3b-8aeb-57cbc5036627" scsiId="0" sizeGb="10"
-          speed="STANDARD" />
-    <createTime>2015-09-23T10:17:28.000Z</createTime>
-    <osImageKey>T-RHEL-6-64-2-4-10</osImageKey>
-    <sortOrder>0</sortOrder>
-    <guest osCustomization="true">
-        <operatingSystem id="REDHAT664" displayName="REDHAT6/64"
-                         family="UNIX" />
-    </guest>
-</osImage>
\ No newline at end of file

Reply via email to