You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/08/14 15:07:25 UTC

[19/51] [abbrv] [partial] stratos git commit: Upgrading to jclouds 1.9.1

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/floatingip_update_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/floatingip_update_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/floatingip_update_request.json
deleted file mode 100644
index 2772b5a..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/floatingip_update_request.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "floatingip": {
-        "port_id": "fc861431-0e6c-4842-a0ed-e2363f9bc3a8"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/floatingip_update_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/floatingip_update_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/floatingip_update_response.json
deleted file mode 100644
index 59c8a68..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/floatingip_update_response.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "floatingip": {
-        "router_id": "d23abc8d-2991-4a55-ba98-2aaea84cc72f",
-        "tenant_id": "4969c491a3c74ee4af974e6d800c62de",
-        "floating_network_id": "376da547-b977-4cfe-9cba-275c80debf57",
-        "fixed_ip_address": "10.0.0.4",
-        "floating_ip_address": "172.24.4.228",
-        "port_id": "fc861431-0e6c-4842-a0ed-e2363f9bc3a8",
-        "id": "2f245a7b-796b-4f26-9cf9-9e82d248fda7"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_create_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_create_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_create_request.json
deleted file mode 100644
index 7d3b6a4..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_create_request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "health_monitor": {
-        "delay": 1,
-        "max_retries": 1,
-        "type": "HTTP",
-        "timeout": 1
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_create_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_create_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_create_response.json
deleted file mode 100644
index 1a0dbce..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_create_response.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "health_monitor": {
-        "status": "PENDING_CREATE",
-        "admin_state_up": true,
-        "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
-        "delay": 1,
-        "expected_codes": "200",
-        "max_retries": 1,
-        "http_method": "GET",
-        "timeout": 1,
-        "pools": [],
-        "url_path": "/",
-        "type": "HTTP",
-        "id": "b624decf-d5d3-4c66-9a3d-f047e7786181"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_get_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_get_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_get_response.json
deleted file mode 100644
index fc162dc..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_get_response.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "health_monitor": {
-        "status": "ACTIVE",
-        "admin_state_up": true,
-        "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
-        "delay": 5,
-        "expected_codes": "200",
-        "max_retries": 2,
-        "http_method": "GET",
-        "timeout": 2,
-        "url_path": "/",
-        "type": "HTTP",
-        "pools": [],
-        "id": "5d4b5228-33b0-4e60-b225-9b727c1a20e7"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_list_response_paged1.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_list_response_paged1.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_list_response_paged1.json
deleted file mode 100644
index 3856187..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_list_response_paged1.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "health_monitors": [
-        {
-            "status": "ACTIVE",
-            "admin_state_up": true,
-            "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
-            "delay": 10,
-            "max_retries": 1,
-            "timeout": 1,
-            "type": "PING",
-            "id": "466c8345-28d8-4f84-a246-e04380b0461d"
-        }
-    ],
-    "health_monitors_links": [
-        {
-            "href": "/v2.0/lb/health_monitors.json?marker=396f12f8-521e-4b91-8e21-2e003500433a",
-            "rel": "next"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_list_response_paged2.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_list_response_paged2.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_list_response_paged2.json
deleted file mode 100644
index 703b123..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_list_response_paged2.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "health_monitors": [
-        {
-            "status": "ACTIVE",
-            "admin_state_up": true,
-            "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
-            "delay": 5,
-            "expected_codes": "200",
-            "max_retries": 2,
-            "http_method": "GET",
-            "timeout": 2,
-            "url_path": "/",
-            "type": "HTTP",
-            "id": "5d4b5228-33b0-4e60-b225-9b727c1a20e7"
-        }
-    ],
-    "health_monitors_links": [
-        {
-            "href": "/v2.0/lb/health_monitors.json?marker=396f12f8-521e-4b91-8e21-2e003500433a",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_update_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_update_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_update_request.json
deleted file mode 100644
index cfb9c2e..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_update_request.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "health_monitor": {
-        "delay": 1,
-        "max_retries": 1,
-        "timeout": 1,
-        "http_method": "HEAD",
-        "url_path": "/index.html",
-        "expected_codes": "201",
-        "admin_state_up": false
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_update_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_update_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_update_response.json
deleted file mode 100644
index 95bdf43..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/health_monitor_update_response.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "health_monitor": {
-        "status": "ACTIVE",
-        "admin_state_up": false,
-        "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
-        "delay": 1,
-        "expected_codes": "201",
-        "max_retries": 1,
-        "http_method": "HEAD",
-        "timeout": 1,
-        "pools": [],
-        "url_path": "/index.html",
-        "type": "HTTP",
-        "id": "466c8345-28d8-4f84-a246-e04380b0461d"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_create_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_create_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_create_request.json
deleted file mode 100644
index 20645b8..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_create_request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "member": {
-        "protocol_port": 80,
-        "pool_id": "72741b06-df4d-4715-b142-276b6bce75ab"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_create_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_create_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_create_response.json
deleted file mode 100644
index cb74c42..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_create_response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "member": {
-        "status": "PENDING_CREATE",
-        "protocol_port": 80,
-        "weight": 1,
-        "admin_state_up": true,
-        "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-        "pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
-        "address": "10.0.0.5",
-        "id":"48a471ea-64f1-4eb6-9be7-dae6bbe40a0f"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_get_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_get_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_get_response.json
deleted file mode 100644
index a7302b3..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_get_response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "member": {
-        "status": "ACTIVE",
-        "protocol_port": 80,
-        "weight": 1,
-        "admin_state_up": true,
-        "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-        "pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
-        "address": "10.0.0.5",
-        "id":"48a471ea-64f1-4eb6-9be7-dae6bbe40a0f"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_list_response_paged1.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_list_response_paged1.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_list_response_paged1.json
deleted file mode 100644
index b793ad4..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_list_response_paged1.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "members": [
-        {
-            "status": "ACTIVE",
-            "protocol_port": 80,
-            "weight": 1,
-            "admin_state_up": true,
-            "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-            "pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
-            "address": "10.0.0.5",
-            "id":"48a471ea-64f1-4eb6-9be7-dae6bbe40a0f"
-        }
-    ],
-    "members_links": [
-        {
-            "href": "/v2.0/lb/members.json?marker=396f12f8-521e-4b91-8e21-2e003500433a",
-            "rel": "next"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_list_response_paged2.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_list_response_paged2.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_list_response_paged2.json
deleted file mode 100644
index c707ae4..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_list_response_paged2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "members": [
-        {
-            "status": "ACTIVE",
-            "protocol_port": 80,
-            "weight": 1,
-            "admin_state_up": true,
-            "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-            "pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
-            "address": "10.0.0.5",
-            "id":"701b531b-111a-4f21-ad85-4795b7b12af6"
-        }
-    ],
-    "members_links": [
-        {
-            "href": "/v2.0/lb/members.json?marker=86ae12f8-521e-4b91-8e21-2e0035005fdc",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_update_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_update_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_update_request.json
deleted file mode 100644
index 4d7ac67..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_update_request.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "member": {
-        "weight": 2,
-        "admin_state_up": false,
-        "pool_id": "new_pool_id"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_update_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_update_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_update_response.json
deleted file mode 100644
index 1d14b9e..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/member_update_response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "member": {
-        "status": "ACTIVE",
-        "protocol_port": 80,
-        "weight": 2,
-        "admin_state_up": false,
-        "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-        "pool_id": "new_pool_id",
-        "address": "10.0.0.5",
-        "id":"48a471ea-64f1-4eb6-9be7-dae6bbe40a0f"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_associate_health_monitor_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_associate_health_monitor_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_associate_health_monitor_request.json
deleted file mode 100644
index c3b2dd4..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_associate_health_monitor_request.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "health_monitor": {
-        "id":"5d4b5228-33b0-4e60-b225-9b727c1a20e7"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_associate_health_monitor_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_associate_health_monitor_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_associate_health_monitor_response.json
deleted file mode 100644
index 3e0459d..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_associate_health_monitor_response.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "health_monitor": {
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_create_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_create_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_create_request.json
deleted file mode 100644
index 077a14b..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_create_request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "pool": {
-        "subnet_id":"8032909d-47a1-4715-90af-5153ffe39861",
-        "lb_method":"ROUND_ROBIN",
-        "protocol":"TCP",
-        "name":"NewPool"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_create_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_create_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_create_response.json
deleted file mode 100644
index 3cc5cf7..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_create_response.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "pool": {
-        "status": "PENDING_CREATE",
-        "lb_method": "ROUND_ROBIN",
-        "protocol": "TCP",
-        "provider": "HAPROXY",
-        "description": "",
-        "health_monitors": [],
-        "health_monitors_status": [],
-        "subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
-        "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-        "admin_state_up": true,
-        "name": "NewPool",
-        "members": [],
-        "id": "a224402b-794b-4c0c-9d08-d95640a6f5a1",
-        "vip_id": null
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_get_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_get_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_get_response.json
deleted file mode 100644
index 00ecef5..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_get_response.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "pool": {
-        "status": "ACTIVE",
-        "lb_method": "ROUND_ROBIN",
-        "protocol": "HTTP",
-        "provider": "HAPROXY",
-        "description": "",
-        "health_monitors": [
-            "466c8345-28d8-4f84-a246-e04380b0461d",
-            "5d4b5228-33b0-4e60-b225-9b727c1a20e7"
-        ],
-        "health_monitors_status": [
-            {
-                "status": "ACTIVE",
-                "monitor_id": "466c8345-28d8-4f84-a246-e04380b0461d",
-                "status_dezcription": null
-            },
-            {
-                "status": "ACTIVE",
-                "monitor_id": "5d4b5228-33b0-4e60-b225-9b727c1a20e7",
-                "status_dezcription": null
-            }
-        ],
-        "subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
-        "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-        "admin_state_up": true,
-        "name": "app_pool",
-        "members": [
-            "701b531b-111a-4f21-ad85-4795b7b12af6",
-            "beb53b4d-230b-4abd-8118-575b8fa006ef"
-        ],
-        "id": "72741b06-df4d-4715-b142-276b6bce75ab",
-        "vip_id": "4ec89087-d057-4e2c-911f-60a3b47ee304"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_list_response_paged1.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_list_response_paged1.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_list_response_paged1.json
deleted file mode 100644
index b10ce38..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_list_response_paged1.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "pools": [
-        {
-            "status": "ACTIVE",
-            "lb_method": "ROUND_ROBIN",
-            "protocol": "HTTP",
-            "description": "",
-            "health_monitors": [
-                "466c8345-28d8-4f84-a246-e04380b0461d",
-                "5d4b5228-33b0-4e60-b225-9b727c1a20e7"
-            ],
-            "health_monitors_status": [
-                {
-                    "status": "ACTIVE",
-                    "monitor_id": "466c8345-28d8-4f84-a246-e04380b0461d",
-                    "status_dezcription": null
-                },
-                {
-                    "status": "ACTIVE",
-                    "monitor_id": "5d4b5228-33b0-4e60-b225-9b727c1a20e7",
-                    "status_dezcription": null
-                }
-            ],
-            "subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
-            "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-            "admin_state_up": true,
-            "name": "app_pool",
-            "members": [
-                "701b531b-111a-4f21-ad85-4795b7b12af6",
-                "beb53b4d-230b-4abd-8118-575b8fa006ef"
-            ],
-            "id":"72741b06-df4d-4715-b142-276b6bce75ab",
-            "vip_id":"4ec89087-d057-4e2c-911f-60a3b47ee304"
-        }
-    ],
-    "pools_links": [
-        {
-            "href": "/v2.0/lb/pools.json?marker=71c1e68c-171a-4aa2-aca5-50ea153a3718",
-            "rel": "next"
-        },
-        {
-            "href": "/v2.0/lb/pools.json?marker=396f12f8-521e-4b91-8e21-2e003500433a&page_reverse=True",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_list_response_paged2.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_list_response_paged2.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_list_response_paged2.json
deleted file mode 100644
index dbe902e..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_list_response_paged2.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "pools": [
-        {
-            "status": "ACTIVE",
-            "lb_method": "ROUND_ROBIN",
-            "protocol": "TCP",
-            "description": "",
-            "health_monitors": [
-                "466c8345-28d8-4f84-a246-e04380b0461d",
-                "5d4b5228-33b0-4e60-b225-9b727c1a20e7"
-            ],
-            "health_monitors_status": [
-                {
-                    "status": "ACTIVE",
-                    "monitor_id": "466c8345-28d8-4f84-a246-e04380b0461d",
-                    "status_dezcription": null
-                },
-                {
-                    "status": "ACTIVE",
-                    "monitor_id": "5d4b5228-33b0-4e60-b225-9b727c1a20e7",
-                    "status_dezcription": null
-                }
-            ],
-            "subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
-            "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-            "admin_state_up": true,
-            "name": "app_pool2",
-            "members": [
-                "701b531b-111a-4f21-ad85-4795b7b12af6",
-                "beb53b4d-230b-4abd-8118-575b8fa006ef"
-            ],
-            "id":"72741b06-df4d-4715-b142-276b6bce75ab_2",
-            "vip_id":"4ec89087-d057-4e2c-911f-60a3b47ee304"
-        }
-    ],
-    "pools_links": [
-        {
-            "href": "/v2.0/lb/pools.json?marker=396f12f8-521e-4b91-8e21-2e003500433a&page_reverse=True",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_update_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_update_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_update_request.json
deleted file mode 100644
index a54b680..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_update_request.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "pool": {
-        "name": "new_name",
-        "description": "new description",
-        "lb_method": "NEW_LB_METHOD",
-        "health_monitors": [
-            "5d4b5228-33b0-4e60-b225-9b727c1a20e7"
-        ],
-        "admin_state_up": false
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_update_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_update_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_update_response.json
deleted file mode 100644
index 9159529..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/pool_update_response.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "pool": {
-        "status": "ACTIVE",
-        "lb_method":"NEW_LB_METHOD",
-        "protocol": "HTTP",
-        "provider": "HAPROXY",
-        "description": "new description",
-        "health_monitors": [
-            "5d4b5228-33b0-4e60-b225-9b727c1a20e7"
-        ],
-        "health_monitors_status": [
-            {
-                "status": "ACTIVE",
-                "monitor_id": "5d4b5228-33b0-4e60-b225-9b727c1a20e7",
-                "status_dezcription": null
-            }
-        ],
-        "subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
-        "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-        "admin_state_up": false,
-        "name": "new_name",
-        "members": [
-            "701b531b-111a-4f21-ad85-4795b7b12af6",
-            "beb53b4d-230b-4abd-8118-575b8fa006ef"
-        ],
-        "id": "72741b06-df4d-4715-b142-276b6bce75ab",
-        "vip_id": "4ec89087-d057-4e2c-911f-60a3b47ee304"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_create_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_create_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_create_request.json
deleted file mode 100644
index 6d159e1..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_create_request.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "vip": {
-        "protocol": "HTTP",
-        "name": "NewVip",
-        "subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
-        "pool_id": "61b1f87a-7a21-4ad3-9dda-7f81d249944f",
-        "protocol_port":80
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_create_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_create_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_create_response.json
deleted file mode 100644
index 7dc958c..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_create_response.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "vip": {
-        "status": "PENDING_CREATE",
-        "protocol": "HTTP",
-        "description": "",
-        "admin_state_up": true,
-        "subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
-        "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-        "connection_limit": -1,
-        "pool_id": "61b1f87a-7a21-4ad3-9dda-7f81d249944f",
-        "address": "10.0.0.11",
-        "protocol_port": 80,
-        "port_id": "f7e6fe6a-b8b5-43a8-8215-73456b32e0f5",
-        "id": "c987d2be-9a3c-4ac9-a046-e8716b1350e2",
-        "name": "NewVip"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_get_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_get_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_get_response.json
deleted file mode 100644
index c237b39..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_get_response.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "vip": {
-        "status": "ACTIVE",
-        "protocol": "HTTP",
-        "description": "",
-        "admin_state_up": true,
-        "subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
-        "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-        "connection_limit": 1000,
-        "pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
-        "session_persistence": {
-            "cookie_name": "MyAppCookie",
-            "type": "APP_COOKIE"
-        },
-        "address": "10.0.0.10",
-        "protocol_port": 80,
-        "port_id": "b5a743d6-056b-468b-862d-fb13a9aa694e",
-        "id": "4ec89087-d057-4e2c-911f-60a3b47ee304",
-        "name": "my-vip"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_list_response_paged1.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_list_response_paged1.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_list_response_paged1.json
deleted file mode 100644
index eaabe2c..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_list_response_paged1.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "vips": [
-        {
-            "status": "ACTIVE",
-            "protocol": "HTTP",
-            "description": "",
-            "admin_state_up": true,
-            "subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
-            "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-            "connection_limit": 1000,
-            "pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
-            "session_persistence": {
-                "cookie_name": "MyAppCookie",
-                "type": "APP_COOKIE"
-            },
-            "address": "10.0.0.10",
-            "protocol_port": 80,
-            "port_id": "b5a743d6-056b-468b-862d-fb13a9aa694e",
-            "id": "4ec89087-d057-4e2c-911f-60a3b47ee304",
-            "name": "my-vip1"
-        }
-    ],
-    "vips_links": [
-        {
-            "href": "/v2.0/lb/vips.json?marker=396f12f8-521e-4b91-8e21-2e003500433a",
-            "rel": "next"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_list_response_paged2.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_list_response_paged2.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_list_response_paged2.json
deleted file mode 100644
index 74c46a9..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_list_response_paged2.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "vips": [
-        {
-            "status": "ACTIVE",
-            "protocol": "HTTPS",
-            "description": "",
-            "admin_state_up": true,
-            "subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
-            "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-            "connection_limit": 100,
-            "pool_id": "61b1f87a-7a21-4ad3-9dda-7f81d249944f",
-            "session_persistence": {
-                "cookie_name": null,
-                "type": "HTTP_COOKIE"
-            },
-            "address": "10.0.0.11",
-            "protocol_port": 80,
-            "port_id": "f7e6fe6a-b8b5-43a8-8215-73456b32e0f5",
-            "id": "c987d2be-9a3c-4ac9-a046-e8716b1350e2",
-            "name": "my-vip2"
-        }
-    ],
-    "vips_links": [
-        {
-            "href": "/v2.0/lb/vips.json?marker=ABCDEFf8-521e-4b91-8e21-2e003500433a",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_update_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_update_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_update_request.json
deleted file mode 100644
index 8d185a3..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_update_request.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "vip": {
-        "name": "new-name",
-        "description": "new description",
-        "pool_id": "61b1f87a-7a21-4ad3-9dda-7f81d249944f",
-        "session_persistence": {
-            "cookie_name": "MyNewAppCookie",
-            "type": "APP_COOKIE"
-        },
-        "connection_limit": 50,
-        "admin_state_up": false
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_update_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_update_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_update_response.json
deleted file mode 100644
index 1502be2..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/lbaas/v1/vip_update_response.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "vip": {
-        "status": "PENDING_UPDATE",
-        "protocol": "HTTP",
-        "description": "new description",
-        "admin_state_up": false,
-        "subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
-        "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-        "connection_limit": 50,
-        "pool_id": "61b1f87a-7a21-4ad3-9dda-7f81d249944f",
-        "session_persistence": {
-            "cookie_name": "MyNewAppCookie",
-            "type": "APP_COOKIE"
-        },
-        "address": "10.0.0.11",
-        "protocol_port": 80,
-        "port_id": "f7e6fe6a-b8b5-43a8-8215-73456b32e0f5",
-        "id": "c987d2be-9a3c-4ac9-a046-e8716b1350e2",
-        "name": "new-name"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_networks.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_networks.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_networks.json
deleted file mode 100644
index 17b9e9f..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_networks.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{"networks": [
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "16dba3bc-f3fa-4775-afdc-237e12c72f6a"
-    },
-    {
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "1a104cf5-cb18-4d35-9407-2fd2646d9d0b"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "31083ae2-420d-48b2-ac98-9f7a4fd8dbdc"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "49c6d6fa-ff2a-459d-b975-75a8d31c9a89"
-    },
-    {
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "5cb3d6f4-62cb-41c9-b964-ba7d9df79e4e"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "5d51d012-3491-4db7-b1b5-6f254015015d"
-    },
-    {
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "5f9cf7dc-22ca-4097-8e49-1cc8b23faf17"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "6319ecad-6bff-48b2-9b53-02ede8cb7588"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "6ba4c788-661f-49ab-9bf8-5f10cbbb2f57"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "74ed170b-5069-4353-ab38-9719766dc57e"
-    },
-    {
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "b71fcac1-e864-4031-8c5b-edbecd9ece36"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "c7681895-d84d-4650-9ca0-82c72036b855"
-    }
-]}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_ports.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_ports.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_ports.json
deleted file mode 100644
index 29c3a2b..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_ports.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{"ports": [
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "16dba3bc-f3fa-4775-afdc-237e12c72f6a"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "1a104cf5-cb18-4d35-9407-2fd2646d9d0b"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "31083ae2-420d-48b2-ac98-9f7a4fd8dbdc"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "49c6d6fa-ff2a-459d-b975-75a8d31c9a89"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "5cb3d6f4-62cb-41c9-b964-ba7d9df79e4e"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "5d51d012-3491-4db7-b1b5-6f254015015d"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "5f9cf7dc-22ca-4097-8e49-1cc8b23faf17"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "6319ecad-6bff-48b2-9b53-02ede8cb7588"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "6ba4c788-661f-49ab-9bf8-5f10cbbb2f57"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "74ed170b-5069-4353-ab38-9719766dc57e"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "b71fcac1-e864-4031-8c5b-edbecd9ece36"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "c7681895-d84d-4650-9ca0-82c72036b855"
-    }
-]}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_routers.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_routers.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_routers.json
deleted file mode 100644
index 14dcfae..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_routers.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{"routers": [
-    {
-        "status": "ACTIVE",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "16dba3bc-f3fa-4775-afdc-237e12c72f6a"
-    },
-    {
-        "status": "ACTIVE",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "1a104cf5-cb18-4d35-9407-2fd2646d9d0b"
-    },
-    {
-        "status": "ACTIVE",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "31083ae2-420d-48b2-ac98-9f7a4fd8dbdc"
-    },
-    {
-        "status": "ACTIVE",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "49c6d6fa-ff2a-459d-b975-75a8d31c9a89"
-    },
-    {
-        "status": "ACTIVE",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "5cb3d6f4-62cb-41c9-b964-ba7d9df79e4e"
-    },
-    {
-        "status": "ACTIVE",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "5d51d012-3491-4db7-b1b5-6f254015015d"
-    },
-    {
-        "status": "ACTIVE",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "5f9cf7dc-22ca-4097-8e49-1cc8b23faf17"
-    },
-    {
-        "status": "ACTIVE",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "6319ecad-6bff-48b2-9b53-02ede8cb7588"
-    },
-    {
-        "status": "ACTIVE",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "6ba4c788-661f-49ab-9bf8-5f10cbbb2f57"
-    },
-    {
-        "status": "ACTIVE",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "74ed170b-5069-4353-ab38-9719766dc57e"
-    },
-    {
-        "status": "ACTIVE",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "b71fcac1-e864-4031-8c5b-edbecd9ece36"
-    },
-    {
-        "status": "ACTIVE",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "c7681895-d84d-4650-9ca0-82c72036b855"
-    }
-]}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_subnets.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_subnets.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_subnets.json
deleted file mode 100644
index b0061e9..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/list_subnets.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{"subnets": [
-    {
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "16dba3bc-f3fa-4775-afdc-237e12c72f6a"
-    },
-    {
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "network_id": "1234567890",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "1a104cf5-cb18-4d35-9407-2fd2646d9d0b"
-    },
-    {
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "31083ae2-420d-48b2-ac98-9f7a4fd8dbdc"
-    },
-    {
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "49c6d6fa-ff2a-459d-b975-75a8d31c9a89"
-    },
-    {
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "network_id": "1234567890",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "5cb3d6f4-62cb-41c9-b964-ba7d9df79e4e"
-    },
-    {
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "5d51d012-3491-4db7-b1b5-6f254015015d"
-    },
-    {
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "network_id": "1234567890",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "5f9cf7dc-22ca-4097-8e49-1cc8b23faf17"
-    },
-    {
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "6319ecad-6bff-48b2-9b53-02ede8cb7588"
-    },
-    {
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "6ba4c788-661f-49ab-9bf8-5f10cbbb2f57"
-    },
-    {
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "74ed170b-5069-4353-ab38-9719766dc57e"
-    },
-    {
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "network_id": "1234567890",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "b71fcac1-e864-4031-8c5b-edbecd9ece36"
-    },
-    {
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "c7681895-d84d-4650-9ca0-82c72036b855"
-    }
-]}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/logback.xml b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/logback.xml
deleted file mode 100644
index 6559c23..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/logback.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.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.
-
--->
-<configuration scan="false">
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-
-    <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds-wire.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-
-    <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds-blobstore.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-
-    <root>
-        <level value="warn" />
-    </root>
-
-    <logger name="org.jclouds">
-        <level value="DEBUG" />
-        <appender-ref ref="FILE" />
-    </logger>
-
-    <logger name="jclouds.wire">
-        <level value="DEBUG" />
-        <appender-ref ref="WIREFILE" />
-    </logger>
-
-    <logger name="jclouds.headers">
-        <level value="DEBUG" />
-        <appender-ref ref="WIREFILE" />
-    </logger>
-
-    <logger name="jclouds.blobstore">
-        <level value="DEBUG" />
-        <appender-ref ref="BLOBSTOREFILE" />
-    </logger>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network.json
deleted file mode 100644
index 06d5d07..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"network": {
-    "provider:network_type": "local",
-    "status": "ACTIVE",
-    "name": "jclouds-wibble",
-    "tenant_id": "1234567890",
-    "id": "624312ff-d14b-4ba3-9834-1c78d23d574d"
-}}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_bulk_create_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_bulk_create_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_bulk_create_request.json
deleted file mode 100644
index e732dde..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_bulk_create_request.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "networks": [
-        {
-            "provider:network_type": "local",
-            "name": "jclouds-wibble"
-        },
-        {
-            "provider:network_type": "local",
-            "name": "jclouds-wibble2"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_bulk_create_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_bulk_create_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_bulk_create_response.json
deleted file mode 100644
index ebde974..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_bulk_create_response.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "networks": [
-        {
-            "provider:network_type": "local",
-            "status": "ACTIVE",
-            "name": "jclouds-wibble",
-            "tenant_id": "1234567890",
-            "id": "624312ff-d14b-4ba3-9834-1c78d23d574d"
-        },
-        {
-            "provider:network_type": "local",
-            "status": "ACTIVE",
-            "name": "jclouds-wibble2",
-            "tenant_id": "1234567890",
-            "id": "624312ff-d14b-4ba3-9834-1c78d23d574e"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_create_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_create_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_create_request.json
deleted file mode 100644
index f6bcfad..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_create_request.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{"network": {
-    "provider:network_type": "local",
-    "name": "jclouds-wibble"
-}}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_create_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_create_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_create_response.json
deleted file mode 100644
index 06d5d07..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_create_response.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"network": {
-    "provider:network_type": "local",
-    "status": "ACTIVE",
-    "name": "jclouds-wibble",
-    "tenant_id": "1234567890",
-    "id": "624312ff-d14b-4ba3-9834-1c78d23d574d"
-}}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_get_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_get_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_get_response.json
deleted file mode 100644
index 06d5d07..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_get_response.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"network": {
-    "provider:network_type": "local",
-    "status": "ACTIVE",
-    "name": "jclouds-wibble",
-    "tenant_id": "1234567890",
-    "id": "624312ff-d14b-4ba3-9834-1c78d23d574d"
-}}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_list_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_list_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_list_response.json
deleted file mode 100644
index 17b9e9f..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_list_response.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{"networks": [
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "16dba3bc-f3fa-4775-afdc-237e12c72f6a"
-    },
-    {
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "1a104cf5-cb18-4d35-9407-2fd2646d9d0b"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "31083ae2-420d-48b2-ac98-9f7a4fd8dbdc"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "49c6d6fa-ff2a-459d-b975-75a8d31c9a89"
-    },
-    {
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "5cb3d6f4-62cb-41c9-b964-ba7d9df79e4e"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "5d51d012-3491-4db7-b1b5-6f254015015d"
-    },
-    {
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "5f9cf7dc-22ca-4097-8e49-1cc8b23faf17"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "6319ecad-6bff-48b2-9b53-02ede8cb7588"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "6ba4c788-661f-49ab-9bf8-5f10cbbb2f57"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "74ed170b-5069-4353-ab38-9719766dc57e"
-    },
-    {
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "b71fcac1-e864-4031-8c5b-edbecd9ece36"
-    },
-    {
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "c7681895-d84d-4650-9ca0-82c72036b855"
-    }
-]}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_list_response_paged1.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_list_response_paged1.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_list_response_paged1.json
deleted file mode 100644
index 9fe7e54..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_list_response_paged1.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "networks": [
-        {
-            "admin_state_up": true,
-            "id": "396f12f8-521e-4b91-8e21-2e003500433a",
-            "name": "net3",
-            "provider:network_type": "vlan",
-            "provider:physical_network": "physnet1",
-            "provider:segmentation_id": 1002,
-            "router:external": false,
-            "shared": false,
-            "status": "ACTIVE",
-            "subnets": [],
-            "tenant_id": "20bd52ff3e1b40039c312395b04683cf"
-        },
-        {
-            "admin_state_up": true,
-            "id": "71c1e68c-171a-4aa2-aca5-50ea153a3718",
-            "name": "net2",
-            "provider:network_type": "vlan",
-            "provider:physical_network": "physnet1",
-            "provider:segmentation_id": 1001,
-            "router:external": false,
-            "shared": false,
-            "status": "ACTIVE",
-            "subnets": [],
-            "tenant_id": "20bd52ff3e1b40039c312395b04683cf"
-        }
-    ],
-    "networks_links": [
-        {
-            "href": "/v2.0/networks.json?marker=71c1e68c-171a-4aa2-aca5-50ea153a3718",
-            "rel": "next"
-        },
-        {
-            "href": "/v2.0/networks.json?marker=396f12f8-521e-4b91-8e21-2e003500433a&page_reverse=True",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_list_response_paged2.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_list_response_paged2.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_list_response_paged2.json
deleted file mode 100644
index b03714f..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_list_response_paged2.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "networks": [
-        {
-            "admin_state_up": true,
-            "id": "396f12f8-521e-4b91-8e21-2e003500433a_2",
-            "name": "net3",
-            "provider:network_type": "vlan",
-            "provider:physical_network": "physnet1",
-            "provider:segmentation_id": 1002,
-            "router:external": false,
-            "shared": false,
-            "status": "ACTIVE",
-            "subnets": [],
-            "tenant_id": "20bd52ff3e1b40039c312395b04683cf"
-        },
-        {
-            "admin_state_up": true,
-            "id": "71c1e68c-171a-4aa2-aca5-50ea153a3718_2",
-            "name": "net2",
-            "provider:network_type": "vlan",
-            "provider:physical_network": "physnet1",
-            "provider:segmentation_id": 1001,
-            "router:external": false,
-            "shared": false,
-            "status": "ACTIVE",
-            "subnets": [],
-            "tenant_id": "20bd52ff3e1b40039c312395b04683cf"
-        }
-    ],
-    "networks_links": [
-        {
-            "href": "/v2.0/networks.json?marker=396f12f8-521e-4b91-8e21-2e003500433a&page_reverse=True",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_update_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_update_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_update_request.json
deleted file mode 100644
index a9f0aee..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_update_request.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{"network": {
-    "provider:network_type": "local",
-    "name": "jclouds-wibble-updated"
-}}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_update_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_update_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_update_response.json
deleted file mode 100644
index 140b648..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/network_update_response.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "network": {
-        "status": "ACTIVE",
-        "subnets": [],
-        "name": "updated_name",
-        "admin_state_up": false,
-        "shared": false,
-        "tenant_id": "c1210485b2424d48804aad5d39c61b8f",
-        "id": "fc68ea2c-b60b-4b4f-bd82-94ec81110766"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port.json
deleted file mode 100644
index 15629a6..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"port": {
-    "status": "ACTIVE",
-    "network_id": "1234567890",
-    "name": "jclouds-wibble",
-    "tenant_id": "1234567890",
-    "id": "624312ff-d14b-4ba3-9834-1c78d23d574d"
-}}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_bulk_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_bulk_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_bulk_request.json
deleted file mode 100644
index c0567c6..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_bulk_request.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "ports": [
-        {
-            "admin_state_up": true,
-            "device_id": "24df1d04-d5cb-41e1-8de5-61ed77c558df",
-            "name": "port1",
-            "network_id": "64239a54-dcc4-4b39-920b-b37c2144effa",
-            "security_groups": [
-                "dbc107f4-afcd-4d5a-9352-f68f82241d5b"
-            ]
-        },
-        {
-            "admin_state_up": false,
-            "name": "port2",
-            "network_id": "e6031bc2-901a-4c66-82da-f4c32ed89406",
-            "security_groups": [
-                "8bf3f7cc-8471-40b1-815f-9da47e79775b",
-                "dbc107f4-afcd-4d5a-9352-f68f82241d5b"
-            ]
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_bulk_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_bulk_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_bulk_response.json
deleted file mode 100644
index 3ecfb52..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_bulk_response.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "ports": [
-        {
-            "admin_state_up": true,
-            "allowed_address_pairs": [],
-            "device_id": "24df1d04-d5cb-41e1-8de5-61ed77c558df",
-            "device_owner": "",
-            "fixed_ips": [
-                {
-                    "ip_address": "10.56.4.2",
-                    "subnet_id": "b0e7435c-1512-45fb-aa9e-9a7c5932fb30"
-                }
-            ],
-            "id": "4fa2a5b2-d758-449d-80d6-dff31df9e91e",
-            "mac_address": "fa:16:3e:63:b0:82",
-            "name": "port1",
-            "network_id": "64239a54-dcc4-4b39-920b-b37c2144effa",
-            "security_groups": [
-                "dbc107f4-afcd-4d5a-9352-f68f82241d5b"
-            ],
-            "status": "DOWN",
-            "tenant_id": "d19231fc08ec4bc4829b668040d34512"
-        },
-        {
-            "admin_state_up": false,
-            "allowed_address_pairs": [],
-            "device_id": "",
-            "device_owner": "",
-            "fixed_ips": [
-                {
-                    "ip_address": "192.168.199.2",
-                    "subnet_id": "0468a7a7-290d-4127-aedd-6c9449775a24"
-                }
-            ],
-            "id": "d3c059b8-40fd-489a-8d17-97bde9370987",
-            "mac_address": "fa:16:3e:86:09:06",
-            "name": "port2",
-            "network_id": "e6031bc2-901a-4c66-82da-f4c32ed89406",
-            "security_groups": [
-                "8bf3f7cc-8471-40b1-815f-9da47e79775b",
-                "dbc107f4-afcd-4d5a-9352-f68f82241d5b"
-            ],
-            "status": "DOWN",
-            "tenant_id": "d19231fc08ec4bc4829b668040d34512"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_request.json
deleted file mode 100644
index d9e8d33..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_request.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "port": {
-        "admin_state_up": true,
-        "device_id": "d6b4d3a5-c700-476f-b609-1493dd9dadc0",
-        "name": "port1",
-        "network_id": "6aeaf34a-c482-4bd3-9dc3-7faf36412f12",
-        "allowed_address_pairs": [
-            {
-                "ip_address": "111.222.333.444",
-                "mac_address": "12"
-            }
-        ]
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_response.json
deleted file mode 100644
index 696ac44..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_create_response.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "port": {
-        "admin_state_up": true,
-        "device_id": "d6b4d3a5-c700-476f-b609-1493dd9dadc0",
-        "device_owner": "",
-        "allowed_address_pairs": [
-            {
-                "ip_address": "192.168.1.1",
-                "mac_address": "12:12"
-            },
-            {
-                "mac_address": "12:13",
-                "ip_address": "192.168.1.2"
-            }
-        ],
-        "fixed_ips": [
-            {
-                "ip_address": "192.168.111.4",
-                "subnet_id": "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27"
-            }
-        ],
-        "id": "ebe69f1e-bc26-4db5-bed0-c0afb4afe3db",
-        "mac_address": "fa:16:3e:a6:50:c1",
-        "name": "port1",
-        "network_id": "6aeaf34a-c482-4bd3-9dc3-7faf36412f12",
-        "status": "ACTIVE",
-        "tenant_id": "cf1a5775e766426cb1968766d0191908"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_get_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_get_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_get_response.json
deleted file mode 100644
index d9c154d..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_get_response.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"port": {
-    "status": "ACTIVE",
-    "network_id": "1234567890",
-    "name": "jclouds-wibble",
-    "tenant_id": "1234567890",
-    "id": "624312ff-d14b-4ba3-9834-1c78d23d574d",
-    "binding:vnic_type": "normal",
-    "binding:vif_type": "hyperv",
-    "binding:vif_details": {"name1": "value1", "name2": {"mapname2": 3}}
-}}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_list_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_list_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_list_response.json
deleted file mode 100644
index 29c3a2b..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_list_response.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{"ports": [
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "16dba3bc-f3fa-4775-afdc-237e12c72f6a"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "1a104cf5-cb18-4d35-9407-2fd2646d9d0b"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "31083ae2-420d-48b2-ac98-9f7a4fd8dbdc"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "49c6d6fa-ff2a-459d-b975-75a8d31c9a89"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "5cb3d6f4-62cb-41c9-b964-ba7d9df79e4e"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "5d51d012-3491-4db7-b1b5-6f254015015d"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "5f9cf7dc-22ca-4097-8e49-1cc8b23faf17"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "6319ecad-6bff-48b2-9b53-02ede8cb7588"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "6ba4c788-661f-49ab-9bf8-5f10cbbb2f57"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "74ed170b-5069-4353-ab38-9719766dc57e"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "wibble",
-        "tenant_id": "1234567890",
-        "id": "b71fcac1-e864-4031-8c5b-edbecd9ece36"
-    },
-    {
-        "status": "ACTIVE",
-        "network_id": "1234567890",
-        "name": "jclouds-test",
-        "tenant_id": "1234567890",
-        "id": "c7681895-d84d-4650-9ca0-82c72036b855"
-    }
-]}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_list_response_paged1.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_list_response_paged1.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_list_response_paged1.json
deleted file mode 100644
index f3bd818..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_list_response_paged1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "ports": [
-        {
-            "admin_state_up": true,
-            "device_id": "257614cc-e178-4c92-9c61-3b28d40eca44",
-            "device_owner": "",
-            "fixed_ips": [
-                {
-                    "ip_address": "192.168.111.3",
-                    "subnet_id": "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27"
-                }
-            ],
-            "id": "24e6637e-c521-45fc-8b8b-d7331aa3c99f",
-            "mac_address": "fa:16:3e:0f:3f:b5",
-            "name": "",
-            "network_id": "6aeaf34a-c482-4bd3-9dc3-7faf36412f12",
-            "status": "ACTIVE",
-            "tenant_id": "cf1a5775e766426cb1968766d0191908"
-        },
-        {
-            "admin_state_up": true,
-            "device_id": "d266f9de-fe2c-4705-93b3-9da71168c93b",
-            "device_owner": "",
-            "fixed_ips": [
-                {
-                    "ip_address": "192.168.111.2",
-                    "subnet_id": "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27"
-                }
-            ],
-            "id": "e54dfd9b-ce6e-47f7-af47-1609cfd1cdb0",
-            "mac_address": "fa:16:3e:f5:41:7f",
-            "name": "",
-            "network_id": "6aeaf34a-c482-4bd3-9dc3-7faf36412f12",
-            "status": "ACTIVE",
-            "tenant_id": "cf1a5775e766426cb1968766d0191908"
-        }
-    ],
-    "ports_links": [
-        {
-            "href": "/v2.0/ports.json?marker=71c1e68c-171a-4aa2-aca5-50ea153a3718",
-            "rel": "next"
-        },
-        {
-            "href": "/v2.0/ports.json?marker=396f12f8-521e-4b91-8e21-2e003500433a&page_reverse=True",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_list_response_paged2.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_list_response_paged2.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_list_response_paged2.json
deleted file mode 100644
index ccd4c93..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_list_response_paged2.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "ports": [
-        {
-            "admin_state_up": true,
-            "device_id": "257614cc-e178-4c92-9c61-3b28d40eca44_3",
-            "device_owner": "",
-            "fixed_ips": [
-                {
-                    "ip_address": "192.168.111.3",
-                    "subnet_id": "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27"
-                }
-            ],
-            "id": "24e6637e-c521-45fc-8b8b-d7331aa3c99f-2_3",
-            "mac_address": "fa:16:3e:0f:3f:b5",
-            "name": "3",
-            "network_id": "6aeaf34a-c482-4bd3-9dc3-7faf36412f12",
-            "status": "ACTIVE",
-            "tenant_id": "cf1a5775e766426cb1968766d0191908"
-        },
-        {
-            "admin_state_up": true,
-            "device_id": "d266f9de-fe2c-4705-93b3-9da71168c93b",
-            "device_owner": "",
-            "fixed_ips": [
-                {
-                    "ip_address": "192.168.111.2",
-                    "subnet_id": "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27"
-                }
-            ],
-            "id": "e54dfd9b-ce6e-47f7-af47-1609cfd1cdb0_4",
-            "mac_address": "fa:16:3e:f5:41:7f",
-            "name": "4",
-            "network_id": "6aeaf34a-c482-4bd3-9dc3-7faf36412f12",
-            "status": "ACTIVE",
-            "tenant_id": "cf1a5775e766426cb1968766d0191908"
-        }
-    ],
-    "ports_links": [
-        {
-            "href": "/v2.0/ports.json?marker=396f12f8-521e-4b91-8e21-2e003500433a&page_reverse=True",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_update_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_update_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_update_request.json
deleted file mode 100644
index f5af476..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_update_request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "port": {
-        "security_groups": [
-            "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "c5ab5c29-2c99-44cb-a4b8-e70a88b77799"
-        ]
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_update_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_update_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_update_response.json
deleted file mode 100644
index b88db25..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/port_update_response.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "port": {
-        "admin_state_up": true,
-        "device_id": "24df1d04-d5cb-41e1-8de5-61ed77c558df",
-        "device_owner": "compute:None",
-        "fixed_ips": [
-            {
-                "ip_address": "10.0.0.3",
-                "subnet_id": "3b498f11-0a20-43ed-b992-0e4202d5f930"
-            }
-        ],
-        "id": "1d8591f4-7b62-428e-857d-e82a15e5a7f1",
-        "mac_address": "fa:16:3e:b6:da:54",
-        "name": "",
-        "network_id": "abaf2e70-4305-4e8d-ac70-3e4cc5f66a07",
-        "security_groups": [
-            "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "c5ab5c29-2c99-44cb-a4b8-e70a88b77799"
-        ],
-        "status": "ACTIVE",
-        "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router.json
deleted file mode 100644
index b39e3c8..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{"router": {
-    "status": "ACTIVE",
-    "external_gateway_info": {
-        "network_id": "624312ff-d14b-4ba3-9834-1c78d23d574d"
-    },
-    "name": "jclouds-wibble",
-    "tenant_id": "1234567890",
-    "id": "16dba3bc-f3fa-4775-afdc-237e12c72f6a"
-}}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_add_interface_port_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_add_interface_port_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_add_interface_port_request.json
deleted file mode 100644
index bae800a..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_add_interface_port_request.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "port_id": "portid"
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_add_interface_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_add_interface_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_add_interface_request.json
deleted file mode 100644
index 107e6e4..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_add_interface_request.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "subnet_id": "a2f1f29d-571b-4533-907f-5803ab96ead1"
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_add_interface_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_add_interface_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_add_interface_response.json
deleted file mode 100644
index d28007c..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_add_interface_response.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "subnet_id": "a2f1f29d-571b-4533-907f-5803ab96ead1",
-    "port_id": "3a44f4e5-1694-493a-a1fb-393881c673a4"
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_create_request.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_create_request.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_create_request.json
deleted file mode 100644
index 106e5d4..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_create_request.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "router": {
-        "name": "another_router",
-        "external_gateway_info": {
-            "network_id": "8ca37218-28ff-41cb-9b10-039601ea7e6b"
-        },
-        "admin_state_up": true
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_create_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_create_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_create_response.json
deleted file mode 100644
index d851d76..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_create_response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "router": {
-        "status": "ACTIVE",
-        "external_gateway_info": {
-            "network_id": "8ca37218-28ff-41cb-9b10-039601ea7e6b"
-        },
-        "name": "another_router",
-        "admin_state_up": true,
-        "tenant_id": "6b96ff0cb17a4b859e1e575d221683d3",
-        "id": "8604a0de-7f6b-409a-a47c-a1cc7bc77b2e"
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_get_response.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_get_response.json b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_get_response.json
deleted file mode 100644
index 77bdebf..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/test/resources/router_get_response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "router": {
-        "status": "ACTIVE",
-        "external_gateway_info": {
-            "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8"
-        },
-        "name": "router1",
-        "admin_state_up": true,
-        "tenant_id": "33a40233088643acb66ff6eb0ebea679",
-        "id": "a9254bdb-2613-4a13-ac4c-adc581fba50d"
-    }
-}