http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/ibm_sce/list_storage_offerings.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/ibm_sce/list_storage_offerings.xml 
b/libcloud/test/compute/fixtures/ibm_sce/list_storage_offerings.xml
deleted file mode 100644
index ed96dc6..0000000
--- a/libcloud/test/compute/fixtures/ibm_sce/list_storage_offerings.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" 
standalone="yes"?><ns2:DescribeVolumeOfferingsResponse 
xmlns:ns2="http://www.ibm.com/xmlns/b2b/cloud/api/2010-03-31";><Offerings><ID>20001208</ID><Location>61</Location><Name>Small</Name><Label>256
 
GiB</Label><Capacity>256</Capacity><SupportedSizes>256</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001208</ID><Location>82</Location><Name>Small</Name><Label>256
 
GiB</Label><Capacity>256</Capacity><SupportedSizes>256</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 CountryCode="ABC"><EffectiveDate>2011-08-12T0
 
0:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001209</ID><Location>61</Location><Name>Medium</Name><Label>512
 
GiB</Label><Capacity>512</Capacity><SupportedSizes>512</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001209</ID><Location>82</Location><Name>Medium</Name><Label>512
 
GiB</Label><Capacity>512</Capacity><SupportedSizes>512</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 CountryCode="ABC"><Effecti
 
veDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001208</ID><Location>41</Location><Name>Small</Name><Label>256
 
GiB</Label><Capacity>256</Capacity><SupportedSizes>256</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001209</ID><Location>41</Location><Name>Medium</Name><Label>512
 
GiB</Label><Capacity>512</Capacity><SupportedSizes>512</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 CountryC
 
ode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001208</ID><Location>121</Location><Name>Small</Name><Label>256
 
GiB</Label><Capacity>256</Capacity><SupportedSizes>256</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001209</ID><Location>121</Location><Name>Medium</Name><Label>512
 
GiB</Label><Capacity>512</Capacity><SupportedSizes>512</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFor
 mats><Price 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001210</ID><Location>61</Location><Name>Large</Name><Label>2048
 
GiB</Label><Capacity>2048</Capacity><SupportedSizes>2048</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001210</ID><Location>82</Location><Name>Large</Name><Label>2048
 
GiB</Label><Capacity>2048</Capacity><SupportedSizes>2048</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label>
 </Format></SupportedFormats><Price 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001210</ID><Location>41</Location><Name>Large</Name><Label>2048
 
GiB</Label><Capacity>2048</Capacity><SupportedSizes>2048</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001210</ID><Location>121</Location><Name>Large</Name><Label>2048
 
GiB</Label><Capacity>2048</Capacity><SupportedSizes>2048</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RA
 W</ID><Label>raw</Label></Format></SupportedFormats><Price 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001208</ID><Location>101</Location><Name>Small</Name><Label>256
 
GiB</Label><Capacity>256</Capacity><SupportedSizes>256</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001209</ID><Location>101</Location><Name>Medium</Name><Label>512
 
GiB</Label><Capacity>512</Capacity><SupportedSizes>512</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></F
 ormat><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001208</ID><Location>141</Location><Name>Small</Name><Label>256
 
GiB</Label><Capacity>256</Capacity><SupportedSizes>256</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001209</ID><Location>141</Location><Name>Medium</Name><Label>512
 
GiB</Label><Capacity>512</Capacity><SupportedSizes>512</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><L
 
abel>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001210</ID><Location>101</Location><Name>Large</Name><Label>2048
 
GiB</Label><Capacity>2048</Capacity><SupportedSizes>2048</SupportedSizes><SupportedFormats><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings><Offerings><ID>20001210</ID><Location>141</Location><Name>Large</Name><Label>2048
 
GiB</Label><Capacity>2048</Capacity><SupportedSizes>2048</SupportedSizes><SupportedFormat
 
s><Format><ID>EXT3</ID><Label>ext3</Label></Format><Format><ID>RAW</ID><Label>raw</Label></Format></SupportedFormats><Price
 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.0000</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>UHR</UnitOfMeasure></Price></Offerings></ns2:DescribeVolumeOfferingsResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/ibm_sce/list_volumes.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/ibm_sce/list_volumes.xml 
b/libcloud/test/compute/fixtures/ibm_sce/list_volumes.xml
deleted file mode 100644
index a6c2617..0000000
--- a/libcloud/test/compute/fixtures/ibm_sce/list_volumes.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" 
standalone="yes"?><ns2:DescribeVolumesResponse 
xmlns:ns2="http://www.ibm.com/xmlns/b2b/cloud/api/2010-03-31";><Volume><ID>39281</ID><Location>141</Location><OfferingID>20001210</OfferingID><InstanceID>0</InstanceID><Owner>[email protected]</Owner><Name>libcloudvol</Name><Format>raw</Format><Size>2048</Size><State>4</State><ProductCodes/><CreatedTime>2012-08-19T13:46:50.000Z</CreatedTime><StorageArea><ID></ID><Name></Name><Description></Description></StorageArea><IOPrice
 
CountryCode="ABC"><EffectiveDate>2011-08-12T00:00:00.000Z</EffectiveDate><CurrencyCode>USD</CurrencyCode><Rate>0.00</Rate><PricePerQuantity>1</PricePerQuantity><UnitOfMeasure>CNT</UnitOfMeasure></IOPrice><CloneStatus>0</CloneStatus><PlatformVersion>2</PlatformVersion><SourceDiskId>0</SourceDiskId></Volume></ns2:DescribeVolumesResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/ibm_sce/locations.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/ibm_sce/locations.xml 
b/libcloud/test/compute/fixtures/ibm_sce/locations.xml
deleted file mode 100644
index 68012de..0000000
--- a/libcloud/test/compute/fixtures/ibm_sce/locations.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" 
standalone="yes"?><ns2:DescribeLocationsResponse 
xmlns:ns2="http://www.ibm.com/xmlns/b2b/cloud/api/2010-03-31";><Location><ID>41</ID><Name>Raleigh,
 U.S.A</Name><Description>This data center is located in Raleigh, North 
