You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by de...@apache.org on 2016/02/06 01:02:59 UTC
[1/3] jclouds-labs-openstack git commit: JCLOUDS-691: Remove 404
fallbacks of PUT and POST calls from OpenStack APIs
Repository: jclouds-labs-openstack
Updated Branches:
refs/heads/master 3b490162a -> 167312fb4
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/ExtensionApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/ExtensionApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/ExtensionApiMockTest.java
index e0b6e1c..a929881 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/ExtensionApiMockTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/ExtensionApiMockTest.java
@@ -18,8 +18,6 @@ package org.jclouds.openstack.neutron.v2.features;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
import java.util.Set;
@@ -67,33 +65,6 @@ public class ExtensionApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListExtensionsIsEmpty() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- ExtensionApi api = neutronApi.getExtensionApi("RegionOne");
-
- Set<Extension> extensions = api.list();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/extensions");
-
- /*
- * Check response
- */
- assertTrue(extensions.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testGetExtensionByAlias() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -122,31 +93,4 @@ public class ExtensionApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetExtensionByAliasFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
-
- Extension routerExtension = neutronApi.getExtensionApi("RegionOne").get("router");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/extensions/router");
-
- /*
- * Check response
- */
- assertNull(routerExtension);
- } finally {
- server.shutdown();
- }
-
- }
-
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/NetworkApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/NetworkApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/NetworkApiMockTest.java
index 5de307e..95e3f4c 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/NetworkApiMockTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/NetworkApiMockTest.java
@@ -20,6 +20,7 @@ import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
+
import org.jclouds.openstack.neutron.v2.NeutronApi;
import org.jclouds.openstack.neutron.v2.domain.Network;
import org.jclouds.openstack.neutron.v2.domain.NetworkStatus;
@@ -27,7 +28,6 @@ import org.jclouds.openstack.neutron.v2.domain.NetworkType;
import org.jclouds.openstack.neutron.v2.domain.Networks;
import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest;
import org.jclouds.openstack.v2_0.options.PaginationOptions;
-import org.jclouds.rest.ResourceNotFoundException;
import org.testng.annotations.Test;
import java.io.IOException;
@@ -35,9 +35,7 @@ import java.net.URISyntaxException;
import java.util.List;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
/**
@@ -82,26 +80,6 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateNetworkFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/network_create_response.json"))));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- NetworkApi api = neutronApi.getNetworkApi("RegionOne");
-
- Network.CreateNetwork createNetwork = Network.createBuilder("jclouds-wibble")
- .networkType(NetworkType.LOCAL)
- .build();
-
- Network network = api.create(createNetwork);
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPageNetwork() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -191,35 +169,6 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListPagedNetworkFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/network_list_response_paged1.json"))));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- NetworkApi api = neutronApi.getNetworkApi("RegionOne");
-
- // Note: Lazy! Have to actually look at the collection.
- List<Network> networks = api.list().concat().toList();
-
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/networks");
-
- /*
- * Check response
- */
- assertTrue(networks.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testGetNetwork() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -249,33 +198,6 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetNetworkFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- NetworkApi api = neutronApi.getNetworkApi("RegionOne");
-
- Network network = api.get("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/networks/12345");
-
- /*
- * Check response
- */
- assertNull(network);
- } finally {
- server.shutdown();
- }
- }
-
public void testCreateNetworkBulk() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -322,30 +244,6 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateNetworkBulkFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- NetworkApi api = neutronApi.getNetworkApi("RegionOne");
-
- Network.CreateNetwork createNetwork1 = Network.createBuilder("jclouds-wibble")
- .networkType(NetworkType.LOCAL)
- .build();
-
- Network.CreateNetwork createNetwork2 = Network.createBuilder("jclouds-wibble2")
- .networkType(NetworkType.LOCAL)
- .build();
-
- FluentIterable<Network> networks = api.createBulk(ImmutableList.of(createNetwork1, createNetwork2));
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateNetwork() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -379,37 +277,6 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdateNetworkFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- NetworkApi api = neutronApi.getNetworkApi("RegionOne");
-
- Network.UpdateNetwork updateNetwork = Network.updateBuilder()
- .name("jclouds-wibble-updated")
- .networkType(NetworkType.LOCAL)
- .build();
-
- Network network = api.update("123456", updateNetwork);
-
- /*
- * Check request
- */
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/networks/123456");
-
- /*
- * Check response
- */
- assertNull(network);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteNetwork() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -436,29 +303,4 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDeleteNetworkFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- NetworkApi api = neutronApi.getNetworkApi("RegionOne");
-
- boolean result = api.delete("123456");
-
- /*
- * Check request
- */
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/networks/123456");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java
index 8b4797d..a8932c7 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java
@@ -17,9 +17,7 @@
package org.jclouds.openstack.neutron.v2.features;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import java.io.IOException;
@@ -36,7 +34,6 @@ import org.jclouds.openstack.neutron.v2.domain.VIFType;
import org.jclouds.openstack.neutron.v2.domain.VNICType;
import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest;
import org.jclouds.openstack.v2_0.options.PaginationOptions;
-import org.jclouds.rest.ResourceNotFoundException;
import org.testng.annotations.Test;
import com.google.common.collect.FluentIterable;
@@ -98,30 +95,6 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreatePortFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- PortApi api = neutronApi.getPortApi("RegionOne");
-
- Port.CreatePort createPort = Port.createBuilder("6aeaf34a-c482-4bd3-9dc3-7faf36412f12")
- .name("port1")
- .adminStateUp(Boolean.TRUE)
- .deviceId("d6b4d3a5-c700-476f-b609-1493dd9dadc0")
- .allowedAddressPairs(ImmutableSet.of(AddressPair.builder("12", "111.222.333.444").build()))
- .build();
-
- Port port = api.create(createPort);
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPagePort() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -150,32 +123,6 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListSpecificPagePortFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- PortApi api = neutronApi.getPortApi("RegionOne");
-
- Ports ports = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
-
- /*
- * Check request
- */
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/ports?limit=2&marker=abcdefg");
-
- /*
- * Check response
- */
- assertTrue(ports.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testListPagedPort() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -209,34 +156,6 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListPagedPortFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- PortApi api = neutronApi.getPortApi("RegionOne");
-
- // Note: Lazy! Have to actually look at the collection.
- List<Port> ports = api.list().concat().toList();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/ports");
-
- /*
- * Check response
- */
- assertTrue(ports.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testCreateBulkPort() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -281,37 +200,6 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateBulkPortFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- PortApi api = neutronApi.getPortApi("RegionOne");
-
- Port.CreatePort createPort1 = Port.createBuilder("64239a54-dcc4-4b39-920b-b37c2144effa")
- .name("port1")
- .adminStateUp(Boolean.TRUE)
- .deviceId("24df1d04-d5cb-41e1-8de5-61ed77c558df")
- .securityGroups(ImmutableSet.of("dbc107f4-afcd-4d5a-9352-f68f82241d5b"))
- .build();
-
- Port.CreatePort createPort2 = Port.createBuilder("e6031bc2-901a-4c66-82da-f4c32ed89406")
- .name("port2")
- .adminStateUp(Boolean.FALSE)
- .securityGroups(
- ImmutableSet.of("8bf3f7cc-8471-40b1-815f-9da47e79775b", "dbc107f4-afcd-4d5a-9352-f68f82241d5b"))
- .build();
-
- FluentIterable<Port> ports = api.createBulk(ImmutableList.of(createPort1, createPort2));
- } finally {
- server.shutdown();
- }
- }
-
public void testGetPort() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -348,33 +236,6 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetPortFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- PortApi api = neutronApi.getPortApi("RegionOne");
-
- Port port = api.get("12345");
-
- /*
- * Check request
- */
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/ports/12345");
-
- /*
- * Check response
- */
- assertNull(port);
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdatePort() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -408,37 +269,6 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdatePortFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- PortApi api = neutronApi.getPortApi("RegionOne");
-
- Port.UpdatePort updatePort = Port.updateBuilder()
- .securityGroups(ImmutableSet.of("85cc3048-abc3-43cc-89b3-377341426ac5", "c5ab5c29-2c99-44cb-a4b8-e70a88b77799"))
- .build();
-
- Port port = api.update("12345", updatePort);
-
- /*
- * Check request
- */
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/ports/12345", "/port_update_request.json");
-
- /*
- * Check response
- */
- assertNull(port);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeletePort() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -465,29 +295,4 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDeletePortFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- PortApi api = neutronApi.getPortApi("RegionOne");
-
- boolean result = api.delete("12345");
-
- /*
- * Check request
- */
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/ports/12345");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/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
index bfe3d12..036bad7 100644
--- 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
@@ -17,9 +17,7 @@
package org.jclouds.openstack.neutron.v2.features;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import java.io.IOException;
@@ -32,7 +30,6 @@ 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.jclouds.rest.ResourceNotFoundException;
import org.testng.annotations.Test;
import com.google.common.collect.FluentIterable;
@@ -83,27 +80,6 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateSubnetFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SubnetApi api = neutronApi.getSubnetApi("RegionOne");
-
- Subnet.CreateSubnet createSubnet = Subnet.createBuilder("1234567890", "cidr")
- .name("jclouds-wibble")
- .ipVersion(4)
- .build();
-
- Subnet subnet = api.create(createSubnet);
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPageSubnet() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -131,32 +107,6 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListSpecificPageSubnetFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- 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
- */
- assertTrue(subnets.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testListPagedSubnet() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -190,34 +140,6 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListPagedSubnetFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- 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(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/subnets");
-
- /*
- * Check response
- */
- assertTrue(subnets.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testGetSubnet() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -249,33 +171,6 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetSubnetFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- 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
- */
- assertNull(subnet);
- } finally {
- server.shutdown();
- }
- }
-
public void testCreateBulkSubnet() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -324,32 +219,6 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateBulkSubnetFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- 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));
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateSubnet() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -385,38 +254,6 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdateSubnetFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- 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
- */
- assertNull(subnet);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteSubnet() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -444,30 +281,4 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDeleteSubnetFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- 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
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/features/ServiceApi.java
----------------------------------------------------------------------
diff --git a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/features/ServiceApi.java b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/features/ServiceApi.java
index 6ed062a..dfc86de 100644
--- a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/features/ServiceApi.java
+++ b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/features/ServiceApi.java
@@ -114,7 +114,6 @@ public interface ServiceApi {
@POST
@ResponseParser(ParseServiceURIFromHeaders.class)
@Produces(MediaType.APPLICATION_JSON)
- @Nullable
URI create(@BinderParam(BindToJsonPayload.class) CreateService createService);
/**
@@ -144,7 +143,6 @@ public interface ServiceApi {
@Path("/{id}")
@ResponseParser(ParseServiceURIFromHeaders.class)
@MapBinder(JSONPatchUpdate.class)
- @Nullable
URI update(@PathParam("id") String id, @PayloadParam("service") Service service, @PayloadParam("updateService") UpdateService updateService);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java
index f634386..d487a19 100644
--- a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java
+++ b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java
@@ -20,7 +20,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
-import static org.testng.AssertJUnit.assertFalse;
import java.io.IOException;
import java.net.URI;
@@ -117,28 +116,6 @@ public class ServiceApiMockTest extends BasePoppyApiMockTest {
}
}
- public void testGetServiceFailOn404() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- PoppyApi poppyApi = api(server.getUrl("/").toString(), "openstack-poppy", overrides);
- ServiceApi api = poppyApi.getServiceApi();
-
- Service oneService = api.get("unknown");
-
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/services/unknown");
-
- assertThat(oneService).isNull();
-
- } finally {
- server.shutdown();
- }
- }
-
public void testListPagedService() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -174,34 +151,6 @@ public class ServiceApiMockTest extends BasePoppyApiMockTest {
}
}
- public void testListPagedServiceFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/poppy_service_list_response_paged1.json"))));
-
- try {
- PoppyApi poppyApi = api(server.getUrl("/").toString(), "openstack-poppy", overrides);
- ServiceApi api = poppyApi.getServiceApi();
-
- // Note: Lazy! Have to actually look at the collection.
- List<Service> services = api.list().concat().toList();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", "/v1.0/123123/services");
-
- /*
- * Check response
- */
- assertTrue(services.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPageService() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -229,32 +178,6 @@ public class ServiceApiMockTest extends BasePoppyApiMockTest {
}
}
- public void testListSpecificPageServiceFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/poppy_service_list_response_paged1.json"))));
-
- try {
- PoppyApi poppyApi = api(server.getUrl("/").toString(), "openstack-poppy", overrides);
- ServiceApi api = poppyApi.getServiceApi();
-
- PaginatedCollection<Service> services = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
-
- /*
- * Check request
- */
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", "/v1.0/123123/services?limit=2&marker=abcdefg");
-
- /*
- * Check response
- */
- assertTrue(services.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testPatchService() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -306,28 +229,6 @@ public class ServiceApiMockTest extends BasePoppyApiMockTest {
}
}
- public void testDeleteServiceFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- PoppyApi poppyApi = api(server.getUrl("/").toString(), "openstack-poppy", overrides);
- ServiceApi api = poppyApi.getServiceApi();
-
- boolean result = api.delete("96737ae3-cfc1-4c72-be88-5d0e7cc9a3f0");
-
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "DELETE", BASE_URI + "/services/96737ae3-cfc1-4c72-be88-5d0e7cc9a3f0");
-
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteServiceAsset() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -351,29 +252,6 @@ public class ServiceApiMockTest extends BasePoppyApiMockTest {
}
}
- public void testDeleteServiceAssetFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- PoppyApi poppyApi = api(server.getUrl("/").toString(), "openstack-poppy", overrides);
- ServiceApi api = poppyApi.getServiceApi();
-
- boolean result = api.deleteAsset("96737ae3-cfc1-4c72-be88-5d0e7cc9a3f0", "/images/1.jpg");
-
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "DELETE",
- BASE_URI + "/services/96737ae3-cfc1-4c72-be88-5d0e7cc9a3f0/assets?url=/images/1.jpg");
-
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteAllServiceAssets() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -397,26 +275,4 @@ public class ServiceApiMockTest extends BasePoppyApiMockTest {
}
}
- public void testDeleteAllServiceAssetsFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- PoppyApi poppyApi = api(server.getUrl("/").toString(), "openstack-poppy", overrides);
- ServiceApi api = poppyApi.getServiceApi();
-
- boolean result = api.deleteAssets("96737ae3-cfc1-4c72-be88-5d0e7cc9a3f0");
-
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "DELETE",
- BASE_URI + "/services/96737ae3-cfc1-4c72-be88-5d0e7cc9a3f0/assets?all=true");
-
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
}
[3/3] jclouds-labs-openstack git commit: JCLOUDS-691: Remove 404
fallbacks of PUT and POST calls from OpenStack APIs
Posted by de...@apache.org.
JCLOUDS-691: Remove 404 fallbacks of PUT and POST calls from OpenStack APIs
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/167312fb
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/167312fb
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/167312fb
Branch: refs/heads/master
Commit: 167312fb41997b9add33e409f542fc4a4dcd22cd
Parents: 3b49016
Author: Reijhanniel Jearl Campos <de...@gmail.com>
Authored: Fri Feb 5 09:06:55 2016 +0800
Committer: Reijhanniel Jearl Campos <de...@apache.org>
Committed: Sat Feb 6 08:02:16 2016 +0800
----------------------------------------------------------------------
.../v1_0/features/ImageApiExpectTest.java | 175 -----
.../heat/v1/features/ResourceApiMockTest.java | 26 -
.../heat/v1/features/StackApiMockTest.java | 202 -----
.../heat/v1/features/TemplateApiMockTest.java | 40 -
.../openstack/marconi/v1/features/ClaimApi.java | 5 +-
.../marconi/v1/features/MessageApi.java | 2 -
.../openstack/marconi/v1/features/QueueApi.java | 6 +-
.../marconi/v1/features/ClaimApiLiveTest.java | 9 +-
.../marconi/v1/features/ClaimApiMockTest.java | 4 +-
.../marconi/v1/features/MessageApiLiveTest.java | 4 +-
.../marconi/v1/features/QueueApiLiveTest.java | 12 +-
.../marconi/v1/features/QueueApiMockTest.java | 68 +-
.../neutron/v2/extensions/FWaaSApi.java | 7 -
.../neutron/v2/extensions/FloatingIPApi.java | 2 -
.../neutron/v2/extensions/RouterApi.java | 6 -
.../v2/extensions/lbaas/v1/LBaaSApi.java | 8 -
.../neutron/v2/features/NetworkApi.java | 2 -
.../openstack/neutron/v2/features/PortApi.java | 1 -
.../neutron/v2/features/SubnetApi.java | 1 -
.../neutron/v2/extensions/FWaaSApiMockTest.java | 418 +----------
.../v2/extensions/FloatingIPApiMockTest.java | 179 -----
.../v2/extensions/RouterApiMockTest.java | 303 --------
.../v2/extensions/SecurityGroupApiMockTest.java | 298 --------
.../extensions/lbaas/v1/LBaaSApiMockTest.java | 742 +------------------
.../v2/features/ExtensionApiMockTest.java | 56 --
.../neutron/v2/features/NetworkApiMockTest.java | 160 +---
.../neutron/v2/features/PortApiMockTest.java | 195 -----
.../neutron/v2/features/SubnetApiMockTest.java | 189 -----
.../openstack/poppy/v1/features/ServiceApi.java | 2 -
.../poppy/v1/features/ServiceApiMockTest.java | 144 ----
30 files changed, 20 insertions(+), 3246 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
----------------------------------------------------------------------
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
index acc9c5e..dddfca4 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
@@ -18,8 +18,6 @@ package org.jclouds.openstack.glance.v1_0.features;
import static org.jclouds.openstack.glance.v1_0.options.CreateImageOptions.Builder.copyFrom;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import javax.ws.rs.core.MediaType;
@@ -35,8 +33,6 @@ import org.jclouds.openstack.glance.v1_0.options.UpdateImageOptions;
import org.jclouds.openstack.glance.v1_0.parse.ParseImageDetailsTest;
import org.jclouds.openstack.glance.v1_0.parse.ParseImagesInDetailTest;
import org.jclouds.openstack.glance.v1_0.parse.ParseImagesTest;
-import org.jclouds.rest.AuthorizationException;
-import org.jclouds.rest.ResourceNotFoundException;
import org.jclouds.util.Strings2;
import org.testng.annotations.Test;
@@ -65,21 +61,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
new ParseImagesTest().expected().toString());
}
- public void testListWhenReponseIs404IsEmpty() throws Exception {
- HttpRequest list = HttpRequest.builder().method("GET")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images")
- .addHeader("Accept", "application/json")
- .addHeader("X-Auth-Token", authToken).build();
-
- HttpResponse listResponse = HttpResponse.builder().statusCode(404).build();
-
- GlanceApi apiWhenNoExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- list, listResponse);
-
- assertTrue(apiWhenNoExist.getImageApi("az-1.region-a.geo-1").list().concat().isEmpty());
- }
-
public void testListInDetailWhenResponseIs2xx() throws Exception {
HttpRequest listInDetail = HttpRequest.builder().method("GET")
.endpoint("https://glance.jclouds.org:9292/v1.0/images/detail")
@@ -99,21 +80,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
new ParseImagesInDetailTest().expected().toString());
}
- public void testListInDetailWhenReponseIs404IsEmpty() throws Exception {
- HttpRequest listInDetail = HttpRequest.builder().method("GET")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images/detail")
- .addHeader("Accept", "application/json")
- .addHeader("X-Auth-Token", authToken).build();
-
- HttpResponse listInDetailResponse = HttpResponse.builder().statusCode(404).build();
-
- GlanceApi apiWhenNoExistInDetail = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- listInDetail, listInDetailResponse);
-
- assertTrue(apiWhenNoExistInDetail.getImageApi("az-1.region-a.geo-1").listInDetail().concat().isEmpty());
- }
-
public void testShowWhenResponseIs2xx() throws Exception {
HttpRequest show = HttpRequest.builder().method("HEAD")
.endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
@@ -132,23 +98,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
new ParseImageDetailsFromHeadersTest().expected().toString());
}
- public void testShowWhenReponseIs404IsNull() throws Exception {
- HttpRequest show = HttpRequest.builder().method("HEAD")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
- .addHeader("Accept", MediaType.APPLICATION_JSON)
- .addHeader("X-Auth-Token", authToken).build();
-
-
- HttpResponse showResponse = HttpResponse.builder().statusCode(404).build();
-
- GlanceApi apiWhenNoExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- show, showResponse);
-
- assertNull(apiWhenNoExist.getImageApi("az-1.region-a.geo-1").get("fcc451d0-f6e4-4824-ad8f-70ec12326d07"));
- }
-
-
public void testGetAsStreamWhenResponseIs2xx() throws Exception {
HttpRequest get = HttpRequest.builder().method("GET")
.endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
@@ -167,21 +116,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
"foo");
}
- public void testGetAsStreamWhenReponseIs404IsNull() throws Exception {
- HttpRequest get = HttpRequest.builder().method("GET")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
- .addHeader("Accept", MediaType.APPLICATION_JSON)
- .addHeader("X-Auth-Token", authToken).build();
-
- HttpResponse getResponse = HttpResponse.builder().statusCode(404).build();
-
- GlanceApi apiWhenNoExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- get, getResponse);
-
- assertNull(apiWhenNoExist.getImageApi("az-1.region-a.geo-1").getAsStream("fcc451d0-f6e4-4824-ad8f-70ec12326d07"));
- }
-
public void testCreateWhenResponseIs2xx() throws Exception {
HttpRequest get = HttpRequest.builder().method("POST")
.endpoint("https://glance.jclouds.org:9292/v1.0/images")
@@ -203,27 +137,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
new ParseImageDetailsTest().expected());
}
- @Test(expectedExceptions = AuthorizationException.class)
- public void testCreateWhenResponseIs4xx() throws Exception {
- HttpRequest get = HttpRequest.builder().method("POST")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images")
- .addHeader("x-image-meta-name", "test")
- .addHeader("Accept", MediaType.APPLICATION_JSON)
- .addHeader("X-Auth-Token", authToken)
- .payload(payloadFromStringWithContentType("somedata", MediaType.APPLICATION_OCTET_STREAM)).build();
-
- HttpResponse createResponse = HttpResponse.builder().statusCode(403)
- .payload(payloadFromResource("/image.json")).build();
-
- GlanceApi apiWhenExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- get, createResponse);
-
- assertEquals(apiWhenExist.getConfiguredRegions(), ImmutableSet.of("az-1.region-a.geo-1"));
-
- apiWhenExist.getImageApi("az-1.region-a.geo-1").create("test", new StringPayload("somedata"));
- }
-
public void testImageCreateCopyFrom() throws Exception {
HttpRequest get = HttpRequest.builder().method("POST")
.endpoint("https://glance.jclouds.org:9292/v1.0/images")
@@ -265,26 +178,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
assertEquals(apiWhenExist.getImageApi("az-1.region-a.geo-1").reserve("test"), new ParseImageDetailsTest().expected());
}
- @Test(expectedExceptions = AuthorizationException.class)
- public void testReserveWhenResponseIs4xx() throws Exception {
- HttpRequest get = HttpRequest.builder().method("POST")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images")
- .addHeader("x-image-meta-name", "test")
- .addHeader("Accept", MediaType.APPLICATION_JSON)
- .addHeader("X-Auth-Token", authToken).build();
-
- HttpResponse createResponse = HttpResponse.builder().statusCode(403)
- .payload(payloadFromResource("/image.json")).build();
-
- GlanceApi apiWhenExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- get, createResponse);
-
- assertEquals(apiWhenExist.getConfiguredRegions(), ImmutableSet.of("az-1.region-a.geo-1"));
-
- apiWhenExist.getImageApi("az-1.region-a.geo-1").reserve("test");
- }
-
public void testUpdateMetadataWhenResponseIs2xx() throws Exception {
HttpRequest get = HttpRequest.builder().method("PUT")
.endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
@@ -322,32 +215,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
new ParseImageDetailsTest().expected());
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testUpdateMetadataWhenResponseIs4xx() throws Exception {
- HttpRequest get = HttpRequest.builder().method("PUT")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
- .headers(
- ImmutableMultimap.<String, String>builder()
- .put("Accept", MediaType.APPLICATION_JSON)
- .put("X-Image-Meta-Name", "newname")
- .put("X-Image-Meta-Is_public", "true")
- .put("X-Auth-Token", authToken).build())
- .build();
-
- HttpResponse updateResponse = HttpResponse.builder().statusCode(404).build();
-
- GlanceApi apiWhenExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- get, updateResponse);
-
- assertEquals(apiWhenExist.getConfiguredRegions(), ImmutableSet.of("az-1.region-a.geo-1"));
-
- apiWhenExist.getImageApi("az-1.region-a.geo-1")
- .update("fcc451d0-f6e4-4824-ad8f-70ec12326d07",
- UpdateImageOptions.Builder.name("newname"),
- UpdateImageOptions.Builder.isPublic(true));
- }
-
public void testUpdateImageWhenResponseIs2xx() throws Exception {
HttpRequest get = HttpRequest.builder().method("PUT")
.endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
@@ -395,30 +262,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
new StringPayload("somenewdata"), UpdateImageOptions.Builder.name("anothernewname")), new ParseImageDetailsTest().expected());
}
- @Test(expectedExceptions = AuthorizationException.class)
- public void testUpdateNameAndImageWhenResponseIs4xx() throws Exception {
- HttpRequest get = HttpRequest.builder().method("PUT")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
- .headers(
- ImmutableMultimap.<String, String>builder()
- .put("Accept", MediaType.APPLICATION_JSON)
- .put("X-Image-Meta-Name", "anothernewname")
- .put("X-Auth-Token", authToken).build())
- .payload(payloadFromStringWithContentType("somenewdata", MediaType.APPLICATION_OCTET_STREAM))
- .build();
-
- HttpResponse updateResponse = HttpResponse.builder().statusCode(403).build();
-
- GlanceApi apiWhenExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- get, updateResponse);
-
- assertEquals(apiWhenExist.getConfiguredRegions(), ImmutableSet.of("az-1.region-a.geo-1"));
-
- apiWhenExist.getImageApi("az-1.region-a.geo-1").upload("fcc451d0-f6e4-4824-ad8f-70ec12326d07",
- new StringPayload("somenewdata"), UpdateImageOptions.Builder.name("anothernewname"));
- }
-
public void testDeleteWhenResponseIs2xx() throws Exception {
HttpRequest get = HttpRequest.builder().method("DELETE")
.endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
@@ -435,22 +278,4 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
assertTrue(apiWhenExist.getImageApi("az-1.region-a.geo-1").delete("fcc451d0-f6e4-4824-ad8f-70ec12326d07"));
}
-
- public void testDeleteWhenResponseIs4xx() throws Exception {
- HttpRequest get = HttpRequest.builder().method("DELETE")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
- .addHeader("Accept", MediaType.APPLICATION_JSON)
- .addHeader("X-Auth-Token", authToken).build();
-
-
- HttpResponse getResponse = HttpResponse.builder().statusCode(404).build();
-
- GlanceApi apiWhenExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- get, getResponse);
-
- assertEquals(apiWhenExist.getConfiguredRegions(), ImmutableSet.of("az-1.region-a.geo-1"));
-
- assertFalse(apiWhenExist.getImageApi("az-1.region-a.geo-1").delete("fcc451d0-f6e4-4824-ad8f-70ec12326d07"));
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/ResourceApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/ResourceApiMockTest.java b/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/ResourceApiMockTest.java
index 47e4c52..984ace8 100644
--- a/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/ResourceApiMockTest.java
+++ b/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/ResourceApiMockTest.java
@@ -63,30 +63,4 @@ public class ResourceApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testListTypesIsEmpty() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- ResourceApi api = heatApi.getResourceApi("RegionOne");
-
- List<String> resourceTypes = api.listTypes();
-
- /*
- * Check request
- */
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/resource_types");
-
- /*
- * Check response
- */
- assertThat(resourceTypes).isEmpty();
- } finally {
- server.shutdown();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/StackApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/StackApiMockTest.java b/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/StackApiMockTest.java
index 2695d5a..d7c2897 100644
--- a/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/StackApiMockTest.java
+++ b/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/StackApiMockTest.java
@@ -18,8 +18,6 @@ package org.jclouds.openstack.heat.v1.features;
import static org.assertj.core.api.Assertions.assertThat;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import java.io.IOException;
@@ -74,28 +72,6 @@ public class StackApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testGetStackFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- Stack stack = api.get("Non_Existing_Stack", "Non-Existing-Stack");
-
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks/Non_Existing_Stack/Non-Existing-Stack");
-
- assertNull(stack);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testGeStackWithIDOnly() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -119,51 +95,6 @@ public class StackApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testGetStackWithIDOnlyFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- Stack stack = api.get("Non-Existing-Stack");
-
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks/Non-Existing-Stack");
-
- assertNull(stack);
-
- } finally {
- server.shutdown();
- }
- }
-
- public void testGetStackResourceFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- StackResource stackResource = api.getStackResource(TEST_STACK_NAME, TEST_STACK_ID, "Non_Existing_Stack_resource");
-
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks/" + TEST_STACK_NAME + "/" + TEST_STACK_ID + "/resources/Non_Existing_Stack_resource");
-
- assertNull(stackResource);
-
- } finally {
- server.shutdown();
- }
- }
-
-
public void testList() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -291,88 +222,6 @@ public class StackApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testListIsEmpty() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- List<Stack> stacks = api.list();
-
- /*
- * Check request
- */
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks");
-
- /*
- * Check response
- */
- assertThat(stacks).isEmpty();
- } finally {
- server.shutdown();
- }
- }
-
- public void testListWithOptionsIsEmpty() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- ListStackOptions options = ListStackOptions.Builder.name("Stack_dont_exist");
- List<Stack> stacks = api.list(options);
-
- /*
- * Check request
- */
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks?name=Stack_dont_exist");
-
- /*
- * Check response
- */
- assertThat(stacks).isEmpty();
- } finally {
- server.shutdown();
- }
- }
-
- public void testListStackResourceIsEmpty() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- List<StackResource> stackResources = api.listStackResources("empty_stack", "empty_stack_id");
-
- /*
- * Check request
- */
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks/empty_stack/empty_stack_id/resources");
-
- /*
- * Check response
- */
- assertThat(stackResources).isEmpty();
- } finally {
- server.shutdown();
- }
- }
-
public void testCreateWithTemplateUrl() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -434,33 +283,6 @@ public class StackApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testDeleteReturnFalseOn404Stack() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- boolean result = api.delete("Non-Existing-Stack-Name", "Non-Existing-Stack-ID");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "DELETE", BASE_URI + "/stacks/Non-Existing-Stack-Name/Non-Existing-Stack-ID");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateStack() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -516,29 +338,5 @@ public class StackApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testResourcesMetadataReturnNullOn404() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- Map<String, Object> metadata = api.getStackResourceMetadata(TEST_STACK_NAME, TEST_STACK_ID, "Stack_Resource_dont_exist");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks/" + TEST_STACK_NAME + "/" + TEST_STACK_ID + "/resources/Stack_Resource_dont_exist/metadata");
- assertThat(metadata).isEmpty();
-
-
- } finally {
- server.shutdown();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/TemplateApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/TemplateApiMockTest.java b/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/TemplateApiMockTest.java
index a8d8e12..ec7ee87 100644
--- a/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/TemplateApiMockTest.java
+++ b/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/TemplateApiMockTest.java
@@ -18,12 +18,10 @@ package org.jclouds.openstack.heat.v1.features;
import static org.assertj.core.api.Assertions.assertThat;
import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
import org.jclouds.openstack.heat.v1.HeatApi;
import org.jclouds.openstack.heat.v1.domain.Template;
import org.jclouds.openstack.heat.v1.internal.BaseHeatApiMockTest;
-import org.jclouds.rest.ResourceNotFoundException;
import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
@@ -59,27 +57,6 @@ public class TemplateApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testGetTemplateFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404).setBody(stringFromResource("/template_get_response.json"))));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- TemplateApi api = heatApi.getTemplateApi("RegionOne");
-
- Template template = api.get("simple_stack", "3095aefc-09fb-4bc7-b1f0-f21a304e864c");
-
- assertNull(template);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET",
- BASE_URI + "/stacks/simple_stack/3095aefc-09fb-4bc7-b1f0-f21a304e864c/template");
- } finally {
- server.shutdown();
- }
- }
-
public void testValidateTemplate() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -105,22 +82,5 @@ public class TemplateApiMockTest extends BaseHeatApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testValidateTemplateFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404).setBody(stringFromResource("/template_validate_response.json"))));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- TemplateApi api = heatApi.getTemplateApi("RegionOne");
-
- Template template = api.validate("https://examplevalidateurl.com/exampletemplate.json");
-
- } finally {
- server.shutdown();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java
index 1afe47f..8bf93f1 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java
@@ -29,7 +29,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
-import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404;
import org.jclouds.Fallbacks.FalseOnNotFoundOr404;
import org.jclouds.Fallbacks.NullOnNotFoundOr404;
import org.jclouds.javax.annotation.Nullable;
@@ -90,7 +89,6 @@ public interface ClaimApi {
@POST
@Payload("%7B\"ttl\":{ttl},\"grace\":{grace}%7D")
@ResponseParser(ParseMessagesToList.class)
- @Fallback(EmptyListOnNotFoundOr404.class)
List<Message> claim(@PayloadParam("ttl") int ttl, @PayloadParam("grace") int grace, @QueryParam("limit") int limit);
/**
@@ -121,8 +119,7 @@ public interface ClaimApi {
@Path("/{claim_id}")
@Produces(MediaType.APPLICATION_JSON)
@Payload("%7B\"ttl\":{ttl}%7D")
- @Fallback(FalseOnNotFoundOr404.class)
- boolean update(@PathParam("claim_id") String claimId, @PayloadParam("ttl") int ttl);
+ void update(@PathParam("claim_id") String claimId, @PayloadParam("ttl") int ttl);
/**
* This operation immediately releases a claim, making any remaining, undeleted messages that are associated with
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java
index 1e648a7..5eb070e 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java
@@ -68,8 +68,6 @@ public interface MessageApi {
@Named("message:create")
@POST
@ResponseParser(ParseMessagesCreated.class)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
MessagesCreated create(@BinderParam(BindToJsonPayload.class) List<CreateMessage> messages);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
index ec59bbe..f8c60e6 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
@@ -66,8 +66,7 @@ public interface QueueApi {
@Named("queue:create")
@PUT
@Path("/{name}")
- @Fallback(FalseOnNotFoundOr404.class)
- boolean create(@PathParam("name") String name);
+ void create(@PathParam("name") String name);
/**
* Delete a queue.
@@ -130,8 +129,7 @@ public interface QueueApi {
@PUT
@Path("/{name}/metadata")
@Produces(MediaType.APPLICATION_JSON)
- @Fallback(FalseOnNotFoundOr404.class)
- boolean setMetadata(@PathParam("name") String name,
+ void setMetadata(@PathParam("name") String name,
@BinderParam(BindToJsonPayload.class) Map<String, String> metadata);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java
index a7fd8e9..083e3f3 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java
@@ -43,9 +43,7 @@ public class ClaimApiLiveTest extends BaseMarconiApiLiveTest {
public void createQueues() throws Exception {
for (String regionId : regions) {
QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
- boolean success = queueApi.create("jclouds-test");
-
- assertTrue(success);
+ queueApi.create("jclouds-test");
}
}
@@ -112,10 +110,7 @@ public class ClaimApiLiveTest extends BaseMarconiApiLiveTest {
public void updateClaim() throws Exception {
for (String regionId : regions) {
ClaimApi claimApi = api.getClaimApi(regionId, CLIENT_ID, "jclouds-test");
-
- boolean success = claimApi.update(claimIds.get(regionId).get(0), 400);
-
- assertTrue(success);
+ claimApi.update(claimIds.get(regionId).get(0), 400);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
index b4f6200..dcd1df2 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
@@ -112,9 +112,7 @@ public class ClaimApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
ClaimApi claimApi = api.getClaimApi("DFW", CLIENT_ID, "jclouds-test");
- boolean success = claimApi.update("52a8d23eb04a584f1bbd4f47", 400);
-
- assertTrue(success);
+ claimApi.update("52a8d23eb04a584f1bbd4f47", 400);
assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
index d0f64a2..b0c8378 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
@@ -48,9 +48,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
public void createQueues() throws Exception {
for (String regionId : regions) {
QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
- boolean success = queueApi.create("jclouds-test");
-
- assertTrue(success);
+ queueApi.create("jclouds-test");
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
index 36a1d40..c33110c 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
@@ -54,9 +54,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
for (int i = 0; i < 6; i++) {
- boolean success = queueApi.create("jclouds-test-" + i);
-
- assertTrue(success);
+ queueApi.create("jclouds-test-" + i);
}
}
}
@@ -82,9 +80,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
for (int i = 6; i < 12; i++) {
- boolean success = queueApi.create("jclouds-test-" + i);
-
- assertTrue(success);
+ queueApi.create("jclouds-test-" + i);
}
}
}
@@ -139,9 +135,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
for (String regionId : regions) {
QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
Map<String, String> metadata = ImmutableMap.of("key1", "value1");
- boolean success = queueApi.setMetadata("jclouds-test-1", metadata);
-
- assertTrue(success);
+ queueApi.setMetadata("jclouds-test-1", metadata);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
index e84b534..102774c 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
@@ -16,17 +16,16 @@
*/
package org.jclouds.openstack.marconi.v1.features;
-import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
+
import org.jclouds.openstack.marconi.v1.MarconiApi;
import org.jclouds.openstack.marconi.v1.domain.Queue;
import org.jclouds.openstack.marconi.v1.domain.QueueStats;
import org.jclouds.openstack.marconi.v1.domain.Queues;
-import org.jclouds.openstack.marconi.v1.options.ListQueuesOptions;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
import org.testng.annotations.Test;
@@ -53,9 +52,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
- boolean success = queueApi.create("jclouds-test");
-
- assertTrue(success);
+ queueApi.create("jclouds-test");
assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
@@ -108,27 +105,6 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
}
}
- public void doesNotExistQueue() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(new MockResponse().setBody(accessRackspace));
- server.enqueue(new MockResponse().setResponseCode(404));
-
- try {
- MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
- boolean success = queueApi.exists("jclouds-blerg");
-
- assertFalse(success);
-
- assertEquals(server.getRequestCount(), 2);
- assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
- assertEquals(server.takeRequest().getRequestLine(), "GET /v1/123123/queues/jclouds-blerg HTTP/1.1");
- }
- finally {
- server.shutdown();
- }
- }
-
public void listZeroPagesOfQueues() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(new MockResponse().setBody(accessRackspace));
@@ -177,42 +153,6 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
}
}
- public void listOnePageOfQueuesFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(new MockResponse().setBody(accessRackspace));
- server.enqueue(new MockResponse().setResponseCode(404));
-
- try {
- MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
-
- FluentIterable<Queue> queues = queueApi.list(false).concat();
-
- assertTrue(queues.isEmpty(), "Expecting empty queues but was " + queues.toString());
- }
- finally {
- server.shutdown();
- }
- }
-
- public void listPagedIterableCollectionQueuesFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(new MockResponse().setBody(accessRackspace));
- server.enqueue(new MockResponse().setResponseCode(404));
-
- try {
- MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
-
- Queues queues = queueApi.list(ListQueuesOptions.NONE);
-
- assertTrue(queues.isEmpty(), "Expecting empty queues but was " + queues.toString());
- }
- finally {
- server.shutdown();
- }
- }
-
public void listManyPagesOfQueues() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(new MockResponse().setBody(accessRackspace));
@@ -288,9 +228,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
Map<String, String> metadata = ImmutableMap.of("key1", "value1");
- boolean success = queueApi.setMetadata("jclouds-test", metadata);
-
- assertTrue(success);
+ queueApi.setMetadata("jclouds-test", metadata);
assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java
index 4d9edcd..68bc807 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java
@@ -136,8 +136,6 @@ public interface FWaaSApi {
@PUT
@Path("/firewalls/{id}")
@SelectJson("firewall")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
Firewall update(@PathParam("id") String id, @WrapWith("firewall") UpdateFirewall updateFirewall);
/**
@@ -183,7 +181,6 @@ public interface FWaaSApi {
@Named("firewall:updatePolicy")
@PUT
@SelectJson("firewall_policy")
- @Fallback(NullOnNotFoundOr404.class)
@Path("/firewall_policies/{id}")
FirewallPolicy updateFirewallPolicy(@PathParam("id") String id, @WrapWith("firewall_policy") UpdateFirewallPolicy updateFirewallPolicy);
@@ -225,8 +222,6 @@ public interface FWaaSApi {
@PUT
@Path("/firewall_rules/{id}")
@SelectJson("firewall_rule")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
FirewallRule updateFirewallRule(@PathParam("id") String id, @WrapWith("firewall_rule") UpdateFirewallRule updateFirewallRule);
@Named("firewall:deleteFirewallRule")
@@ -238,8 +233,6 @@ public interface FWaaSApi {
@Named("firewall:insertFirewallRuleToPolicy")
@PUT
@Path("/firewall_policies/{id}/insert_rule")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
FirewallPolicy insertFirewallRuleToPolicy(@PathParam("id") String policyId, @WrapWith("firewall_rule_id") String firewallRuleId);
@Named("firewall:removeFirewallRuleFromPolicy")
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java
index 9f0164a..98da377 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java
@@ -123,8 +123,6 @@ public interface FloatingIPApi {
@PUT
@Path("/{id}")
@SelectJson("floatingip")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
FloatingIP update(@PathParam("id") String id, @WrapWith("floatingip") FloatingIP.UpdateFloatingIP updateFloatingIP);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
index b4668aa..6cddbdc 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
@@ -127,8 +127,6 @@ public interface RouterApi {
@PUT
@Path("/{id}")
@SelectJson("router")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
Router update(@PathParam("id") String id, @WrapWith("router") Router.UpdateRouter router);
/**
@@ -154,8 +152,6 @@ public interface RouterApi {
@PUT
@Path("/{id}/add_router_interface")
@MapBinder(EmptyOptions.class)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
RouterInterface addInterfaceForSubnet(@PathParam("id") String routerId, @PayloadParam("subnet_id") String subnetId);
/**
@@ -169,8 +165,6 @@ public interface RouterApi {
@PUT
@Path("/{id}/add_router_interface")
@MapBinder(EmptyOptions.class)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
RouterInterface addInterfaceForPort(@PathParam("id") String routerId, @PayloadParam("port_id") String portId);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java
index dad80d8..6f6d767 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java
@@ -142,8 +142,6 @@ public interface LBaaSApi {
@PUT
@Path("/vips/{id}")
@SelectJson("vip")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
VIP updateVIP(@PathParam("id") String id, @WrapWith("vip") VIP.UpdateVIP vip);
/**
@@ -220,8 +218,6 @@ public interface LBaaSApi {
@PUT
@Path("/pools/{id}")
@SelectJson("pool")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
Pool updatePool(@PathParam("id") String id, @WrapWith("pool") Pool.UpdatePool pool);
/**
@@ -298,8 +294,6 @@ public interface LBaaSApi {
@PUT
@Path("/members/{id}")
@SelectJson("member")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
Member updateMember(@PathParam("id") String id, @WrapWith("member") Member.UpdateMember member);
/**
@@ -376,8 +370,6 @@ public interface LBaaSApi {
@PUT
@Path("/health_monitors/{id}")
@SelectJson("health_monitor")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
HealthMonitor updateHealthMonitor(@PathParam("id") String id,
@WrapWith("health_monitor") HealthMonitor.UpdateHealthMonitor healthMonitor);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java
index 08e5586..2706517 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java
@@ -133,8 +133,6 @@ public interface NetworkApi {
@PUT
@Path("/{id}")
@SelectJson("network")
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @Nullable
Network update(@PathParam("id") String id, @WrapWith("network") Network.UpdateNetwork network);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java
index 6466a90..3797810 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java
@@ -131,7 +131,6 @@ public interface PortApi {
@PUT
@Path("/{id}")
@SelectJson("port")
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
Port update(@PathParam("id") String id, @WrapWith("port") Port.UpdatePort port);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java
index 7b6f54e..ffb7dcd 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java
@@ -127,7 +127,6 @@ public interface SubnetApi {
@PUT
@Path("/{id}")
@SelectJson("subnet")
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
Subnet update(@PathParam("id") String id, @WrapWith("subnet") Subnet.UpdateSubnet subnet);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java
index fe7a879..ae84c36 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java
@@ -19,8 +19,8 @@ package org.jclouds.openstack.neutron.v2.extensions;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
+
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.List;
@@ -33,14 +33,12 @@ import org.jclouds.openstack.neutron.v2.domain.Firewall;
import org.jclouds.openstack.neutron.v2.domain.FirewallPolicy;
import org.jclouds.openstack.neutron.v2.domain.FirewallRule;
import org.jclouds.openstack.neutron.v2.domain.FloatingIP;
-import org.jclouds.openstack.neutron.v2.domain.FloatingIPs;
import org.jclouds.openstack.neutron.v2.domain.UpdateFirewall;
import org.jclouds.openstack.neutron.v2.domain.UpdateFirewallPolicy;
import org.jclouds.openstack.neutron.v2.domain.UpdateFirewallRule;
import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest;
import org.jclouds.openstack.v2_0.domain.PaginatedCollection;
import org.jclouds.openstack.v2_0.options.PaginationOptions;
-import org.jclouds.rest.ResourceNotFoundException;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
@@ -97,29 +95,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateFirewallFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- CreateFirewall firewallRequest = CreateFirewall.builder()
- .firewallPolicyId("c69933c1-b472-44f9-8226-30dc4ffd454c")
- .adminStateUp(Boolean.TRUE)
- .build();
-
- Firewall firewall = api.create(firewallRequest);
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPageFirewall() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -152,36 +127,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListSpecificPageFirewallFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne").get();
-
- FloatingIPs floatingIPs = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/floatingips?limit=2&marker=abcdefg");
-
- /*
- * Check response
- */
- assertNotNull(floatingIPs);
- assertTrue(floatingIPs.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testListPagedFirewall() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -217,37 +162,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListPagedFirewallFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne").get();
-
- // Note: Lazy! Have to actually look at the collection.
- List<FloatingIP> floatingIPs = api.list().concat().toList();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/floatingips");
-
- /*
- * Check response
- */
- assertNotNull(floatingIPs);
- assertTrue(floatingIPs.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testGetFirewall() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -285,37 +199,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetFirewallFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- Firewall firewall = api.get("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/fw/firewalls/12345");
-
- /*
- * Check response
- */
- assertNull(firewall);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateFirewall() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -352,40 +235,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdateFirewallFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- UpdateFirewall updateFirewall = UpdateFirewall.builder()
- .adminStateUp(false)
- .build();
-
- Firewall firewall = api.update("12345", updateFirewall);
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/fw/firewalls/12345", "/firewall_update_request.json");
-
- /*
- * Check response
- */
- assertNull(firewall);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteFirewall() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -416,36 +265,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDeleteFirewallFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- boolean result = api.delete("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/fw/firewalls/12345");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
public void testCreateFirewallPolicy() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -487,29 +306,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateFirewallPolicyFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- CreateFirewallPolicy firewallPolicyRequest = CreateFirewallPolicy.builder()
- .name("jclouds-fw-policy_group-52-e8b")
- .build();
-
- FirewallPolicy firewallPolicy = api.createFirewallPolicy(firewallPolicyRequest);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testGetFirewallPolicy() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -547,37 +343,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetFirewallPolicyFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- FirewallPolicy firewallPolicy = api.getFirewallPolicy("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/fw/firewall_policies/12345");
-
- /*
- * Check response
- */
- assertNull(firewallPolicy);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateFirewallPolicy() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -619,41 +384,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdateFirewallPolicyFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- UpdateFirewallPolicy updateFirewallPolicy = UpdateFirewallPolicy.builder()
- .shared(true)
- .build();
-
- FirewallPolicy firewallPolicy = api.updateFirewallPolicy("12345", updateFirewallPolicy);
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/fw/firewall_policies/12345");
-
- /*
- * Check response
- */
- assertNull(firewallPolicy);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testInsertFirewallRuleIntoFirewallPolicy() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -685,36 +415,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testInsertFirewallRuleIntoFirewallPolicyFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- FirewallPolicy updatedFirewallPolicy = api.insertFirewallRuleToPolicy("12345", "59585143-e819-48c9-944d-f03e0f049dba");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/fw/firewall_policies/12345/insert_rule", "/firewall_policy_insert_rule_request.json");
-
- /*
- * Check response
- */
- assertNull(updatedFirewallPolicy);
- } finally {
- server.shutdown();
- }
- }
-
public void testCreateFirewallRule() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -762,29 +462,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateFirewallRuleFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- CreateFirewallRule firewallRuleRequest = CreateFirewallRule.builder()
- .name("jclouds-fw-rule_group-52-e8b_port-22")
- .build();
-
- FirewallRule firewallRule = api.createFirewallRule(firewallRuleRequest);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testGetFirewallRule() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -824,37 +501,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetFirewallRuleFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- FirewallRule firewallRule = api.getFirewallRule("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/fw/firewall_rules/12345");
-
- /*
- * Check response
- */
- assertNull(firewallRule);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateFirewallRule() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -889,38 +535,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdateFirewallRuleFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- UpdateFirewallRule updateFirewallRule = UpdateFirewallRule.builder()
- .build();
-
- FirewallRule firewallRule = api.updateFirewallRule("12345", updateFirewallRule);
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/fw/firewall_rules/12345", "/firewall_rule_update_request.json");
-
- /*
- * Check response
- */
- assertNull(firewallRule);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteFirewallRule() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -951,34 +565,4 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDeleteFirewallRuleFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- boolean result = api.deleteFirewallRule("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/fw/firewall_rules/12345");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
}
[2/3] jclouds-labs-openstack git commit: JCLOUDS-691: Remove 404
fallbacks of PUT and POST calls from OpenStack APIs
Posted by de...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApiMockTest.java
index 279dca9..ea368ee 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApiMockTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApiMockTest.java
@@ -17,7 +17,6 @@
package org.jclouds.openstack.neutron.v2.extensions;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
@@ -31,7 +30,6 @@ import org.jclouds.openstack.neutron.v2.domain.FloatingIP;
import org.jclouds.openstack.neutron.v2.domain.FloatingIPs;
import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest;
import org.jclouds.openstack.v2_0.options.PaginationOptions;
-import org.jclouds.rest.ResourceNotFoundException;
import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
@@ -86,28 +84,6 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateFloatingIPFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne").get();
-
- FloatingIP.CreateFloatingIP createFip = FloatingIP.createBuilder("376da547-b977-4cfe-9cba-275c80debf57")
- .portId("ce705c24-c1ef-408a-bda3-7bbd946164ab")
- .build();
-
- FloatingIP floatingIP = api.create(createFip);
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPageFloatingIP() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -140,36 +116,6 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListSpecificPageFloatingIPFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne").get();
-
- FloatingIPs floatingIPs = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/floatingips?limit=2&marker=abcdefg");
-
- /*
- * Check response
- */
- assertNotNull(floatingIPs);
- assertTrue(floatingIPs.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testListPagedFloatingIP() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -205,37 +151,6 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListPagedFloatingIPFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne").get();
-
- // Note: Lazy! Have to actually look at the collection.
- List<FloatingIP> floatingIPs = api.list().concat().toList();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/floatingips");
-
- /*
- * Check response
- */
- assertNotNull(floatingIPs);
- assertTrue(floatingIPs.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testGetFloatingIP() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -274,37 +189,6 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetFloatingIPFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne").get();
-
- FloatingIP floatingIP = api.get("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/floatingips/12345");
-
- /*
- * Check response
- */
- assertNull(floatingIP);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateFloatingIP() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -375,40 +259,6 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdateFloatingIPFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne").get();
-
- FloatingIP.UpdateFloatingIP updateFloatingIP = FloatingIP.updateBuilder()
- .portId("fc861431-0e6c-4842-a0ed-e2363f9bc3a8")
- .build();
-
- FloatingIP floatingIP = api.update("12345", updateFloatingIP);
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/floatingips/12345", "/floatingip_update_request.json");
-
- /*
- * Check response
- */
- assertNull(floatingIP);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteFloatingIP() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -439,33 +289,4 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDeleteFloatingIPFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne").get();
-
- boolean result = api.delete("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/floatingips/12345");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java
index 902518e..16859f4 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java
@@ -17,11 +17,8 @@
package org.jclouds.openstack.neutron.v2.extensions;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
import java.io.IOException;
import java.net.URISyntaxException;
@@ -35,7 +32,6 @@ import org.jclouds.openstack.neutron.v2.domain.RouterInterface;
import org.jclouds.openstack.neutron.v2.domain.Routers;
import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest;
import org.jclouds.openstack.v2_0.options.PaginationOptions;
-import org.jclouds.rest.ResourceNotFoundException;
import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
@@ -92,30 +88,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateRouterFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- RouterApi api = neutronApi.getRouterApi("RegionOne").get();
-
- Router.CreateRouter createRouter = Router.createBuilder().name("another_router").adminStateUp(Boolean.TRUE)
- .externalGatewayInfo(ExternalGatewayInfo.builder().networkId("8ca37218-28ff-41cb-9b10-039601ea7e6b").build())
- .build();
-
- api.create(createRouter);
- fail("Should have failed with not found exception");
-
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPageRouter() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -147,36 +119,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListSpecificPageRouterFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- RouterApi api = neutronApi.getRouterApi("RegionOne").get();
-
- Routers routers = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/routers?limit=2&marker=abcdefg");
-
- /*
- * Check response
- */
- assertNotNull(routers);
- assertTrue(routers.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testListPagedRouter() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -212,37 +154,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListPagedRouterFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- RouterApi api = neutronApi.getRouterApi("RegionOne").get();
-
- // Note: Lazy! Have to actually look at the collection.
- List<Router> routers = api.list().concat().toList();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/routers");
-
- /*
- * Check response
- */
- assertNotNull(routers);
- assertTrue(routers.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testGetRouter() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -279,36 +190,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetRouterFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- RouterApi api = neutronApi.getRouterApi("RegionOne").get();
-
- Router router = api.get("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/routers/12345");
-
- /*
- * Check response
- */
- assertNull(router);
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateRouter() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -350,41 +231,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdateRouterFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- RouterApi api = neutronApi.getRouterApi("RegionOne").get();
-
- Router.UpdateRouter updateRouter = Router.updateBuilder()
- .externalGatewayInfo(
- ExternalGatewayInfo.builder().networkId("8ca37218-28ff-41cb-9b10-039601ea7e6b").build())
- .build();
-
- Router router = api.update("12345", updateRouter);
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/routers/12345", "/router_update_request.json");
-
- /*
- * Check response
- */
- assertNull(router);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteRouter() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -415,36 +261,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDeleteRouterFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- RouterApi api = neutronApi.getRouterApi("RegionOne").get();
-
- boolean result = api.delete("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/routers/12345");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
public void testAddRouterInterfaceForSubnet() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -476,36 +292,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testAddRouterInterfaceForSubnetFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- RouterApi api = neutronApi.getRouterApi("RegionOne").get();
-
- RouterInterface routerInterface = api.addInterfaceForSubnet("12345", "a2f1f29d-571b-4533-907f-5803ab96ead1");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/routers/12345/add_router_interface", "/router_add_interface_request.json");
-
- /*
- * Check response
- */
- assertNull(routerInterface);
- } finally {
- server.shutdown();
- }
- }
-
public void testAddRouterInterfaceForPort() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -538,36 +324,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testAddRouterInterfaceForPortFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- RouterApi api = neutronApi.getRouterApi("RegionOne").get();
-
- RouterInterface routerInterface = api.addInterfaceForPort("12345", "portid");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/routers/12345/add_router_interface", "/router_add_interface_port_request.json");
-
- /*
- * Check response
- */
- assertNull(routerInterface);
- } finally {
- server.shutdown();
- }
- }
-
public void testRemoveRouterInterfaceForSubnet() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -598,36 +354,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testRemoveRouterInterfaceForSubnetFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- RouterApi api = neutronApi.getRouterApi("RegionOne").get();
-
- boolean result = api.removeInterfaceForSubnet("12345", "a2f1f29d-571b-4533-907f-5803ab96ead1");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/routers/12345/remove_router_interface", "/router_remove_interface_subnet_request.json");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
public void testRemoveRouterInterfaceForPort() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -658,33 +384,4 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testRemoveRouterInterfaceForPortFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- RouterApi api = neutronApi.getRouterApi("RegionOne").get();
-
- boolean result = api.removeInterfaceForPort("12345", "portid");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/routers/12345/remove_router_interface", "/router_remove_interface_port_request.json");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiMockTest.java
index 6494a05..682232e 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiMockTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiMockTest.java
@@ -17,9 +17,7 @@
package org.jclouds.openstack.neutron.v2.extensions;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import java.io.IOException;
@@ -36,7 +34,6 @@ import org.jclouds.openstack.neutron.v2.domain.SecurityGroup;
import org.jclouds.openstack.neutron.v2.domain.SecurityGroups;
import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest;
import org.jclouds.openstack.v2_0.options.PaginationOptions;
-import org.jclouds.rest.ResourceNotFoundException;
import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
@@ -93,28 +90,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateSecurityGroupFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get();
-
- SecurityGroup.CreateSecurityGroup createSecurityGroup = SecurityGroup.createBuilder().name("new-webservers")
- .description("security group for webservers")
- .build();
-
- SecurityGroup securityGroup = api.create(createSecurityGroup);
- } finally {
- server.shutdown();
- }
- }
-
public void testCreateSecurityGroupRule() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -164,33 +139,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateSecurityGroupRuleFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get();
-
- Rule.CreateRule createSecurityGroupRule = Rule.createBuilder(
- RuleDirection.INGRESS, "a7734e61-b545-452d-a3cd-0189cbd9747a")
- .portRangeMin(80)
- .portRangeMax(80)
- .ethertype(RuleEthertype.IPV4)
- .protocol(RuleProtocol.TCP)
- .remoteGroupId("85cc3048-abc3-43cc-89b3-377341426ac5")
- .build();
-
- Rule rule = api.create(createSecurityGroupRule);
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPageSecurityGroup() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -224,36 +172,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListSpecificPageSecurityGroupFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get();
-
- SecurityGroups securityGroups = api.listSecurityGroups(PaginationOptions.Builder.limit(2).marker("abcdefg"));
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/security-groups?limit=2&marker=abcdefg");
-
- /*
- * Check response
- */
- assertNotNull(securityGroups);
- assertTrue(securityGroups.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPageSecurityGroupRule() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -287,36 +205,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListSpecificPageSecurityGroupRuleFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get();
-
- Rules rules = api.listRules(PaginationOptions.Builder.limit(2).marker("abcdefg"));
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/security-group-rules?limit=2&marker=abcdefg");
-
- /*
- * Check response
- */
- assertNotNull(rules);
- assertTrue(rules.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testListPagedSecurityGroups() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -354,38 +242,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListPagedSecurityGroupsFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get();
-
- // Note: Lazy! Have to actually look at the collection.
- List<SecurityGroup> securityGroups = api.listSecurityGroups().concat().toList();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/security-groups");
-
- /*
- * Check response
- */
- assertNotNull(securityGroups);
- assertTrue(securityGroups.isEmpty());
-
- } finally {
- server.shutdown();
- }
- }
-
public void testListPagedSecurityGroupRules() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -423,38 +279,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListPagedSecurityGroupRulesFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get();
-
- // Note: Lazy! Have to actually look at the collection.
- List<Rule> rules = api.listRules().concat().toList();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/security-group-rules");
-
- /*
- * Check response
- */
- assertNotNull(rules);
- assertTrue(rules.isEmpty());
-
- } finally {
- server.shutdown();
- }
- }
-
public void testGetSecurityGroup() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -491,37 +315,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetSecurityGroupFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get();
-
- SecurityGroup securityGroup = api.getSecurityGroup("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/security-groups/12345");
-
- /*
- * Check response
- */
- assertNull(securityGroup);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testGetSecurityGroupRule() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -558,37 +351,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetSecurityGroupRuleFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get();
-
- Rule rule = api.get("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/security-group-rules/12345");
-
- /*
- * Check response
- */
- assertNull(rule);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteSecurityGroup() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -619,36 +381,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDeleteSecurityGroupFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get();
-
- boolean result = api.deleteSecurityGroup("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/security-groups/12345");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteSecurityGroupRule() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -678,34 +410,4 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
server.shutdown();
}
}
-
- public void testDeleteSecurityGroupRuleFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get();
-
- boolean result = api.deleteRule("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/security-group-rules/12345");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiMockTest.java
index f83dcf9..ce5dc66 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiMockTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiMockTest.java
@@ -17,11 +17,9 @@
package org.jclouds.openstack.neutron.v2.extensions.lbaas.v1;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
import java.io.IOException;
import java.util.List;
@@ -42,7 +40,6 @@ import org.jclouds.openstack.neutron.v2.domain.lbaas.v1.VIP;
import org.jclouds.openstack.neutron.v2.domain.lbaas.v1.VIPs;
import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest;
import org.jclouds.openstack.v2_0.options.PaginationOptions;
-import org.jclouds.rest.ResourceNotFoundException;
import org.testng.annotations.Test;
import com.google.common.base.Optional;
@@ -144,29 +141,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreatePoolFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- Pool.CreatePool createPool = Pool.createBuilder("8032909d-47a1-4715-90af-5153ffe39861", Protocol.TCP, Pool.ROUND_ROBIN)
- .name("NewPool").description(null).healthMonitors(null).provider(null).adminStateUp(null).build();
-
- lbaasApi.createPool(createPool);
-
- fail("Should have failed with not found exception");
-
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPagePool() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -197,35 +171,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListSpecificPagePoolFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- Pools pools = lbaasApi.listPools(PaginationOptions.Builder.limit(2).marker("abcdefg"));
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/lb/pools?limit=2&marker=abcdefg");
-
- /*
- * Check response
- */
- assertNotNull(pools);
- assertTrue(pools.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testListPagedPool() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -261,37 +206,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListPagedPoolFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- // Note: Lazy! Have to actually look at the collection.
- List<Pool> pools = lbaasApi.listPools().concat().toList();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/lb/pools");
-
- /*
- * Check response
- */
- assertNotNull(pools);
- assertTrue(pools.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testGetPool() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -338,34 +252,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetPoolFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- Pool pool = lbaasApi.getPool("72741b06-df4d-4715-b142-276b6bce75ab");
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/lb/pools/72741b06-df4d-4715-b142-276b6bce75ab");
-
- /*
- * Check response
- */
- assertNull(pool);
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdatePool() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -417,37 +303,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdatePoolFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- Pool.UpdatePool updatePool = Pool.updateBuilder().name("new_name").description("new description").lbMethod("NEW_LB_METHOD")
- .healthMonitors(ImmutableSet.of("5d4b5228-33b0-4e60-b225-9b727c1a20e7")).adminStateUp(Boolean.FALSE).build();
-
- Pool pool = lbaasApi.updatePool("72741b06-df4d-4715-b142-276b6bce75ab", updatePool);
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/lb/pools/72741b06-df4d-4715-b142-276b6bce75ab", "/lbaas/v1/pool_update_request.json");
-
- /*
- * Check response
- */
- assertNull(pool);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeletePool() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -476,34 +331,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDeletePoolFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- boolean result = lbaasApi.deletePool("72741b06-df4d-4715-b142-276b6bce75ab");
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/lb/pools/72741b06-df4d-4715-b142-276b6bce75ab");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
public void testCreateMember() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -544,29 +371,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateMemberFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- Member.CreateMember createMember = Member.createBuilder("72741b06-df4d-4715-b142-276b6bce75ab", null, 80)
- .weight(null).adminStateUp(null).build();
-
- lbaasApi.createMember(createMember);
-
- fail("Should have failed with not found exception");
-
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPageMember() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -597,35 +401,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListSpecificPageMemberFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- Members members = lbaasApi.listMembers(PaginationOptions.Builder.limit(2).marker("abcdefg"));
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/lb/members?limit=2&marker=abcdefg");
-
- /*
- * Check response
- */
- assertNotNull(members);
- assertTrue(members.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testListPagedMember() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -661,37 +436,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListPagedMemberFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- // Note: Lazy! Have to actually look at the collection.
- List<Member> members = lbaasApi.listMembers().concat().toList();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/lb/members");
-
- /*
- * Check response
- */
- assertNotNull(members);
- assertTrue(members.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testGetMember() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -729,34 +473,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetMemberFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- Member member = lbaasApi.getMember("48a471ea-64f1-4eb6-9be7-dae6bbe40a0f");
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/lb/members/48a471ea-64f1-4eb6-9be7-dae6bbe40a0f");
-
- /*
- * Check response
- */
- assertNull(member);
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateMember() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -797,88 +513,29 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdateMemberFail() throws IOException, InterruptedException {
+ public void testDeleteMember() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
+ server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
- Member.UpdateMember updateMember = Member.updateBuilder().poolId("new_pool_id").weight(2)
- .adminStateUp(Boolean.FALSE).build();
-
- Member member = lbaasApi.updateMember("48a471ea-64f1-4eb6-9be7-dae6bbe40a0f", updateMember);
+ boolean result = lbaasApi.deleteMember("48a471ea-64f1-4eb6-9be7-dae6bbe40a0f");
/*
* Check request
*/
assertAuthentication(server);
server.takeRequest();
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/lb/members/48a471ea-64f1-4eb6-9be7-dae6bbe40a0f", "/lbaas/v1/member_update_request.json");
+ assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/lb/members/48a471ea-64f1-4eb6-9be7-dae6bbe40a0f");
/*
* Check response
*/
- assertNull(member);
- } finally {
- server.shutdown();
- }
- }
-
- public void testDeleteMember() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- boolean result = lbaasApi.deleteMember("48a471ea-64f1-4eb6-9be7-dae6bbe40a0f");
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/lb/members/48a471ea-64f1-4eb6-9be7-dae6bbe40a0f");
-
- /*
- * Check response
- */
- assertTrue(result);
- } finally {
- server.shutdown();
- }
- }
-
- public void testDeleteMemberFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- boolean result = lbaasApi.deleteMember("48a471ea-64f1-4eb6-9be7-dae6bbe40a0f");
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/lb/members/48a471ea-64f1-4eb6-9be7-dae6bbe40a0f");
-
- /*
- * Check response
- */
- assertFalse(result);
+ assertTrue(result);
} finally {
server.shutdown();
}
@@ -930,29 +587,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateVIPFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- VIP.CreateVIP createVIP = VIP.createBuilder("8032909d-47a1-4715-90af-5153ffe39861", Protocol.HTTP, 80, "61b1f87a-7a21-4ad3-9dda-7f81d249944f")
- .name("NewVip").description(null).address(null).sessionPersistence(null).connectionLimit(null).build();
-
- lbaasApi.createVIP(createVIP);
-
- fail("Should have failed with not found exception");
-
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPageVIP() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -983,35 +617,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListSpecificPageVIPFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- VIPs vips = lbaasApi.listVIPs(PaginationOptions.Builder.limit(2).marker("abcdefg"));
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/lb/vips?limit=2&marker=abcdefg");
-
- /*
- * Check response
- */
- assertNotNull(vips);
- assertTrue(vips.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testListPagedVIP() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -1047,37 +652,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListPagedVIPFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- // Note: Lazy! Have to actually look at the collection.
- List<VIP> vips = lbaasApi.listVIPs().concat().toList();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/lb/vips");
-
- /*
- * Check response
- */
- assertNotNull(vips);
- assertTrue(vips.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testGetVIP() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -1122,34 +696,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetVIPFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- VIP vip = lbaasApi.getVIP("4ec89087-d057-4e2c-911f-60a3b47ee304");
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/lb/vips/4ec89087-d057-4e2c-911f-60a3b47ee304");
-
- /*
- * Check response
- */
- assertNull(vip);
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateVIP() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -1197,38 +743,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdateVIPFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- SessionPersistence sessionPersistence = SessionPersistence.builder().type(SessionPersistence.Type.APP_COOKIE).cookieName("MyNewAppCookie").build();
- VIP.UpdateVIP updateVIP = VIP.updateBuilder().name("new-name").description("new description").poolId("61b1f87a-7a21-4ad3-9dda-7f81d249944f")
- .sessionPersistence(sessionPersistence).connectionLimit(50).adminStateUp(Boolean.FALSE).build();
-
- VIP vip = lbaasApi.updateVIP("c987d2be-9a3c-4ac9-a046-e8716b1350e2", updateVIP);
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/lb/vips/c987d2be-9a3c-4ac9-a046-e8716b1350e2", "/lbaas/v1/vip_update_request.json");
-
- /*
- * Check response
- */
- assertNull(vip);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteVIP() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -1257,34 +771,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDeleteVIPFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- boolean result = lbaasApi.deleteVIP("c987d2be-9a3c-4ac9-a046-e8716b1350e2");
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/lb/vips/c987d2be-9a3c-4ac9-a046-e8716b1350e2");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
public void testCreateHealthMonitor() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -1330,29 +816,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateHealthMonitorFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- HealthMonitor.CreateHealthMonitor createHealthMonitor = HealthMonitor.createBuilder(ProbeType.HTTP, Integer.valueOf(1), Integer.valueOf(1), Integer.valueOf(1))
- .httpMethod(null).urlPath(null).expectedCodes(null).adminStateUp(null).build();
-
- lbaasApi.createHealthMonitor(createHealthMonitor);
-
- fail("Should have failed with not found exception");
-
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPageHealthMonitor() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -1383,35 +846,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListSpecificPageHealthMonitorFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- HealthMonitors healthMonitors = lbaasApi.listHealthMonitors(PaginationOptions.Builder.limit(2).marker("abcdefg"));
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/lb/health_monitors?limit=2&marker=abcdefg");
-
- /*
- * Check response
- */
- assertNotNull(healthMonitors);
- assertTrue(healthMonitors.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testListPagedHealthMonitor() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -1447,37 +881,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListPagedHealthMonitorFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- // Note: Lazy! Have to actually look at the collection.
- List<HealthMonitor> healthMonitors = lbaasApi.listHealthMonitors().concat().toList();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/lb/health_monitors");
-
- /*
- * Check response
- */
- assertNotNull(healthMonitors);
- assertTrue(healthMonitors.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testGetHealthMonitor() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -1520,34 +923,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetHealthMonitorFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- HealthMonitor healthMonitor = lbaasApi.getHealthMonitor("5d4b5228-33b0-4e60-b225-9b727c1a20e7");
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/lb/health_monitors/5d4b5228-33b0-4e60-b225-9b727c1a20e7");
-
- /*
- * Check response
- */
- assertNull(healthMonitor);
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateHealthMonitor() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -1593,37 +968,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdateHealthMonitorFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- HealthMonitor.UpdateHealthMonitor updateHealthMonitor = HealthMonitor.updateBuilder().delay(Integer.valueOf(1)).timeout(Integer.valueOf(1)).maxRetries(Integer.valueOf(1))
- .httpMethod(HttpMethod.HEAD).urlPath("/index.html").expectedCodes("201").adminStateUp(Boolean.FALSE).build();
-
- HealthMonitor healthMonitor = lbaasApi.updateHealthMonitor("466c8345-28d8-4f84-a246-e04380b0461d", updateHealthMonitor);
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/lb/health_monitors/466c8345-28d8-4f84-a246-e04380b0461d", "/lbaas/v1/health_monitor_update_request.json");
-
- /*
- * Check response
- */
- assertNull(healthMonitor);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteHealthMonitor() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -1652,34 +996,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDeleteHealthMonitorFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- boolean result = lbaasApi.deleteHealthMonitor("466c8345-28d8-4f84-a246-e04380b0461d");
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/lb/health_monitors/466c8345-28d8-4f84-a246-e04380b0461d");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
public void testAssociateHealthMonitorWithPool() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -1708,26 +1024,6 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testAssociateHealthMonitorWithPoolFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- lbaasApi.associateHealthMonitor("72741b06-df4d-4715-b142-276b6bce75ab", "5d4b5228-33b0-4e60-b225-9b727c1a20e7");
-
- fail("Should have failed with not found exception");
-
- } finally {
- server.shutdown();
- }
- }
-
public void testDisassociateHealthMonitorFromPool() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -1756,32 +1052,4 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDisassociateHealthMonitorFromPoolFail() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
-
- boolean result = lbaasApi.disassociateHealthMonitor("72741b06-df4d-4715-b142-276b6bce75ab", "5d4b5228-33b0-4e60-b225-9b727c1a20e7");
-
- /*
- * Check request
- */
- assertAuthentication(server);
- server.takeRequest();
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/lb/pools/72741b06-df4d-4715-b142-276b6bce75ab/health_monitors/5d4b5228-33b0-4e60-b225-9b727c1a20e7");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
}