http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapabilitiesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapabilitiesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapabilitiesresponse.json
deleted file mode 100644
index 09c1e43..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapabilitiesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listcapabilitiesresponse" :  { "capability" : 
{"securitygroupsenabled":true,"cloudstackversion":"2.2","userpublictemplateenabled":true}
 }  }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapacityresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapacityresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapacityresponse.json
deleted file mode 100644
index ec31e1d..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapacityresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listcapacityresponse" : { "count":2 ,"capacity" : [  
{"type":3,"zoneid":1,"zonename":"Dev Zone 
1","podid":"null","podname":"All","capacityused":34057748480,"capacitytotal":1796712955904,"percentused":"1.9"},
 {"type":3,"zoneid":1,"zonename":"Dev Zone 1","podid":1,"podname":"Dev Pod 
1","capacityused":34057748480,"capacitytotal":1796712955904,"percentused":"1.9"}
 ] } }

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listclustersresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listclustersresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listclustersresponse.json
deleted file mode 100644
index 64dd052..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listclustersresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listclustersresponse" : { "count":2 ,"cluster" : [  {"id":1,"name":"Xen 
Clust 1","podid":1,"podname":"Dev Pod 1","zoneid":1,"zonename":"Dev Zone 
1","hypervisortype":"XenServer","clustertype":"CloudManaged","allocationstate":"Enabled","managedstate":"Managed"},
 {"id":2,"name":"Xen Clust 1","podid":2,"podname":"Dev Pod 
2","zoneid":2,"zonename":"Dev Zone 
2","hypervisortype":"XenServer","clustertype":"CloudManaged","allocationstate":"Enabled","managedstate":"Managed"}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listconfigurationsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listconfigurationsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listconfigurationsresponse.json
deleted file mode 100644
index 25bc7a1..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listconfigurationsresponse.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "listconfigurationsresponse" : { "count":2 ,"configuration" : [
-    
{"category":"Advanced","name":"account.cleanup.interval","value":"86400","description":"The
 interval (in seconds) between cleanup for removed accounts"},
-    
{"category":"Advanced","name":"agent.lb.enabled","value":"true","description":"If
 agent load balancing enabled in cluster setup"}]
-}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdiskofferingsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdiskofferingsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdiskofferingsresponse.json
deleted file mode 100644
index 4c7e703..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdiskofferingsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listdiskofferingsresponse" : { "diskoffering" : [  
{"id":3,"domainid":1,"domain":"ROOT","name":"Small","displaytext":"Small Disk, 
5 GB","disksize":5,"created":"2011-02-11T15:22:32-0800","iscustomized":false}, 
{"id":4,"domainid":1,"domain":"ROOT","name":"Medium","displaytext":"Medium 
Disk, 20 
GB","disksize":20,"created":"2011-02-11T15:22:32-0800","iscustomized":false}, 
{"id":5,"domainid":1,"domain":"ROOT","name":"Large","displaytext":"Large Disk, 
100 
GB","disksize":100,"created":"2011-02-11T15:22:32-0800","iscustomized":false} ] 
} }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainchildrenresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainchildrenresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainchildrenresponse.json
deleted file mode 100644
index 5cd2289..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainchildrenresponse.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{ "listdomainchildrenresponse" : { "count":2 ,"domain" : [
-    
{"id":2,"name":"jclouds1","level":1,"parentdomainid":1,"parentdomainname":"ROOT","haschild":false},
-    
{"id":3,"name":"jclouds2","level":1,"parentdomainid":1,"parentdomainname":"ROOT","haschild":false}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainsresponse.json
deleted file mode 100644
index 79d7e00..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainsresponse.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{ "listdomainsresponse" : { "count":2 ,"domain" : [
-    {"id":1,"name":"ROOT","level":0,"haschild":true},
-    
{"id":2,"name":"jclouds1","level":1,"parentdomainid":1,"parentdomainname":"ROOT","haschild":false}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listegressfirewallrulesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listegressfirewallrulesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listegressfirewallrulesresponse.json
deleted file mode 100644
index c76b216..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listegressfirewallrulesresponse.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "listegressfirewallrulesresponse" : { "count":3 ,"firewallrule" : [
-    
{"id":2017,"protocol":"tcp","startport":"30","endport":"35","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"},
-    
{"id":2016,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"},
-    
{"id":10,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":8,"ipaddress":"10.27.27.57","state":"Active","cidrlist":"0.0.0.0/0"}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listeventtypesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listeventtypesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listeventtypesresponse.json
deleted file mode 100644
index 1b75dab..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listeventtypesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listeventtypesresponse" : { "count":123 ,"eventtype" : [  
{"name":"VM.CREATE"}, {"name":"VM.DESTROY"}, {"name":"VM.START"}, 
{"name":"VM.STOP"}, {"name":"VM.REBOOT"}, {"name":"VM.UPDATE"}, 
{"name":"VM.UPGRADE"}, {"name":"VM.RESETPASSWORD"}, {"name":"VM.MIGRATE"}, 
{"name":"ROUTER.CREATE"}, {"name":"ROUTER.DESTROY"}, {"name":"ROUTER.START"}, 
{"name":"ROUTER.STOP"}, {"name":"ROUTER.REBOOT"}, {"name":"ROUTER.HA"}, 
{"name":"ROUTER.UPGRADE"}, {"name":"PROXY.CREATE"}, {"name":"PROXY.DESTROY"}, 
{"name":"PROXY.START"}, {"name":"PROXY.STOP"}, {"name":"PROXY.REBOOT"}, 
{"name":"PROXY.HA"}, {"name":"VNC.CONNECT"}, {"name":"VNC.DISCONNECT"}, 
{"name":"NET.IPASSIGN"}, {"name":"NET.IPRELEASE"}, {"name":"NET.RULEADD"}, 
{"name":"NET.RULEDELETE"}, {"name":"NET.RULEMODIFY"}, 
{"name":"NETWORK.CREATE"}, {"name":"NETWORK.DELETE"}, 
{"name":"NETWORK.UPDATE"}, {"name":"LB.ASSIGN.TO.RULE"}, 
{"name":"LB.REMOVE.FROM.RULE"}, {"name":"LB.CREATE"}, {"name":"LB.DELETE"}, 
{"name":"LB.UPDATE"}, {"name":"ACCOUNT.DISA
 BLE"}, {"name":"ACCOUNT.CREATE"}, {"name":"ACCOUNT.DELETE"}, 
{"name":"USER.LOGIN"}, {"name":"USER.LOGOUT"}, {"name":"USER.CREATE"}, 
{"name":"USER.DELETE"}, {"name":"USER.DISABLE"}, {"name":"USER.UPDATE"}, 
{"name":"USER.ENABLE"}, {"name":"TEMPLATE.CREATE"}, {"name":"TEMPLATE.DELETE"}, 
{"name":"TEMPLATE.UPDATE"}, {"name":"TEMPLATE.DOWNLOAD.START"}, 
{"name":"TEMPLATE.DOWNLOAD.SUCCESS"}, {"name":"TEMPLATE.DOWNLOAD.FAILED"}, 
{"name":"TEMPLATE.COPY"}, {"name":"TEMPLATE.EXTRACT"}, 
{"name":"TEMPLATE.UPLOAD"}, {"name":"TEMPLATE.CLEANUP"}, 
{"name":"VOLUME.CREATE"}, {"name":"VOLUME.DELETE"}, {"name":"VOLUME.ATTACH"}, 
{"name":"VOLUME.DETACH"}, {"name":"VOLUME.EXTRACT"}, {"name":"VOLUME.UPLOAD"}, 
{"name":"DOMAIN.CREATE"}, {"name":"DOMAIN.DELETE"}, {"name":"DOMAIN.UPDATE"}, 
{"name":"SNAPSHOT.CREATE"}, {"name":"SNAPSHOT.DELETE"}, 
{"name":"SNAPSHOTPOLICY.CREATE"}, {"name":"SNAPSHOTPOLICY.UPDATE"}, 
{"name":"SNAPSHOTPOLICY.DELETE"}, {"name":"ISO.CREATE"}, {"name":"ISO.DELETE"}, 
{"name":"ISO.COPY"}, {
 "name":"ISO.ATTACH"}, {"name":"ISO.DETACH"}, {"name":"ISO.EXTRACT"}, 
{"name":"ISO.UPLOAD"}, {"name":"SSVM.CREATE"}, {"name":"SSVM.DESTROY"}, 
{"name":"SSVM.START"}, {"name":"SSVM.STOP"}, {"name":"SSVM.REBOOT"}, 
{"name":"SSVM.HA"}, {"name":"SERVICE.OFFERING.CREATE"}, 
{"name":"SERVICE.OFFERING.EDIT"}, {"name":"SERVICE.OFFERING.DELETE"}, 
{"name":"DISK.OFFERING.CREATE"}, {"name":"DISK.OFFERING.EDIT"}, 
{"name":"DISK.OFFERING.DELETE"}, {"name":"NETWORK.OFFERING.CREATE"}, 
{"name":"NETWORK.OFFERING.ASSIGN"}, {"name":"NETWORK.OFFERING.EDIT"}, 
{"name":"NETWORK.OFFERING.REMOVE"}, {"name":"NETWORK.OFFERING.DELETE"}, 
{"name":"POD.CREATE"}, {"name":"POD.EDIT"}, {"name":"POD.DELETE"}, 
{"name":"ZONE.CREATE"}, {"name":"ZONE.EDIT"}, {"name":"ZONE.DELETE"}, 
{"name":"VLAN.IP.RANGE.CREATE"}, {"name":"VLAN.IP.RANGE.DELETE"}, 
{"name":"CONFIGURATION.VALUE.EDIT"}, {"name":"SG.AUTH.INGRESS"}, 
{"name":"SG.REVOKE.INGRESS"}, {"name":"SG.CREATE"}, {"name":"SG.DELETE"}, 
{"name":"HOST.RECONNECT"}, {"name":"MAINT.CA
 NCEL"}, {"name":"MAINT.CANCEL.PS"}, {"name":"MAINT.PREPARE"}, 
{"name":"MAINT.PREPARE.PS"}, {"name":"VPN.REMOTE.ACCESS.CREATE"}, 
{"name":"VPN.REMOTE.ACCESS.DESTROY"}, {"name":"VPN.USER.ADD"}, 
{"name":"VPN.USER.REMOVE"}, {"name":"NETWORK.RESTART"}, 
{"name":"UPLOAD.CUSTOM.CERTIFICATE"}, {"name":"STATICNAT.ENABLE"}, 
{"name":"STATICNAT.DISABLE"}, {"name":"ZONE.VLAN.ASSIGN"}, 
{"name":"ZONE.VLAN.RELEASE"} ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listfirewallrulesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listfirewallrulesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listfirewallrulesresponse.json
deleted file mode 100644
index e93d76e..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listfirewallrulesresponse.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "listfirewallrulesresponse" : { "count":3 ,"firewallrule" : [
-    
{"id":2017,"protocol":"tcp","startport":"30","endport":"35","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"},
-    
{"id":2016,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"},
-    
{"id":10,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":8,"ipaddress":"10.27.27.57","state":"Active","cidrlist":"0.0.0.0/0"}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhostsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhostsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhostsresponse.json
deleted file mode 100644
index 5d1fcf3..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhostsresponse.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "listhostsresponse" : { "count":4 ,"host" : [
-    
{"id":1,"name":"cs2-xevsrv.alucloud.local","state":"Up","type":"Routing","ipaddress":"10.26.26.107","zoneid":1,"zonename":"Dev
 Zone 1","podid":1,"podname":"Dev Pod 
1","version":"2.2.12.20110928142833","hypervisor":"XenServer","cpunumber":24,"cpuspeed":2266,"cpuallocated":"2.76%","cpuused":"0.1%","cpuwithoverprovisioning":"54384.0","networkkbsread":4443,"networkkbswrite":15048,"memorytotal":100549733760,"memoryallocated":3623878656,"memoryused":3623878656,"capabilities":"xen-3.0-x86_64
 , xen-3.0-x86_32p , hvm-3.0-x86_32 , hvm-3.0-x86_32p , 
hvm-3.0-x86_64","lastpinged":"1970-01-16T00:54:43+0200","managementserverid":223098941760041,"clusterid":1,"clustername":"Xen
 Clust 
1","clustertype":"CloudManaged","islocalstorageactive":false,"created":"2011-11-26T23:28:36+0200","events":"PrepareUnmanaged;
 HypervisorVersionChanged; ManagementServerDown; PingTimeout; 
AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; 
StartAgentRebalance; ShutdownRequested; Ping","hosttags":"","h
 asEnoughCapacity":false,"allocationstate":"Enabled"},
-    
{"id":2,"name":"nfs://10.26.26.165/mnt/nfs/cs_sec","state":"Alert","disconnected":"2011-11-26T23:33:38+0200","type":"SecondaryStorage","ipaddress":"nfs","zoneid":1,"zonename":"Dev
 Zone 
1","version":"2.2.12.20110928142833","hypervisor":"None","lastpinged":"1970-01-16T00:42:30+0200","islocalstorageactive":false,"created":"2011-11-26T23:33:38+0200","events":"ManagementServerDown;
 AgentDisconnected; Remove; MaintenanceRequested; AgentConnected; 
Ping","hasEnoughCapacity":false,"allocationstate":"Enabled"},
-    
{"id":3,"name":"s-1-VM","state":"Up","type":"SecondaryStorageVM","ipaddress":"10.26.26.81","zoneid":1,"zonename":"Dev
 Zone 1","podid":1,"podname":"Dev Pod 
1","version":"2.2.12.20110928142833","lastpinged":"1970-01-16T00:54:43+0200","managementserverid":223098941760041,"islocalstorageactive":false,"created":"2011-11-26T23:35:51+0200","events":"PrepareUnmanaged;
 HypervisorVersionChanged; ManagementServerDown; PingTimeout; 
AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; 
StartAgentRebalance; ShutdownRequested; 
Ping","hasEnoughCapacity":false,"allocationstate":"Enabled"},
-    
{"id":4,"name":"v-2-VM","state":"Up","type":"ConsoleProxy","ipaddress":"10.26.26.96","zoneid":1,"zonename":"Dev
 Zone 1","podid":1,"podname":"Dev Pod 
1","version":"2.2.12.20110928142833","lastpinged":"1970-01-16T00:54:43+0200","managementserverid":223098941760041,"islocalstorageactive":false,"created":"2011-11-26T23:36:46+0200","events":"PrepareUnmanaged;
 HypervisorVersionChanged; ManagementServerDown; PingTimeout; 
AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; 
StartAgentRebalance; ShutdownRequested; 
Ping","hasEnoughCapacity":false,"allocationstate":"Enabled"} ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhypervisorsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhypervisorsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhypervisorsresponse.json
deleted file mode 100644
index a8afd87..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhypervisorsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listhypervisorsresponse" : { "hypervisor" : [  {"name":"KVM"}, 
{"name":"VMware"}, {"name":"XenServer"} ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listipforwardingrulesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listipforwardingrulesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listipforwardingrulesresponse.json
deleted file mode 100644
index 984f6ee..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listipforwardingrulesresponse.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "listipforwardingrulesresponse": {
-        "count": 1,
-        "ipforwardingrule": [{
-            "id": 66,
-            "protocol": "tcp",
-            "virtualmachineid": 58,
-            "virtualmachinename": "i-4-58-VM",
-            "virtualmachinedisplayname": "i-4-58-VM",
-            "ipaddressid": 15,
-            "ipaddress": "10.27.27.64",
-            "startport": 22,
-            "endport": 22,
-            "state": "Active"
-        }]
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listisosresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listisosresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listisosresponse.json
deleted file mode 100644
index c1dba0b..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listisosresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listisosresponse" : { "count":2 ,"iso" : [ 
{"id":"018e0928-8205-4d8e-9329-f731a9ccd488","name":"xs-tools.iso","displaytext":"xen-pv-drv-iso","ispublic":true,"created":"2012-08-21T15:45:01+0530","isready":true,"passwordenabled":false,"bootable":false,"isfeatured":true,"crossZones":false,"account":"system","domain":"ROOT","domainid":"9d189ea2-097e-4b2b-9bae-d885f5430d69","isextractable":false,"tags":[]},
 
{"id":"1e29244b-9cf0-4ff2-9978-677eb83f6bfb","name":"vmware-tools.iso","displaytext":"VMware
 Tools Installer 
ISO","ispublic":true,"created":"2012-08-21T15:45:01+0530","isready":true,"passwordenabled":false,"bootable":false,"isfeatured":true,"crossZones":false,"account":"system","domain":"ROOT","domainid":"9d189ea2-097e-4b2b-9bae-d885f5430d69","isextractable":false,"tags":[]}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listloadbalancerrulesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listloadbalancerrulesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listloadbalancerrulesresponse.json
deleted file mode 100644
index 6093882..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listloadbalancerrulesresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "listloadbalancerrulesresponse" : { "count":1 ,"loadbalancerrule" : [
-    
{"id":93,"name":"Ranny","publicipid":10,"publicip":"10.27.27.59","publicport":"80","privateport":"80","algorithm":"roundrobin","cidrlist":"","account":"admin","domainid":1,"domain":"ROOT","state":"Add","zoneid":1}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworkofferingsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworkofferingsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworkofferingsresponse.json
deleted file mode 100644
index 76947e8..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworkofferingsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listnetworkofferingsresponse" : { "networkoffering" : [  
{"id":6,"name":"DefaultVirtualizedNetworkOffering","displaytext":"Virtual 
Vlan","traffictype":"Guest","isdefault":true,"specifyvlan":false,"availability":"Required","networkrate":200},
 
{"id":7,"name":"DefaultDirectNetworkOffering","displaytext":"Direct","traffictype":"Public","isdefault":true,"specifyvlan":false,"availability":"Required","networkrate":200}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse-2.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse-2.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse-2.json
deleted file mode 100644
index 2f10824..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse-2.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listnetworksresponse" : { "network" : [  {"id":204,"name":"Virtual 
Network","displaytext":"A dedicated virtualized network for your account.  The 
broadcast domain is contained within a VLAN and all public network access is 
routed out by a virtual 
router.","broadcastdomaintype":"Vlan","traffictype":"Guest","zoneid":2,"networkofferingid":6,"networkofferingname":"DefaultVirtualizedNetworkOffering","networkofferingdisplaytext":"Virtual
 
Vlan","networkofferingavailability":"Required","isshared":false,"issystem":false,"state":"Implemented","related":204,"broadcasturi":"vlan://240","dns1":"8.8.8.8","type":"Virtual","account":"adrian","domainid":1,"domain":"ROOT","isdefault":true,"service":[{"name":"Vpn","capability":[{"name":"SupportedVpnTypes","value":"pptp,l2tp,ipsec"}]},{"name":"Gateway"},{"name":"UserData"},{"name":"Dhcp"},{"name":"Firewall","capability":[{"name":"SupportedSourceNatTypes","value":"per
 
account"},{"name":"StaticNat","value":"true"},{"name":"TrafficStatistics","value":"
 per public 
ip"},{"name":"PortForwarding","value":"true"},{"name":"MultipleIps","value":"true"},{"name":"SupportedProtocols","value":"tcp,udp"}]},{"name":"Dns"},{"name":"Lb","capability":[{"name":"SupportedLbAlgorithms","value":"roundrobin,leastconn,source"},{"name":"SupportedProtocols","value":"tcp,
 udp"}]}],"networkdomain":"cs3cloud.internal"} ] } }

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse.json
deleted file mode 100644
index 1e5fa8d..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listnetworksresponse" : { "network" : [  {"id":204,"name":"Virtual 
Network","displaytext":"A dedicated virtualized network for your account.  The 
broadcast domain is contained within a VLAN and all public network access is 
routed out by a virtual 
router.","broadcastdomaintype":"Vlan","traffictype":"Guest","zoneid":1,"networkofferingid":6,"networkofferingname":"DefaultVirtualizedNetworkOffering","networkofferingdisplaytext":"Virtual
 
Vlan","networkofferingavailability":"Required","isshared":false,"issystem":false,"state":"Implemented","related":204,"broadcasturi":"vlan://240","dns1":"8.8.8.8","type":"Virtual","account":"adrian","domainid":1,"domain":"ROOT","isdefault":true,"service":[{"name":"Vpn","capability":[{"name":"SupportedVpnTypes","value":"pptp,l2tp,ipsec"}]},{"name":"Gateway"},{"name":"UserData"},{"name":"Dhcp"},{"name":"Firewall","capability":[{"name":"SupportedSourceNatTypes","value":"per
 
account"},{"name":"StaticNat","value":"true"},{"name":"TrafficStatistics","value":"
 per public 
ip"},{"name":"PortForwarding","value":"true"},{"name":"MultipleIps","value":"true"},{"name":"SupportedProtocols","value":"tcp,udp"}]},{"name":"Dns"},{"name":"Lb","capability":[{"name":"SupportedLbAlgorithms","value":"roundrobin,leastconn,source"},{"name":"SupportedProtocols","value":"tcp,
 udp"}]}],"networkdomain":"cs3cloud.internal"} ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listoscategoriesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listoscategoriesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listoscategoriesresponse.json
deleted file mode 100644
index ed5bc6b..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listoscategoriesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listoscategoriesresponse" : { "oscategory" : [  {"id":1,"name":"CentOS"}, 
{"id":2,"name":"Debian"}, {"id":3,"name":"Oracle"}, {"id":4,"name":"RedHat"}, 
{"id":5,"name":"SUSE"}, {"id":6,"name":"Windows"}, {"id":7,"name":"Other"}, 
{"id":8,"name":"Novel"}, {"id":9,"name":"Unix"}, {"id":10,"name":"Ubuntu"} ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listostypesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listostypesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listostypesresponse.json
deleted file mode 100644
index c892e39..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listostypesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listostypesresponse" : { "ostype" : [  
{"id":69,"oscategoryid":7,"description":"Asianux 3(32-bit)"}, 
{"id":70,"oscategoryid":7,"description":"Asianux 3(64-bit)"}, 
{"id":1,"oscategoryid":1,"description":"CentOS 4.5 (32-bit)"}, 
{"id":2,"oscategoryid":1,"description":"CentOS 4.6 (32-bit)"}, 
{"id":3,"oscategoryid":1,"description":"CentOS 4.7 (32-bit)"}, 
{"id":4,"oscategoryid":1,"description":"CentOS 4.8 (32-bit)"}, 
{"id":5,"oscategoryid":1,"description":"CentOS 5.0 (32-bit)"}, 
{"id":6,"oscategoryid":1,"description":"CentOS 5.0 (64-bit)"}, 
{"id":7,"oscategoryid":1,"description":"CentOS 5.1 (32-bit)"}, 
{"id":8,"oscategoryid":1,"description":"CentOS 5.1 (64-bit)"}, 
{"id":9,"oscategoryid":1,"description":"CentOS 5.2 (32-bit)"}, 
{"id":10,"oscategoryid":1,"description":"CentOS 5.2 (64-bit)"}, 
{"id":11,"oscategoryid":1,"description":"CentOS 5.3 (32-bit)"}, 
{"id":12,"oscategoryid":1,"description":"CentOS 5.3 (64-bit)"}, 
{"id":13,"oscategoryid":1,"description":"CentOS 5.4 (32-bit)"}, {"id":14
 ,"oscategoryid":1,"description":"CentOS 5.4 (64-bit)"}, 
{"id":111,"oscategoryid":1,"description":"CentOS 5.5 (32-bit)"}, 
{"id":112,"oscategoryid":1,"description":"CentOS 5.5 (64-bit)"}, 
{"id":73,"oscategoryid":2,"description":"Debian GNU/Linux 4(32-bit)"}, 
{"id":74,"oscategoryid":2,"description":"Debian GNU/Linux 4(64-bit)"}, 
{"id":72,"oscategoryid":2,"description":"Debian GNU/Linux 5(64-bit)"}, 
{"id":15,"oscategoryid":2,"description":"Debian GNU/Linux 5.0 (32-bit)"}, 
{"id":132,"oscategoryid":2,"description":"Debian GNU/Linux 6(32-bit)"}, 
{"id":133,"oscategoryid":2,"description":"Debian GNU/Linux 6(64-bit)"}, 
{"id":102,"oscategoryid":6,"description":"DOS"}, 
{"id":118,"oscategoryid":4,"description":"Fedora 10"}, 
{"id":117,"oscategoryid":4,"description":"Fedora 11"}, 
{"id":116,"oscategoryid":4,"description":"Fedora 12"}, 
{"id":115,"oscategoryid":4,"description":"Fedora 13"}, 
{"id":120,"oscategoryid":4,"description":"Fedora 8"}, 
{"id":119,"oscategoryid":4,"description":"Fedora 9"}, {"i
 d":83,"oscategoryid":9,"description":"FreeBSD (32-bit)"}, 
{"id":84,"oscategoryid":9,"description":"FreeBSD (64-bit)"}, 
{"id":92,"oscategoryid":6,"description":"Microsoft Small Bussiness Server 
2003"}, {"id":78,"oscategoryid":8,"description":"Novell Netware 5.1"}, 
{"id":77,"oscategoryid":8,"description":"Novell Netware 6.x"}, 
{"id":68,"oscategoryid":7,"description":"Open Enterprise Server"}, 
{"id":16,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.0 
(32-bit)"}, {"id":17,"oscategoryid":3,"description":"Oracle Enterprise Linux 
5.0 (64-bit)"}, {"id":18,"oscategoryid":3,"description":"Oracle Enterprise 
Linux 5.1 (32-bit)"}, {"id":19,"oscategoryid":3,"description":"Oracle 
Enterprise Linux 5.1 (64-bit)"}, 
{"id":20,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.2 
(32-bit)"}, {"id":21,"oscategoryid":3,"description":"Oracle Enterprise Linux 
5.2 (64-bit)"}, {"id":22,"oscategoryid":3,"description":"Oracle Enterprise 
Linux 5.3 (32-bit)"}, {"id":23,"oscategoryid":3,"descripti
 on":"Oracle Enterprise Linux 5.3 (64-bit)"}, 
{"id":24,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.4 
(32-bit)"}, {"id":25,"oscategoryid":3,"description":"Oracle Enterprise Linux 
5.4 (64-bit)"}, {"id":134,"oscategoryid":3,"description":"Oracle Enterprise 
Linux 5.5 (32-bit)"}, {"id":135,"oscategoryid":3,"description":"Oracle 
Enterprise Linux 5.5 (64-bit)"}, 
{"id":104,"oscategoryid":7,"description":"OS/2"}, 
{"id":60,"oscategoryid":7,"description":"Other (32-bit)"}, 
{"id":103,"oscategoryid":7,"description":"Other (64-bit)"}, 
{"id":75,"oscategoryid":7,"description":"Other 2.6x Linux (32-bit)"}, 
{"id":76,"oscategoryid":7,"description":"Other 2.6x Linux (64-bit)"}, 
{"id":98,"oscategoryid":7,"description":"Other Linux (32-bit)"}, 
{"id":99,"oscategoryid":7,"description":"Other Linux (64-bit)"}, 
{"id":59,"oscategoryid":10,"description":"Other Ubuntu (32-bit)"}, 
{"id":100,"oscategoryid":10,"description":"Other Ubuntu (64-bit)"}, 
{"id":131,"oscategoryid":10,"description":"Red Hat E
 nterprise Linux 2"}, {"id":66,"oscategoryid":4,"description":"Red Hat 
Enterprise Linux 3(32-bit)"}, {"id":67,"oscategoryid":4,"description":"Red Hat 
Enterprise Linux 3(64-bit)"}, {"id":106,"oscategoryid":4,"description":"Red Hat 
Enterprise Linux 4(64-bit)"}, {"id":26,"oscategoryid":4,"description":"Red Hat 
Enterprise Linux 4.5 (32-bit)"}, {"id":27,"oscategoryid":4,"description":"Red 
Hat Enterprise Linux 4.6 (32-bit)"}, 
{"id":28,"oscategoryid":4,"description":"Red Hat Enterprise Linux 4.7 
(32-bit)"}, {"id":29,"oscategoryid":4,"description":"Red Hat Enterprise Linux 
4.8 (32-bit)"}, {"id":30,"oscategoryid":4,"description":"Red Hat Enterprise 
Linux 5.0 (32-bit)"}, {"id":31,"oscategoryid":4,"description":"Red Hat 
Enterprise Linux 5.0 (64-bit)"}, {"id":32,"oscategoryid":4,"description":"Red 
Hat Enterprise Linux 5.1 (32-bit)"}, 
{"id":33,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.1 
(64-bit)"}, {"id":34,"oscategoryid":4,"description":"Red Hat Enterprise Linux 
5.2 (32-bit)"}, 
 {"id":35,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.2 
(64-bit)"}, {"id":36,"oscategoryid":4,"description":"Red Hat Enterprise Linux 
5.3 (32-bit)"}, {"id":37,"oscategoryid":4,"description":"Red Hat Enterprise 
Linux 5.3 (64-bit)"}, {"id":38,"oscategoryid":4,"description":"Red Hat 
Enterprise Linux 5.4 (32-bit)"}, {"id":39,"oscategoryid":4,"description":"Red 
Hat Enterprise Linux 5.4 (64-bit)"}, 
{"id":113,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.5 
(32-bit)"}, {"id":114,"oscategoryid":4,"description":"Red Hat Enterprise Linux 
5.5 (64-bit)"}, {"id":136,"oscategoryid":4,"description":"Red Hat Enterprise 
Linux 6.0 (32-bit)"}, {"id":137,"oscategoryid":4,"description":"Red Hat 
Enterprise Linux 6.0 (64-bit)"}, {"id":85,"oscategoryid":9,"description":"SCO 
OpenServer 5"}, {"id":86,"oscategoryid":9,"description":"SCO UnixWare 7"}, 
{"id":79,"oscategoryid":9,"description":"Sun Solaris 10(32-bit)"}, 
{"id":80,"oscategoryid":9,"description":"Sun Solaris 10(64-bit)"}, {
 "id":82,"oscategoryid":9,"description":"Sun Solaris 8(Experimental)"}, 
{"id":81,"oscategoryid":9,"description":"Sun Solaris 9(Experimental)"}, 
{"id":109,"oscategoryid":5,"description":"SUSE Linux Enterprise 10(32-bit)"}, 
{"id":110,"oscategoryid":5,"description":"SUSE Linux Enterprise 10(64-bit)"}, 
{"id":96,"oscategoryid":5,"description":"SUSE Linux Enterprise 8(32-bit)"}, 
{"id":97,"oscategoryid":5,"description":"SUSE Linux Enterprise 8(64-bit)"}, 
{"id":107,"oscategoryid":5,"description":"SUSE Linux Enterprise 9(32-bit)"}, 
{"id":108,"oscategoryid":5,"description":"SUSE Linux Enterprise 9(64-bit)"}, 
{"id":41,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 10 SP1 
(32-bit)"}, {"id":42,"oscategoryid":5,"description":"SUSE Linux Enterprise 
Server 10 SP1 (64-bit)"}, {"id":43,"oscategoryid":5,"description":"SUSE Linux 
Enterprise Server 10 SP2 (32-bit)"}, 
{"id":44,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 10 SP2 
(64-bit)"}, {"id":45,"oscategoryid":5,"descripti
 on":"SUSE Linux Enterprise Server 10 SP3 (64-bit)"}, 
{"id":46,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 11 
(32-bit)"}, {"id":47,"oscategoryid":5,"description":"SUSE Linux Enterprise 
Server 11 (64-bit)"}, {"id":40,"oscategoryid":5,"description":"SUSE Linux 
Enterprise Server 9 SP4 (32-bit)"}, 
{"id":121,"oscategoryid":10,"description":"Ubuntu 10.04 (32-bit)"}, 
{"id":126,"oscategoryid":10,"description":"Ubuntu 10.04 (64-bit)"}, 
{"id":125,"oscategoryid":10,"description":"Ubuntu 8.04 (32-bit)"}, 
{"id":130,"oscategoryid":10,"description":"Ubuntu 8.04 (64-bit)"}, 
{"id":124,"oscategoryid":10,"description":"Ubuntu 8.10 (32-bit)"}, 
{"id":129,"oscategoryid":10,"description":"Ubuntu 8.10 (64-bit)"}, 
{"id":123,"oscategoryid":10,"description":"Ubuntu 9.04 (32-bit)"}, 
{"id":128,"oscategoryid":10,"description":"Ubuntu 9.04 (64-bit)"}, 
{"id":122,"oscategoryid":10,"description":"Ubuntu 9.10 (32-bit)"}, 
{"id":127,"oscategoryid":10,"description":"Ubuntu 9.10 (64-bit)"}, 
{"id":95,"osca
 tegoryid":6,"description":"Windows 2000 Advanced Server"}, 
{"id":105,"oscategoryid":6,"description":"Windows 2000 Professional"}, 
{"id":61,"oscategoryid":6,"description":"Windows 2000 Server"}, 
{"id":55,"oscategoryid":6,"description":"Windows 2000 Server SP4 (32-bit)"}, 
{"id":65,"oscategoryid":6,"description":"Windows 3.1"}, 
{"id":48,"oscategoryid":6,"description":"Windows 7 (32-bit)"}, 
{"id":49,"oscategoryid":6,"description":"Windows 7 (64-bit)"}, 
{"id":63,"oscategoryid":6,"description":"Windows 95"}, 
{"id":62,"oscategoryid":6,"description":"Windows 98"}, 
{"id":64,"oscategoryid":6,"description":"Windows NT 4"}, 
{"id":87,"oscategoryid":6,"description":"Windows Server 2003 DataCenter 
Edition(32-bit)"}, {"id":88,"oscategoryid":6,"description":"Windows Server 2003 
DataCenter Edition(64-bit)"}, {"id":50,"oscategoryid":6,"description":"Windows 
Server 2003 Enterprise Edition(32-bit)"}, 
{"id":51,"oscategoryid":6,"description":"Windows Server 2003 Enterprise 
Edition(64-bit)"}, {"id":89,"osc
 ategoryid":6,"description":"Windows Server 2003 Standard Edition(32-bit)"}, 
{"id":90,"oscategoryid":6,"description":"Windows Server 2003 Standard 
Edition(64-bit)"}, {"id":91,"oscategoryid":6,"description":"Windows Server 2003 
Web Edition"}, {"id":52,"oscategoryid":6,"description":"Windows Server 2008 
(32-bit)"}, {"id":53,"oscategoryid":6,"description":"Windows Server 2008 
(64-bit)"}, {"id":54,"oscategoryid":6,"description":"Windows Server 2008 R2 
(64-bit)"}, {"id":56,"oscategoryid":6,"description":"Windows Vista (32-bit)"}, 
{"id":101,"oscategoryid":6,"description":"Windows Vista (64-bit)"}, 
{"id":93,"oscategoryid":6,"description":"Windows XP (32-bit)"}, 
{"id":94,"oscategoryid":6,"description":"Windows XP (64-bit)"}, 
{"id":57,"oscategoryid":6,"description":"Windows XP SP2 (32-bit)"}, 
{"id":58,"oscategoryid":6,"description":"Windows XP SP3 (32-bit)"} ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpodsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpodsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpodsresponse.json
deleted file mode 100644
index 9b63799..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpodsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listpodsresponse" : { "count":2 ,"pod" : [  {"id":1,"name":"Dev Pod 
1","zoneid":1,"zonename":"Dev Zone 
1","gateway":"10.26.26.254","netmask":"255.255.255.0","startip":"10.26.26.50","endip":"10.26.26.100","allocationstate":"Enabled"},
 {"id":2,"name":"Dev Pod 2","zoneid":2,"zonename":"Dev Zone 
2","gateway":"10.22.22.254","netmask":"255.255.255.0","startip":"10.22.22.25","endip":"10.22.22.50","allocationstate":"Enabled"}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listportforwardingrulesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listportforwardingrulesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listportforwardingrulesresponse.json
deleted file mode 100644
index c385f7e..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listportforwardingrulesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listportforwardingrulesresponse" : { "portforwardingrule" : [  
{"id":18,"privateport":"22","protocol":"tcp","publicport":"22","virtualmachineid":89,"virtualmachinename":"i-3-89-VM","ipaddressid":34,"ipaddress":"72.52.126.63","state":"Active"},
 
{"id":15,"privateport":"22","protocol":"tcp","publicport":"2022","virtualmachineid":3,"virtualmachinename":"i-3-3-VM","ipaddressid":3,"ipaddress":"72.52.126.32","state":"Active","cidrlist":"0.0.0.0/1,128.0.0.0/1"}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listprojectsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listprojectsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listprojectsresponse.json
deleted file mode 100644
index 33273ef..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listprojectsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listprojectsresponse" : { "count":2 ,"project" : [  
{"id":"489da162-0b77-489d-b044-ce39aa018b1f","name":"NN-HA-T1","displaytext":"","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","account":"thyde","state":"Active"},
 
{"id":"1c11f22c-15ac-4fa7-b833-4d748df317b7","name":"hive","displaytext":"Hive","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","account":"prasadm","state":"Active"}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpublicipaddressesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpublicipaddressesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpublicipaddressesresponse.json
deleted file mode 100644
index 914c95a..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpublicipaddressesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listpublicipaddressesresponse" : { "publicipaddress" : [  
{"id":30,"ipaddress":"72.52.126.59","allocated":"2011-02-19T21:15:01-0800","zoneid":1,"zonename":"San
 Jose 
1","issourcenat":false,"account":"adrian","domainid":1,"domain":"ROOT","forvirtualnetwork":true,"isstaticnat":false,"associatednetworkid":204,"networkid":200,"state":"Allocated"}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listresourcelimitsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listresourcelimitsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listresourcelimitsresponse.json
deleted file mode 100644
index 247782a..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listresourcelimitsresponse.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "listresourcelimitsresponse" : { "count":8 ,"resourcelimit" : [
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"0","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"1","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"2","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"3","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"4","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"7","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"8","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"9","max":-1}]
 } }

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsecuritygroupsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsecuritygroupsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsecuritygroupsresponse.json
deleted file mode 100644
index 25136a3..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsecuritygroupsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listsecuritygroupsresponse" : { "securitygroup" : [  
{"id":12,"name":"adriancole","account":"adrian","domainid":1,"domain":"ROOT"}, 
{"id":13,"name":"default","description":"description","account":"adrian","domainid":1,"domain":"ROOT","ingressrule":[{"ruleid":5,"protocol":"tcp","startport":22,"endport":22,"securitygroupname":"adriancole","account":"adrian"},{"ruleid":6,"protocol":"udp","startport":11,"endport":11,"cidr":"1.1.1.1/24"}]},
 
{"id":14,"name":"1","description":"description","account":"adrian","domainid":1,"domain":"ROOT","ingressrule":[{"ruleid":7,"protocol":"tcp","startport":10,"endport":10,"cidr":"1.1.1.1/24"},{"ruleid":8,"protocol":"tcp","startport":10,"endport":10,"cidr":"2.2.2.2/16"}]},
 
{"id":15,"name":"2","description":"description","account":"adrian","domainid":1,"domain":"ROOT"},
 
{"id":16,"name":"with1and2","description":"description","account":"adrian","domainid":1,"domain":"ROOT","ingressrule":[{"ruleid":9,"protocol":"icmp","icmptype":-1,"icmpcode":-1,"security
 
groupname":"1","account":"adrian"},{"ruleid":10,"protocol":"tcp","startport":22,"endport":22,"securitygroupname":"1","account":"adrian"},{"ruleid":11,"protocol":"tcp","startport":22,"endport":22,"securitygroupname":"2","account":"adrian"}]}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listserviceofferingsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listserviceofferingsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listserviceofferingsresponse.json
deleted file mode 100644
index be1dab6..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listserviceofferingsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listserviceofferingsresponse" : { "serviceoffering" : [  
{"id":1,"name":"Small Instance","displaytext":"Small Instance - 500 MhZ CPU, 
512 MB RAM - $0.05 per 
hour","cpunumber":1,"cpuspeed":500,"memory":512,"created":"2011-02-11T15:22:32-0800","storagetype":"shared","offerha":false},
 {"id":2,"name":"Medium Instance","displaytext":"Medium Instance, 1 GhZ CPU,  1 
GB RAM - $0.10 per 
hour","cpunumber":1,"cpuspeed":1000,"memory":1024,"created":"2011-02-11T15:22:32-0800","storagetype":"shared","offerha":false}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsshkeypairsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsshkeypairsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsshkeypairsresponse.json
deleted file mode 100644
index 37d0def..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsshkeypairsresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "listsshkeypairsresponse" : { "count":1 ,"sshkeypair" : [
-   
{"name":"jclouds-keypair","fingerprint":"1c:06:74:52:3b:99:1c:95:5c:04:c2:f4:ba:77:6e:7b"}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/liststoragepoolsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/liststoragepoolsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/liststoragepoolsresponse.json
deleted file mode 100644
index dc3ae46..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/liststoragepoolsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "liststoragepoolsresponse" : { "count":1 ,"storagepool" : [  
{"id":201,"zoneid":1,"zonename":"Dev Zone 1","podid":1,"podname":"Dev Pod 
1","name":"NFS Pri 
1","ipaddress":"10.26.26.165","path":"/mnt/nfs/cs_pri","created":"2011-11-26T23:33:06+0200","type":"NetworkFilesystem","clusterid":1,"clustername":"Xen
 Clust 
1","disksizetotal":898356445184,"disksizeallocated":18276679680,"tags":"tag1","state":"Up"}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse-imageextension.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse-imageextension.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse-imageextension.json
deleted file mode 100644
index 1643700..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse-imageextension.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listtemplatesresponse" : { "count":1 ,"template" : [  
{"id":"3dc6ce25-a6cf-4d60-a664-3499993b511b","name":"temp-template-ignore","displaytext":"sometext","ispublic":false,"created":"2013-06-21T12:37:01-0700","isready":true,"passwordenabled":false,"format":"QCOW2","isfeatured":false,"crossZones":false,"ostypeid":"be820210-c741-4c36-9ba1-f38363bd37d5","ostypename":"CentOS
 5.6 (32-bit)","account":"andrew","zoneid":"1","zonename":"San Jose 
1","status":"Download 
Complete","size":26843545600,"templatetype":"USER","hypervisor":"KVM","domain":"ROOT","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","isextractable":false,"checksum":"6dd5d7f073ff951b033a8cadb877bde2","sourcetemplateid":"9d597afb-4d3d-4a69-bf45-f95b0d1ee160"}
 ] } }

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse.json
deleted file mode 100644
index 140e8ca..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listtemplatesresponse" : { "template" : [  {"id":2,"name":"CentOS 
5.3(64-bit) no GUI (XenServer)","displaytext":"CentOS 5.3(64-bit) no GUI 
(XenServer)","ispublic":true,"created":"2011-03-20T19:17:48-0700","isready":false,"passwordenabled":false,"format":"VHD","isfeatured":true,"crossZones":true,"ostypeid":11,"ostypename":"CentOS
 5.3 
(32-bit)","account":"system","zoneid":2,"zonename":"Chicago","templatetype":"BUILTIN","hypervisor":"XenServer","domain":"ROOT","domainid":1,"isextractable":true},
 {"id":4,"name":"CentOS 5.5(64-bit) no GUI (KVM)","displaytext":"CentOS 
5.5(64-bit) no GUI 
(KVM)","ispublic":true,"created":"2011-03-20T19:17:48-0700","isready":true,"passwordenabled":false,"format":"QCOW2","isfeatured":true,"crossZones":true,"ostypeid":112,"ostypename":"CentOS
 5.5 
(64-bit)","account":"system","zoneid":2,"zonename":"Chicago","size":8589934592,"templatetype":"BUILTIN","hypervisor":"KVM","domain":"ROOT","domainid":1,"isextractable":true},
 {"id":203,"name":"Windows 7 KVM","displ
 aytext":"Windows 7 
KVM","ispublic":true,"created":"2011-03-20T22:02:18-0700","isready":true,"passwordenabled":false,"format":"QCOW2","isfeatured":true,"crossZones":false,"ostypeid":48,"ostypename":"Windows
 7 
(32-bit)","account":"admin","zoneid":2,"zonename":"Chicago","size":17179869184,"templatetype":"USER","hypervisor":"KVM","domain":"ROOT","domainid":1,"isextractable":false},
 {"id":7,"name":"CentOS 5.3(64-bit) no GUI (vSphere)","displaytext":"CentOS 
5.3(64-bit) no GUI 
(vSphere)","ispublic":true,"created":"2011-03-20T19:17:48-0700","isready":false,"passwordenabled":false,"format":"OVA","isfeatured":true,"crossZones":true,"ostypeid":12,"ostypename":"CentOS
 5.3 
(64-bit)","account":"system","zoneid":2,"zonename":"Chicago","templatetype":"BUILTIN","hypervisor":"VMware","domain":"ROOT","domainid":1,"isextractable":true},
 
{"id":241,"name":"kvmdev4","displaytext":"v5.6.28_Dev4","ispublic":true,"created":"2011-04-21T09:43:25-0700","isready":true,"passwordenabled":false,"format":"QCOW2","is
 featured":false,"crossZones":false,"ostypeid":14,"ostypename":"CentOS 5.4 
(64-bit)","account":"rs3","zoneid":2,"zonename":"Chicago","size":10737418240,"templatetype":"USER","hypervisor":"KVM","domain":"ROOT","domainid":1,"isextractable":false}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listusagerecordsresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listusagerecordsresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listusagerecordsresponse.json
deleted file mode 100644
index 5175f70..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listusagerecordsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listusagerecordsresponse" : { "count":1 ,"usagerecord" : [  
{"account":"admin","accountid":2,"domainid":1,"zoneid":1,"description":"Template
 Id:203 Size:3117171712","usage":"24 
Hrs","usagetype":7,"rawusage":"24","templateid":0,"usageid":203,"size":3117171712,"startdate":"2011-12-15'T'00:00:00+00:00","enddate":"2011-12-15'T'23:59:59+00:00"}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse-imageextension.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse-imageextension.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse-imageextension.json
deleted file mode 100644
index aae4d48..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse-imageextension.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "listvirtualmachinesresponse" : { "count":1 ,"virtualmachine" : [
-{"id":"3239ade9-fd25-405c-8eda-59f0313a3fb0","name":"apb-cent32-bld","displayname":"apb-cent32-bld","account":"andrew","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","created":"2013-04-16T16:25:57-0700","state":"Stopped","haenable":false,"zoneid":"1","zonename":"San
 Jose 
1","hostid":"0","templateid":"9d597afb-4d3d-4a69-bf45-f95b0d1ee160","templatename":"centos-6.2-x32-template","templatedisplaytext":"CentOS
 6.2 x32 
Template","passwordenabled":false,"serviceofferingid":"7cc4f8c3-7c56-4155-9916-9f42072ea712","serviceofferingname":"Tiny","cpunumber":1,"cpuspeed":1600,"memory":1024,"cpuused":"0.01%","networkkbsread":319420,"networkkbswrite":3,"guestosid":"45de18f1-87c6-4646-8099-95c61f2a300a","rootdeviceid":0,"rootdevicetype":"Filesystem","securitygroup":[{"id":"50288900-28eb-4d7f-9c33-e4c26e3b66d2","name":"default","description":"Default
 Security 
Group"}],"nic":[{"id":"fd65b6fd-2c3e-4c8a-a0bc-6a5db4e8007a","networkid":"0c82cd9f-ca64-4df4-9300-b33d81562403","netmask":
 
"255.255.254.0","gateway":"10.20.92.3","ipaddress":"10.20.92.96","traffictype":"Guest","type":"Shared","isdefault":true,"macaddress":"06:ec:68:00:0f:04"}],"hypervisor":"KVM","instancename":"i-4-69942-VM"}
 ] } }

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse.json
deleted file mode 100644
index 0d27100..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listvirtualmachinesresponse" : { "virtualmachine" : [  
{"id":54,"name":"i-3-54-VM","displayname":"i-3-54-VM","account":"adrian","domainid":1,"domain":"ROOT","created":"2011-02-16T14:28:37-0800","state":"Starting","haenable":false,"zoneid":1,"zonename":"San
 Jose 1","templateid":2,"templatename":"CentOS 5.3(64-bit) no GUI 
(XenServer)","templatedisplaytext":"CentOS 5.3(64-bit) no GUI 
(XenServer)","passwordenabled":false,"serviceofferingid":1,"serviceofferingname":"Small
 
Instance","cpunumber":1,"cpuspeed":500,"memory":512,"guestosid":11,"rootdeviceid":0,"rootdevicetype":"NetworkFilesystem","securitygroup":[],"jobid":63,"jobstatus":0,"nic":[{"id":72,"networkid":204,"netmask":"255.255.255.0","gateway":"10.1.1.1","ipaddress":"10.1.1.18","traffictype":"Guest","type":"Virtual","isdefault":true}],"hypervisor":"XenServer"}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse3x.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse3x.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse3x.json
deleted file mode 100644
index 5a41ac6..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse3x.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listvirtualmachinesresponse" : { "count":1 ,"virtualmachine" : [  
{"id":"fee2ccb3-c1f2-4e7b-8465-42b390e10dff","name":"cloudstack-r-611","displayname":"cloudstack-r-611","account":"jcloud2","domainid":"ea66e3a5-d007-42e8-a0de-ec5ce778a1d7","domain":"jCloud","created":"2012-05-22T09:18:28-0700","state":"Running","haenable":false,"zoneid":"1","zonename":"Santa
 Clara 
Zone","templateid":"5c65f152-a4bc-4405-a756-fd10841a9aa7","templatename":"jclouds-6d4bdc29","templatedisplaytext":"jclouds
 live 
testCreateTemplate","passwordenabled":false,"serviceofferingid":"5305750d-df71-4da9-8cd0-e23c2236a6e2","serviceofferingname":"Micro
 
Instance","cpunumber":1,"cpuspeed":500,"memory":256,"guestosid":"6dcd58ce-1ec6-432c-af0b-9ab4ca9207d9","rootdeviceid":0,"rootdevicetype":"IscsiLUN","securitygroup":[],"nic":[{"id":"48640c5e-90f3-45bd-abd2-a108ca8957ac","networkid":"c0d5db5b-f7d5-44e1-b854-21ecd1a09dbf","netmask":"255.255.255.0","gateway":"10.1.1.1","ipaddress":"10.1.1.227","traffictype":"Guest","ty
 
pe":"Isolated","isdefault":true}],"publicipid":"e202aafb-ab41-4dc0-80e9-9fcd64fbf45c","publicip":"72.52.126.110"}
 ] } }"

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvlaniprangesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvlaniprangesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvlaniprangesresponse.json
deleted file mode 100644
index 2eaae46..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvlaniprangesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listvlaniprangesresponse" : { "count":2 ,"vlaniprange" : [  
{"id":1,"forvirtualnetwork":true,"zoneid":1,"vlan":"127","account":"system","domainid":1,"domain":"ROOT","gateway":"10.27.27.254","netmask":"255.255.255.0","startip":"10.27.27.50","endip":"10.27.27.100","networkid":200},
 
{"id":2,"forvirtualnetwork":false,"zoneid":2,"vlan":"untagged","account":"system","domainid":1,"domain":"ROOT","podid":2,"podname":"Dev
 Pod 
2","gateway":"10.22.22.254","netmask":"255.255.255.0","startip":"10.22.22.51","endip":"10.22.22.100","networkid":209}
 ] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesreponse-imageextension.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesreponse-imageextension.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesreponse-imageextension.json
deleted file mode 100644
index 420f365..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesreponse-imageextension.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "listvolumesresponse" : { "count":1 ,"volume" : [
-{"id":"fe1ada16-57a0-40ae-b577-01a153690fb4","name":"ROOT-69942","zoneid":"1","zonename":"San
 Jose 
1","type":"ROOT","deviceid":0,"virtualmachineid":"3239ade9-fd25-405c-8eda-59f0313a3fb0","vmname":"apb-cent32-bld","vmdisplayname":"apb-cent32-bld","vmstate":"Stopped","size":139264,"created":"2013-04-16T16:25:57-0700","state":"Ready","account":"andrew","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","storagetype":"local","hypervisor":"KVM","storage":"c2422.halxg.cloudera.com","destroyed":false,"serviceofferingid":"7cc4f8c3-7c56-4155-9916-9f42072ea712","serviceofferingname":"Tiny","serviceofferingdisplaytext":"Tiny
 (1 core, 1GB RAM)","isextractable":false} ] } }

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesresponse-imageextension.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesresponse-imageextension.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesresponse-imageextension.json
deleted file mode 100644
index 5fa8fd1..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesresponse-imageextension.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listvolumesresponse" : { "count":1 ,"volume" : [  
{"id":"fe1ada16-57a0-40ae-b577-01a153690fb4","name":"ROOT-69942","zoneid":"7dbc4787-ec2f-498d-95f0-848c8c81e5da","zonename":"MTV-Zone1","type":"ROOT","deviceid":0,"virtualmachineid":"3239ade9-fd25-405c-8eda-59f0313a3fb0","vmname":"apb-cent32-bld","vmdisplayname":"apb-cent32-bld","vmstate":"Stopped","size":139264,"created":"2013-04-16T16:25:57-0700","state":"Ready","account":"andrew","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","storagetype":"local","hypervisor":"KVM","storage":"c2422.halxg.cloudera.com","destroyed":false,"serviceofferingid":"7cc4f8c3-7c56-4155-9916-9f42072ea712","serviceofferingname":"Tiny","serviceofferingdisplaytext":"Tiny
 (1 core, 1GB RAM)","isextractable":false} ] } }

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse.json
deleted file mode 100644
index 4714b86..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listzonesresponse" : { "zone" : [  {"id":1,"name":"San Jose 
1","networktype":"Advanced","securitygroupsenabled":false}, 
{"id":2,"name":"Chicago","networktype":"Advanced","securitygroupsenabled":true} 
] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse_single.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse_single.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse_single.json
deleted file mode 100644
index 1fe1dbe..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse_single.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listzonesresponse" : { "zone" : [  
{"id":2,"name":"Chicago","networktype":"Advanced","securitygroupsenabled":true} 
] } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/loginresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/loginresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/loginresponse.json
deleted file mode 100644
index 7e1c955..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/loginresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "loginresponse" : { "timeout" : "1800", "lastname" : "Kiran", "registered" : 
"false", "username" : "jclouds", "firstname" : "Vijay", "domainid" : "11", 
"type" : "2", "userid" : "19", "sessionkey" : "uYT4/MNiglgAKiZRQkvV8QP8gn0=", 
"account" : "jclouds" } }

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/logoutresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/logoutresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/logoutresponse.json
deleted file mode 100644
index f88dddd..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/logoutresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "logoutresponse" : { "description" : "success" } }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/preparehostformaintenanceresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/preparehostformaintenanceresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/preparehostformaintenanceresponse.json
deleted file mode 100644
index 294f646..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/preparehostformaintenanceresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "preparehostformaintenanceresponse" : {"warning":"this test data is 
fabricated","jobid":2036,"id":2017} }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-authorizeingress.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-authorizeingress.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-authorizeingress.json
deleted file mode 100644
index 7ee489d..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-authorizeingress.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "queryasyncjobresultresponse": {
-        "accountid": 3,
-        "userid": 3,
-        "cmd": "com.cloud.api.commands.AuthorizeSecurityGroupIngressCmd",
-        "jobstatus": 1,
-        "jobprocstatus": 0,
-        "jobresultcode": 0,
-        "jobresulttype": "object",
-        "jobresult": {
-            "securitygroup": {
-                "id": "30",
-                "name": "jclouds-test",
-                "account": "adrian",
-                "domainid": "1",
-                "domain": "ROOT",
-                "ingressrule": [
-                    {
-                        "ruleid": "35bb2ad4-e0cb-48a0-9534-fc4a067b5665",
-                        "protocol": "tcp",
-                        "startport": 22,
-                        "endport": 22,
-                        "cidr": "0.0.0.0/0"
-                    }
-                ],
-                "egressrule": [
-                    
-                ]
-            }
-        },
-        "jobid": "13330fc9-8b3e-4582-aa3e-90883c041010",
-        "created": "2013-06-04T14:37:26-0700"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate-imageextension.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate-imageextension.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate-imageextension.json
deleted file mode 100644
index 891f9fe..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate-imageextension.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "queryasyncjobresultresponse" :
-{"accountid":"ee092437-d681-499e-b78b-f4e449128247","userid":"0c9608c8-188c-47df-a934-d66dc96b96e3","cmd":"com.cloud.api.commands.CreateTemplateCmd","jobstatus":1,"jobprocstatus":0,"jobresultcode":0,"jobresulttype":"object","jobresult":{"template":{"id":"3dc6ce25-a6cf-4d60-a664-3499993b511b","name":"temp-template-ignore","displaytext":"temp-template-ignore","ispublic":false,"created":"2013-06-21T12:37:01-0700","isready":true,"passwordenabled":false,"format":"QCOW2","isfeatured":false,"crossZones":false,"ostypeid":"be820210-c741-4c36-9ba1-f38363bd37d5","ostypename":"CentOS
 5.6 (32-bit)","account":"andrew","zoneid":"1","zonename":"San Jose 
1","status":"Download 
Complete","size":26843545600,"templatetype":"USER","hypervisor":"KVM","domain":"ROOT","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","isextractable":false,"checksum":"6dd5d7f073ff951b033a8cadb877bde2","sourcetemplateid":"9d597afb-4d3d-4a69-bf45-f95b0d1ee160"}},"created":"2013-06-21T12:31:33-0700","jobid":"4e345230-8fcc-48a3-
 8a37-c5fe960df671"} }

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate.json
deleted file mode 100644
index ed2b886..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "queryasyncjobresultresponse" : 
{"jobid":2716,"jobstatus":1,"jobprocstatus":0,"jobresultcode":0,"jobresulttype":"object","jobresult":{"template":{"id":249,"name":"jclouds-c5c7dce0","displaytext":"jclouds
 live 
testCreateTemplate","ispublic":false,"created":"2011-11-16T06:43:00-0800","isready":true,"passwordenabled":false,"format":"VHD","isfeatured":false,"crossZones":false,"ostypeid":12,"ostypename":"CentOS
 5.3 
(64-bit)","account":"jcloud2","zoneid":1,"zonename":"Demo5","status":"Download 
Complete","size":8589934592,"templatetype":"USER","hypervisor":"XenServer","domain":"jCloud","domainid":11,"isextractable":true,"checksum":"bdc1c2c49b747694f97be5042323a1fa","sourcetemplateid":202}}}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createvolume.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createvolume.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createvolume.json
deleted file mode 100644
index a6c5592..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createvolume.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-   "queryasyncjobresultresponse" : 
-      {"accountid":"43e3d66f-c8a3-43b2-a3d0-3bbc2416da14",
-      "userid":"99458e63-725b-48ec-aedc-f8ccc11f5231",
-      "cmd":"com.cloud.api.commands.CreateVolumeCmd",
-      "jobstatus":1,
-      "jobprocstatus":0,
-      "jobresultcode":0,
-      "jobresulttype":"object",
-      "jobresult":{
-         "volume":{
-            "id":"f947c7b3-e079-4e7d-aacc-1509d1ae387a",
-            "name":"VolumeApiExpectTest-jclouds-volume",
-            "zoneid":"6f9a2921-b22a-4149-8b71-6ffc275a2177",
-            "zonename":"Basic1",
-            "type":"DATADISK",
-            "size":1073741824,
-            "created":"2013-02-05T13:41:14+0200",
-            "state":"Allocated",
-            "account":"admin",
-            "domainid":"99f4159b-c698-4bd9-b8c5-5ac462f101eb",
-            "domain":"ROOT",
-            "storagetype":"shared",
-            "hypervisor":"None",
-            "diskofferingid":"0473f5dd-bca5-4af4-a9b6-db9e8a88a2f6",
-            "diskofferingname":"Custom",
-            "diskofferingdisplaytext":"Custom Disk",
-            "storage":"none","destroyed":false,
-            "isextractable":true,
-            "tags":[]
-         }
-      },
-      "created":"2013-02-05T13:41:14+0200",
-      "jobid":"4ec82395-365a-4dad-8bd7-238c4f388702"
-   }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-extracttemplate.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-extracttemplate.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-extracttemplate.json
deleted file mode 100644
index 387f56f..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-extracttemplate.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "queryasyncjobresultresponse" : 
{"jobid":2720,"jobstatus":1,"jobprocstatus":0,"jobresultcode":0,"jobresulttype":"object","jobresult":{"template":{"id":249,"name":"jclouds-c5c7dce0","extractId":6,"accountid":19,"state":"DOWNLOAD_URL_CREATED","zoneid":1,"zonename":"Demo5","extractMode":"HTTP_DOWNLOAD","url":"https:%2F%2F72-52-126-96.realhostip.com%2Fuserdata%2Ff52f8e7d-7c89-4cf7-8e5a-b5ea17366d73.vhd"}}}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipaddress.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipaddress.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipaddress.json
deleted file mode 100644
index db705b0..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipaddress.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "queryasyncjobresultresponse" : 
{"jobid":860,"jobstatus":1,"jobprocstatus":0,"jobresultcode":0,"jobresulttype":"object","jobresult":{"ipaddress":{"id":6,"ipaddress":"72.52.126.35","allocated":"2011-02-23T20:15:01-0800","zoneid":1,"zonename":"San
 Jose 
1","issourcenat":false,"account":"adrian","domainid":1,"domain":"ROOT","forvirtualnetwork":true,"isstaticnat":false,"associatednetworkid":204,"networkid":200,"state":"Allocating"}}}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipforwardingrule.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipforwardingrule.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipforwardingrule.json
deleted file mode 100644
index eb90915..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipforwardingrule.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "queryasyncjobresultresponse" : 
{"jobid":1133,"jobstatus":1,"jobprocstatus":0,"jobresultcode":0,"jobresulttype":"object","jobresult":{"ipforwardingrule":{"id":109,"protocol":"tcp","virtualmachineid":226,"virtualmachinename":"i-3-226-VM","ipaddressid":36,"ipaddress":"72.52.126.65","startport":22,"endport":22,"state":"Active"}}}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-stopvirtualmachine-imageextension.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-stopvirtualmachine-imageextension.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-stopvirtualmachine-imageextension.json
deleted file mode 100644
index f11c9eb..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-stopvirtualmachine-imageextension.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "queryasyncjobresultresponse" :
-{"accountid":"ee092437-d681-499e-b78b-f4e449128247","userid":"0c9608c8-188c-47df-a934-d66dc96b96e3","cmd":"com.cloud.api.commands.StopVMCmd","jobstatus":1,"jobprocstatus":0,"jobresultcode":0,"jobresulttype":"object","jobresult":{"virtualmachine":{"id":"3239ade9-fd25-405c-8eda-59f0313a3fb0","name":"apb-cent32-bld","displayname":"apb-cent32-bld","account":"andrew","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","created":"2013-04-16T16:25:57-0700","state":"Stopped","haenable":false,"zoneid":"1","zonename":"San
 Jose 
1","hostid":"0","templateid":"9d597afb-4d3d-4a69-bf45-f95b0d1ee160","templatename":"centos-6.2-x32-template","templatedisplaytext":"CentOS
 6.2 x32 
Template","passwordenabled":false,"serviceofferingid":"7cc4f8c3-7c56-4155-9916-9f42072ea712","serviceofferingname":"Tiny","cpunumber":1,"cpuspeed":1600,"memory":1024,"cpuused":"-65.18%","networkkbsread":319420,"networkkbswrite":3,"guestosid":"45de18f1-87c6-4646-8099-95c61f2a300a","rootdeviceid":0,"rootdevicetype
 
":"Filesystem","securitygroup":[{"id":"50288900-28eb-4d7f-9c33-e4c26e3b66d2","name":"default","description":"Default
 Security 
Group"}],"nic":[{"id":"fd65b6fd-2c3e-4c8a-a0bc-6a5db4e8007a","networkid":"0c82cd9f-ca64-4df4-9300-b33d81562403","netmask":"255.255.254.0","gateway":"10.20.92.3","ipaddress":"10.20.92.96","traffictype":"Guest","type":"Shared","isdefault":true,"macaddress":"06:ec:68:00:0f:04"}],"hypervisor":"KVM","instancename":"i-4-69942-VM"}},"created":"2013-06-21T12:49:59-0700","jobid":"a7d5127b-24a2-4a44-a4a7-25a6d057b453"}
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine-securitygroup.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine-securitygroup.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine-securitygroup.json
deleted file mode 100644
index cc75e11..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine-securitygroup.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "queryasyncjobresultresponse": {
-            "jobid": 50006,
-            "accountid": 3,
-            "userid": 3,
-            "cmd": "com.cloud.api.commands.DeployVMCmd",
-            "jobstatus": 1,
-            "jobprocstatus": 0,
-            "jobresultcode": 0,
-            "jobresult": {
-                "virtualmachine": {
-                    "id": 1234,
-                    "name": "i-3-218-VM",
-                    "displayname": "i-3-218-VM",
-                    "account": "adrian",
-                    "domainid": 1,
-                    "domain": "ROOT",
-                    "created": "2011-02-27T08:39:10-0800",
-                    "state": "Running",
-                    "haenable": false,
-                    "zoneid": 1,
-                    "zonename": "San Jose 1",
-                    "templateid": 203,
-                    "templatename": "Centos 5.3 Password Managed",
-                    "templatedisplaytext": "Centos 5.3 Password Managed",
-                    "passwordenabled": true,
-                    "serviceofferingid": 1,
-                    "serviceofferingname": "Small Instance",
-                    "cpunumber": 1,
-                    "cpuspeed": 500,
-                    "memory": 512,
-                    "guestosid": 12,
-                    "rootdeviceid": 0,
-                    "rootdevicetype": "NetworkFilesystem",
-                    "securitygroup": [
-                        {
-                            "id": "30",
-                            "name": "jclouds-test",
-                            "account": "adrian",
-                            "domainid": "1",
-                            "domain": "ROOT",
-                            "ingressrule": [
-                                {
-                                    "ruleid": 
"35bb2ad4-e0cb-48a0-9534-fc4a067b5665",
-                                    "protocol": "tcp",
-                                    "startport": 22,
-                                    "endport": 22,
-                                    "cidr": "0.0.0.0/0"
-                                }
-                            ],
-                            "egressrule": [
-                                
-                            ]
-                        }
-                    ],
-                    "password": "dD7jwajkh",
-                    "nic": [{
-                        "id": 250,
-                        "networkid": 204,
-                        "netmask": "255.255.255.0",
-                        "gateway": "10.1.1.1",
-                        "ipaddress": "10.1.1.195",
-                        "traffictype": "Guest",
-                        "type": "Virtual",
-                        "isdefault": true
-                    }],
-                    "hypervisor": "XenServer"
-                }
-            },
-            "created": "2011-02-27T08:39:10-0800"
-        }
-    
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine.json
deleted file mode 100644
index 6e4654a..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "queryasyncjobresultresponse": {
-            "jobid": 50006,
-            "accountid": 3,
-            "userid": 3,
-            "cmd": "com.cloud.api.commands.DeployVMCmd",
-            "jobstatus": 1,
-            "jobprocstatus": 0,
-            "jobresultcode": 0,
-            "jobresult": {
-                "virtualmachine": {
-                    "id": 1234,
-                    "name": "i-3-218-VM",
-                    "displayname": "i-3-218-VM",
-                    "account": "adrian",
-                    "domainid": 1,
-                    "domain": "ROOT",
-                    "created": "2011-02-27T08:39:10-0800",
-                    "state": "Running",
-                    "haenable": false,
-                    "zoneid": 1,
-                    "zonename": "San Jose 1",
-                    "templateid": 203,
-                    "templatename": "Centos 5.3 Password Managed",
-                    "templatedisplaytext": "Centos 5.3 Password Managed",
-                    "passwordenabled": true,
-                    "serviceofferingid": 1,
-                    "serviceofferingname": "Small Instance",
-                    "cpunumber": 1,
-                    "cpuspeed": 500,
-                    "memory": 512,
-                    "guestosid": 12,
-                    "rootdeviceid": 0,
-                    "rootdevicetype": "NetworkFilesystem",
-                    "securitygroup": [],
-                    "password": "dD7jwajkh",
-                    "nic": [{
-                        "id": 250,
-                        "networkid": 204,
-                        "netmask": "255.255.255.0",
-                        "gateway": "10.1.1.1",
-                        "ipaddress": "10.1.1.195",
-                        "traffictype": "Guest",
-                        "type": "Virtual",
-                        "isdefault": true
-                    }],
-                    "hypervisor": "XenServer"
-                }
-            },
-            "created": "2011-02-27T08:39:10-0800"
-        }
-    
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/reconnecthostresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/reconnecthostresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/reconnecthostresponse.json
deleted file mode 100644
index 2b86f49..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/reconnecthostresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "reconnecthostresponse" : {"warning":"this test data is 
fabricated","jobid":2036,"id":2017} }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registerisoresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registerisoresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registerisoresponse.json
deleted file mode 100644
index c0be454..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registerisoresponse.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{ "registerisoresponse" : { "count":1 ,"iso" : [  
-{"id":"b52c509d-c6e2-452c-b6ec-aa00720ed6cd","name":"ubuntu10.10","displaytext":"ubuntu
 10.10 (32 
bit)","ispublic":true,"created":"2012-08-21T15:45:01+0530","isready":false,"bootable":true,"isfeatured":false,"crossZones":false,"ostypeid":"0e0335d9-b6cc-4808-bddf-0828e66a0d03","ostypename":"Ubuntu
 10.10 
(32-bit)","account":"admin","zoneid":"6f9a2921-b22a-4149-8b71-6ffc275a2177","zonename":"Basic1","status":"","domain":"ROOT","domainid":"99f4159b-c698-4bd9-b8c5-5ac462f101eb","isextractable":false}
 ] 
-}}

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registersshkeypairresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registersshkeypairresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registersshkeypairresponse.json
deleted file mode 100644
index 1c3f35e..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registersshkeypairresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "registersshkeypairresponse" :  { "keypair" :
-   
{"name":"jclouds-keypair","fingerprint":"8f:f1:91:2d:b1:a8:51:f1:79:cf:c4:31:c4:14:9d:81"}
 }  }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/1d88fdf4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registeruserkeysresponse.json
----------------------------------------------------------------------
diff --git 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registeruserkeysresponse.json
 
b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registeruserkeysresponse.json
deleted file mode 100644
index 9e6a958..0000000
--- 
a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registeruserkeysresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "registeruserkeysresponse" :  { "userkeys" : 
{"apikey":"5nn6IAQ-0BYuAKTu45rf49VsyX0rg9t48TpY8NKsduE5t-_1_g_AU8ZjP3OJvVdlzWKL3Lgfa6_nkC9hU6NyQQ","secretkey":"GSCDYzj65CiSkxzCJxlFvcF52qglM7HbuG6QL7zYVeWVhVO8GnW85wGTBBuZ3xpzEN_UfKnsORvrNszYQ1ofAw"}
 }  }
\ No newline at end of file

Reply via email to