Repository: jclouds-labs-openstack
Updated Branches:
  refs/heads/master d3afa6eea -> 35142182c


http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/security_group_list_response.json
----------------------------------------------------------------------
diff --git 
a/openstack-neutron/src/test/resources/security_group_list_response.json 
b/openstack-neutron/src/test/resources/security_group_list_response.json
deleted file mode 100644
index c0cf747..0000000
--- a/openstack-neutron/src/test/resources/security_group_list_response.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "security_groups": [
-        {
-            "description": "default",
-            "id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "name": "default",
-            "security_group_rules": [
-                {
-                    "direction": "egress",
-                    "ethertype": "IPv6",
-                    "id": "3c0e45ff-adaf-4124-b083-bf390e5482ff",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": null,
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "egress",
-                    "ethertype": "IPv4",
-                    "id": "93aa42e5-80db-4581-9391-3a608bd0e448",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": null,
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "ingress",
-                    "ethertype": "IPv6",
-                    "id": "c0b09f00-1d49-4e64-a0a7-8a186d928138",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "ingress",
-                    "ethertype": "IPv4",
-                    "id": "f7d45c89-008e-4bab-88ad-d6811724c51c",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                }
-            ],
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        },
-        {
-            "description": "default",
-            "id": "85cc3048-abc3-43cc-89b3-377341426ac52",
-            "name": "default",
-            "security_group_rules": [
-                {
-                    "direction": "egress",
-                    "ethertype": "IPv6",
-                    "id": "3c0e45ff-adaf-4124-b083-bf390e5482ff2",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": null,
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "egress",
-                    "ethertype": "IPv4",
-                    "id": "93aa42e5-80db-4581-9391-3a608bd0e4482",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": null,
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "ingress",
-                    "ethertype": "IPv6",
-                    "id": "c0b09f00-1d49-4e64-a0a7-8a186d9281382",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "ingress",
-                    "ethertype": "IPv4",
-                    "id": "f7d45c89-008e-4bab-88ad-d6811724c51c2",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                }
-            ],
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/security_group_list_response_paged1.json
----------------------------------------------------------------------
diff --git 
a/openstack-neutron/src/test/resources/security_group_list_response_paged1.json 
b/openstack-neutron/src/test/resources/security_group_list_response_paged1.json
deleted file mode 100644
index dcf91c8..0000000
--- 
a/openstack-neutron/src/test/resources/security_group_list_response_paged1.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-    "security_groups": [
-        {
-            "description": "default",
-            "id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "name": "default",
-            "security_group_rules": [
-                {
-                    "direction": "egress",
-                    "ethertype": "IPv6",
-                    "id": "3c0e45ff-adaf-4124-b083-bf390e5482ff",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": null,
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "egress",
-                    "ethertype": "IPv4",
-                    "id": "93aa42e5-80db-4581-9391-3a608bd0e448",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": null,
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "ingress",
-                    "ethertype": "IPv6",
-                    "id": "c0b09f00-1d49-4e64-a0a7-8a186d928138",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "ingress",
-                    "ethertype": "IPv4",
-                    "id": "f7d45c89-008e-4bab-88ad-d6811724c51c",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                }
-            ],
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        },
-        {
-            "description": "default",
-            "id": "85cc3048-abc3-43cc-89b3-377341426ac52",
-            "name": "default",
-            "security_group_rules": [
-                {
-                    "direction": "egress",
-                    "ethertype": "IPv6",
-                    "id": "3c0e45ff-adaf-4124-b083-bf390e5482ff2",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": null,
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "egress",
-                    "ethertype": "IPv4",
-                    "id": "93aa42e5-80db-4581-9391-3a608bd0e4482",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": null,
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "ingress",
-                    "ethertype": "IPv6",
-                    "id": "c0b09f00-1d49-4e64-a0a7-8a186d9281382",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "ingress",
-                    "ethertype": "IPv4",
-                    "id": "f7d45c89-008e-4bab-88ad-d6811724c51c2",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                }
-            ],
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        }
-    ],
-    "security_groups_links": [
-        {
-            "href": 
"/v2.0/security-groups.json?marker=71c1e68c-171a-4aa2-aca5-50ea153a3718",
-            "rel": "next"
-        },
-        {
-            "href": 
"/v2.0/security-groups.json?marker=396f12f8-521e-4b91-8e21-2e003500433a&page_reverse=True",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/security_group_list_response_paged2.json
----------------------------------------------------------------------
diff --git 
a/openstack-neutron/src/test/resources/security_group_list_response_paged2.json 
b/openstack-neutron/src/test/resources/security_group_list_response_paged2.json
deleted file mode 100644
index ded8067..0000000
--- 
a/openstack-neutron/src/test/resources/security_group_list_response_paged2.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "security_groups": [
-        {
-            "description": "default",
-            "id": "85cc3048-abc3-43cc-89b3-377341426ac53",
-            "name": "default",
-            "security_group_rules": [
-                {
-                    "direction": "egress",
-                    "ethertype": "IPv6",
-                    "id": "3c0e45ff-adaf-4124-b083-bf390e5482ff",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": null,
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "egress",
-                    "ethertype": "IPv4",
-                    "id": "93aa42e5-80db-4581-9391-3a608bd0e448",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": null,
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "ingress",
-                    "ethertype": "IPv6",
-                    "id": "c0b09f00-1d49-4e64-a0a7-8a186d928138",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "ingress",
-                    "ethertype": "IPv4",
-                    "id": "f7d45c89-008e-4bab-88ad-d6811724c51c",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                }
-            ],
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        },
-        {
-            "description": "default",
-            "id": "85cc3048-abc3-43cc-89b3-377341426ac524",
-            "name": "default",
-            "security_group_rules": [
-                {
-                    "direction": "egress",
-                    "ethertype": "IPv6",
-                    "id": "3c0e45ff-adaf-4124-b083-bf390e5482ff2",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": null,
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "egress",
-                    "ethertype": "IPv4",
-                    "id": "93aa42e5-80db-4581-9391-3a608bd0e4482",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": null,
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "ingress",
-                    "ethertype": "IPv6",
-                    "id": "c0b09f00-1d49-4e64-a0a7-8a186d9281382",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                },
-                {
-                    "direction": "ingress",
-                    "ethertype": "IPv4",
-                    "id": "f7d45c89-008e-4bab-88ad-d6811724c51c2",
-                    "port_range_max": null,
-                    "port_range_min": null,
-                    "protocol": null,
-                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "remote_ip_prefix": null,
-                    "security_group_id": 
"85cc3048-abc3-43cc-89b3-377341426ac5",
-                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-                }
-            ],
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        }
-    ],
-    "security_groups_links": [
-        {
-            "href": 
"/v2.0/security-groups.json?marker=396f12f8-521e-4b91-8e21-2e003500433a&page_reverse=True",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/security_group_rule_create_request.json
----------------------------------------------------------------------
diff --git 
a/openstack-neutron/src/test/resources/security_group_rule_create_request.json 
b/openstack-neutron/src/test/resources/security_group_rule_create_request.json
deleted file mode 100644
index 14bea85..0000000
--- 
a/openstack-neutron/src/test/resources/security_group_rule_create_request.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "security_group_rule": {
-        "direction": "ingress",
-        "port_range_min": 80,
-        "ethertype": "IPv4",
-        "port_range_max": 80,
-        "protocol": "tcp",
-        "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-        "security_group_id": "a7734e61-b545-452d-a3cd-0189cbd9747a"
-    }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/security_group_rule_create_response.json
----------------------------------------------------------------------
diff --git 
a/openstack-neutron/src/test/resources/security_group_rule_create_response.json 
b/openstack-neutron/src/test/resources/security_group_rule_create_response.json
deleted file mode 100644
index 0037e94..0000000
--- 
a/openstack-neutron/src/test/resources/security_group_rule_create_response.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "security_group_rule": {
-        "direction": "ingress",
-        "ethertype": "IPv4",
-        "id": "2bc0accf-312e-429a-956e-e4407625eb62",
-        "port_range_max": 80,
-        "port_range_min": 80,
-        "protocol": "tcp",
-        "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-        "remote_ip_prefix": null,
-        "security_group_id": "a7734e61-b545-452d-a3cd-0189cbd9747a",
-        "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/security_group_rule_get_response.json
----------------------------------------------------------------------
diff --git 
a/openstack-neutron/src/test/resources/security_group_rule_get_response.json 
b/openstack-neutron/src/test/resources/security_group_rule_get_response.json
deleted file mode 100644
index 7225101..0000000
--- a/openstack-neutron/src/test/resources/security_group_rule_get_response.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "security_group_rule": {
-        "direction": "egress",
-        "ethertype": "IPv6",
-        "id": "3c0e45ff-adaf-4124-b083-bf390e5482ff",
-        "port_range_max": null,
-        "port_range_min": null,
-        "protocol": null,
-        "remote_group_id": null,
-        "remote_ip_prefix": null,
-        "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-        "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-    }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/security_group_rule_list_response.json
----------------------------------------------------------------------
diff --git 
a/openstack-neutron/src/test/resources/security_group_rule_list_response.json 
b/openstack-neutron/src/test/resources/security_group_rule_list_response.json
deleted file mode 100644
index fbdeddf..0000000
--- 
a/openstack-neutron/src/test/resources/security_group_rule_list_response.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "security_group_rules": [
-        {
-            "direction": "egress",
-            "ethertype": "IPv6",
-            "id": "3c0e45ff-adaf-4124-b083-bf390e5482ff",
-            "port_range_max": null,
-            "port_range_min": null,
-            "protocol": null,
-            "remote_group_id": null,
-            "remote_ip_prefix": null,
-            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        },
-        {
-            "direction": "egress",
-            "ethertype": "IPv4",
-            "id": "93aa42e5-80db-4581-9391-3a608bd0e448",
-            "port_range_max": null,
-            "port_range_min": null,
-            "protocol": null,
-            "remote_group_id": null,
-            "remote_ip_prefix": null,
-            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        },
-        {
-            "direction": "ingress",
-            "ethertype": "IPv6",
-            "id": "c0b09f00-1d49-4e64-a0a7-8a186d928138",
-            "port_range_max": null,
-            "port_range_min": null,
-            "protocol": null,
-            "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "remote_ip_prefix": null,
-            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        },
-        {
-            "direction": "ingress",
-            "ethertype": "IPv4",
-            "id": "f7d45c89-008e-4bab-88ad-d6811724c51c",
-            "port_range_max": null,
-            "port_range_min": null,
-            "protocol": null,
-            "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "remote_ip_prefix": null,
-            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/security_group_rule_list_response_paged1.json
----------------------------------------------------------------------
diff --git 
a/openstack-neutron/src/test/resources/security_group_rule_list_response_paged1.json
 
b/openstack-neutron/src/test/resources/security_group_rule_list_response_paged1.json
deleted file mode 100644
index 5ecbfd3..0000000
--- 
a/openstack-neutron/src/test/resources/security_group_rule_list_response_paged1.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "security_group_rules": [
-        {
-            "direction": "egress",
-            "ethertype": "IPv6",
-            "id": "3c0e45ff-adaf-4124-b083-bf390e5482ff",
-            "port_range_max": null,
-            "port_range_min": null,
-            "protocol": null,
-            "remote_group_id": null,
-            "remote_ip_prefix": null,
-            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        },
-        {
-            "direction": "egress",
-            "ethertype": "IPv4",
-            "id": "93aa42e5-80db-4581-9391-3a608bd0e448",
-            "port_range_max": null,
-            "port_range_min": null,
-            "protocol": null,
-            "remote_group_id": null,
-            "remote_ip_prefix": null,
-            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        },
-        {
-            "direction": "ingress",
-            "ethertype": "IPv6",
-            "id": "c0b09f00-1d49-4e64-a0a7-8a186d928138",
-            "port_range_max": null,
-            "port_range_min": null,
-            "protocol": null,
-            "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "remote_ip_prefix": null,
-            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        },
-        {
-            "direction": "ingress",
-            "ethertype": "IPv4",
-            "id": "f7d45c89-008e-4bab-88ad-d6811724c51c",
-            "port_range_max": null,
-            "port_range_min": null,
-            "protocol": null,
-            "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "remote_ip_prefix": null,
-            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        }
-    ],
-    "security_group_rules_links": [
-        {
-            "href": 
"/v2.0/security-group-rules.json?marker=71c1e68c-171a-4aa2-aca5-50ea153a3718",
-            "rel": "next"
-        },
-        {
-            "href": 
"/v2.0/security-group-rules.json?marker=396f12f8-521e-4b91-8e21-2e003500433a&page_reverse=True",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/security_group_rule_list_response_paged2.json
----------------------------------------------------------------------
diff --git 
a/openstack-neutron/src/test/resources/security_group_rule_list_response_paged2.json
 
b/openstack-neutron/src/test/resources/security_group_rule_list_response_paged2.json
deleted file mode 100644
index 1688ede..0000000
--- 
a/openstack-neutron/src/test/resources/security_group_rule_list_response_paged2.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-    "security_group_rules": [
-        {
-            "direction": "egress",
-            "ethertype": "IPv6",
-            "id": "3c0e45ff-adaf-4124-b083-bf390e5482ff2",
-            "port_range_max": null,
-            "port_range_min": null,
-            "protocol": null,
-            "remote_group_id": null,
-            "remote_ip_prefix": null,
-            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        },
-        {
-            "direction": "egress",
-            "ethertype": "IPv4",
-            "id": "93aa42e5-80db-4581-9391-3a608bd0e4482",
-            "port_range_max": null,
-            "port_range_min": null,
-            "protocol": null,
-            "remote_group_id": null,
-            "remote_ip_prefix": null,
-            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        },
-        {
-            "direction": "ingress",
-            "ethertype": "IPv6",
-            "id": "c0b09f00-1d49-4e64-a0a7-8a186d9281382",
-            "port_range_max": null,
-            "port_range_min": null,
-            "protocol": null,
-            "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "remote_ip_prefix": null,
-            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        },
-        {
-            "direction": "ingress",
-            "ethertype": "IPv4",
-            "id": "f7d45c89-008e-4bab-88ad-d6811724c51c2",
-            "port_range_max": null,
-            "port_range_min": null,
-            "protocol": null,
-            "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "remote_ip_prefix": null,
-            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
-            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
-        }
-    ],
-    "security_group_rules_links": [
-        {
-            "href": 
"/v2.0/security-group-rules.json?marker=396f12f8-521e-4b91-8e21-2e003500433a&page_reverse=True",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/subnet.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/subnet.json 
b/openstack-neutron/src/test/resources/subnet.json
deleted file mode 100644
index 58c4382..0000000
--- a/openstack-neutron/src/test/resources/subnet.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"subnet": {
-    "ip_version": 4,
-    "cidr": "10.0.3.0/24",
-    "network_id": "1234567890",
-    "name": "jclouds-wibble",
-    "tenant_id": "1234567890",
-    "id": "624312ff-d14b-4ba3-9834-1c78d23d574d"
-}}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/subnet_bulk_create_request.json
----------------------------------------------------------------------
diff --git 
a/openstack-neutron/src/test/resources/subnet_bulk_create_request.json 
b/openstack-neutron/src/test/resources/subnet_bulk_create_request.json
deleted file mode 100644
index 0bb8460..0000000
--- a/openstack-neutron/src/test/resources/subnet_bulk_create_request.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "subnets": [
-        {
-            "cidr": "192.168.199.0/24",
-            "ip_version": 4,
-            "network_id": "e6031bc2-901a-4c66-82da-f4c32ed89406"
-        },
-        {
-            "cidr": "10.56.4.0/22",
-            "ip_version": 4,
-            "network_id": "64239a54-dcc4-4b39-920b-b37c2144effa"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/subnet_bulk_create_response.json
----------------------------------------------------------------------
diff --git 
a/openstack-neutron/src/test/resources/subnet_bulk_create_response.json 
b/openstack-neutron/src/test/resources/subnet_bulk_create_response.json
deleted file mode 100644
index f643084..0000000
--- a/openstack-neutron/src/test/resources/subnet_bulk_create_response.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "subnets": [
-        {
-            "allocation_pools": [
-                {
-                    "end": "192.168.199.254",
-                    "start": "192.168.199.2"
-                }
-            ],
-            "cidr": "192.168.199.0/24",
-            "dns_nameservers": [
-
-            ],
-            "enable_dhcp": true,
-            "gateway_ip": "192.168.199.1",
-            "host_routes": [
-
-            ],
-            "id": "0468a7a7-290d-4127-aedd-6c9449775a24",
-            "ip_version": 4,
-            "name": "",
-            "network_id": "e6031bc2-901a-4c66-82da-f4c32ed89406",
-            "tenant_id": "d19231fc08ec4bc4829b668040d34512"
-        },
-        {
-            "allocation_pools": [
-                {
-                    "end": "10.56.7.254",
-                    "start": "10.56.4.2"
-                }
-            ],
-            "cidr": "10.56.4.0/22",
-            "dns_nameservers": [
-
-            ],
-            "enable_dhcp": true,
-            "gateway_ip": "10.56.4.1",
-            "host_routes": [
-
-            ],
-            "id": "b0e7435c-1512-45fb-aa9e-9a7c5932fb30",
-            "ip_version": 4,
-            "name": "",
-            "network_id": "64239a54-dcc4-4b39-920b-b37c2144effa",
-            "tenant_id": "d19231fc08ec4bc4829b668040d34512"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/subnet_create_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/subnet_create_request.json 
b/openstack-neutron/src/test/resources/subnet_create_request.json
deleted file mode 100644
index 49a53b6..0000000
--- a/openstack-neutron/src/test/resources/subnet_create_request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"subnet": {
-    "ip_version": 4,
-    "cidr": "10.0.3.0/24",
-    "network_id": "1234567890",
-    "name": "jclouds-wibble"
-}}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/subnet_create_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/subnet_create_response.json 
b/openstack-neutron/src/test/resources/subnet_create_response.json
deleted file mode 100644
index 58c4382..0000000
--- a/openstack-neutron/src/test/resources/subnet_create_response.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"subnet": {
-    "ip_version": 4,
-    "cidr": "10.0.3.0/24",
-    "network_id": "1234567890",
-    "name": "jclouds-wibble",
-    "tenant_id": "1234567890",
-    "id": "624312ff-d14b-4ba3-9834-1c78d23d574d"
-}}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/subnet_get_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/subnet_get_response.json 
b/openstack-neutron/src/test/resources/subnet_get_response.json
deleted file mode 100644
index aead0f9..0000000
--- a/openstack-neutron/src/test/resources/subnet_get_response.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{"subnet": {
-    "ip_version": 4,
-    "cidr": "10.0.3.0/24",
-    "network_id": "1234567890",
-    "name": "jclouds-wibble",
-    "tenant_id": "1234567890",
-    "id": "624312ff-d14b-4ba3-9834-1c78d23d574d",
-    "ipv6_address_mode": "slaac"
-}}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/subnet_list_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/subnet_list_response.json 
b/openstack-neutron/src/test/resources/subnet_list_response.json
deleted file mode 100644
index b0061e9..0000000
--- a/openstack-neutron/src/test/resources/subnet_list_response.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/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/subnet_list_response_pages1.json
----------------------------------------------------------------------
diff --git 
a/openstack-neutron/src/test/resources/subnet_list_response_pages1.json 
b/openstack-neutron/src/test/resources/subnet_list_response_pages1.json
deleted file mode 100644
index 10b3aaa..0000000
--- a/openstack-neutron/src/test/resources/subnet_list_response_pages1.json
+++ /dev/null
@@ -1,30 +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"
-        }
-    ],
-    "subnets_links": [
-        {
-            "href": 
"/v2.0/subnets.json?marker=71c1e68c-171a-4aa2-aca5-50ea153a3718",
-            "rel": "next"
-        },
-        {
-            "href": 
"/v2.0/subnets.json?marker=396f12f8-521e-4b91-8e21-2e003500433a&page_reverse=True",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/subnet_list_response_pages2.json
----------------------------------------------------------------------
diff --git 
a/openstack-neutron/src/test/resources/subnet_list_response_pages2.json 
b/openstack-neutron/src/test/resources/subnet_list_response_pages2.json
deleted file mode 100644
index 0319fbe..0000000
--- a/openstack-neutron/src/test/resources/subnet_list_response_pages2.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "subnets": [
-        {
-            "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"
-        }
-    ],
-    "subnets_links": [
-        {
-            "href": 
"/v2.0/subnets.json?marker=396f12f8-521e-4b91-8e21-2e003500433a&page_reverse=True",
-            "rel": "previous"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/subnet_update_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/subnet_update_request.json 
b/openstack-neutron/src/test/resources/subnet_update_request.json
deleted file mode 100644
index 6345647..0000000
--- a/openstack-neutron/src/test/resources/subnet_update_request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "subnet": {
-        "gateway_ip": "10.0.3.254",
-        "name": "new_name"
-    }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/subnet_update_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/subnet_update_response.json 
b/openstack-neutron/src/test/resources/subnet_update_response.json
deleted file mode 100644
index 40c65e9..0000000
--- a/openstack-neutron/src/test/resources/subnet_update_response.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "subnet": {
-        "name": "new_name",
-        "network_id": "ed2e3c10-2e43-4297-9006-2863a2d1abbc",
-        "tenant_id": "c1210485b2424d48804aad5d39c61b8f",
-        "allocation_pools": [
-            {
-                "start": "10.0.3.20",
-                "end": "10.0.3.150"
-            }
-        ],
-        "gateway_ip": "10.0.3.254",
-        "ip_version": 4,
-        "cidr": "10.0.3.0/24",
-        "enable_dhcp": true,
-        "id": "9436e561-47bf-436a-b1f1-fe23a926e031"
-    }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1c0ead8..f84c21a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,6 @@
   <modules>
     <module>openstack-glance</module>
     <module>openstack-heat</module>
-    <module>openstack-neutron</module>
     <module>openstack-poppy</module>
     <module>openstack-marconi</module>
     <module>rackspace-autoscale</module>

Reply via email to