Carolina, U.S.A. The services provided are: Guest Instances, Image Capture, 
Persistent Storage, Reserved IP, Private 
VLAN/VPN.</Description><Location>RTP</Location><Capabilities><Capability 
id="oss.storage.format"><Entry key="EXT3"><Value>ext3</Value></Entry><Entry 
key="RAW"><Value>raw</Value></Entry></Capability><Capability 
id="oss.instance.spec.i386"/><Capability 
id="oss.instance.spec.x86_64"/><Capability 
id="oss.storage.availabilityarea"><Entry 
key="2"><Value>Area2</Value><Value>gpfs2 of SONAS1</Value></Entry><Entry 
key="1"><Value>Area1</Value><Value>gpfs1 of 
SONAS1</Value></Entry></Capability></Capabilities><State>1</State></Location><Location><ID>61</ID><Name>Ehningen,
 Germany</Name><Description>This data center is located in E
 hningen(near Baden-Wurttemberg), Germany. The services provided are: Guest 
Instances, Image Capture, Persistent Storage, Reserved IP, Private 
VLAN/VPN.</Description><Location>EHN</Location><Capabilities><Capability 
id="oss.storage.format"><Entry key="EXT3"><Value>ext3</Value></Entry><Entry 
key="RAW"><Value>raw</Value></Entry></Capability><Capability 
id="oss.instance.spec.i386"/><Capability 
id="oss.instance.spec.x86_64"/><Capability 
id="oss.storage.availabilityarea"><Entry 
key="4"><Value>Area2</Value><Value>gpfs2 of SONAS1</Value></Entry><Entry 
key="3"><Value>Area1</Value><Value>gpfs1 of 
SONAS1</Value></Entry></Capability></Capabilities><State>1</State></Location><Location><ID>82</ID><Name>Boulder1,
 U.S.A</Name><Description>This data center is located in Boulder(near Denver), 
Colorado, U.S.A. The services provided are: Guest Instances, Image Capture, 
Persistent Storage, Reserved IP, Private 
VLAN/VPN.</Description><Location>us-co-dc1</Location><Capabilities><Capability 
id="oss.storage
 .format"><Entry key="EXT3"><Value>ext3</Value></Entry><Entry 
key="RAW"><Value>raw</Value></Entry></Capability><Capability 
id="oss.instance.spec.i386"/><Capability 
id="oss.instance.spec.x86_64"/><Capability 
id="oss.storage.availabilityarea"/></Capabilities><State>1</State></Location><Location><ID>101</ID><Name>Markham,
 Canada</Name><Description>This data center is located in Markham(near 
Toronto), Ontario, Canada. The services provided are: Guest Instances, Image 
Capture, Persistent Storage, Reserved IP, Private 
VLAN/VPN.</Description><Location>ca-on-dc1</Location><Capabilities><Capability 
id="oss.storage.format"><Entry key="EXT3"><Value>ext3</Value></Entry><Entry 
key="RAW"><Value>raw</Value></Entry></Capability><Capability 
id="oss.instance.spec.i386"/><Capability 
id="oss.instance.spec.x86_64"/><Capability 
id="oss.storage.availabilityarea"/></Capabilities><State>1</State></Location><Location><ID>121</ID><Name>Makuhari,
 Japan</Name><Description>This data center is located in Makuhari(
 near Tokoyo), Japan. The services provided are: Guest Instances, Image 
Capture, Persistent Storage, Reserved IP, Private 
VLAN/VPN.</Description><Location>ap-jp-dc1</Location><Capabilities><Capability 
id="oss.storage.format"><Entry key="EXT3"><Value>ext3</Value></Entry><Entry 
key="RAW"><Value>raw</Value></Entry></Capability><Capability 
id="oss.instance.spec.i386"/><Capability 
id="oss.instance.spec.x86_64"/><Capability 
id="oss.storage.availabilityarea"/></Capabilities><State>1</State></Location><Location><ID>141</ID><Name>Singapore,
 Singapore</Name><Description>This data center is located in Singapore. The 
services provided are: Guest Instances, Image Capture, Persistent Storage, 
Reserved IP, Private 
VLAN/VPN.</Description><Location>ap-sg-dc1</Location><Capabilities><Capability 
id="oss.storage.format"><Entry key="EXT3"><Value>ext3</Value></Entry><Entry 
key="RAW"><Value>raw</Value></Entry></Capability><Capability 
id="oss.instance.spec.i386"/><Capability id="oss.instance.spec.x86_64"/><
 Capability 
id="oss.storage.availabilityarea"/></Capabilities><State>1</State></Location></ns2:DescribeLocationsResponse>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/ibm_sce/reboot_active.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/ibm_sce/reboot_active.xml 
b/libcloud/test/compute/fixtures/ibm_sce/reboot_active.xml
deleted file mode 100644
index 2a43c1c..0000000
--- a/libcloud/test/compute/fixtures/ibm_sce/reboot_active.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" 
standalone="yes"?><ns2:RestartInstanceResponse 
xmlns:ns2="http://www.ibm.com/xmlns/b2b/cloud/api/2009-04-03"/>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/ibm_sce/sizes.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/ibm_sce/sizes.xml 
b/libcloud/test/compute/fixtures/ibm_sce/sizes.xml
deleted file mode 100644
index 2a43c1c..0000000
--- a/libcloud/test/compute/fixtures/ibm_sce/sizes.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" 
standalone="yes"?><ns2:RestartInstanceResponse 
xmlns:ns2="http://www.ibm.com/xmlns/b2b/cloud/api/2009-04-03"/>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/_oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/_oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server.xml
 
