You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2018/01/17 08:11:23 UTC
[03/12] jclouds-labs-openstack git commit: OpenStack Neutron promoted
to the main repo
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java
deleted file mode 100644
index 036bad7..0000000
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.neutron.v2.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.List;
-
-import org.jclouds.openstack.neutron.v2.NeutronApi;
-import org.jclouds.openstack.neutron.v2.domain.IPv6DHCPMode;
-import org.jclouds.openstack.neutron.v2.domain.Subnet;
-import org.jclouds.openstack.neutron.v2.domain.Subnets;
-import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest;
-import org.jclouds.openstack.v2_0.options.PaginationOptions;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.ImmutableList;
-import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.MockWebServer;
-
-/**
- * Tests NetworkApi Guice wiring and parsing
- *
- */
-@Test
-public class SubnetApiMockTest extends BaseNeutronApiMockTest {
-
- public void testCreateSubnet() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/subnet_create_response.json"))));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SubnetApi api = neutronApi.getSubnetApi("RegionOne");
-
- Subnet.CreateSubnet createSubnet = Subnet.createBuilder("1234567890", "10.0.3.0/24")
- .name("jclouds-wibble")
- .ipVersion(4)
- .build();
-
- Subnet subnet = api.create(createSubnet);
-
- /*
- * Check request
- */
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "POST", uriApiVersion + "/subnets", "/subnet_create_request.json");
-
- /*
- * Check response
- */
- assertNotNull(subnet);
- assertEquals(subnet.getName(), "jclouds-wibble");
- assertEquals(subnet.getIpVersion().intValue(), 4);
- assertEquals(subnet.getCidr(), "10.0.3.0/24");
- assertEquals(subnet.getTenantId(), "1234567890");
- assertEquals(subnet.getId(), "624312ff-d14b-4ba3-9834-1c78d23d574d");
- } finally {
- server.shutdown();
- }
- }
-
- public void testListSpecificPageSubnet() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/subnet_list_response_pages1.json"))));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SubnetApi api = neutronApi.getSubnetApi("RegionOne");
-
- Subnets subnets = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
-
- /*
- * Check request
- */
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/subnets?limit=2&marker=abcdefg");
-
- /*
- * Check response
- */
- assertNotNull(subnets);
- assertEquals(subnets.first().get().getId(), "16dba3bc-f3fa-4775-afdc-237e12c72f6a");
- } finally {
- server.shutdown();
- }
- }
-
- public void testListPagedSubnet() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/subnet_list_response_pages1.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/subnet_list_response_pages2.json"))));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SubnetApi api = neutronApi.getSubnetApi("RegionOne");
-
- // Note: Lazy! Have to actually look at the collection.
- List<Subnet> subnets = api.list().concat().toList();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/subnets");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/subnets?marker=71c1e68c-171a-4aa2-aca5-50ea153a3718");
-
- /*
- * Check response
- */
- assertNotNull(subnets);
- assertEquals(subnets.size(), 4);
- assertEquals(subnets.get(0).getId(), "16dba3bc-f3fa-4775-afdc-237e12c72f6a");
- assertEquals(subnets.get(3).getId(), "6ba4c788-661f-49ab-9bf8-5f10cbbb2f57");
- } finally {
- server.shutdown();
- }
- }
-
- public void testGetSubnet() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/subnet_get_response.json"))));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SubnetApi api = neutronApi.getSubnetApi("RegionOne");
-
- Subnet subnet = api.get("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/subnets/12345");
-
- /*
- * Check response
- */
- assertNotNull(subnet);
- assertEquals(subnet.getName(), "jclouds-wibble");
- assertEquals(subnet.getId(), "624312ff-d14b-4ba3-9834-1c78d23d574d");
- assertEquals(subnet.getTenantId(), "1234567890");
- assertEquals(subnet.getIPv6AddressMode(), IPv6DHCPMode.SLAAC);
- } finally {
- server.shutdown();
- }
- }
-
- public void testCreateBulkSubnet() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/subnet_bulk_create_response.json"))));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SubnetApi api = neutronApi.getSubnetApi("RegionOne");
-
- Subnet.CreateSubnet createSubnet1 = Subnet.createBuilder("e6031bc2-901a-4c66-82da-f4c32ed89406",
- "192.168.199.0/24")
- .ipVersion(4)
- .build();
-
- Subnet.CreateSubnet createSubnet2 = Subnet.createBuilder("64239a54-dcc4-4b39-920b-b37c2144effa",
- "10.56.4.0/22")
- .ipVersion(4)
- .build();
-
- FluentIterable<Subnet> subnets = api.createBulk(ImmutableList.of(createSubnet1, createSubnet2));
-
- /*
- * Check request
- */
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "POST", uriApiVersion + "/subnets", "/subnet_bulk_create_request.json");
-
- /*
- * Check response
- */
- assertNotNull(subnets);
- assertEquals(subnets.size(), 2);
- assertEquals(subnets.get(0).getName(), "");
- assertEquals(subnets.get(0).getIpVersion().intValue(), 4);
- assertEquals(subnets.get(0).getCidr(), "192.168.199.0/24");
- assertTrue(subnets.get(0).getDnsNameservers().isEmpty());
- assertTrue(subnets.get(0).getEnableDhcp());
- assertTrue(subnets.get(0).getHostRoutes().isEmpty());
- assertEquals(subnets.get(0).getTenantId(), "d19231fc08ec4bc4829b668040d34512");
- assertEquals(subnets.get(0).getId(), "0468a7a7-290d-4127-aedd-6c9449775a24");
- assertEquals(subnets.get(0).getNetworkId(), "e6031bc2-901a-4c66-82da-f4c32ed89406");
- assertEquals(subnets.get(0).getAllocationPools().iterator().next().getStart(), "192.168.199.2");
- assertEquals(subnets.get(0).getAllocationPools().iterator().next().getEnd(), "192.168.199.254");
- } finally {
- server.shutdown();
- }
- }
-
- public void testUpdateSubnet() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/subnet_update_response.json"))));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SubnetApi api = neutronApi.getSubnetApi("RegionOne");
-
- Subnet.UpdateSubnet updateSubnet = Subnet.updateBuilder()
- .name("new_name")
- .gatewayIp("10.0.3.254")
- .build();
-
- Subnet subnet = api.update("12345", updateSubnet);
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/subnets/12345", "/subnet_update_request.json");
-
- /*
- * Check response
- */
- assertNotNull(subnet);
- assertEquals(subnet.getName(), "new_name");
- assertEquals(subnet.getId(), "9436e561-47bf-436a-b1f1-fe23a926e031");
- assertEquals(subnet.getTenantId(), "c1210485b2424d48804aad5d39c61b8f");
- } finally {
- server.shutdown();
- }
- }
-
- public void testDeleteSubnet() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SubnetApi api = neutronApi.getSubnetApi("RegionOne");
-
- boolean result = api.delete("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/subnets/12345");
-
- /*
- * Check response
- */
- assertTrue(result);
- } finally {
- server.shutdown();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiLiveTest.java
deleted file mode 100644
index d544aba..0000000
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiLiveTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.neutron.v2.internal;
-
-import java.util.Properties;
-
-import org.jclouds.apis.BaseApiLiveTest;
-import org.jclouds.logging.config.LoggingModule;
-import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
-import org.jclouds.openstack.keystone.config.KeystoneProperties;
-import org.jclouds.openstack.neutron.v2.NeutronApi;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code NeutronApi}
- *
- */
-@Test(groups = "live")
-public class BaseNeutronApiLiveTest extends BaseApiLiveTest<NeutronApi> {
-
- public BaseNeutronApiLiveTest() {
- provider = "openstack-neutron";
- }
-
- @Override
- protected LoggingModule getLoggingModule() {
- return new SLF4JLoggingModule();
- }
-
- @Override
- protected Properties setupProperties() {
- Properties props = super.setupProperties();
- setIfTestSystemPropertyPresent(props, KeystoneProperties.CREDENTIAL_TYPE);
- return props;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java
deleted file mode 100644
index be7d245..0000000
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.neutron.v2.internal;
-
-import static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE;
-import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE;
-
-import java.util.Properties;
-
-import org.jclouds.openstack.keystone.auth.config.CredentialTypes;
-import org.jclouds.openstack.neutron.v2.NeutronApi;
-import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
-
-/**
- * Base class for writing Neutron Mock tests
- *
- */
-public class BaseNeutronApiMockTest extends BaseOpenStackMockTest<NeutronApi> {
- protected Properties overrides;
- protected String uriApiVersion = "/v2.0";
-
- /**
- * Base Mock Test
- */
- public BaseNeutronApiMockTest() {
- overrides = new Properties();
- overrides.setProperty(SERVICE_TYPE, "network");
- overrides.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/util/ClassUtil.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/util/ClassUtil.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/util/ClassUtil.java
deleted file mode 100644
index b9ba915..0000000
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/util/ClassUtil.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jclouds.openstack.neutron.v2.util;
-
-import java.lang.reflect.Field;
-
-public class ClassUtil {
-
- public static Field findField(Class clazz, String fieldName) {
- Field fieldToFind = null;
- if (clazz.getSuperclass() != null)
- fieldToFind = findField(clazz.getSuperclass(), fieldName);
-
- if (fieldToFind != null)
- return fieldToFind;
-
- for (Field field : clazz.getDeclaredFields()) {
- if (field.getName().equals(fieldName))
- return field;
- }
- return null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/util/PredicateUtil.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/util/PredicateUtil.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/util/PredicateUtil.java
deleted file mode 100644
index a3c39ce..0000000
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/util/PredicateUtil.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jclouds.openstack.neutron.v2.util;
-
-import com.google.common.base.Predicate;
-import org.jclouds.javax.annotation.Nullable;
-
-import java.lang.reflect.Field;
-
-public class PredicateUtil {
-
- public static <T> Predicate<T> createIdEqualsPredicate(final String id) {
- return new Predicate<T>() {
- @Override
- public boolean apply(@Nullable T input) {
- if (input == null) return false;
-
- try {
- Class clazz = input.getClass();
- Field field = ClassUtil.findField(clazz, "id");
- field.setAccessible(true);
- String value = (String) field.get(input);
- field.setAccessible(false);
- return value != null && value.equals(id);
- } catch (IllegalAccessException iae) {
- return false;
- }
- }
- };
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/access.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/access.json b/openstack-neutron/src/test/resources/access.json
deleted file mode 100644
index fab1645..0000000
--- a/openstack-neutron/src/test/resources/access.json
+++ /dev/null
@@ -1,228 +0,0 @@
-{
- "access": {
- "metadata": {
- "roles": [
- "9fe2ff9ee4384b1894a90878d3e92bab",
- "b926cb0f4e2642678735f86c2b06205e",
- "33484487e73d4da0918a19b9c7e1f8ae",
- "f2e54c2105fb49e29479af047115cebc"
- ],
- "is_admin": 0
- },
- "user": {
- "name": "joe",
- "roles": [
- {
- "name": "_member_"
- },
- {
- "name": "anotherrole"
- },
- {
- "name": "heat_stack_owner"
- },
- {
- "name": "Member"
- }
- ],
- "id": "8fbf8e68d36e4ac7bcf912a26213bd49",
- "roles_links": [],
- "username": "joe"
- },
- "serviceCatalog": [
- {
- "name": "nova",
- "type": "compute",
- "endpoints_links": [],
- "endpoints": [
- {
- "publicURL": "URL/v2/da0d12be20394afb851716e10a49e4a7",
- "id": "2122bcaa704343c19ad2578410d4961d",
- "internalURL": "URL/v2/da0d12be20394afb851716e10a49e4a7",
- "region": "RegionOne",
- "adminURL": "URL/v2/da0d12be20394afb851716e10a49e4a7"
- }
- ]
- },
- {
- "name": "neutron",
- "type": "network",
- "endpoints_links": [],
- "endpoints": [
- {
- "publicURL": "URL/",
- "id": "65a4d3f13cfb49a6a57a04e205cc2158",
- "internalURL": "URL/",
- "region": "RegionOne",
- "adminURL": "URL/"
- }
- ]
- },
- {
- "name": "cinderv2",
- "type": "volumev2",
- "endpoints_links": [],
- "endpoints": [
- {
- "publicURL": "URL/v2/da0d12be20394afb851716e10a49e4a7",
- "id": "31fe4d92eac44044b05be21c6f44cebc",
- "internalURL": "URL/v2/da0d12be20394afb851716e10a49e4a7",
- "region": "RegionOne",
- "adminURL": "URL/v2/da0d12be20394afb851716e10a49e4a7"
- }
- ]
- },
- {
- "name": "trove",
- "type": "database",
- "endpoints_links": [],
- "endpoints": [
- {
- "publicURL": "URL/v1.0/da0d12be20394afb851716e10a49e4a7",
- "id": "06b7a7dbd25c4a01819c879700a9712a",
- "internalURL": "URL/v1.0/da0d12be20394afb851716e10a49e4a7",
- "region": "RegionOne",
- "adminURL": "URL/v1.0/da0d12be20394afb851716e10a49e4a7"
- }
- ]
- },
- {
- "name": "s3",
- "type": "s3",
- "endpoints_links": [],
- "endpoints": [
- {
- "publicURL": "URL",
- "id": "93b0b67091324e8ba01b62ee0584994c",
- "internalURL": "URL",
- "region": "RegionOne",
- "adminURL": "URL"
- }
- ]
- },
- {
- "name": "glance",
- "type": "image",
- "endpoints_links": [],
- "endpoints": [
- {
- "publicURL": "URL",
- "id": "a542e91bcfa046bfa1bf2397356d1414",
- "internalURL": "URL",
- "region": "RegionOne",
- "adminURL": "URL"
- }
- ]
- },
- {
- "name": "novav3",
- "type": "computev3",
- "endpoints_links": [],
- "endpoints": [
- {
- "publicURL": "URL/v3",
- "id": "9c3e8abb576d483db93bcef70c67bc1d",
- "internalURL": "URL/v3",
- "region": "RegionOne",
- "adminURL": "URL/v3"
- }
- ]
- },
- {
- "name": "heat",
- "type": "cloudformation",
- "endpoints_links": [],
- "endpoints": [
- {
- "publicURL": "URL/v1",
- "id": "6f4ca5ca9698425b85c300b3fc176c39",
- "internalURL": "URL/v1",
- "region": "RegionOne",
- "adminURL": "URL/v1"
- }
- ]
- },
- {
- "name": "cinder",
- "type": "volume",
- "endpoints_links": [],
- "endpoints": [
- {
- "publicURL": "URL/v1/da0d12be20394afb851716e10a49e4a7",
- "id": "037039c676694a35aa28d34fce09e51d",
- "internalURL": "URL/v1/da0d12be20394afb851716e10a49e4a7",
- "region": "RegionOne",
- "adminURL": "URL/v1/da0d12be20394afb851716e10a49e4a7"
- }
- ]
- },
- {
- "name": "ec2",
- "type": "ec2",
- "endpoints_links": [],
- "endpoints": [
- {
- "publicURL": "URL/services/Cloud",
- "id": "1d242631bccb4ff4ba7a395dbcb51648",
- "internalURL": "URL/services/Cloud",
- "region": "RegionOne",
- "adminURL": "URL/services/Admin"
- }
- ]
- },
- {
- "name": "heat",
- "type": "orchestration",
- "endpoints_links": [],
- "endpoints": [
- {
- "publicURL": "URL/v1/da0d12be20394afb851716e10a49e4a7",
- "id": "199d00075e4a40308a6ad2aa8980d0cd",
- "internalURL": "URL/v1/da0d12be20394afb851716e10a49e4a7",
- "region": "RegionOne",
- "adminURL": "URL/v1/da0d12be20394afb851716e10a49e4a7"
- }
- ]
- },
- {
- "name": "swift",
- "type": "object-store",
- "endpoints_links": [],
- "endpoints": [
- {
- "publicURL": "URL/v1/AUTH_da0d12be20394afb851716e10a49e4a7",
- "id": "26b2cb1efb044193b847fc3f2fb12e82",
- "internalURL": "URL/v1/AUTH_da0d12be20394afb851716e10a49e4a7",
- "region": "RegionOne",
- "adminURL": "URL"
- }
- ]
- },
- {
- "name": "keystone",
- "type": "identity",
- "endpoints_links": [],
- "endpoints": [
- {
- "publicURL": "URL/v2.0",
- "id": "1bbfe80b50df4c4a84040aa782e42140",
- "internalURL": "URL/v2.0",
- "region": "RegionOne",
- "adminURL": "URL/v2.0"
- }
- ]
- }
- ],
- "token": {
- "tenant": {
- "name": "jclouds",
- "id": "da0d12be20394afb851716e10a49e4a7",
- "enabled": true,
- "description": null
- },
- "id": "TOKEN",
- "expires": "2014-04-28T22:48:24Z",
- "issued_at": "2014-04-28T21:48:24.972896"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/extension_details.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/extension_details.json b/openstack-neutron/src/test/resources/extension_details.json
deleted file mode 100644
index 9e10fef..0000000
--- a/openstack-neutron/src/test/resources/extension_details.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "extension": {
- "name": "Neutron L3 Router",
- "namespace": "http://docs.openstack.org/ext/neutron/router/api/v1.0",
- "alias": "router",
- "updated": "2012-07-20T10:00:00-00:00",
- "description": "Router abstraction for basic L3 forwarding between L2 Neutron networks and access to external networks via a NAT gateway.",
- "links": []
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/extension_list.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/extension_list.json b/openstack-neutron/src/test/resources/extension_list.json
deleted file mode 100644
index acdd36a..0000000
--- a/openstack-neutron/src/test/resources/extension_list.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "extensions": [
- {
- "updated": "2013-01-20T00:00:00-00:00",
- "name": "Neutron Service Type Management",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/service-type/api/v1.0",
- "alias": "service-type",
- "description": "API for retrieving service providers for Neutron advanced services"
- },
- {
- "updated": "2012-10-05T10:00:00-00:00",
- "name": "security-group",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/securitygroups/api/v2.0",
- "alias": "security-group",
- "description": "The security groups extension."
- },
- {
- "updated": "2013-02-07T10:00:00-00:00",
- "name": "Loadbalancer Agent Scheduler",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/lbaas_agent_scheduler/api/v1.0",
- "alias": "lbaas_agent_scheduler",
- "description": "Schedule pools among lbaas agents"
- },
- {
- "updated": "2013-02-25T10:00:00-00:00",
- "name": "Firewall service",
- "links": [],
- "namespace": "http://wiki.openstack.org/Neutron/FWaaS/API_1.0",
- "alias": "fwaas",
- "description": "Extension for Firewall service"
- },
- {
- "updated": "2014-02-03T10:00:00-00:00",
- "name": "Port Binding",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/binding/api/v1.0",
- "alias": "binding",
- "description": "Expose port bindings of a virtual port to external application"
- },
- {
- "updated": "2012-07-29T10:00:00-00:00",
- "name": "Quota management support",
- "links": [],
- "namespace": "http://docs.openstack.org/network/ext/quotas-sets/api/v2.0",
- "alias": "quotas",
- "description": "Expose functions for quotas management per tenant"
- },
- {
- "updated": "2014-01-01T10:00:00-00:00",
- "name": "Nuage security-group",
- "links": [],
- "namespace": "http://nuagenetworks.net/ext/secgroup/api/v1.0",
- "alias": "nuage-security-group",
- "description": "Nuage security-group"
- },
- {
- "updated": "2014-01-01T10:00:00-00:00",
- "name": "Nuage router",
- "links": [],
- "namespace": "http://nuagenetworks.net/ext/routers/api/v1.0",
- "alias": "nuage-router",
- "description": "Nuage Router"
- },
- {
- "updated": "2013-01-14T10:00:00-00:00",
- "name": "Neutron external network",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/external_net/api/v1.0",
- "alias": "external-net",
- "description": "Adds external network attribute to network resource."
- },
- {
- "updated": "2012-07-20T10:00:00-00:00",
- "name": "Neutron L3 Router",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/router/api/v1.0",
- "alias": "router",
- "description": "Router abstraction for basic L3 forwarding between L2 Neutron networks and access to external networks via a NAT gateway."
- },
- {
- "updated": "2014-01-01T10:00:00-00:00",
- "name": "Nuage subnet",
- "links": [],
- "namespace": "http://nuagenetworks.net/ext/subnets/api/v1.0",
- "alias": "nuage-subnet",
- "description": "Nuage subnet"
- },
- {
- "updated": "2013-05-29T10:00:00-00:00",
- "name": "VPN service",
- "links": [],
- "namespace": "https://wiki.openstack.org/Neutron/VPNaaS",
- "alias": "vpnaas",
- "description": "Extension for VPN service"
- },
- {
- "updated": "2014-01-01T10:00:00-00:00",
- "name": "NetPartition",
- "links": [],
- "namespace": "http://nuagenetworks.net/ext/net_partition/api/v1.0",
- "alias": "net-partition",
- "description": "NetPartition"
- },
- {
- "updated": "2012-10-07T10:00:00-00:00",
- "name": "LoadBalancing service",
- "links": [],
- "namespace": "http://wiki.openstack.org/neutron/LBaaS/API_1.0",
- "alias": "lbaas",
- "description": "Extension for LoadBalancing service"
- },
- {
- "updated": "2013-02-01T10:00:00-00:00",
- "name": "Neutron Extra Route",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/extraroutes/api/v1.0",
- "alias": "extraroute",
- "description": "Extra routes configuration for L3 router"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/extension_list_with_lbaas_v1_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/extension_list_with_lbaas_v1_response.json b/openstack-neutron/src/test/resources/extension_list_with_lbaas_v1_response.json
deleted file mode 100644
index 9f85e1e..0000000
--- a/openstack-neutron/src/test/resources/extension_list_with_lbaas_v1_response.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
- "extensions": [
- {
- "updated": "2013-01-20T00:00:00-00:00",
- "name": "Neutron Service Type Management",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/service-type/api/v1.0",
- "alias": "service-type",
- "description": "API for retrieving service providers for Neutron advanced services"
- },
- {
- "updated": "2012-10-05T10:00:00-00:00",
- "name": "security-group",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/securitygroups/api/v2.0",
- "alias": "security-group",
- "description": "The security groups extension."
- },
- {
- "updated": "2013-02-07T10:00:00-00:00",
- "name": "L3 Agent Scheduler",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/l3_agent_scheduler/api/v1.0",
- "alias": "l3_agent_scheduler",
- "description": "Schedule routers among l3 agents"
- },
- {
- "updated": "2013-02-07T10:00:00-00:00",
- "name": "Loadbalancer Agent Scheduler",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/lbaas_agent_scheduler/api/v1.0",
- "alias": "lbaas_agent_scheduler",
- "description": "Schedule pools among lbaas agents"
- },
- {
- "updated": "2013-03-28T10:00:00-00:00",
- "name": "Neutron L3 Configurable external gateway mode",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/ext-gw-mode/api/v1.0",
- "alias": "ext-gw-mode",
- "description": "Extension of the router abstraction for specifying whether SNAT should occur on the external gateway"
- },
- {
- "updated": "2014-02-03T10:00:00-00:00",
- "name": "Port Binding",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/binding/api/v1.0",
- "alias": "binding",
- "description": "Expose port bindings of a virtual port to external application"
- },
- {
- "updated": "2012-09-07T10:00:00-00:00",
- "name": "Provider Network",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/provider/api/v1.0",
- "alias": "provider",
- "description": "Expose mapping of virtual networks to physical networks"
- },
- {
- "updated": "2013-02-03T10:00:00-00:00",
- "name": "agent",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/agent/api/v2.0",
- "alias": "agent",
- "description": "The agent management extension."
- },
- {
- "updated": "2012-07-29T10:00:00-00:00",
- "name": "Quota management support",
- "links": [],
- "namespace": "http://docs.openstack.org/network/ext/quotas-sets/api/v2.0",
- "alias": "quotas",
- "description": "Expose functions for quotas management per tenant"
- },
- {
- "updated": "2013-02-07T10:00:00-00:00",
- "name": "DHCP Agent Scheduler",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/dhcp_agent_scheduler/api/v1.0",
- "alias": "dhcp_agent_scheduler",
- "description": "Schedule networks among dhcp agents"
- },
- {
- "updated": "2013-06-27T10:00:00-00:00",
- "name": "Multi Provider Network",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/multi-provider/api/v1.0",
- "alias": "multi-provider",
- "description": "Expose mapping of virtual networks to multiple physical networks"
- },
- {
- "updated": "2013-01-14T10:00:00-00:00",
- "name": "Neutron external network",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/external_net/api/v1.0",
- "alias": "external-net",
- "description": "Adds external network attribute to network resource."
- },
- {
- "updated": "2012-07-20T10:00:00-00:00",
- "name": "Neutron L3 Router",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/router/api/v1.0",
- "alias": "router",
- "description": "Router abstraction for basic L3 forwarding between L2 Neutron networks and access to external networks via a NAT gateway."
- },
- {
- "updated": "2013-07-23T10:00:00-00:00",
- "name": "Allowed Address Pairs",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/allowedaddresspairs/api/v2.0",
- "alias": "allowed-address-pairs",
- "description": "Provides allowed address pairs"
- },
- {
- "updated": "2013-03-17T12:00:00-00:00",
- "name": "Neutron Extra DHCP opts",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/extra_dhcp_opt/api/v1.0",
- "alias": "extra_dhcp_opt",
- "description": "Extra options configuration for DHCP. For example PXE boot options to DHCP clients can be specified (e.g. tftp-server, server-ip-address, bootfile-name)"
- },
- {
- "updated": "2012-10-07T10:00:00-00:00",
- "name": "LoadBalancing service",
- "links": [],
- "namespace": "http://wiki.openstack.org/neutron/LBaaS/API_1.0",
- "alias": "lbaas",
- "description": "Extension for LoadBalancing service"
- },
- {
- "updated": "2013-02-01T10:00:00-00:00",
- "name": "Neutron Extra Route",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/extraroutes/api/v1.0",
- "alias": "extraroute",
- "description": "Extra routes configuration for L3 router"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/extension_list_without_lbaas_v1_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/extension_list_without_lbaas_v1_response.json b/openstack-neutron/src/test/resources/extension_list_without_lbaas_v1_response.json
deleted file mode 100644
index 7f4a7c1..0000000
--- a/openstack-neutron/src/test/resources/extension_list_without_lbaas_v1_response.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
- "extensions": [
- {
- "updated": "2013-01-20T00:00:00-00:00",
- "name": "Neutron Service Type Management",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/service-type/api/v1.0",
- "alias": "service-type",
- "description": "API for retrieving service providers for Neutron advanced services"
- },
- {
- "updated": "2012-10-05T10:00:00-00:00",
- "name": "security-group",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/securitygroups/api/v2.0",
- "alias": "security-group",
- "description": "The security groups extension."
- },
- {
- "updated": "2013-02-07T10:00:00-00:00",
- "name": "L3 Agent Scheduler",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/l3_agent_scheduler/api/v1.0",
- "alias": "l3_agent_scheduler",
- "description": "Schedule routers among l3 agents"
- },
- {
- "updated": "2013-02-07T10:00:00-00:00",
- "name": "Loadbalancer Agent Scheduler",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/lbaas_agent_scheduler/api/v1.0",
- "alias": "lbaas_agent_scheduler",
- "description": "Schedule pools among lbaas agents"
- },
- {
- "updated": "2013-03-28T10:00:00-00:00",
- "name": "Neutron L3 Configurable external gateway mode",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/ext-gw-mode/api/v1.0",
- "alias": "ext-gw-mode",
- "description": "Extension of the router abstraction for specifying whether SNAT should occur on the external gateway"
- },
- {
- "updated": "2014-02-03T10:00:00-00:00",
- "name": "Port Binding",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/binding/api/v1.0",
- "alias": "binding",
- "description": "Expose port bindings of a virtual port to external application"
- },
- {
- "updated": "2012-09-07T10:00:00-00:00",
- "name": "Provider Network",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/provider/api/v1.0",
- "alias": "provider",
- "description": "Expose mapping of virtual networks to physical networks"
- },
- {
- "updated": "2013-02-03T10:00:00-00:00",
- "name": "agent",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/agent/api/v2.0",
- "alias": "agent",
- "description": "The agent management extension."
- },
- {
- "updated": "2012-07-29T10:00:00-00:00",
- "name": "Quota management support",
- "links": [],
- "namespace": "http://docs.openstack.org/network/ext/quotas-sets/api/v2.0",
- "alias": "quotas",
- "description": "Expose functions for quotas management per tenant"
- },
- {
- "updated": "2013-02-07T10:00:00-00:00",
- "name": "DHCP Agent Scheduler",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/dhcp_agent_scheduler/api/v1.0",
- "alias": "dhcp_agent_scheduler",
- "description": "Schedule networks among dhcp agents"
- },
- {
- "updated": "2013-06-27T10:00:00-00:00",
- "name": "Multi Provider Network",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/multi-provider/api/v1.0",
- "alias": "multi-provider",
- "description": "Expose mapping of virtual networks to multiple physical networks"
- },
- {
- "updated": "2013-01-14T10:00:00-00:00",
- "name": "Neutron external network",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/external_net/api/v1.0",
- "alias": "external-net",
- "description": "Adds external network attribute to network resource."
- },
- {
- "updated": "2012-07-20T10:00:00-00:00",
- "name": "Neutron L3 Router",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/router/api/v1.0",
- "alias": "router",
- "description": "Router abstraction for basic L3 forwarding between L2 Neutron networks and access to external networks via a NAT gateway."
- },
- {
- "updated": "2013-07-23T10:00:00-00:00",
- "name": "Allowed Address Pairs",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/allowedaddresspairs/api/v2.0",
- "alias": "allowed-address-pairs",
- "description": "Provides allowed address pairs"
- },
- {
- "updated": "2013-03-17T12:00:00-00:00",
- "name": "Neutron Extra DHCP opts",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/extra_dhcp_opt/api/v1.0",
- "alias": "extra_dhcp_opt",
- "description": "Extra options configuration for DHCP. For example PXE boot options to DHCP clients can be specified (e.g. tftp-server, server-ip-address, bootfile-name)"
- },
- {
- "updated": "2013-02-01T10:00:00-00:00",
- "name": "Neutron Extra Route",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/neutron/extraroutes/api/v1.0",
- "alias": "extraroute",
- "description": "Extra routes configuration for L3 router"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_create_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_create_request.json b/openstack-neutron/src/test/resources/firewall_create_request.json
deleted file mode 100644
index 7a7a5e7..0000000
--- a/openstack-neutron/src/test/resources/firewall_create_request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "firewall": {
- "admin_state_up": true,
- "firewall_policy_id": "c69933c1-b472-44f9-8226-30dc4ffd454c"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_create_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_create_response.json b/openstack-neutron/src/test/resources/firewall_create_response.json
deleted file mode 100644
index 0433a76..0000000
--- a/openstack-neutron/src/test/resources/firewall_create_response.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "firewall": {
- "admin_state_up": true,
- "description": "",
- "firewall_policy_id": "c69933c1-b472-44f9-8226-30dc4ffd454c",
- "id": "3b0ef8f4-82c7-44d4-a4fb-6177f9a21977",
- "name": "",
- "status": "PENDING_CREATE",
- "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_get_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_get_response.json b/openstack-neutron/src/test/resources/firewall_get_response.json
deleted file mode 100644
index 14425e1..0000000
--- a/openstack-neutron/src/test/resources/firewall_get_response.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "firewall": {
- "admin_state_up": true,
- "description": "",
- "firewall_policy_id": "c69933c1-b472-44f9-8226-30dc4ffd454c",
- "id": "3b0ef8f4-82c7-44d4-a4fb-6177f9a21977",
- "name": "",
- "status": "ACTIVE",
- "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_list_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_list_response.json b/openstack-neutron/src/test/resources/firewall_list_response.json
deleted file mode 100644
index 9881360..0000000
--- a/openstack-neutron/src/test/resources/firewall_list_response.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "firewalls": [
- {
- "status": "ACTIVE",
- "name": "fw",
- "admin_state_up": true,
- "tenant_id": "3e00d5716204446c8d3c47a466eec25a",
- "firewall_policy_id": "5083ef0d-7ad2-4305-acd8-bd036c332e1e",
- "id": "5eb708e7-3856-449a-99ac-fec27cd745f9",
- "description": ""
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_policy_create_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_policy_create_request.json b/openstack-neutron/src/test/resources/firewall_policy_create_request.json
deleted file mode 100644
index d5d417d..0000000
--- a/openstack-neutron/src/test/resources/firewall_policy_create_request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "firewall_policy": {
- "name": "jclouds-fw-policy_group-52-e8b",
- "shared": false,
- "firewall_rules": [],
- "audited": false
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_policy_create_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_policy_create_response.json b/openstack-neutron/src/test/resources/firewall_policy_create_response.json
deleted file mode 100644
index 8e3dd37..0000000
--- a/openstack-neutron/src/test/resources/firewall_policy_create_response.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "firewall_policy": {
- "name": "jclouds-fw-policy_group-52-e8b",
- "firewall_rules": [],
- "tenant_id": "3e00d5716204446c8d3c47a466eec25a",
- "audited": false,
- "shared": false,
- "id": "12971159-95cf-4ca1-9baa-c82298ae0918",
- "description": ""
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_policy_get_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_policy_get_response.json b/openstack-neutron/src/test/resources/firewall_policy_get_response.json
deleted file mode 100644
index 9ee2a17..0000000
--- a/openstack-neutron/src/test/resources/firewall_policy_get_response.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "firewall_policy": {
- "name": "myfirewallrule",
- "firewall_rules": [
- "3e5a4e53-4390-4b22-baea-75529dbeafb8",
- "4e58f636-1ef1-4e8e-b3ad-5f7f9d1f9f23"
- ],
- "tenant_id": "e1defcdd823741c89afd5824040deed2",
- "audited": false,
- "shared": true,
- "id": "18d2f4e5-afdd-4c10-87ea-d35f38faf98c",
- "description": ""
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_policy_insert_rule_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_policy_insert_rule_request.json b/openstack-neutron/src/test/resources/firewall_policy_insert_rule_request.json
deleted file mode 100644
index eba7d52..0000000
--- a/openstack-neutron/src/test/resources/firewall_policy_insert_rule_request.json
+++ /dev/null
@@ -1 +0,0 @@
-{"firewall_rule_id": "59585143-e819-48c9-944d-f03e0f049dba"}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_policy_insert_rule_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_policy_insert_rule_response.json b/openstack-neutron/src/test/resources/firewall_policy_insert_rule_response.json
deleted file mode 100644
index 9f58f20..0000000
--- a/openstack-neutron/src/test/resources/firewall_policy_insert_rule_response.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "name": "jclouds-fw-policy_group-52-e8b",
- "firewall_rules": ["59585143-e819-48c9-944d-f03e0f049dba"],
- "shared": false,
- "audited": false,
- "tenant_id": "3e00d5716204446c8d3c47a466eec25a",
- "id": "12971159-95cf-4ca1-9baa-c82298ae0918",
- "firewall_list": [],
- "description": ""
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_policy_list_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_policy_list_response.json b/openstack-neutron/src/test/resources/firewall_policy_list_response.json
deleted file mode 100644
index ecf2e3d..0000000
--- a/openstack-neutron/src/test/resources/firewall_policy_list_response.json
+++ /dev/null
@@ -1,255 +0,0 @@
-{
- "firewall_policies": [
- {
- "name": "myfirewallrule",
- "firewall_rules": [
- "3e5a4e53-4390-4b22-baea-75529dbeafb8",
- "4e58f636-1ef1-4e8e-b3ad-5f7f9d1f9f23"
- ],
- "tenant_id": "e1defcdd823741c89afd5824040deed2",
- "audited": false,
- "shared": true,
- "id": "18d2f4e5-afdd-4c10-87ea-d35f38faf98c",
- "description": ""
- },
- {
- "name": "Policy SBT",
- "firewall_rules": [],
- "tenant_id": "ba6ba03f266e4ccfb07d2372bc8d68a2",
- "audited": false,
- "shared": true,
- "id": "31d6368b-3d8b-49a1-af5d-901283223801",
- "description": ""
- },
- {
- "name": "FW-POLICY-DEMO",
- "firewall_rules": [
- "e434b562-c33f-4d64-84da-adfaaa94630e",
- "03a3d9d7-eb92-49c4-83c1-a479ec37d87b",
- "1086d52d-2323-434d-a1e8-ade5791fb5ac",
- "7240cdf3-a8da-4006-90e2-9191d998fee0",
- "eec4cdbe-859f-45c5-9acb-1935056af1e4",
- "a18ee08e-9d5d-4c9e-9372-c4b8f71c6c75",
- "7aefe7f9-01f6-4387-900e-177684e3c59d",
- "b6017900-7811-4428-9940-a02033042c88",
- "94129848-4eb8-4c8e-9164-cd8ee60faa49",
- "e0649a2b-a327-45ed-a3a0-f068cb3fcf37",
- "53f5bf0a-05e3-4a30-800b-611151a9685d",
- "e07558b1-5e18-4d2d-a79b-0a95f36d1715",
- "43931a28-513d-4cbb-80fa-464bf49df65f",
- "79572a32-fda4-4f2c-bdad-bb11a08af9ed"
- ],
- "tenant_id": "cfb5b69938dc49f19f192eabf62a32e6",
- "audited": false,
- "shared": true,
- "id": "4c0743e4-0361-4ed0-a6ce-2a8959d978a9",
- "description": ""
- },
- {
- "name": "fw-policy",
- "firewall_rules": [
- "3c51d308-1c5c-4776-b4ac-6d3c9ebd5685",
- "e614f597-4eb2-457a-a102-5b9ad2beba42",
- "e908239c-2b40-4afa-8ec3-9c4b437367da",
- "1ae9b906-9250-4f8c-a262-b0fe6e7b1680",
- "daa2ee3c-760c-4c67-81a8-e61a310366f1",
- "1bd356b4-d0b0-4a86-a5a3-3245ac838960",
- "e72605a4-f866-4cfe-9962-6577c4a87a4d"
- ],
- "tenant_id": "3e00d5716204446c8d3c47a466eec25a",
- "audited": false,
- "shared": false,
- "id": "5083ef0d-7ad2-4305-acd8-bd036c332e1e",
- "description": ""
- },
- {
- "name": "PolicyOfTheVoid",
- "firewall_rules": [],
- "tenant_id": "85c79b517ef6431881c9477d2227be5f",
- "audited": true,
- "shared": true,
- "id": "60779a72-21bd-4b97-a587-cd5fb8b8e7c0",
- "description": ""
- },
- {
- "name": "Policy",
- "firewall_rules": [
- "2b6646ea-a0d8-4982-b3e2-e14ad2743428",
- "21a42289-b05c-4271-9f06-1172b88c8465",
- "7b998345-1660-428f-969d-bfcdb4c0dbaf",
- "8996fcfd-b88d-4b68-bff7-5fb07fc0088a",
- "55b96a08-f868-45fd-9386-1fd831b7b63b",
- "df5aaeb6-50d7-4344-9f00-f973d5e28185",
- "bc23bcb1-1a81-4658-b72d-485da3af8a8a"
- ],
- "tenant_id": "ccef3550ec724607a8024977b3b4e410",
- "audited": false,
- "shared": true,
- "id": "63337440-d0ad-4a3c-9e26-777a6e360119",
- "description": "Ping + SSH"
- },
- {
- "name": "allow_all",
- "firewall_rules": ["d52ea23a-9911-44ef-815b-f3b4b6b0df64"],
- "tenant_id": "53b1ed26b8874556bc7141f9482fd789",
- "audited": false,
- "shared": true,
- "id": "6e3d5d6d-1356-43eb-91ef-d6f70888632d",
- "description": "Allow All"
- },
- {
- "name": "Politique Production",
- "firewall_rules": [
- "a6f58b76-5c90-4530-908c-cc7dbd945a4b",
- "3521380b-624c-42a1-8415-992b52a9dfec",
- "fbcf3060-bd0c-4cd9-b4b1-cf3c76b7fe7d",
- "45aecaba-a659-490a-8f12-92adfda79c15",
- "5cfc4e09-a765-4f4e-93d5-8a9650f051f8",
- "304ff502-eb6f-46b5-8110-c75a483c23e0",
- "1662f0bb-a9a6-415a-b1a7-19ba113d7a52",
- "8bbd0490-452c-4bee-a70f-213558e0bc65",
- "e39fcf85-bea2-49fa-8a8e-c69c5f2e29ae",
- "1bbdd6ba-9ae8-4cd3-8815-ef992c56cb63",
- "100e638c-77cf-4f1e-8194-5a26171f645a",
- "91b8316c-96ae-41da-9c14-42e1f778c0a8"
- ],
- "tenant_id": "13a12b25d3cf4275905e2a6b9878a619",
- "audited": false,
- "shared": true,
- "id": "89d7ef67-4cb8-485f-83ac-14085e616137",
- "description": ""
- },
- {
- "name": "any-shared",
- "firewall_rules": ["b35ab1c6-309d-4690-b16c-0343a535651c"],
- "tenant_id": "3fdcdc95fc88431597700dbb20be37c6",
- "audited": false,
- "shared": true,
- "id": "a0a3a1b1-d985-4507-b785-311f8e981fa6",
- "description": ""
- },
- {
- "name": "production",
- "firewall_rules": ["5dbe3498-b230-4b34-9915-7bcc22bed99c"],
- "tenant_id": "94eb5f2fd9ed471992e2c5c2313b0703",
- "audited": false,
- "shared": true,
- "id": "a23d0af2-3124-49cf-ae04-02c175eda549",
- "description": "production"
- },
- {
- "name": "PolProdStdDmz1",
- "firewall_rules": [
- "3178c9f6-f017-462b-b93f-715e11247c30",
- "2b775a98-9813-48e0-8f32-a04dfc176872",
- "a5a7e990-fbe4-429b-a55c-35df087b6f80",
- "6ca67373-b89e-492d-94c6-1c40765800ce",
- "bf93dda9-6f42-42cf-852f-689b6facf5b4",
- "e3bd91ee-1337-4d73-9484-836a0fb5869b"
- ],
- "tenant_id": "3345a933109049779647ff02ca498f3a",
- "audited": false,
- "shared": true,
- "id": "afc19c5c-d136-4dbf-b614-c0b784a4f68d",
- "description": ""
- },
- {
- "name": "ALL",
- "firewall_rules": [
- "43bfdc83-5f76-407d-b851-5803d4e23f0b",
- "316965f2-4242-4c56-8e34-22f4ff1992a3",
- "1fb6cbde-4446-4bef-9eac-cc6b76afc565",
- "a3da3767-608d-493d-b15a-1793d66891c8",
- "6f58413b-3667-41f6-93b4-eef813632aee",
- "a28bdf75-894f-4af5-9063-e2fcee4cb01d",
- "0ed005c7-2d89-43a1-8aaf-714d44858173",
- "710e513c-df2b-4c78-8572-bd9701f5b108",
- "016922c5-7810-41cb-ae2c-04bbd87b3b24",
- "22d6ade0-0f0d-473a-9cec-4b5ba22db8e4",
- "7ed0e62c-848d-4e4e-baa7-eea7e9c3c3ec",
- "05a34244-0922-4a6d-b551-c95c500f2194",
- "9d40ac55-0802-4590-aa89-8199dab7038f",
- "3d1f3c70-44e1-4c6e-9253-53421976d707",
- "4d22985f-ad50-459d-af00-eea902900e41",
- "dd16596d-065d-4a3a-bb75-054ab7acf54f",
- "33228008-6dba-4270-9c55-3d8752472795",
- "46ea5a1c-8b4b-4eaf-b9c2-767efa8bc2ae",
- "3b3c3136-d914-46ae-ace3-726f638ed1d5",
- "2c3f8fce-3d05-405a-8249-1d3843b8a62d",
- "23106a5d-556e-4e78-af13-1d0c9280b2e2",
- "40e342d6-86fc-4205-b306-e9dcd816b958",
- "bf290614-8ab0-487f-811f-4474a51a40d3",
- "08b91c69-310d-4d55-bea1-ffe0d95e150b",
- "8e9509ff-93cb-442d-92c6-1cfb79b9243c",
- "019bd1b9-2f2b-4cfa-b645-6eb779d4622e",
- "4f7fd6e2-7ac5-4a46-8e3d-c4dcdde8a3f0",
- "4fd8fc8b-c449-457d-8526-6ba23f6f299d",
- "e2a96758-70ba-499c-bd97-6d8ee55610ed",
- "ade798f5-862a-442b-8168-f39a06030535"
- ],
- "tenant_id": "b6e174b62a964db7bf897a38b92fc217",
- "audited": false,
- "shared": true,
- "id": "e0f918c2-7a10-45d1-a5f9-9b2a2026bf3e",
- "description": ""
- },
- {
- "name": "Pre-Prod",
- "firewall_rules": [
- "fd124f42-f064-4259-b840-1ca05203c6b7",
- "f03bd950-6c56-4f5e-a307-45967078f507"
- ],
- "tenant_id": "80cf934d6ffb4ef5b244f1c512ad1e61",
- "audited": false,
- "shared": true,
- "id": "e2a5fb51-698c-4898-87e8-f1eee6b50919",
- "description": ""
- },
- {
- "name": "ports VM ouverts",
- "firewall_rules": ["c5535724-8ed8-4e50-933a-17e37b06994d"],
- "tenant_id": "66165eac36f846099ab3f667f0c05229",
- "audited": false,
- "shared": true,
- "id": "e5b8e392-1e70-4948-a6a4-b3726b528059",
- "description": "ouverture de tous les ports du projet stagiaires"
- },
- {
- "name": "www",
- "firewall_rules": [
- "75452b36-268e-4e75-aaf4-f0e7ed50bc97",
- "c9e77ca0-1bc8-497d-904d-948107873dc6",
- "67004fb6-9111-441f-a3c1-b94b08bbd496",
- "80965cc0-2d60-48e8-8fe9-78be016f10b6",
- "41c72886-f39d-450e-b4b5-818ebddf17d5",
- "c854fab5-bdaf-4a86-9359-78de93e5df01",
- "350288f9-4aea-4e13-b434-91141e5e5960",
- "03d2a6ad-633f-431a-8463-4370d06a22c8"
- ],
- "tenant_id": "9145d91459d248b1b02fdaca97c6a75d",
- "audited": false,
- "shared": true,
- "id": "f2b08c1e-aa81-4668-8ae1-1401bcb0576c",
- "description": ""
- },
- {
- "name": "fw-policy",
- "firewall_rules": [
- "32ea5280-b601-4531-903f-ddef6dd1b733",
- "f6f39ac3-0bda-47ff-b8b9-f089a5440e19",
- "dad47cfb-893f-4d7c-8e40-c7a86bcda175",
- "1d089edc-ae35-4c60-b6af-79b69e2f3247",
- "eac689d5-ce70-4d4a-bf43-5d1416ebb770",
- "3c1318de-e095-4870-a2ec-3091fee81683",
- "beb6249b-5e98-4c25-a356-d45f5b0cae29",
- "b4b2362e-0d16-42ef-b8e4-9de56ca00c84",
- "72c159d0-4777-4468-9136-543ba42d18f0"
- ],
- "tenant_id": "94eb5f2fd9ed471992e2c5c2313b0703",
- "audited": false,
- "shared": true,
- "id": "f66e862e-9982-465e-a5af-79d61ca9c6eb",
- "description": ""
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_rule_create_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_rule_create_request.json b/openstack-neutron/src/test/resources/firewall_rule_create_request.json
deleted file mode 100644
index 5dcacfe..0000000
--- a/openstack-neutron/src/test/resources/firewall_rule_create_request.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "firewall_rule": {
- "tenant_id": "3e00d5716204446c8d3c47a466eec25a",
- "name": "jclouds-fw-rule_group-52-e8b_port-22",
- "shared": false,
- "protocol": "tcp",
- "destination_ip_address": "192.168.0.117",
- "destination_port": "22",
- "action": "allow",
- "enabled": true
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_rule_create_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_rule_create_response.json b/openstack-neutron/src/test/resources/firewall_rule_create_response.json
deleted file mode 100644
index eb835f2..0000000
--- a/openstack-neutron/src/test/resources/firewall_rule_create_response.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "firewall_rule": {
- "protocol": "tcp",
- "description": "",
- "source_port": null,
- "source_ip_address": null,
- "destination_ip_address": "192.168.0.117",
- "firewall_policy_id": null,
- "position": null,
- "destination_port": "22",
- "id": "59585143-e819-48c9-944d-f03e0f049dba",
- "name": "jclouds-fw-rule_group-52-e8b_port-22",
- "tenant_id": "3e00d5716204446c8d3c47a466eec25a",
- "enabled": true,
- "action": "allow",
- "ip_version": 4,
- "shared": false
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_rule_get_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_rule_get_response.json b/openstack-neutron/src/test/resources/firewall_rule_get_response.json
deleted file mode 100644
index 860d6b1..0000000
--- a/openstack-neutron/src/test/resources/firewall_rule_get_response.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "firewall_rule": {
- "protocol": "tcp",
- "description": "jclouds test fw rule",
- "source_port": null,
- "source_ip_address": null,
- "destination_ip_address": "192.168.0.1",
- "firewall_policy_id": null,
- "position": null,
- "destination_port": "22",
- "id": "736b1686-3301-4a3d-9eaf-15e3c2682edc",
- "name": "jclouds-test-org.jclouds.openstack.neutron.v2.extensions.fwaasapilivetest-fw-rule-22",
- "tenant_id": "3e00d5716204446c8d3c47a466eec25a",
- "enabled": true,
- "action": "allow",
- "ip_version": 4,
- "shared": false
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_rule_update_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_rule_update_request.json b/openstack-neutron/src/test/resources/firewall_rule_update_request.json
deleted file mode 100644
index 9850b8b..0000000
--- a/openstack-neutron/src/test/resources/firewall_rule_update_request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "firewall_rule": {
- "shared": false,
- "enabled": false
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_rule_update_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_rule_update_response.json b/openstack-neutron/src/test/resources/firewall_rule_update_response.json
deleted file mode 100644
index 0ba9c1f..0000000
--- a/openstack-neutron/src/test/resources/firewall_rule_update_response.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "firewall_rule": {
- "protocol": "tcp",
- "description": "jclouds test fw rule",
- "source_port": null,
- "source_ip_address": null,
- "destination_ip_address": "192.168.0.1",
- "firewall_policy_id": null,
- "position": null,
- "destination_port": "22",
- "id": "736b1686-3301-4a3d-9eaf-15e3c2682edc",
- "name": "jclouds-test-org.jclouds.openstack.neutron.v2.extensions.fwaasapilivetest-fw-rule-22-updated",
- "tenant_id": "3e00d5716204446c8d3c47a466eec25a",
- "enabled": false,
- "action": "allow",
- "ip_version": 4,
- "shared": false
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_update_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_update_request.json b/openstack-neutron/src/test/resources/firewall_update_request.json
deleted file mode 100644
index 58021f7..0000000
--- a/openstack-neutron/src/test/resources/firewall_update_request.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "firewall": {
- "admin_state_up": false
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/firewall_update_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/firewall_update_response.json b/openstack-neutron/src/test/resources/firewall_update_response.json
deleted file mode 100644
index cc9635f..0000000
--- a/openstack-neutron/src/test/resources/firewall_update_response.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "firewall": {
- "admin_state_up": false,
- "description": "",
- "firewall_policy_id": "c69933c1-b472-44f9-8226-30dc4ffd454c",
- "id": "3b0ef8f4-82c7-44d4-a4fb-6177f9a21977",
- "name": "",
- "status": "PENDING_UPDATE",
- "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/floatingip_create_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/floatingip_create_request.json b/openstack-neutron/src/test/resources/floatingip_create_request.json
deleted file mode 100644
index 72ed72f..0000000
--- a/openstack-neutron/src/test/resources/floatingip_create_request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "floatingip": {
- "floating_network_id": "376da547-b977-4cfe-9cba-275c80debf57",
- "port_id": "ce705c24-c1ef-408a-bda3-7bbd946164ab"
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/floatingip_create_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/floatingip_create_response.json b/openstack-neutron/src/test/resources/floatingip_create_response.json
deleted file mode 100644
index 4dbb82c..0000000
--- a/openstack-neutron/src/test/resources/floatingip_create_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.3",
- "floating_ip_address": "172.24.4.228",
- "port_id": "ce705c24-c1ef-408a-bda3-7bbd946164ab",
- "id": "2f245a7b-796b-4f26-9cf9-9e82d248fda7"
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/floatingip_get_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/floatingip_get_response.json b/openstack-neutron/src/test/resources/floatingip_get_response.json
deleted file mode 100644
index 4dbb82c..0000000
--- a/openstack-neutron/src/test/resources/floatingip_get_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.3",
- "floating_ip_address": "172.24.4.228",
- "port_id": "ce705c24-c1ef-408a-bda3-7bbd946164ab",
- "id": "2f245a7b-796b-4f26-9cf9-9e82d248fda7"
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/floatingip_list_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/floatingip_list_response.json b/openstack-neutron/src/test/resources/floatingip_list_response.json
deleted file mode 100644
index 6b41bf9..0000000
--- a/openstack-neutron/src/test/resources/floatingip_list_response.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "floatingips": [
- {
- "router_id": "d23abc8d-2991-4a55-ba98-2aaea84cc72f",
- "tenant_id": "4969c491a3c74ee4af974e6d800c62de",
- "floating_network_id": "376da547-b977-4cfe-9cba-275c80debf57",
- "fixed_ip_address": "10.0.0.3",
- "floating_ip_address": "172.24.4.228",
- "port_id": "ce705c24-c1ef-408a-bda3-7bbd946164ab",
- "id": "2f245a7b-796b-4f26-9cf9-9e82d248fda7"
- },
- {
- "router_id": null,
- "tenant_id": "4969c491a3c74ee4af974e6d800c62de",
- "floating_network_id": "376da547-b977-4cfe-9cba-275c80debf57",
- "fixed_ip_address": null,
- "floating_ip_address": "172.24.4.227",
- "port_id": null,
- "id": "61cea855-49cb-4846-997d-801b70c71bdd"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/floatingip_list_response_paged1.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/floatingip_list_response_paged1.json b/openstack-neutron/src/test/resources/floatingip_list_response_paged1.json
deleted file mode 100644
index 7b809f8..0000000
--- a/openstack-neutron/src/test/resources/floatingip_list_response_paged1.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "floatingips": [
- {
- "router_id": "d23abc8d-2991-4a55-ba98-2aaea84cc72f",
- "tenant_id": "4969c491a3c74ee4af974e6d800c62de",
- "floating_network_id": "376da547-b977-4cfe-9cba-275c80debf57",
- "fixed_ip_address": "10.0.0.3",
- "floating_ip_address": "172.24.4.228",
- "port_id": "ce705c24-c1ef-408a-bda3-7bbd946164ab",
- "id": "2f245a7b-796b-4f26-9cf9-9e82d248fda7"
- },
- {
- "router_id": null,
- "tenant_id": "4969c491a3c74ee4af974e6d800c62de",
- "floating_network_id": "376da547-b977-4cfe-9cba-275c80debf57",
- "fixed_ip_address": null,
- "floating_ip_address": "172.24.4.227",
- "port_id": null,
- "id": "61cea855-49cb-4846-997d-801b70c71bdd"
- }
- ],
- "floatingips_links": [
- {
- "href": "/v2.0/floatingips.json?marker=71c1e68c-171a-4aa2-aca5-50ea153a3718",
- "rel": "next"
- },
- {
- "href": "/v2.0/floatingips.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/floatingip_list_response_paged2.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/floatingip_list_response_paged2.json b/openstack-neutron/src/test/resources/floatingip_list_response_paged2.json
deleted file mode 100644
index 9ca8cd2..0000000
--- a/openstack-neutron/src/test/resources/floatingip_list_response_paged2.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "floatingips": [
- {
- "router_id": "d23abc8d-2991-4a55-ba98-2aaea84cc72f2",
- "tenant_id": "4969c491a3c74ee4af974e6d800c62de2",
- "floating_network_id": "376da547-b977-4cfe-9cba-275c80debf572",
- "fixed_ip_address": "10.0.0.3",
- "floating_ip_address": "172.24.4.228",
- "port_id": "ce705c24-c1ef-408a-bda3-7bbd946164ab2",
- "id": "2f245a7b-796b-4f26-9cf9-9e82d248fda72"
- },
- {
- "router_id": null,
- "tenant_id": "4969c491a3c74ee4af974e6d800c62de2",
- "floating_network_id": "376da547-b977-4cfe-9cba-275c80debf572",
- "fixed_ip_address": null,
- "floating_ip_address": "172.24.4.227",
- "port_id": null,
- "id": "61cea855-49cb-4846-997d-801b70c71bdd2"
- }
- ],
- "floatingips_links": [
- {
- "href": "/v2.0/floatingips.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/floatingip_update_dissociate_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/floatingip_update_dissociate_request.json b/openstack-neutron/src/test/resources/floatingip_update_dissociate_request.json
deleted file mode 100644
index a45f500..0000000
--- a/openstack-neutron/src/test/resources/floatingip_update_dissociate_request.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "floatingip": {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/floatingip_update_dissociate_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/floatingip_update_dissociate_response.json b/openstack-neutron/src/test/resources/floatingip_update_dissociate_response.json
deleted file mode 100644
index 5515a22..0000000
--- a/openstack-neutron/src/test/resources/floatingip_update_dissociate_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": null,
- "floating_ip_address": "172.24.4.228",
- "port_id": null,
- "id": "2f245a7b-796b-4f26-9cf9-9e82d248fda7"
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/floatingip_update_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/floatingip_update_request.json b/openstack-neutron/src/test/resources/floatingip_update_request.json
deleted file mode 100644
index 2772b5a..0000000
--- a/openstack-neutron/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/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/floatingip_update_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/floatingip_update_response.json b/openstack-neutron/src/test/resources/floatingip_update_response.json
deleted file mode 100644
index 59c8a68..0000000
--- a/openstack-neutron/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/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_create_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_create_request.json b/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_create_request.json
deleted file mode 100644
index 7d3b6a4..0000000
--- a/openstack-neutron/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/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_create_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_create_response.json b/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_create_response.json
deleted file mode 100644
index 1a0dbce..0000000
--- a/openstack-neutron/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/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_get_response.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_get_response.json b/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_get_response.json
deleted file mode 100644
index fc162dc..0000000
--- a/openstack-neutron/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/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_list_response_paged1.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_list_response_paged1.json b/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_list_response_paged1.json
deleted file mode 100644
index 3856187..0000000
--- a/openstack-neutron/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/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_list_response_paged2.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_list_response_paged2.json b/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_list_response_paged2.json
deleted file mode 100644
index 703b123..0000000
--- a/openstack-neutron/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/jclouds-labs-openstack/blob/35142182/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_update_request.json
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_update_request.json b/openstack-neutron/src/test/resources/lbaas/v1/health_monitor_update_request.json
deleted file mode 100644
index cfb9c2e..0000000
--- a/openstack-neutron/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
- }
-}