b/libcloud/test/compute/fixtures/opsource/_oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server.xml
deleted file mode 100644
index 191c7ae..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/_oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ns12:Status xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns12:operation>Deploy Server</ns12:operation>
-    <ns12:result>SUCCESS</ns12:result>
-    <ns12:resultDetail>Server "Deploy" issued</ns12:resultDetail>
-    <ns12:resultCode>REASON_0</ns12:resultCode>
-</ns12:Status>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_datacenter.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_datacenter.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_datacenter.xml
deleted file mode 100644
index 4870ee1..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_datacenter.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns8:Datacenters xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns8:datacenter>
-        <ns8:location>NA1</ns8:location>
-        <ns8:displayName>US - East</ns8:displayName>
-        <ns8:city>Ashburn</ns8:city>
-        <ns8:state>Virginia</ns8:state>
-        <ns8:country>US</ns8:country>
-        <ns8:vpnUrl>https://opsource-na1.cloud-vpn.net/</ns8:vpnUrl>
-        <ns8:default>true</ns8:default>
-    </ns8:datacenter>
-</ns8:Datacenters>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkWithLocation.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkWithLocation.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkWithLocation.xml
deleted file mode 100644
index ca27554..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkWithLocation.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns4:NetworkWithLocations xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns4:network>
-        <ns4:id>53b4c05b-341e-4ac3-b688-bdd74e53ca9b</ns4:id>
-        <ns4:name>test-net1</ns4:name>
-        <ns4:description>test-net1 description</ns4:description>
-        <ns4:location>NA1</ns4:location>
-        <ns4:privateNet>10.162.1.0</ns4:privateNet>
-        <ns4:multicast>false</ns4:multicast>
-    </ns4:network>
-</ns4:NetworkWithLocations>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_delete.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_delete.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_delete.xml
deleted file mode 100644
index 90686b9..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_delete.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns12:Status xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns12:operation>Delete Server</ns12:operation>
-    <ns12:result>SUCCESS</ns12:result>
-    <ns12:resultDetail>Server "Delete" issued</ns12:resultDetail>
-    <ns12:resultCode>REASON_0</ns12:resultCode>
-</ns12:Status>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_delete_INPROGRESS.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_delete_INPROGRESS.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_delete_INPROGRESS.xml
deleted file mode 100644
index df55852..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_delete_INPROGRESS.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns12:Status xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns12:operation>Delete Server</ns12:operation>
-    <ns12:result>ERROR</ns12:result>
-    <ns12:resultDetail>Operation in progress on Server with Id 
11</ns12:resultDetail>
-    <ns12:resultCode>REASON_392</ns12:resultCode>
-</ns12:Status>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_poweroff.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_poweroff.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_poweroff.xml
deleted file mode 100644
index 03c0f3d..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_poweroff.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns12:Status xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns12:operation>Power Off Server</ns12:operation>
-    <ns12:result>SUCCESS</ns12:result>
-    <ns12:resultDetail>Server "Power Off" issued</ns12:resultDetail>
-    <ns12:resultCode>REASON_0</ns12:resultCode>
-</ns12:Status>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_poweroff_INPROGRESS.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_poweroff_INPROGRESS.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_poweroff_INPROGRESS.xml
deleted file mode 100644
index 7b9a9d7..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_poweroff_INPROGRESS.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns12:Status xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns12:operation>Power Off Server</ns12:operation>
-    <ns12:result>ERROR</ns12:result>
-    <ns12:resultDetail>Operation in progress on Server with Id 
11</ns12:resultDetail>
-    <ns12:resultCode>REASON_392</ns12:resultCode>
-</ns12:Status>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_restart.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_restart.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_restart.xml
deleted file mode 100644
index 0638feb..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_restart.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ns12:Status xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns12:operation>Restart Server</ns12:operation>
-    <ns12:result>SUCCESS</ns12:result>
-    <ns12:resultDetail>Server "Restart" issued</ns12:resultDetail>
-    <ns12:resultCode>REASON_0</ns12:resultCode>
-</ns12:Status>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_restart_INPROGRESS.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_restart_INPROGRESS.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_restart_INPROGRESS.xml
deleted file mode 100644
index ab9e31f..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_restart_INPROGRESS.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns12:Status xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns12:operation>Restart Server</ns12:operation>
-    <ns12:result>ERROR</ns12:result>
-    <ns12:resultDetail>Operation in progress on Server with Id 
11</ns12:resultDetail>
-    <ns12:resultCode>REASON_392</ns12:resultCode>
-</ns12:Status>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_shutdown.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_shutdown.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_shutdown.xml
deleted file mode 100644
index b0937c8..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_shutdown.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ns12:Status xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns12:operation>Graceful Shutdown Server</ns12:operation>
-    <ns12:result>SUCCESS</ns12:result>
-    <ns12:resultDetail>Server "Graceful Shutdown" issued</ns12:resultDetail>
-    <ns12:resultCode>REASON_0</ns12:resultCode>
-</ns12:Status>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_shutdown_INPROGRESS.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_shutdown_INPROGRESS.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_shutdown_INPROGRESS.xml
deleted file mode 100644
index eb3cbb5..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_shutdown_INPROGRESS.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns12:Status xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns12:operation>Graceful Shutdown Server</ns12:operation>
-    <ns12:result>ERROR</ns12:result>
-    <ns12:resultDetail>Operation in progress on Server with Id 
11</ns12:resultDetail>
-    <ns12:resultCode>REASON_392</ns12:resultCode>
-</ns12:Status>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_start.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_start.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_start.xml
deleted file mode 100644
index 274e05f..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_start.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns12:Status xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns12:operation>Start Server</ns12:operation>
-    <ns12:result>SUCCESS</ns12:result>
-    <ns12:resultDetail>Server "Start" issued</ns12:resultDetail>
-    <ns12:resultCode>REASON_0</ns12:resultCode>
-</ns12:Status>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_start_INPROGRESS.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_start_INPROGRESS.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_start_INPROGRESS.xml
deleted file mode 100644
index 6d1714f..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_11_start_INPROGRESS.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns12:Status xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns12:operation>Start Server</ns12:operation>
-    <ns12:result>ERROR</ns12:result>
-    <ns12:resultDetail>Operation in progress on Server with Id 
11</ns12:resultDetail>
-    <ns12:resultCode>REASON_392</ns12:resultCode>
-</ns12:Status>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployed.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployed.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployed.xml
deleted file mode 100644
index a11d6c2..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_deployed.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DeployedServers xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <DeployedServer>
-        <id>abadbc7e-9e10-46ca-9d4a-194bcc6b6c16</id>
-        <name>testnode01</name>
-        <description>this is testnode01 description</description>
-        <machineSpecification>
-            <cpuCount>2</cpuCount>
-            <memoryMb>2048</memoryMb>
-            <osStorageGb>10</osStorageGb>
-            <additionalLocalStorageGb>20</additionalLocalStorageGb>
-            <operatingSystem>
-                <type>UNIX</type>
-                <displayName>REDHAT5/64</displayName>
-            </operatingSystem>
-        </machineSpecification>
-        <sourceImageId>44ed8b72-ebea-11df-bdc1-001517c46384</sourceImageId>
-        <networkId>53b4c05b-341e-4ac3-b688-bdd78e43ca9e</networkId>
-        <privateIpAddress>10.162.1.1</privateIpAddress>
-        <publicIpAddress>200.16.132.7</publicIpAddress>
-        <machineName>10-162-1-1</machineName>
-        <isStarted>true</isStarted>
-        <deployedTime>2011-03-02T17:16:09.882Z</deployedTime>
-    </DeployedServer>
-    <DeployedServer>
-        <id>dbadbc8e-9e10-56ca-5d4a-155bcc5b5c15</id>
-        <name>testnode02</name>
-        <description>this is testnode02 description</description>
-        <machineSpecification>
-            <cpuCount>4</cpuCount>
-            <memoryMb>4096</memoryMb>
-            <osStorageGb>10</osStorageGb>
-            <additionalLocalStorageGb>20</additionalLocalStorageGb>
-            <operatingSystem>
-                <type>UNIX</type>
-                <displayName>REDHAT5/64</displayName>
-            </operatingSystem>
-        </machineSpecification>
-        <sourceImageId>44ed8b72-ebea-11df-bdc1-001517c46384</sourceImageId>
-        <networkId>53b4c05b-341e-4ac3-b688-bdd78e43ca9e</networkId>
-        <privateIpAddress>10.162.1.2</privateIpAddress>
-        <machineName>10-162-1-2</machineName>
-        <isStarted>true</isStarted>
-        <deployedTime>2011-03-02T17:16:10.882Z</deployedTime>
-    </DeployedServer>
-</DeployedServers>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_pendingDeploy.xml
----------------------------------------------------------------------
diff --git 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_pendingDeploy.xml
 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_pendingDeploy.xml
deleted file mode 100644
index f24073f..0000000
--- 
a/libcloud/test/compute/fixtures/opsource/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_pendingDeploy.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<PendingDeployServers xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <PendingDeployServer>
-        <id>e75ead52-692f-4314-8725-c8a4f4d13a87</id>
-        <name>test2</name>
-        <description>test2 node</description>
-        <machineSpecification>
-            <cpuCount>1</cpuCount>
-            <memoryMb>2048</memoryMb>
-            <osStorageGb>10</osStorageGb>
-            <additionalLocalStorageGb>0</additionalLocalStorageGb>
-            <operatingSystem>
-                <type>UNIX</type>
-                <displayName>REDHAT5/64</displayName>
-            </operatingSystem>
-        </machineSpecification>
-        <sourceImageId>52ed8b72-ebea-11df-bdc1-001517c46384</sourceImageId>
-        <networkId>52f4c05b-341e-4ac3-b688-bdd78e43ca9e</networkId>
-        <privateIpAddress>10.162.151.11</privateIpAddress>
-        <status>
-            <action>DEPLOY_SERVER</action>
-            <requestTime>2011-03-20T22:32:23.000Z</requestTime>
-            <userName>copia</userName>
-        </status>
-    </PendingDeployServer>
-</PendingDeployServers>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_base_image.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/opsource/oec_0_9_base_image.xml 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_base_image.xml
deleted file mode 100644
index 3be14f0..0000000
--- a/libcloud/test/compute/fixtures/opsource/oec_0_9_base_image.xml
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ServerImages xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ServerImage>
-        <id>52ed8b72-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed8b72-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>RedHat 5.5 64-bit 1 CPU</name>
-        <description>RedHat 5.5 Enterprise (Tikanga), 64-bit</description>
-        <operatingSystem>
-            <type>UNIX</type>
-            <displayName>REDHAT5/64</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>1</cpuCount>
-        <memory>2048</memory>
-        <osStorage>10</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed8dca-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed8dca-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>RedHat 5.5 64-bit 2 CPU</name>
-        <description>RedHat 5.5 Enterprise (Tikanga), 64-bit</description>
-        <operatingSystem>
-            <type>UNIX</type>
-            <displayName>REDHAT5/64</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>2</cpuCount>
-        <memory>4096</memory>
-        <osStorage>10</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed8ed8-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed8ed8-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>RedHat 5.5 64-bit 4 CPU</name>
-        <description>RedHat 5.5 Enterprise (Tikanga), 64-bit</description>
-        <operatingSystem>
-            <type>UNIX</type>
-            <displayName>REDHAT5/64</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>4</cpuCount>
-        <memory>6144</memory>
-        <osStorage>10</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>6fc040ae-3605-11e0-bfb5-001517c46384</id>
-        
<resourcePath>/oec/base/image/6fc040ae-3605-11e0-bfb5-001517c46384</resourcePath>
-        <name>RedHat 5.5 32-bit 1 CPU</name>
-        <description>RedHat 5.5 Enterprise (Tikanga), 32-bit</description>
-        <operatingSystem>
-            <type>UNIX</type>
-            <displayName>REDHAT5/32</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>1</cpuCount>
-        <memory>2048</memory>
-        <osStorage>10</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>2011-02-11T17:36:19.000Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed92d4-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed92d4-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>Ubuntu 8.04.4 2 CPU</name>
-        <description>Ubuntu 8.04.4 LTS, 64-bit</description>
-        <operatingSystem>
-            <type>UNIX</type>
-            <displayName>UBUNTU8/64</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>2</cpuCount>
-        <memory>4096</memory>
-        <osStorage>10</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed876c-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed876c-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>Win2008 Ent 64-bit R2 2 CPU</name>
-        <description>Windows 2008 Enterprise R2 64-bit</description>
-        <operatingSystem>
-            <type>WINDOWS</type>
-            <displayName>WIN2008R2E/64</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>2</cpuCount>
-        <memory>4096</memory>
-        <osStorage>50</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed8a5a-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed8a5a-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>Win2008 Ent 64-bit R2 4 CPU</name>
-        <description>Windows 2008 Enterprise R2 64-bit</description>
-        <operatingSystem>
-            <type>WINDOWS</type>
-            <displayName>WIN2008R2E/64</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>4</cpuCount>
-        <memory>8192</memory>
-        <osStorage>50</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed865e-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed865e-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>Win2008 Std 64-bit R2 2 CPU</name>
-        <description>Windows 2008 Standard R2 64-bit</description>
-        <operatingSystem>
-            <type>WINDOWS</type>
-            <displayName>WIN2008R2S/64</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>2</cpuCount>
-        <memory>4096</memory>
-        <osStorage>50</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed7b96-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed7b96-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>Win2008 Std 32-bit 1 CPU</name>
-        <description>Windows 2008 Standard SP2 32-bit</description>
-        <operatingSystem>
-            <type>WINDOWS</type>
-            <displayName>WIN2008S/32</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>1</cpuCount>
-        <memory>2048</memory>
-        <osStorage>50</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed7cb8-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed7cb8-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>Win2008 Std 32-bit 2 CPU</name>
-        <description>Windows 2008 Standard SP2 32-bit</description>
-        <operatingSystem>
-            <type>WINDOWS</type>
-            <displayName>WIN2008S/32</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>2</cpuCount>
-        <memory>4096</memory>
-        <osStorage>50</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed7da8-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed7da8-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>Win2008 Std 32-bit 4 CPU</name>
-        <description>Windows 2008 Standard SP2 32-bit</description>
-        <operatingSystem>
-            <type>WINDOWS</type>
-            <displayName>WIN2008S/32</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>4</cpuCount>
-        <memory>4096</memory>
-        <osStorage>50</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed7ea2-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed7ea2-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>Win2008 Ent 32-bit 2 CPU</name>
-        <description>Windows 2008 Enterprise SP2 32-bit</description>
-        <operatingSystem>
-            <type>WINDOWS</type>
-            <displayName>WIN2008E/32</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>2</cpuCount>
-        <memory>4096</memory>
-        <osStorage>50</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed8fd2-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed8fd2-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>Red Hat 4.8 32-bit 1 CPU</name>
-        <description>Red Hat ES 4.8 (Nahant), 32-bit</description>
-        <operatingSystem>
-            <type>UNIX</type>
-            <displayName>REDHAT4/32</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>1</cpuCount>
-        <memory>2048</memory>
-        <osStorage>10</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed90cc-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed90cc-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>CentOS 5.5 32-bit 1 CPU</name>
-        <description>CentOS release 5.5, 32-bit</description>
-        <operatingSystem>
-            <type>UNIX</type>
-            <displayName>CENTOS5/32</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>1</cpuCount>
-        <memory>2048</memory>
-        <osStorage>10</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed91da-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed91da-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>CentOS 5.5 64-bit 1 CPU</name>
-        <description>CentOS release 5.5, 64-bit</description>
-        <operatingSystem>
-            <type>UNIX</type>
-            <displayName>CENTOS5/64</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>1</cpuCount>
-        <memory>2048</memory>
-        <osStorage>10</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed766e-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed766e-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>Win2003 Ent 32-bit 1 CPU</name>
-        <description>Windows 2003 Enterprise SP2 32-bit</description>
-        <operatingSystem>
-            <type>WINDOWS</type>
-            <displayName>WIN2003E/32</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>1</cpuCount>
-        <memory>2048</memory>
-        <osStorage>16</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed7876-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed7876-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>Win2003 Ent 32-bit 2 CPU</name>
-        <description>Windows 2003 Enterprise SP2 32-bit</description>
-        <operatingSystem>
-            <type>WINDOWS</type>
-            <displayName>WIN2003E/32</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>2</cpuCount>
-        <memory>4096</memory>
-        <osStorage>16</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed7984-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed7984-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>Win2003 Ent 32-bit 4 CPU</name>
-        <description>Windows 2003 Enterprise SP2 32-bit</description>
-        <operatingSystem>
-            <type>WINDOWS</type>
-            <displayName>WIN2003E/32</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>4</cpuCount>
-        <memory>4096</memory>
-        <osStorage>16</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>52ed7a88-ebea-11df-bdc1-001517c46384</id>
-        
<resourcePath>/oec/base/image/52ed7a88-ebea-11df-bdc1-001517c46384</resourcePath>
-        <name>Win2003 Std 64-bit 2 CPU</name>
-        <description>Windows 2003 Standard x64 SP2, 64-bit</description>
-        <operatingSystem>
-            <type>WINDOWS</type>
-            <displayName>WIN2003S/64</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>2</cpuCount>
-        <memory>4096</memory>
-        <osStorage>16</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>1970-01-01T00:00:02.010Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>0c231ef0-2a42-11e0-bfb5-001517c46384</id>
-        
<resourcePath>/oec/base/image/0c231ef0-2a42-11e0-bfb5-001517c46384</resourcePath>
-        <name>RedHat 64-bit 2 CPU with MySQL</name>
-        <description>RedHat 5.5 Enterprise with MySQL 5.5 
installed</description>
-        <operatingSystem>
-            <type>UNIX</type>
-            <displayName>REDHAT5/64</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>2</cpuCount>
-        <memory>8192</memory>
-        <osStorage>10</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>2011-01-27T18:19:58.000Z</created>
-    </ServerImage>
-    <ServerImage>
-        <id>2fb5261a-2a42-11e0-bfb5-001517c46384</id>
-        
<resourcePath>/oec/base/image/2fb5261a-2a42-11e0-bfb5-001517c46384</resourcePath>
-        <name>RedHat 64-bit 2 CPU with PostgreSQL</name>
-        <description>RedHat 5.5 Enterprise with PostgreSQL 9.0 
installed</description>
-        <operatingSystem>
-            <type>UNIX</type>
-            <displayName>REDHAT5/64</displayName>
-        </operatingSystem>
-        <location>NA1</location>
-        <cpuCount>2</cpuCount>
-        <memory>8192</memory>
-        <osStorage>10</osStorage>
-        <additionalLocalStorage>0</additionalLocalStorage>
-        <created>2011-01-27T18:20:57.000Z</created>
-    </ServerImage>
-</ServerImages>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/fixtures/opsource/oec_0_9_myaccount.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/opsource/oec_0_9_myaccount.xml 
b/libcloud/test/compute/fixtures/opsource/oec_0_9_myaccount.xml
deleted file mode 100644
index 4f3b132..0000000
--- a/libcloud/test/compute/fixtures/opsource/oec_0_9_myaccount.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns3:Account xmlns="http://oec.api.opsource.net/schemas/server"; 
xmlns:ns9="http://oec.api.opsource.net/schemas/reset"; 
xmlns:ns5="http://oec.api.opsource.net/schemas/vip"; 
xmlns:ns12="http://oec.api.opsource.net/schemas/general"; 
xmlns:ns6="http://oec.api.opsource.net/schemas/imageimportexport"; 
xmlns:ns13="http://oec.api.opsource.net/schemas/support"; 
xmlns:ns7="http://oec.api.opsource.net/schemas/whitelabel"; 
xmlns:ns10="http://oec.api.opsource.net/schemas/ipplan"; 
xmlns:ns8="http://oec.api.opsource.net/schemas/datacenter"; 
xmlns:ns11="http://oec.api.opsource.net/schemas/storage"; 
xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; 
xmlns:ns4="http://oec.api.opsource.net/schemas/network"; 
xmlns:ns3="http://oec.api.opsource.net/schemas/directory";>
-    <ns3:userName>testuser</ns3:userName>
-    <ns3:fullName>Test User</ns3:fullName>
-    <ns3:firstName>Test</ns3:firstName>
-    <ns3:lastName>User</ns3:lastName>
-    <ns3:emailAddress>[email protected]</ns3:emailAddress>
-    <ns3:orgId>8a8f6abc-2745-4d8a-9cbc-8dabe5a7d0e4</ns3:orgId>
-    <ns3:roles>
-        <ns3:role>
-            <ns3:name>create image</ns3:name>
-        </ns3:role>
-        <ns3:role>
-            <ns3:name>reports</ns3:name>
-        </ns3:role>
-        <ns3:role>
-            <ns3:name>server</ns3:name>
-        </ns3:role>
-        <ns3:role>
-            <ns3:name>primary administrator</ns3:name>
-        </ns3:role>
-        <ns3:role>
-            <ns3:name>network</ns3:name>
-        </ns3:role>
-    </ns3:roles>
-</ns3:Account>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/d2ca6cdf/libcloud/test/compute/test_cloudframes.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_cloudframes.py 
b/libcloud/test/compute/test_cloudframes.py
deleted file mode 100644
index 1698198..0000000
--- a/libcloud/test/compute/test_cloudframes.py
+++ /dev/null
@@ -1,292 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import sys
-import uuid
-import base64
-import unittest
-import datetime
-
-from libcloud.compute.base import Node, NodeImage, NodeLocation
-from libcloud.compute.types import NodeState
-from libcloud.compute.drivers.cloudframes import CloudFramesNodeDriver
-from libcloud.compute.drivers.cloudframes import CloudFramesSnapshot
-
-from libcloud.utils.py3 import httplib, xmlrpclib, b
-from libcloud.test import MockHttpTestCase
-from libcloud.test.compute import TestCaseMixin
-from libcloud.test.secrets import CLOUDFRAMES_PARAMS
-from libcloud.test.file_fixtures import ComputeFileFixtures
-
-
-# how many seconds to give the vm to boot and have VMWare tools start up
-START_TIMEOUT = 300
-
-
-class CloudFramesMockHttp(MockHttpTestCase):
-    fixtures = ComputeFileFixtures('cloudframes')
-
-    content_headers = {
-        'Server': 'TwistedWeb/9.0.0',
-        'Date': datetime.datetime.now().ctime(),
-        'Content-Type': 'text/xml',
-    }
-
-    def __getattr__(self, key):
-        if key == '_appserver_xmlrpc_http:__host:8888_appserver_xmlrpc':
-            return self._xmlrpc
-        raise AttributeError(key)
-
-    def _xmlrpc(self, method, url, body, headers):
-        params, methodname = xmlrpclib.loads(body)
-        meth_name = methodname.replace('.', '_').replace('cloud_api_', '')
-        return getattr(self, meth_name)(method, url, params, headers)
-
-    def _authenticate(self, headers):
-        self.assertTrue('Authorization' in headers.keys())
-        self.assertTrue(headers['Authorization'].startswith('Basic '))
-        auth = base64.b64decode(
-            b(headers['Authorization'].split(' ', 1)[1])).decode('ascii')
-        username, password = auth.split(':', 1)
-        self.assertEqual(username, CLOUDFRAMES_PARAMS[0])
-        self.assertEqual(password, CLOUDFRAMES_PARAMS[1])
-
-    def cloudspace_find(self, method, url, params, headers):
-        self._authenticate(headers)
-        body = self.fixtures.load('_cloudspace_find.xml')
-        return (httplib.OK, body, self.content_headers,
-                httplib.responses[httplib.OK])
-
-    def machine_find(self, method, url, params, headers):
-        self._authenticate(headers)
-        if params[18]:
-            body = self.fixtures.load('_machine_find_templates.xml')
-        elif params[17] == 'PHYSICAL':
-            body = self.fixtures.load('_machine_find_physical.xml')
-        elif params[17] == 'VIRTUALSERVER':
-            body = self.fixtures.load('_machine_find_virtualserver.xml')
-        elif params[17] == 'VIRTUALDESKTOP':
-            body = self.fixtures.load('_machine_find_virtualdesktop.xml')
-        else:
-            raise Exception(
-                'unknown machine.find query with params: %s' % params)
-        return (httplib.OK, body, self.content_headers,
-                httplib.responses[httplib.OK])
-
-    def machine_list(self, method, url, params, headers):
-        self._authenticate(headers)
-        body = None
-        if params[3]:
-            body = self.fixtures.load(
-                '_machine_list_machineguid_%s.xml' % params[3])
-        if body:
-            return (httplib.OK, body, self.content_headers,
-                    httplib.responses[httplib.OK])
-        else:
-            return (httplib.INTERNAL_SERVER_ERROR, '',
-                    self.content_headers, 'Could not parse request')
-
-    def machine_delete(self, method, url, params, headers):
-        self._authenticate(headers)
-        body = self.fixtures.load('_machine_delete.xml')
-        return (httplib.OK, body, self.content_headers,
-                httplib.responses[httplib.OK])
-
-    def machine_stop(self, method, url, params, headers):
-        self._authenticate(headers)
-        body = self.fixtures.load('_machine_stop.xml')
-        return (httplib.OK, body, self.content_headers,
-                httplib.responses[httplib.OK])
-
-    def machine_reboot(self, method, url, params, headers):
-        self._authenticate(headers)
-        body = self.fixtures.load('_machine_reboot.xml')
-        return (httplib.OK, body, self.content_headers,
-                httplib.responses[httplib.OK])
-
-    def machine_createFromTemplate(self, method, url, params, headers):
-        self._authenticate(headers)
-        body = self.fixtures.load('_machine_createFromTemplate.xml')
-        return (httplib.OK, body, self.content_headers,
-                httplib.responses[httplib.OK])
-
-    def machine_start(self, method, url, params, headers):
-        self._authenticate(headers)
-        body = self.fixtures.load('_machine_start.xml')
-        return (httplib.OK, body, self.content_headers,
-                httplib.responses[httplib.OK])
-
-    def machine_snapshot(self, method, url, params, headers):
-        self._authenticate(headers)
-        body = self.fixtures.load('_machine_snapshot.xml')
-        return (httplib.OK, body, self.content_headers,
-                httplib.responses[httplib.OK])
-
-    def machine_listSnapshots(self, method, url, params, headers):
-        self._authenticate(headers)
-        body = self.fixtures.load('_machine_listSnapshots.xml')
-        return (httplib.OK, body, self.content_headers,
-                httplib.responses[httplib.OK])
-
-    def machine_rollback(self, method, url, params, headers):
-        self._authenticate(headers)
-        body = self.fixtures.load('_machine_rollback.xml')
-        return (httplib.OK, body, self.content_headers,
-                httplib.responses[httplib.OK])
-
-    def lan_find(self, method, url, params, headers):
-        self._authenticate(headers)
-        body = self.fixtures.load('_lan_find.xml')
-        return (httplib.OK, body, self.content_headers,
-                httplib.responses[httplib.OK])
-
-
-class CloudFramesTests(unittest.TestCase, TestCaseMixin):
-
-    should_list_locations = True
-    should_have_pricing = False
-    should_list_volumes = False
-
-    def __init__(self, name, url=None):
-        self.url = url
-        super(CloudFramesTests, self).__init__(name)
-
-    def setUp(self):
-        if self.url:
-            args = ()
-            kwargs = {'url': self.url}
-        else:
-            CloudFramesNodeDriver.connectionCls.conn_classes = (
-                CloudFramesMockHttp, CloudFramesMockHttp)
-            args = CLOUDFRAMES_PARAMS
-            kwargs = {}
-        self.driver = CloudFramesNodeDriver(*args, **kwargs)
-
-    def _retry_until_up(self, cmd, *args, **kwargs):
-        """
-        When testing against a live system, this will cause the given command
-        to be retried until it succeeds.
-        (Calls like snapshot/reboot will fail until the vm has started fully.)
-        """
-        now = datetime.datetime.now()
-        while not (datetime.datetime.now() - now).seconds > START_TIMEOUT:
-            try:
-                return cmd(*args, **kwargs)
-            except:
-                pass
-        else:
-            raise Exception('VMWare tools did not become available in time')
-
-    def test_connection(self):
-        key, secret, secure, host, port = CLOUDFRAMES_PARAMS
-        CloudFramesNodeDriver(key, secret, secure, host)
-        CloudFramesNodeDriver(key, secret, secure, host, 80)
-        self.assertRaises(NotImplementedError, CloudFramesNodeDriver,
-                          key, secret, True, host, 80)
-        CloudFramesNodeDriver(key, secret, secure, host, '80')
-        self.assertRaises(NotImplementedError, CloudFramesNodeDriver,
-                          key, secure=secure, host=host)
-        self.assertRaises(NotImplementedError, CloudFramesNodeDriver,
-                          secret=secret, secure=secure, host=host)
-        CloudFramesNodeDriver(
-            url='http://%s:%s@%s:80/appserver/xmlrpc' % (key, secret, host))
-        CloudFramesNodeDriver(
-            url='http://%s:%s@%s/appserver/xmlrpc' % (key, secret, host))
-        self.assertRaises(NotImplementedError, CloudFramesNodeDriver,
-                          key=key, secret=secret,
-                          url='https://%s/appserver/xmlrpc' % host)
-        self.assertRaises(NotImplementedError, CloudFramesNodeDriver,
-                          key=key, secret=secret, secure=False,
-                          url='https://%s/appserver/xmlrpc' % host)
-        self.assertRaises(NotImplementedError, CloudFramesNodeDriver,
-                          url='http://%s@%s/appserver/xmlrpc' % (key, host))
-        CloudFramesNodeDriver(
-            secret=secret, url='http://%s@%s/appserver/xmlrpc' % (key, host))
-        self.assertRaises(NotImplementedError, CloudFramesNodeDriver,
-                          url='http://%s/appserver/xmlrpc' % host)
-        self.assertRaises(
-            NotImplementedError, CloudFramesNodeDriver,
-            secret=secret, url='http://%s/appserver/xmlrpc' % host)
-        self.assertRaises(NotImplementedError, CloudFramesNodeDriver,
-                          key=key, url='http://%s/appserver/xmlrpc' % host)
-        CloudFramesNodeDriver(
-            key=key, secret=secret, url='http://%s/appserver/xmlrpc' % host)
-
-    def test_snapshot(self):
-        nodes = [node for node in self.driver.list_nodes()
-                 if node.state == NodeState.RUNNING]
-        if not nodes:
-            raise Exception('No running vm to test snapshotting')
-        self._test_snapshot(nodes[0])
-
-    def _test_snapshot(self, node):
-        if self.url:
-            self.assertEqual(len(self.driver.ex_list_snapshots(node)), 0)
-        snapshot1 = self._retry_until_up(
-            self.driver.ex_snapshot_node, node)
-        self.assertTrue(isinstance(snapshot1, CloudFramesSnapshot))
-        if self.url:
-            self.assertEqual(len(self.driver.ex_list_snapshots(node)), 1)
-        snapshot2 = self.driver.ex_snapshot_node(node)
-        self.assertTrue(isinstance(snapshot2, CloudFramesSnapshot))
-        if self.url:
-            self.assertEqual(len(self.driver.ex_list_snapshots(node)), 2)
-        self.driver.ex_destroy_snapshot(node, snapshot2)
-        if self.url:
-            self.assertEqual(len(self.driver.ex_list_snapshots(node)), 1)
-        self.driver.ex_rollback_node(node, snapshot1)
-        if self.url:
-            self.assertEqual(len(self.driver.ex_list_snapshots(node)), 1)
-        self.driver.ex_destroy_snapshot(node, snapshot1)
-
-    def test_comprehensive(self):
-        """
-        Creates a node with the first location, image and size it finds.
-
-        Then boots the node, reboots, creates two snapshots.
-        Deletes one snapshot, rolls back to the other, then destroys the node.
-
-        In between these operations it verifies the node status and lists.
-        """
-        if not self.url:
-            return
-        location = self.driver.list_locations()[0]
-        self.assertTrue(isinstance(location, NodeLocation))
-        image = self.driver.list_images()[0]
-        self.assertTrue(isinstance(image, NodeImage))
-        size = self.driver.list_sizes()[0]
-        name = 'AUTOTEST_%s' % uuid.uuid4()
-        node = self.driver.create_node(
-            image=image, name=name, size=size, location=location)
-        # give the node time to boot up and load the vmware tools
-        self.assertTrue(isinstance(node, Node))
-        self.assertTrue(node.id in [x.id for x in self.driver.list_nodes()])
-        self.assertTrue(node.state == NodeState.RUNNING)
-        self._test_snapshot(node)
-        self._retry_until_up(self.driver.reboot_node, node)
-        self.driver.destroy_node(node)
-        self.assertFalse(node.id in [x.id for x in self.driver.list_nodes()])
-
-
-if __name__ == '__main__':
-    # add a full url as first arg to this script to test against a live system
-    # fi: http://key:secret@host:port/appserver/xmlrpc
-    if len(sys.argv) > 1:
-        suite = unittest.TestSuite()
-        suite.addTest(CloudFramesTests('test_comprehensive', sys.argv[1]))
-        if not unittest.TextTestRunner().run(suite).wasSuccessful():
-            sys.exit(1)
-        del sys.argv[1]
-    sys.exit(unittest.main())

Reply via email to