Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-1551: Update version of OkHttp 3.14.9

This commit is contained in:
korlov42 2020-10-06 18:38:30 +03:00 committed by Andrew Gaul
parent 56ad552344
commit 44ff69d144
130 changed files with 1128 additions and 890 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apis/docker/pom.xml
View File

@ -104,7 +104,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
@ -115,6 +115,18 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-tls</artifactId>
<scope>test</scope>
<exclusions>
<!-- Already provided by jclouds-sshj -->
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.shrinkwrap</groupId> <groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-depchain</artifactId> <artifactId>shrinkwrap-depchain</artifactId>

16
apis/docker/src/main/java/org/jclouds/docker/config/DockerOkHttpClientSupplier.java
View File

@ -21,6 +21,10 @@ import java.io.File;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import okhttp3.ConnectionSpec;
import okhttp3.OkHttpClient;
import okhttp3.TlsVersion;
import org.jclouds.docker.suppliers.DockerSSLContextSupplier; import org.jclouds.docker.suppliers.DockerSSLContextSupplier;
import org.jclouds.domain.Credentials; import org.jclouds.domain.Credentials;
import org.jclouds.http.okhttp.OkHttpClientSupplier; import org.jclouds.http.okhttp.OkHttpClientSupplier;
@ -28,9 +32,7 @@ import org.jclouds.location.Provider;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.ConnectionSpec;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.TlsVersion;
@Singleton @Singleton
public class DockerOkHttpClientSupplier implements OkHttpClientSupplier { public class DockerOkHttpClientSupplier implements OkHttpClientSupplier {
@ -46,18 +48,18 @@ public class DockerOkHttpClientSupplier implements OkHttpClientSupplier {
@Override @Override
public OkHttpClient get() { public OkHttpClient get() {
OkHttpClient client = new OkHttpClient(); OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
ConnectionSpec tlsSpec = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS) ConnectionSpec tlsSpec = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
.tlsVersions(TlsVersion.TLS_1_0, TlsVersion.TLS_1_1, TlsVersion.TLS_1_2) .tlsVersions(TlsVersion.TLS_1_0, TlsVersion.TLS_1_1, TlsVersion.TLS_1_2)
.build(); .build();
ConnectionSpec cleartextSpec = new ConnectionSpec.Builder(ConnectionSpec.CLEARTEXT) ConnectionSpec cleartextSpec = new ConnectionSpec.Builder(ConnectionSpec.CLEARTEXT)
.build(); .build();
client.setConnectionSpecs(ImmutableList.of(tlsSpec, cleartextSpec)); clientBuilder.connectionSpecs(ImmutableList.of(tlsSpec, cleartextSpec));
// check if identity and credential are files, to set up sslContext // check if identity and credential are files, to set up sslContext
if (new File(creds.get().identity).isFile() && new File(creds.get().credential).isFile()) { if (new File(creds.get().identity).isFile() && new File(creds.get().credential).isFile()) {
client.setSslSocketFactory(dockerSSLContextSupplier.get().getSocketFactory()); clientBuilder.sslSocketFactory(dockerSSLContextSupplier.get().getSocketFactory());
} }
return client; return clientBuilder.build();
} }
} }

38
apis/docker/src/test/java/org/jclouds/docker/features/ContainerApiMockTest.java
View File

@ -20,6 +20,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNotNull;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.docker.DockerApi; import org.jclouds.docker.DockerApi;
import org.jclouds.docker.config.DockerParserModule; import org.jclouds.docker.config.DockerParserModule;
import org.jclouds.docker.domain.Config; import org.jclouds.docker.domain.Config;
@ -32,8 +35,7 @@ import org.jclouds.docker.parse.ContainersParseTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Mock tests for the {@link org.jclouds.docker.features.ContainerApi} class. * Mock tests for the {@link org.jclouds.docker.features.ContainerApi} class.
@ -43,7 +45,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testListContainers() throws Exception { public void testListContainers() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/containers.json"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/containers.json")));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
try { try {
assertEquals(api.listContainers(), new ContainersParseTest().expected()); assertEquals(api.listContainers(), new ContainersParseTest().expected());
assertSent(server, "GET", "/containers/json"); assertSent(server, "GET", "/containers/json");
@ -54,7 +56,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testListNonexistentContainers() throws Exception { public void testListNonexistentContainers() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(404)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(404));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
try { try {
assertEquals(api.listContainers(), ImmutableList.of()); assertEquals(api.listContainers(), ImmutableList.of());
assertSent(server, "GET", "/containers/json"); assertSent(server, "GET", "/containers/json");
@ -66,7 +68,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
@Test(timeOut = 10000L) @Test(timeOut = 10000L)
public void testListAllContainers() throws Exception { public void testListAllContainers() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/containers.json"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/containers.json")));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
try { try {
assertEquals(api.listContainers(ListContainerOptions.Builder.all(true)), new ContainersParseTest().expected()); assertEquals(api.listContainers(ListContainerOptions.Builder.all(true)), new ContainersParseTest().expected());
assertSent(server, "GET", "/containers/json?all=true"); assertSent(server, "GET", "/containers/json?all=true");
@ -77,7 +79,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testGetContainer() throws Exception { public void testGetContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/container.json"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/container.json")));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString(), new DockerParserModule()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString(), new DockerParserModule()).getContainerApi();
String containerId = "e475abdf3e139a5e1e158b38b6cb290a1bec856d39d5a951f015dfb8fcba7331"; String containerId = "e475abdf3e139a5e1e158b38b6cb290a1bec856d39d5a951f015dfb8fcba7331";
try { try {
assertEquals(api.inspectContainer(containerId), new ContainerParseTest().expected()); assertEquals(api.inspectContainer(containerId), new ContainerParseTest().expected());
@ -89,7 +91,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testCreateContainer() throws Exception { public void testCreateContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/container-creation.json"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/container-creation.json")));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
Config containerConfig = Config.builder() Config containerConfig = Config.builder()
.cmd(ImmutableList.of("date")) .cmd(ImmutableList.of("date"))
.attachStdin(false) .attachStdin(false)
@ -110,7 +112,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testRemoveContainer() throws Exception { public void testRemoveContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
String containerId = "6d35806c1bd2b25cd92bba2d2c2c5169dc2156f53ab45c2b62d76e2d2fee14a9"; String containerId = "6d35806c1bd2b25cd92bba2d2c2c5169dc2156f53ab45c2b62d76e2d2fee14a9";
try { try {
@ -124,7 +126,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testStartContainer() throws Exception { public void testStartContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
try { try {
api.startContainer("1"); api.startContainer("1");
assertSent(server, "POST", "/containers/1/start"); assertSent(server, "POST", "/containers/1/start");
@ -135,7 +137,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testStopContainer() throws Exception { public void testStopContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
try { try {
api.stopContainer("1"); api.stopContainer("1");
assertSent(server, "POST", "/containers/1/stop"); assertSent(server, "POST", "/containers/1/stop");
@ -147,7 +149,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testCommitContainer() throws Exception { public void testCommitContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(201)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(201));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
try { try {
api.commit(); api.commit();
assertSent(server, "POST", "/commit"); assertSent(server, "POST", "/commit");
@ -158,7 +160,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testPauseContainer() throws Exception { public void testPauseContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
try { try {
api.pause("1"); api.pause("1");
assertSent(server, "POST", "/containers/1/pause"); assertSent(server, "POST", "/containers/1/pause");
@ -169,7 +171,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testUnpauseContainer() throws Exception { public void testUnpauseContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
try { try {
api.unpause("1"); api.unpause("1");
assertSent(server, "POST", "/containers/1/unpause"); assertSent(server, "POST", "/containers/1/unpause");
@ -180,7 +182,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testAttachContainer() throws Exception { public void testAttachContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
try { try {
api.attach("1"); api.attach("1");
assertSent(server, "POST", "/containers/1/attach"); assertSent(server, "POST", "/containers/1/attach");
@ -191,7 +193,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testWaitContainer() throws Exception { public void testWaitContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
try { try {
api.wait("1"); api.wait("1");
assertSent(server, "POST", "/containers/1/wait"); assertSent(server, "POST", "/containers/1/wait");
@ -202,7 +204,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testRestartContainer() throws Exception { public void testRestartContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
try { try {
api.restart("1"); api.restart("1");
assertSent(server, "POST", "/containers/1/restart"); assertSent(server, "POST", "/containers/1/restart");
@ -213,7 +215,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testKillContainer() throws Exception { public void testKillContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
try { try {
api.kill("1"); api.kill("1");
assertSent(server, "POST", "/containers/1/kill"); assertSent(server, "POST", "/containers/1/kill");
@ -224,7 +226,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest {
public void testCopyFileFromContainer() throws Exception { public void testCopyFileFromContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204));
ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); ContainerApi api = api(DockerApi.class, server.url("/").toString()).getContainerApi();
try { try {
api.copy("1", Resource.create("test")); api.copy("1", Resource.create("test"));
assertSent(server, "POST", "/containers/1/copy"); assertSent(server, "POST", "/containers/1/copy");

18
apis/docker/src/test/java/org/jclouds/docker/features/ImageApiMockTest.java
View File

@ -22,6 +22,9 @@ import static org.testng.Assert.assertTrue;
import java.util.List; import java.util.List;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.docker.DockerApi; import org.jclouds.docker.DockerApi;
import org.jclouds.docker.config.DockerParserModule; import org.jclouds.docker.config.DockerParserModule;
import org.jclouds.docker.domain.ImageHistory; import org.jclouds.docker.domain.ImageHistory;
@ -33,8 +36,7 @@ import org.jclouds.docker.parse.ImagesParseTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Mock tests for the {@link org.jclouds.docker.features.ImageApi} class. * Mock tests for the {@link org.jclouds.docker.features.ImageApi} class.
@ -44,7 +46,7 @@ public class ImageApiMockTest extends BaseDockerMockTest {
public void testCreateImage() throws Exception { public void testCreateImage() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200));
ImageApi api = api(DockerApi.class, server.getUrl("/").toString()).getImageApi(); ImageApi api = api(DockerApi.class, server.url("/").toString()).getImageApi();
try { try {
api.createImage(CreateImageOptions.Builder.fromImage("base")); api.createImage(CreateImageOptions.Builder.fromImage("base"));
assertSent(server, "POST", "/images/create?fromImage=base"); assertSent(server, "POST", "/images/create?fromImage=base");
@ -55,7 +57,7 @@ public class ImageApiMockTest extends BaseDockerMockTest {
public void testGetImage() throws Exception { public void testGetImage() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/image.json"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/image.json")));
ImageApi api = api(DockerApi.class, server.getUrl("/").toString(), new DockerParserModule()).getImageApi(); ImageApi api = api(DockerApi.class, server.url("/").toString(), new DockerParserModule()).getImageApi();
try { try {
String imageId = "cbba6639a342646deed70d7ea6162fa2a0acea9300f911f4e014555fe37d3456"; String imageId = "cbba6639a342646deed70d7ea6162fa2a0acea9300f911f4e014555fe37d3456";
assertEquals(api.inspectImage(imageId), new ImageParseTest().expected()); assertEquals(api.inspectImage(imageId), new ImageParseTest().expected());
@ -67,7 +69,7 @@ public class ImageApiMockTest extends BaseDockerMockTest {
public void testListImages() throws Exception { public void testListImages() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/images.json"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/images.json")));
ImageApi api = api(DockerApi.class, server.getUrl("/").toString()).getImageApi(); ImageApi api = api(DockerApi.class, server.url("/").toString()).getImageApi();
try { try {
assertEquals(api.listImages(), new ImagesParseTest().expected()); assertEquals(api.listImages(), new ImagesParseTest().expected());
assertSent(server, "GET", "/images/json"); assertSent(server, "GET", "/images/json");
@ -78,7 +80,7 @@ public class ImageApiMockTest extends BaseDockerMockTest {
public void testTagImage() throws Exception { public void testTagImage() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(201)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(201));
ImageApi api = api(DockerApi.class, server.getUrl("/").toString()).getImageApi(); ImageApi api = api(DockerApi.class, server.url("/").toString()).getImageApi();
try { try {
api.tagImage("633fcd11259e8d6bccfbb59a4086b95b0d0fb44edfc3912000ef1f70e8a7bfc6", "jclouds", "testTag", true); api.tagImage("633fcd11259e8d6bccfbb59a4086b95b0d0fb44edfc3912000ef1f70e8a7bfc6", "jclouds", "testTag", true);
assertSent(server, "POST", assertSent(server, "POST",
@ -90,7 +92,7 @@ public class ImageApiMockTest extends BaseDockerMockTest {
public void testDeleteImage() throws Exception { public void testDeleteImage() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204));
ImageApi api = api(DockerApi.class, server.getUrl("/").toString()).getImageApi(); ImageApi api = api(DockerApi.class, server.url("/").toString()).getImageApi();
try { try {
api.deleteImage("1"); api.deleteImage("1");
assertSent(server, "DELETE", "/images/1"); assertSent(server, "DELETE", "/images/1");
@ -105,7 +107,7 @@ public class ImageApiMockTest extends BaseDockerMockTest {
new MockResponse().setBody(payloadFromResource("/history.json")), new MockResponse().setBody(payloadFromResource("/history.json")),
new MockResponse().setBody(payloadFromResource("/history-apiver22.json")), new MockResponse().setBody(payloadFromResource("/history-apiver22.json")),
new MockResponse().setResponseCode(404)); new MockResponse().setResponseCode(404));
ImageApi api = api(DockerApi.class, server.getUrl("/").toString()).getImageApi(); ImageApi api = api(DockerApi.class, server.url("/").toString()).getImageApi();
try { try {
assertEquals(api.getHistory("ubuntu"), new HistoryParseTest().expected()); assertEquals(api.getHistory("ubuntu"), new HistoryParseTest().expected());
assertSent(server, "GET", "/images/ubuntu/history"); assertSent(server, "GET", "/images/ubuntu/history");

22
apis/docker/src/test/java/org/jclouds/docker/features/MiscApiMockTest.java
View File

@ -30,6 +30,10 @@ import java.nio.charset.StandardCharsets;
import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.HttpHeaders;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.docker.DockerApi; import org.jclouds.docker.DockerApi;
import org.jclouds.docker.config.DockerParserModule; import org.jclouds.docker.config.DockerParserModule;
import org.jclouds.docker.domain.Exec; import org.jclouds.docker.domain.Exec;
@ -47,9 +51,7 @@ import org.jclouds.io.Payloads;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
/** /**
* Mock tests for the {@link org.jclouds.docker.features.MiscApi} class. * Mock tests for the {@link org.jclouds.docker.features.MiscApi} class.
@ -59,7 +61,7 @@ public class MiscApiMockTest extends BaseDockerMockTest {
public void testGetVersion() throws Exception { public void testGetVersion() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/version.json"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/version.json")));
MiscApi api = api(DockerApi.class, server.getUrl("/").toString()).getMiscApi(); MiscApi api = api(DockerApi.class, server.url("/").toString()).getMiscApi();
try { try {
assertEquals(api.getVersion(), new VersionParseTest().expected()); assertEquals(api.getVersion(), new VersionParseTest().expected());
assertSent(server, "GET", "/version"); assertSent(server, "GET", "/version");
@ -70,7 +72,7 @@ public class MiscApiMockTest extends BaseDockerMockTest {
public void testGetInfo() throws Exception { public void testGetInfo() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/info.json"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/info.json")));
MiscApi api = api(DockerApi.class, server.getUrl("/").toString()).getMiscApi(); MiscApi api = api(DockerApi.class, server.url("/").toString()).getMiscApi();
try { try {
assertEquals(api.getInfo(), new InfoParseTest().expected()); assertEquals(api.getInfo(), new InfoParseTest().expected());
assertSent(server, "GET", "/info"); assertSent(server, "GET", "/info");
@ -81,7 +83,7 @@ public class MiscApiMockTest extends BaseDockerMockTest {
public void testBuildContainer() throws Exception { public void testBuildContainer() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200));
MiscApi api = api(DockerApi.class, server.getUrl("/").toString()).getMiscApi(); MiscApi api = api(DockerApi.class, server.url("/").toString()).getMiscApi();
try { try {
api.build(tarredDockerfile()); api.build(tarredDockerfile());
RecordedRequest request = assertSent(server, "POST", "/build"); RecordedRequest request = assertSent(server, "POST", "/build");
@ -93,7 +95,7 @@ public class MiscApiMockTest extends BaseDockerMockTest {
public void testBuildContainerUsingPayload() throws Exception { public void testBuildContainerUsingPayload() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200));
MiscApi api = api(DockerApi.class, server.getUrl("/").toString()).getMiscApi(); MiscApi api = api(DockerApi.class, server.url("/").toString()).getMiscApi();
File file = File.createTempFile("docker", "tmp"); File file = File.createTempFile("docker", "tmp");
FileInputStream data = new FileInputStream(file); FileInputStream data = new FileInputStream(file);
Payload payload = Payloads.newInputStreamPayload(data); Payload payload = Payloads.newInputStreamPayload(data);
@ -110,7 +112,7 @@ public class MiscApiMockTest extends BaseDockerMockTest {
public void testExecCreate() throws Exception { public void testExecCreate() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/exec.json"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/exec.json")));
MiscApi api = api(DockerApi.class, server.getUrl("/").toString(), new DockerParserModule()).getMiscApi(); MiscApi api = api(DockerApi.class, server.url("/").toString(), new DockerParserModule()).getMiscApi();
try { try {
final String containerId = "a40d212a0a379de00426a1da2a8fd3fd20d5f74fd7c2dd42f6c93a6b1b0e6974"; final String containerId = "a40d212a0a379de00426a1da2a8fd3fd20d5f74fd7c2dd42f6c93a6b1b0e6974";
final ExecCreateParams execParams = ExecCreateParams.builder() final ExecCreateParams execParams = ExecCreateParams.builder()
@ -126,7 +128,7 @@ public class MiscApiMockTest extends BaseDockerMockTest {
public void testExecStart() throws Exception { public void testExecStart() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/exec.start"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/exec.start")));
MiscApi api = api(DockerApi.class, server.getUrl("/").toString(), new DockerParserModule()).getMiscApi(); MiscApi api = api(DockerApi.class, server.url("/").toString(), new DockerParserModule()).getMiscApi();
DockerInputStream dis = null; DockerInputStream dis = null;
try { try {
final String execId = "dbf45d296388032ebb9872edb75847f6655a72b4e9ab0d99ae1c75589c4ca957"; final String execId = "dbf45d296388032ebb9872edb75847f6655a72b4e9ab0d99ae1c75589c4ca957";
@ -155,7 +157,7 @@ public class MiscApiMockTest extends BaseDockerMockTest {
public void testExecInspect() throws IOException, InterruptedException { public void testExecInspect() throws IOException, InterruptedException {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/execInspect.json"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/execInspect.json")));
MiscApi api = api(DockerApi.class, server.getUrl("/").toString(), new DockerParserModule()).getMiscApi(); MiscApi api = api(DockerApi.class, server.url("/").toString(), new DockerParserModule()).getMiscApi();
final String expectedExecId = "fda1cf8064863fc0667c691c69793fdb7d0bd4a1fabb8250536abe5203e4208a"; final String expectedExecId = "fda1cf8064863fc0667c691c69793fdb7d0bd4a1fabb8250536abe5203e4208a";
ExecInspect execInspect = api.execInspect(expectedExecId); ExecInspect execInspect = api.execInspect(expectedExecId);
assertNotNull(execInspect); assertNotNull(execInspect);

20
apis/docker/src/test/java/org/jclouds/docker/features/NetworkApiMockTest.java
View File

@ -21,6 +21,9 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNotNull;
import java.util.Map; import java.util.Map;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.docker.DockerApi; import org.jclouds.docker.DockerApi;
import org.jclouds.docker.config.DockerParserModule; import org.jclouds.docker.config.DockerParserModule;
import org.jclouds.docker.domain.Network; import org.jclouds.docker.domain.Network;
@ -31,8 +34,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Mock tests for the {@link NetworkApi} class. * Mock tests for the {@link NetworkApi} class.
@ -42,7 +44,7 @@ public class NetworkApiMockTest extends BaseDockerMockTest {
public void testListNetworks() throws Exception { public void testListNetworks() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/networks.json"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/networks.json")));
NetworkApi api = api(DockerApi.class, server.getUrl("/").toString()).getNetworkApi(); NetworkApi api = api(DockerApi.class, server.url("/").toString()).getNetworkApi();
try { try {
assertEquals(api.listNetworks(), new NetworksParseTest().expected()); assertEquals(api.listNetworks(), new NetworksParseTest().expected());
assertSent(server, "GET", "/networks"); assertSent(server, "GET", "/networks");
@ -53,7 +55,7 @@ public class NetworkApiMockTest extends BaseDockerMockTest {
public void testListNonexistentNetworks() throws Exception { public void testListNonexistentNetworks() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(404)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(404));
NetworkApi api = api(DockerApi.class, server.getUrl("/").toString()).getNetworkApi(); NetworkApi api = api(DockerApi.class, server.url("/").toString()).getNetworkApi();
try { try {
assertEquals(api.listNetworks(), ImmutableList.of()); assertEquals(api.listNetworks(), ImmutableList.of());
assertSent(server, "GET", "/networks"); assertSent(server, "GET", "/networks");
@ -64,7 +66,7 @@ public class NetworkApiMockTest extends BaseDockerMockTest {
public void testGetNetwork() throws Exception { public void testGetNetwork() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/network.json"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/network.json")));
NetworkApi api = api(DockerApi.class, server.getUrl("/").toString(), new DockerParserModule()).getNetworkApi(); NetworkApi api = api(DockerApi.class, server.url("/").toString(), new DockerParserModule()).getNetworkApi();
String networkId = "b03d4cd15b76f8876110615cdeed15eadf77c9beb408d62f1687dcc69192cd6d"; String networkId = "b03d4cd15b76f8876110615cdeed15eadf77c9beb408d62f1687dcc69192cd6d";
try { try {
assertEquals(api.inspectNetwork(networkId), new NetworkParseTest().expected()); assertEquals(api.inspectNetwork(networkId), new NetworkParseTest().expected());
@ -76,7 +78,7 @@ public class NetworkApiMockTest extends BaseDockerMockTest {
public void testCreateNetwork() throws Exception { public void testCreateNetwork() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/network-creation.json"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/network-creation.json")));
NetworkApi api = api(DockerApi.class, server.getUrl("/").toString()).getNetworkApi(); NetworkApi api = api(DockerApi.class, server.url("/").toString()).getNetworkApi();
Map<String, String> options = ImmutableMap.<String, String> builder() Map<String, String> options = ImmutableMap.<String, String> builder()
.put("com.docker.network.bridge.default_bridge", "true") .put("com.docker.network.bridge.default_bridge", "true")
@ -118,7 +120,7 @@ public class NetworkApiMockTest extends BaseDockerMockTest {
public void testRemoveNetwork() throws Exception { public void testRemoveNetwork() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(204));
NetworkApi api = api(DockerApi.class, server.getUrl("/").toString()).getNetworkApi(); NetworkApi api = api(DockerApi.class, server.url("/").toString()).getNetworkApi();
String networkId = "6d35806c1bd2b25cd92bba2d2c2c5169dc2156f53ab45c2b62d76e2d2fee14a9"; String networkId = "6d35806c1bd2b25cd92bba2d2c2c5169dc2156f53ab45c2b62d76e2d2fee14a9";
try { try {
api.removeNetwork(networkId); api.removeNetwork(networkId);
@ -130,7 +132,7 @@ public class NetworkApiMockTest extends BaseDockerMockTest {
public void testConnectContainerToNetwork() throws Exception { public void testConnectContainerToNetwork() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200));
NetworkApi api = api(DockerApi.class, server.getUrl("/").toString()).getNetworkApi(); NetworkApi api = api(DockerApi.class, server.url("/").toString()).getNetworkApi();
try { try {
api.connectContainerToNetwork("123456789", "containerName"); api.connectContainerToNetwork("123456789", "containerName");
assertSent(server, "POST", "/networks/123456789/connect", "{ \"Container\": \"containerName\" }"); assertSent(server, "POST", "/networks/123456789/connect", "{ \"Container\": \"containerName\" }");
@ -141,7 +143,7 @@ public class NetworkApiMockTest extends BaseDockerMockTest {
public void testDisconnectContainerFromNetwork() throws Exception { public void testDisconnectContainerFromNetwork() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(200));
NetworkApi api = api(DockerApi.class, server.getUrl("/").toString()).getNetworkApi(); NetworkApi api = api(DockerApi.class, server.url("/").toString()).getNetworkApi();
try { try {
api.disconnectContainerFromNetwork("123456789", "containerName"); api.disconnectContainerFromNetwork("123456789", "containerName");
assertSent(server, "POST", "/networks/123456789/disconnect", "{ \"Container\": \"containerName\" }"); assertSent(server, "POST", "/networks/123456789/disconnect", "{ \"Container\": \"containerName\" }");

14
apis/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java
View File

@ -16,7 +16,6 @@
*/ */
package org.jclouds.docker.internal; package org.jclouds.docker.internal;
import static com.google.common.base.Charsets.UTF_8;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.jclouds.util.Strings2.toStringAndClose; import static org.jclouds.util.Strings2.toStringAndClose;
@ -27,15 +26,16 @@ import java.util.Properties;
import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.http.BaseMockWebServerTest; import org.jclouds.http.BaseMockWebServerTest;
import org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule; import org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule;
import com.google.common.base.Charsets;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
/** /**
* Base class for all Docker mock tests. * Base class for all Docker mock tests.
@ -54,9 +54,9 @@ public class BaseDockerMockTest extends BaseMockWebServerTest {
return new OkHttpCommandExecutorServiceModule(); return new OkHttpCommandExecutorServiceModule();
} }
public byte[] payloadFromResource(String resource) { public String payloadFromResource(String resource) {
try { try {
return toStringAndClose(getClass().getResourceAsStream(resource)).getBytes(Charsets.UTF_8); return toStringAndClose(getClass().getResourceAsStream(resource));
} catch (IOException e) { } catch (IOException e) {
throw Throwables.propagate(e); throw Throwables.propagate(e);
} }
@ -74,7 +74,7 @@ public class BaseDockerMockTest extends BaseMockWebServerTest {
throws InterruptedException { throws InterruptedException {
RecordedRequest request = assertSent(server, method, path); RecordedRequest request = assertSent(server, method, path);
assertEquals(request.getHeader("Content-Type"), APPLICATION_JSON); assertEquals(request.getHeader("Content-Type"), APPLICATION_JSON);
assertEquals(parser.parse(new String(request.getBody(), UTF_8)), parser.parse(json)); assertEquals(parser.parse(request.getBody().readUtf8()), parser.parse(json));
return request; return request;
} }

2
apis/ec2/pom.xml
View File

@ -84,7 +84,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>

19
apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiMockTest.java
View File

@ -28,6 +28,10 @@ import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.Constants; import org.jclouds.Constants;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.concurrent.config.ExecutorServiceModule;
@ -36,13 +40,10 @@ import org.jclouds.ec2.EC2ApiMetadata;
import org.testng.annotations.AfterMethod; import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
/** /**
* Tests need to run {@code singleThreaded = true) as otherwise tests will clash on the regionToServers field. * Tests need to run {@code singleThreaded = true) as otherwise tests will clash on the regionToServers field.
@ -66,7 +67,7 @@ public class BaseEC2ApiMockTest {
MockWebServer defaultServer = regionToServers.get(DEFAULT_REGION); MockWebServer defaultServer = regionToServers.get(DEFAULT_REGION);
return ContextBuilder.newBuilder(new EC2ApiMetadata()) return ContextBuilder.newBuilder(new EC2ApiMetadata())
.credentials(ACCESS_KEY, SECRET_KEY) .credentials(ACCESS_KEY, SECRET_KEY)
.endpoint(defaultServer.getUrl("").toString()) .endpoint(defaultServer.url("").toString())
.overrides(overrides) .overrides(overrides)
.modules(modules); .modules(modules);
} }
@ -76,7 +77,7 @@ public class BaseEC2ApiMockTest {
@BeforeMethod @BeforeMethod
public void start() throws IOException { public void start() throws IOException {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
server.play(); server.start();
regionToServers.put(DEFAULT_REGION, server); regionToServers.put(DEFAULT_REGION, server);
} }
@ -99,11 +100,11 @@ public class BaseEC2ApiMockTest {
describeRegionsResponse.append("<regionName>").append(region).append("</regionName>"); describeRegionsResponse.append("<regionName>").append(region).append("</regionName>");
if (!regionToServers.containsKey(region)) { if (!regionToServers.containsKey(region)) {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
server.play(); server.start();
regionToServers.put(region, server); regionToServers.put(region, server);
} }
MockWebServer server = regionToServers.get(region); MockWebServer server = regionToServers.get(region);
String regionEndpoint = server.getUrl("").toString(); String regionEndpoint = server.url("").toString();
describeRegionsResponse.append("<regionEndpoint>").append(regionEndpoint).append("</regionEndpoint>"); describeRegionsResponse.append("<regionEndpoint>").append(regionEndpoint).append("</regionEndpoint>");
describeRegionsResponse.append("</item>"); describeRegionsResponse.append("</item>");
} }
@ -130,7 +131,7 @@ public class BaseEC2ApiMockTest {
RecordedRequest request = regionToServers.get(region).takeRequest(); RecordedRequest request = regionToServers.get(region).takeRequest();
assertEquals(request.getMethod(), "POST"); assertEquals(request.getMethod(), "POST");
assertEquals(request.getPath(), "/"); assertEquals(request.getPath(), "/");
assertEquals(new String(request.getBody(), Charsets.UTF_8).replaceAll("&Signature.*", ""), postParams); assertEquals(request.getBody().readUtf8().replaceAll("&Signature.*", ""), postParams);
return request; return request;
} }
} }

4
apis/ec2/src/test/java/org/jclouds/ec2/suppliers/DescribeAvailabilityZonesInRegionMockTest.java
View File

@ -22,6 +22,8 @@ import static org.testng.Assert.fail;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.ec2.internal.BaseEC2ApiMockTest; import org.jclouds.ec2.internal.BaseEC2ApiMockTest;
import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.AuthorizationException;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -29,7 +31,7 @@ import org.testng.annotations.Test;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.base.Suppliers; import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "DescribeAvailabilityZonesInRegionMockTest", singleThreaded = true) @Test(groups = "unit", testName = "DescribeAvailabilityZonesInRegionMockTest", singleThreaded = true)
public class DescribeAvailabilityZonesInRegionMockTest extends BaseEC2ApiMockTest { public class DescribeAvailabilityZonesInRegionMockTest extends BaseEC2ApiMockTest {

14
apis/elasticstack/pom.xml
View File

@ -72,7 +72,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
@ -83,6 +83,18 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-tls</artifactId>
<scope>test</scope>
<exclusions>
<!-- Already provided by jclouds-sshj -->
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>com.google.auto.service</groupId> <groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId> <artifactId>auto-service</artifactId>

17
apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackMockTest.java
View File

@ -27,17 +27,18 @@ import java.util.Set;
import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.HttpHeaders;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.elasticstack.domain.StandardDrive; import org.jclouds.elasticstack.domain.StandardDrive;
import org.jclouds.http.BaseMockWebServerTest; import org.jclouds.http.BaseMockWebServerTest;
import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.base.Charsets;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
/** /**
* Mock tests for the {@link ElasticStackApi} class. * Mock tests for the {@link ElasticStackApi} class.
@ -48,7 +49,7 @@ public class ElasticStackMockTest extends BaseMockWebServerTest {
public void testListStandardDrives() throws IOException, InterruptedException { public void testListStandardDrives() throws IOException, InterruptedException {
MockWebServer server = mockWebServer(new MockResponse() MockWebServer server = mockWebServer(new MockResponse()
.setBody(payloadFromResource("/standard_drives_uuids.txt"))); .setBody(payloadFromResource("/standard_drives_uuids.txt")));
ElasticStackApi api = api(ElasticStackApi.class, server.getUrl("/").toString()); ElasticStackApi api = api(ElasticStackApi.class, server.url("/").toString());
try { try {
Set<String> standardDrives = api.listStandardDrives(); Set<String> standardDrives = api.listStandardDrives();
@ -65,7 +66,7 @@ public class ElasticStackMockTest extends BaseMockWebServerTest {
public void testListStandardDriveInfo() throws IOException, InterruptedException { public void testListStandardDriveInfo() throws IOException, InterruptedException {
MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/standard_drives.txt"))); MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/standard_drives.txt")));
ElasticStackApi api = api(ElasticStackApi.class, server.getUrl("/").toString()); ElasticStackApi api = api(ElasticStackApi.class, server.url("/").toString());
try { try {
Set<StandardDrive> standardDrives = api.listStandardDriveInfo(); Set<StandardDrive> standardDrives = api.listStandardDriveInfo();
@ -84,9 +85,9 @@ public class ElasticStackMockTest extends BaseMockWebServerTest {
assertEquals(request.getHeader(HttpHeaders.AUTHORIZATION), "Basic dXVpZDphcGlrZXk="); assertEquals(request.getHeader(HttpHeaders.AUTHORIZATION), "Basic dXVpZDphcGlrZXk=");
} }
private byte[] payloadFromResource(String resource) { private String payloadFromResource(String resource) {
try { try {
return toStringAndClose(getClass().getResourceAsStream(resource)).getBytes(Charsets.UTF_8); return toStringAndClose(getClass().getResourceAsStream(resource));
} catch (IOException e) { } catch (IOException e) {
throw Throwables.propagate(e); throw Throwables.propagate(e);
} }

2
apis/oauth/pom.xml
View File

@ -66,7 +66,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

30
apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiMockTest.java
View File

@ -37,6 +37,10 @@ import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.Properties; import java.util.Properties;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.concurrent.config.ExecutorServiceModule;
import org.jclouds.oauth.v2.config.CredentialType; import org.jclouds.oauth.v2.config.CredentialType;
@ -55,9 +59,7 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.io.BaseEncoding; import com.google.common.io.BaseEncoding;
import com.google.inject.Binder; import com.google.inject.Binder;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(groups = "unit", testName = "OAuthApiMockTest") @Test(groups = "unit", testName = "OAuthApiMockTest")
public class AuthorizationApiMockTest { public class AuthorizationApiMockTest {
@ -101,9 +103,9 @@ public class AuthorizationApiMockTest {
server.enqueue(new MockResponse().setBody("{\n" server.enqueue(new MockResponse().setBody("{\n"
+ " \"access_token\" : \"1/8xbJqaOZXSUZbHLl5EOtu1pxz3fmmetKx9W8CV4t79M\",\n" + " \"access_token\" : \"1/8xbJqaOZXSUZbHLl5EOtu1pxz3fmmetKx9W8CV4t79M\",\n"
+ " \"token_type\" : \"Bearer\",\n" + " \"expires_in\" : 3600\n" + "}")); + " \"token_type\" : \"Bearer\",\n" + " \"expires_in\" : 3600\n" + "}"));
server.play(); server.start();
AuthorizationApi api = api(server.getUrl("/"), P12_PRIVATE_KEY_CREDENTIALS); AuthorizationApi api = api(server.url("/").url(), P12_PRIVATE_KEY_CREDENTIALS);
assertEquals(api.authorize(CLAIMS), TOKEN); assertEquals(api.authorize(CLAIMS), TOKEN);
@ -113,7 +115,7 @@ public class AuthorizationApiMockTest {
assertEquals(request.getHeader("Content-Type"), "application/x-www-form-urlencoded"); assertEquals(request.getHeader("Content-Type"), "application/x-www-form-urlencoded");
assertEquals( assertEquals(
new String(request.getBody(), UTF_8), // request.getBody().readUtf8(), //
"grant_type=urn%3Aietf%3Aparams%3Aoauth%3Agrant-type%3Ajwt-bearer&" "grant_type=urn%3Aietf%3Aparams%3Aoauth%3Agrant-type%3Ajwt-bearer&"
+ +
// Base64 Encoded Header // Base64 Encoded Header
@ -134,9 +136,9 @@ public class AuthorizationApiMockTest {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
try { try {
server.enqueue(new MockResponse().setResponseCode(400)); server.enqueue(new MockResponse().setResponseCode(400));
server.play(); server.start();
AuthorizationApi api = api(server.getUrl("/"), P12_PRIVATE_KEY_CREDENTIALS); AuthorizationApi api = api(server.url("/").url(), P12_PRIVATE_KEY_CREDENTIALS);
api.authorize(CLAIMS); api.authorize(CLAIMS);
fail("An AuthorizationException should have been raised"); fail("An AuthorizationException should have been raised");
} catch (AuthorizationException ex) { } catch (AuthorizationException ex) {
@ -158,9 +160,9 @@ public class AuthorizationApiMockTest {
server.enqueue(new MockResponse().setBody("{\n" server.enqueue(new MockResponse().setBody("{\n"
+ " \"access_token\" : \"1/8xbJqaOZXSUZbHLl5EOtu1pxz3fmmetKx9W8CV4t79M\",\n" + " \"access_token\" : \"1/8xbJqaOZXSUZbHLl5EOtu1pxz3fmmetKx9W8CV4t79M\",\n"
+ " \"token_type\" : \"Bearer\",\n" + " \"expires_in\" : 3600\n" + "}")); + " \"token_type\" : \"Bearer\",\n" + " \"expires_in\" : 3600\n" + "}"));
server.play(); server.start();
AuthorizationApi api = api(server.getUrl("/"), CLIENT_CREDENTIALS_SECRET); AuthorizationApi api = api(server.url("/").url(), CLIENT_CREDENTIALS_SECRET);
assertEquals(api.authorizeClientSecret(identity, credential, resource, null), TOKEN); assertEquals(api.authorizeClientSecret(identity, credential, resource, null), TOKEN);
@ -170,7 +172,7 @@ public class AuthorizationApiMockTest {
assertEquals(request.getHeader("Content-Type"), "application/x-www-form-urlencoded"); assertEquals(request.getHeader("Content-Type"), "application/x-www-form-urlencoded");
assertEquals( assertEquals(
new String(request.getBody(), UTF_8), // request.getBody().readUtf8(), //
"grant_type=client_credentials&client_id=" + identity "grant_type=client_credentials&client_id=" + identity
+ "&client_secret=" + credential + "&client_secret=" + credential
+ "&resource=" + encoded_resource); + "&resource=" + encoded_resource);
@ -190,9 +192,9 @@ public class AuthorizationApiMockTest {
server.enqueue(new MockResponse().setBody("{\n" server.enqueue(new MockResponse().setBody("{\n"
+ " \"access_token\" : \"1/8xbJqaOZXSUZbHLl5EOtu1pxz3fmmetKx9W8CV4t79M\",\n" + " \"access_token\" : \"1/8xbJqaOZXSUZbHLl5EOtu1pxz3fmmetKx9W8CV4t79M\",\n"
+ " \"token_type\" : \"Bearer\",\n" + " \"expires_in\" : 3600\n" + "}")); + " \"token_type\" : \"Bearer\",\n" + " \"expires_in\" : 3600\n" + "}"));
server.play(); server.start();
AuthorizationApi api = api(server.getUrl("/"), CLIENT_CREDENTIALS_P12_AND_CERTIFICATE); AuthorizationApi api = api(server.url("/").url(), CLIENT_CREDENTIALS_P12_AND_CERTIFICATE);
assertEquals(api.authorize(identity, CLIENT_CREDENTIALS_CLAIMS, resource, null), TOKEN); assertEquals(api.authorize(identity, CLIENT_CREDENTIALS_CLAIMS, resource, null), TOKEN);
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
@ -201,7 +203,7 @@ public class AuthorizationApiMockTest {
assertEquals(request.getHeader("Content-Type"), "application/x-www-form-urlencoded"); assertEquals(request.getHeader("Content-Type"), "application/x-www-form-urlencoded");
assertEquals( assertEquals(
new String(request.getBody(), UTF_8), request.getBody().readUtf8(),
"grant_type=client_credentials&" + "grant_type=client_credentials&" +
"client_assertion_type=urn%3Aietf%3Aparams%3Aoauth%3Aclient-assertion-type%3Ajwt-bearer&" + "client_assertion_type=urn%3Aietf%3Aparams%3Aoauth%3Aclient-assertion-type%3Ajwt-bearer&" +
"client_id=" + identity + "&" + "client_id=" + identity + "&" +

2
apis/openstack-keystone/pom.xml
View File

@ -78,7 +78,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

18
apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApiMockTest.java
View File

@ -22,6 +22,10 @@ import static org.testng.Assert.assertTrue;
import java.util.Set; import java.util.Set;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.openstack.keystone.v2_0.KeystoneApi; import org.jclouds.openstack.keystone.v2_0.KeystoneApi;
import org.jclouds.openstack.keystone.v2_0.domain.Role; import org.jclouds.openstack.keystone.v2_0.domain.Role;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
@ -29,9 +33,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
/** /**
* Tests RoleApi Guice wiring and parsing * Tests RoleApi Guice wiring and parsing
@ -52,7 +54,7 @@ public class RoleAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
stringFromResource("/role_list_response.json")))); stringFromResource("/role_list_response.json"))));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
RoleAdminApi roleAdminApi = keystoneApi.getRoleAdminApi().get(); RoleAdminApi roleAdminApi = keystoneApi.getRoleAdminApi().get();
FluentIterable<? extends Role> roles = roleAdminApi.list(); FluentIterable<? extends Role> roles = roleAdminApi.list();
@ -78,7 +80,7 @@ public class RoleAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
stringFromResource("/role_create_response.json")))); stringFromResource("/role_create_response.json"))));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
RoleAdminApi roleAdminApi = keystoneApi.getRoleAdminApi().get(); RoleAdminApi roleAdminApi = keystoneApi.getRoleAdminApi().get();
Role testRole = roleAdminApi.create("jclouds-role"); Role testRole = roleAdminApi.create("jclouds-role");
@ -90,7 +92,7 @@ public class RoleAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
assertExtensions(server); assertExtensions(server);
RecordedRequest createRoleRequest = server.takeRequest(); RecordedRequest createRoleRequest = server.takeRequest();
assertEquals(createRoleRequest.getRequestLine(), "POST /OS-KSADM/roles HTTP/1.1"); assertEquals(createRoleRequest.getRequestLine(), "POST /OS-KSADM/roles HTTP/1.1");
assertEquals(new String(createRoleRequest.getBody()), "{\"role\":{\"name\":\"jclouds-role\"}}"); assertEquals(createRoleRequest.getBody().readUtf8(), "{\"role\":{\"name\":\"jclouds-role\"}}");
} finally { } finally {
server.shutdown(); server.shutdown();
} }
@ -104,7 +106,7 @@ public class RoleAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
stringFromResource("/role_create_response.json")))); stringFromResource("/role_create_response.json"))));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
RoleAdminApi roleAdminApi = keystoneApi.getRoleAdminApi().get(); RoleAdminApi roleAdminApi = keystoneApi.getRoleAdminApi().get();
Role role = roleAdminApi.get("r1000"); Role role = roleAdminApi.get("r1000");
@ -131,7 +133,7 @@ public class RoleAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
RoleAdminApi roleAdminApi = keystoneApi.getRoleAdminApi().get(); RoleAdminApi roleAdminApi = keystoneApi.getRoleAdminApi().get();
boolean success = roleAdminApi.delete("r1000"); boolean success = roleAdminApi.delete("r1000");

20
apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApiMockTest.java
View File

@ -21,6 +21,10 @@ import static org.testng.Assert.assertNotNull;
import java.util.Set; import java.util.Set;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.collect.PagedIterable; import org.jclouds.collect.PagedIterable;
import org.jclouds.openstack.keystone.v2_0.KeystoneApi; import org.jclouds.openstack.keystone.v2_0.KeystoneApi;
import org.jclouds.openstack.keystone.v2_0.domain.Service; import org.jclouds.openstack.keystone.v2_0.domain.Service;
@ -30,9 +34,7 @@ import org.jclouds.openstack.v2_0.options.PaginationOptions;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
/** /**
* Tests ServiceApi Guice wiring and parsing * Tests ServiceApi Guice wiring and parsing
@ -54,7 +56,7 @@ public class ServiceAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi>
stringFromResource("/service_list_response.json")))); stringFromResource("/service_list_response.json"))));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
ServiceAdminApi serviceAdminApi = keystoneApi.getServiceAdminApi().get(); ServiceAdminApi serviceAdminApi = keystoneApi.getServiceAdminApi().get();
PagedIterable<? extends Service> services = serviceAdminApi.list(); PagedIterable<? extends Service> services = serviceAdminApi.list();
@ -80,7 +82,7 @@ public class ServiceAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi>
stringFromResource("/service_list_response.json")))); stringFromResource("/service_list_response.json"))));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
ServiceAdminApi serviceAdminApi = keystoneApi.getServiceAdminApi().get(); ServiceAdminApi serviceAdminApi = keystoneApi.getServiceAdminApi().get();
PaginatedCollection<? extends Service> services = serviceAdminApi.list(new PaginationOptions()); PaginatedCollection<? extends Service> services = serviceAdminApi.list(new PaginationOptions());
@ -106,7 +108,7 @@ public class ServiceAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi>
stringFromResource("/service_create_response.json")))); stringFromResource("/service_create_response.json"))));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
ServiceAdminApi serviceAdminApi = keystoneApi.getServiceAdminApi().get(); ServiceAdminApi serviceAdminApi = keystoneApi.getServiceAdminApi().get();
Service testService = serviceAdminApi.create("jclouds-service-test", "jclouds-service-type", Service testService = serviceAdminApi.create("jclouds-service-test", "jclouds-service-type",
"jclouds-service-description"); "jclouds-service-description");
@ -119,7 +121,7 @@ public class ServiceAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi>
assertExtensions(server); assertExtensions(server);
RecordedRequest createServiceRequest = server.takeRequest(); RecordedRequest createServiceRequest = server.takeRequest();
assertEquals(createServiceRequest.getRequestLine(), "POST /OS-KSADM/services HTTP/1.1"); assertEquals(createServiceRequest.getRequestLine(), "POST /OS-KSADM/services HTTP/1.1");
String bodyRequest = new String(createServiceRequest.getBody()); String bodyRequest = createServiceRequest.getBody().readUtf8();
assertEquals( assertEquals(
bodyRequest, bodyRequest,
"{\"OS-KSADM:service\":{\"name\":\"jclouds-service-test\",\"type\":\"jclouds-service-type\",\"description\":\"jclouds-service-description\"}}"); "{\"OS-KSADM:service\":{\"name\":\"jclouds-service-test\",\"type\":\"jclouds-service-type\",\"description\":\"jclouds-service-description\"}}");
@ -136,7 +138,7 @@ public class ServiceAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi>
stringFromResource("/service_create_response.json")))); stringFromResource("/service_create_response.json"))));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
ServiceAdminApi serviceAdminApi = keystoneApi.getServiceAdminApi().get(); ServiceAdminApi serviceAdminApi = keystoneApi.getServiceAdminApi().get();
Service service = serviceAdminApi.get("s1000"); Service service = serviceAdminApi.get("s1000");
@ -163,7 +165,7 @@ public class ServiceAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi>
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
ServiceAdminApi serviceAdminApi = keystoneApi.getServiceAdminApi().get(); ServiceAdminApi serviceAdminApi = keystoneApi.getServiceAdminApi().get();
serviceAdminApi.delete("s1000"); serviceAdminApi.delete("s1000");

21
apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApiMockTest.java
View File

@ -19,6 +19,10 @@ package org.jclouds.openstack.keystone.v2_0.extensions;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNotNull;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.openstack.keystone.v2_0.KeystoneApi; import org.jclouds.openstack.keystone.v2_0.KeystoneApi;
import org.jclouds.openstack.keystone.v2_0.domain.Tenant; import org.jclouds.openstack.keystone.v2_0.domain.Tenant;
import org.jclouds.openstack.keystone.v2_0.options.CreateTenantOptions; import org.jclouds.openstack.keystone.v2_0.options.CreateTenantOptions;
@ -26,9 +30,6 @@ import org.jclouds.openstack.keystone.v2_0.options.UpdateTenantOptions;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
/** /**
* Tests TenantApi Guice wiring and parsing * Tests TenantApi Guice wiring and parsing
@ -44,7 +45,7 @@ public class TenantAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
stringFromResource("/tenant_create_response.json")))); stringFromResource("/tenant_create_response.json"))));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
TenantAdminApi tenantAdminApi = keystoneApi.getTenantAdminApi().get(); TenantAdminApi tenantAdminApi = keystoneApi.getTenantAdminApi().get();
CreateTenantOptions createTenantOptions = CreateTenantOptions.Builder.description("jclouds-description") CreateTenantOptions createTenantOptions = CreateTenantOptions.Builder.description("jclouds-description")
.enabled(true); .enabled(true);
@ -58,7 +59,7 @@ public class TenantAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
assertExtensions(server); assertExtensions(server);
RecordedRequest createTenantRequest = server.takeRequest(); RecordedRequest createTenantRequest = server.takeRequest();
assertEquals(createTenantRequest.getRequestLine(), "POST /tenants HTTP/1.1"); assertEquals(createTenantRequest.getRequestLine(), "POST /tenants HTTP/1.1");
assertEquals(new String(createTenantRequest.getBody()), assertEquals(createTenantRequest.getBody().readUtf8(),
"{\"tenant\":{\"name\":\"jclouds-tenant\",\"description\":\"jclouds-description\",\"enabled\":true}}"); "{\"tenant\":{\"name\":\"jclouds-tenant\",\"description\":\"jclouds-description\",\"enabled\":true}}");
} finally { } finally {
server.shutdown(); server.shutdown();
@ -73,7 +74,7 @@ public class TenantAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
stringFromResource("/tenant_update_response.json")))); stringFromResource("/tenant_update_response.json"))));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
TenantAdminApi tenantAdminApi = keystoneApi.getTenantAdminApi().get(); TenantAdminApi tenantAdminApi = keystoneApi.getTenantAdminApi().get();
UpdateTenantOptions updateTenantOptions = UpdateTenantOptions.Builder UpdateTenantOptions updateTenantOptions = UpdateTenantOptions.Builder
.description("jclouds-description-modified").enabled(false).name("jclouds-tenant-modified"); .description("jclouds-description-modified").enabled(false).name("jclouds-tenant-modified");
@ -88,7 +89,7 @@ public class TenantAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
RecordedRequest updateTenantRequest = server.takeRequest(); RecordedRequest updateTenantRequest = server.takeRequest();
assertEquals(updateTenantRequest.getRequestLine(), "PUT /tenants/t1000 HTTP/1.1"); assertEquals(updateTenantRequest.getRequestLine(), "PUT /tenants/t1000 HTTP/1.1");
assertEquals( assertEquals(
new String(updateTenantRequest.getBody()), updateTenantRequest.getBody().readUtf8(),
"{\"tenant\":{\"name\":\"jclouds-tenant-modified\",\"description\":\"jclouds-description-modified\",\"enabled\":false}}"); "{\"tenant\":{\"name\":\"jclouds-tenant-modified\",\"description\":\"jclouds-description-modified\",\"enabled\":false}}");
} finally { } finally {
server.shutdown(); server.shutdown();
@ -102,7 +103,7 @@ public class TenantAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
TenantAdminApi tenantAdminApi = keystoneApi.getTenantAdminApi().get(); TenantAdminApi tenantAdminApi = keystoneApi.getTenantAdminApi().get();
tenantAdminApi.delete("t1000"); tenantAdminApi.delete("t1000");
@ -123,7 +124,7 @@ public class TenantAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201)));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
TenantAdminApi tenantAdminApi = keystoneApi.getTenantAdminApi().get(); TenantAdminApi tenantAdminApi = keystoneApi.getTenantAdminApi().get();
tenantAdminApi.addRoleOnTenant("u1000", "t1000", "r1000"); tenantAdminApi.addRoleOnTenant("u1000", "t1000", "r1000");
@ -145,7 +146,7 @@ public class TenantAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
TenantAdminApi tenantAdminApi = keystoneApi.getTenantAdminApi().get(); TenantAdminApi tenantAdminApi = keystoneApi.getTenantAdminApi().get();
tenantAdminApi.deleteRoleOnTenant("t1000", "u1000", "r1000"); tenantAdminApi.deleteRoleOnTenant("t1000", "u1000", "r1000");

17
apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApiMockTest.java
View File

@ -19,6 +19,10 @@ package org.jclouds.openstack.keystone.v2_0.extensions;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNotNull;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.openstack.keystone.v2_0.KeystoneApi; import org.jclouds.openstack.keystone.v2_0.KeystoneApi;
import org.jclouds.openstack.keystone.v2_0.domain.User; import org.jclouds.openstack.keystone.v2_0.domain.User;
import org.jclouds.openstack.keystone.v2_0.options.CreateUserOptions; import org.jclouds.openstack.keystone.v2_0.options.CreateUserOptions;
@ -26,9 +30,6 @@ import org.jclouds.openstack.keystone.v2_0.options.UpdateUserOptions;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
/** /**
* Tests UserApi Guice wiring and parsing * Tests UserApi Guice wiring and parsing
@ -44,7 +45,7 @@ public class UserAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
stringFromResource("/user_create_response.json")))); stringFromResource("/user_create_response.json"))));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
UserAdminApi userAdminApi = keystoneApi.getUserAdminApi().get(); UserAdminApi userAdminApi = keystoneApi.getUserAdminApi().get();
CreateUserOptions createUserOptions = CreateUserOptions.Builder.email("john.smith@example.org").enabled(true) CreateUserOptions createUserOptions = CreateUserOptions.Builder.email("john.smith@example.org").enabled(true)
.tenant("12345"); .tenant("12345");
@ -59,7 +60,7 @@ public class UserAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
RecordedRequest createUserRequest = server.takeRequest(); RecordedRequest createUserRequest = server.takeRequest();
assertEquals(createUserRequest.getRequestLine(), "POST /users HTTP/1.1"); assertEquals(createUserRequest.getRequestLine(), "POST /users HTTP/1.1");
assertEquals( assertEquals(
new String(createUserRequest.getBody()), createUserRequest.getBody().readUtf8(),
"{\"user\":{\"name\":\"jqsmith\",\"tenantId\":\"12345\",\"password\":\"jclouds-password\",\"email\":\"john.smith@example.org\",\"enabled\":true}}"); "{\"user\":{\"name\":\"jqsmith\",\"tenantId\":\"12345\",\"password\":\"jclouds-password\",\"email\":\"john.smith@example.org\",\"enabled\":true}}");
} finally { } finally {
server.shutdown(); server.shutdown();
@ -74,7 +75,7 @@ public class UserAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
stringFromResource("/user_update_response.json")))); stringFromResource("/user_update_response.json"))));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
UserAdminApi userAdminApi = keystoneApi.getUserAdminApi().get(); UserAdminApi userAdminApi = keystoneApi.getUserAdminApi().get();
UpdateUserOptions updateUserOptions = UpdateUserOptions.Builder.email("john.smith.renamed@example.org") UpdateUserOptions updateUserOptions = UpdateUserOptions.Builder.email("john.smith.renamed@example.org")
.enabled(false).name("jqsmith-renamed").password("jclouds-password"); .enabled(false).name("jqsmith-renamed").password("jclouds-password");
@ -89,7 +90,7 @@ public class UserAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
RecordedRequest updateUserRequest = server.takeRequest(); RecordedRequest updateUserRequest = server.takeRequest();
assertEquals(updateUserRequest.getRequestLine(), "PUT /users/u1000 HTTP/1.1"); assertEquals(updateUserRequest.getRequestLine(), "PUT /users/u1000 HTTP/1.1");
assertEquals( assertEquals(
new String(updateUserRequest.getBody()), updateUserRequest.getBody().readUtf8(),
"{\"user\":{\"name\":\"jqsmith-renamed\",\"email\":\"john.smith.renamed@example.org\",\"password\":\"jclouds-password\",\"enabled\":false}}"); "{\"user\":{\"name\":\"jqsmith-renamed\",\"email\":\"john.smith.renamed@example.org\",\"password\":\"jclouds-password\",\"enabled\":false}}");
} finally { } finally {
server.shutdown(); server.shutdown();
@ -103,7 +104,7 @@ public class UserAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
try { try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone"); KeystoneApi keystoneApi = api(server.url("/").toString(), "openstack-keystone");
UserAdminApi userAdminApi = keystoneApi.getUserAdminApi().get(); UserAdminApi userAdminApi = keystoneApi.getUserAdminApi().get();
userAdminApi.delete("u1000"); userAdminApi.delete("u1000");

3
apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v3/features/AuthApiMockTest.java
View File

@ -21,12 +21,13 @@ import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNull; import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.openstack.keystone.v3.domain.Token; import org.jclouds.openstack.keystone.v3.domain.Token;
import org.jclouds.openstack.keystone.v3.domain.User; import org.jclouds.openstack.keystone.v3.domain.User;
import org.jclouds.openstack.keystone.v3.internal.BaseV3KeystoneApiMockTest; import org.jclouds.openstack.keystone.v3.internal.BaseV3KeystoneApiMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(groups = "unit", testName = "AuthApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "AuthApiMockTest", singleThreaded = true)
public class AuthApiMockTest extends BaseV3KeystoneApiMockTest { public class AuthApiMockTest extends BaseV3KeystoneApiMockTest {

4
apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v3/features/ProjectApiMockTest.java
View File

@ -25,12 +25,14 @@ import static org.testng.Assert.assertTrue;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.openstack.keystone.v3.domain.Project; import org.jclouds.openstack.keystone.v3.domain.Project;
import org.jclouds.openstack.keystone.v3.internal.BaseV3KeystoneApiMockTest; import org.jclouds.openstack.keystone.v3.internal.BaseV3KeystoneApiMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "ProjectApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "ProjectApiMockTest", singleThreaded = true)
public class ProjectApiMockTest extends BaseV3KeystoneApiMockTest { public class ProjectApiMockTest extends BaseV3KeystoneApiMockTest {

14
apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v3/internal/BaseV3KeystoneApiMockTest.java
View File

@ -27,6 +27,10 @@ import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.concurrent.config.ExecutorServiceModule;
import org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule; import org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule;
@ -48,9 +52,7 @@ import com.google.common.io.Resources;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
public class BaseV3KeystoneApiMockTest { public class BaseV3KeystoneApiMockTest {
@ -68,7 +70,7 @@ public class BaseV3KeystoneApiMockTest {
@BeforeMethod @BeforeMethod
public void start() throws IOException { public void start() throws IOException {
server = new MockWebServer(); server = new MockWebServer();
server.play(); server.start();
ApiContext<KeystoneApi> ctx = ContextBuilder.newBuilder("openstack-keystone-3") ApiContext<KeystoneApi> ctx = ContextBuilder.newBuilder("openstack-keystone-3")
.credentials("domain:identity", "credential") .credentials("domain:identity", "credential")
@ -103,7 +105,7 @@ public class BaseV3KeystoneApiMockTest {
} }
protected String url(String path) { protected String url(String path) {
return server.getUrl(path).toString(); return server.url(path).toString();
} }
protected void enqueueAuthentication(MockWebServer server) { protected void enqueueAuthentication(MockWebServer server) {
@ -178,7 +180,7 @@ public class BaseV3KeystoneApiMockTest {
private void assertBody(RecordedRequest request, String body) { private void assertBody(RecordedRequest request, String body) {
assertEquals(request.getHeader("Content-Type"), "application/json"); assertEquals(request.getHeader("Content-Type"), "application/json");
assertEquals(parser.parse(new String(request.getBody(), Charsets.UTF_8)), parser.parse(body)); assertEquals(parser.parse(request.getBody().readUtf8()), parser.parse(body));
} }
protected Token tokenFromResource(String resource) { protected Token tokenFromResource(String resource) {

33
apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java
View File

@ -30,11 +30,16 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.QueueDispatcher;
import okhttp3.mockwebserver.RecordedRequest;
import okhttp3.mockwebserver.SocketPolicy;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.concurrent.config.ExecutorServiceModule;
import org.jclouds.util.Strings2; import org.jclouds.util.Strings2;
import com.google.common.base.Charsets;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.net.HttpHeaders; import com.google.common.net.HttpHeaders;
@ -43,10 +48,7 @@ import com.google.common.reflect.TypeToken;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.QueueDispatcher;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
public class BaseOpenStackMockTest<A extends Closeable> { public class BaseOpenStackMockTest<A extends Closeable> {
@ -85,9 +87,9 @@ public class BaseOpenStackMockTest<A extends Closeable> {
public static MockWebServer mockOpenStackServer() throws IOException { public static MockWebServer mockOpenStackServer() throws IOException {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
server.play(); server.start();
URL url = server.getUrl(""); URL url = server.url("").url();
server.setDispatcher(getURLReplacingQueueDispatcher(url)); server.setDispatcher(getURLReplacingQueueDispatcher(url.toString()));
return server; return server;
} }
@ -95,7 +97,9 @@ public class BaseOpenStackMockTest<A extends Closeable> {
* there's no built-in way to defer evaluation of a response header, hence * there's no built-in way to defer evaluation of a response header, hence
* this method, which allows us to send back links to the mock server. * this method, which allows us to send back links to the mock server.
*/ */
public static QueueDispatcher getURLReplacingQueueDispatcher(final URL url) { public static QueueDispatcher getURLReplacingQueueDispatcher(final String url) {
final String strippedUrl = url.endsWith("/") ? url.substring(0, url.length() - 1) : url;
final QueueDispatcher dispatcher = new QueueDispatcher() { final QueueDispatcher dispatcher = new QueueDispatcher() {
protected final BlockingQueue<MockResponse> responseQueue = new LinkedBlockingQueue<MockResponse>(); protected final BlockingQueue<MockResponse> responseQueue = new LinkedBlockingQueue<MockResponse>();
@ -108,7 +112,7 @@ public class BaseOpenStackMockTest<A extends Closeable> {
* access.json or accessRackspace.json) for the declared service * access.json or accessRackspace.json) for the declared service
* endpoints. * endpoints.
*/ */
String newBody = urlTokenPattern.matcher(new String(response.getBody().readByteArray())).replaceAll(": \"" + url.toString()); String newBody = urlTokenPattern.matcher(new String(response.getBody().readByteArray())).replaceAll(": \"" + strippedUrl);
response = response.setBody(newBody); response = response.setBody(newBody);
} }
@ -119,6 +123,11 @@ public class BaseOpenStackMockTest<A extends Closeable> {
public void enqueueResponse(MockResponse response) { public void enqueueResponse(MockResponse response) {
responseQueue.add(response); responseQueue.add(response);
} }
@Override
public MockResponse peek() {
return super.peek().setSocketPolicy(SocketPolicy.EXPECT_CONTINUE);
}
}; };
return dispatcher; return dispatcher;
@ -187,7 +196,7 @@ public class BaseOpenStackMockTest<A extends Closeable> {
* @see RecordedRequest * @see RecordedRequest
*/ */
private void assertContentTypeIsJSON(RecordedRequest request) { private void assertContentTypeIsJSON(RecordedRequest request) {
assertTrue(request.getHeaders().contains("Content-Type: application/json")); assertTrue(request.getHeaders().values("Content-Type").contains("application/json"));
} }
/** /**
@ -224,7 +233,7 @@ public class BaseOpenStackMockTest<A extends Closeable> {
JsonElement requestJson = null; // to be compared JsonElement requestJson = null; // to be compared
JsonElement resourceJson; // to be compared JsonElement resourceJson; // to be compared
try { try {
requestJson = parser.parse(new String(request.getBody(), Charsets.UTF_8)); requestJson = parser.parse(request.getBody().readUtf8());
} catch (Exception e) { } catch (Exception e) {
Throwables.propagate(e); Throwables.propagate(e);
} }

2
apis/openstack-neutron/pom.xml
View File

@ -78,7 +78,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

33
apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java
View File

@ -25,6 +25,9 @@ import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.List; import java.util.List;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.neutron.v2.NeutronApi; import org.jclouds.openstack.neutron.v2.NeutronApi;
import org.jclouds.openstack.neutron.v2.domain.CreateFirewall; import org.jclouds.openstack.neutron.v2.domain.CreateFirewall;
import org.jclouds.openstack.neutron.v2.domain.CreateFirewallPolicy; import org.jclouds.openstack.neutron.v2.domain.CreateFirewallPolicy;
@ -44,8 +47,6 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Tests Floating Api Guice wiring and parsing * Tests Floating Api Guice wiring and parsing
@ -62,7 +63,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_create_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get(); FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
CreateFirewall firewallRequest = CreateFirewall.builder() CreateFirewall firewallRequest = CreateFirewall.builder()
@ -103,7 +104,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/firewall_list_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/firewall_list_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get(); FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
PaginatedCollection<Firewall> firewalls = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg")); PaginatedCollection<Firewall> firewalls = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
@ -135,7 +136,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/floatingip_list_response_paged2.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/floatingip_list_response_paged2.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne"); FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne");
// Note: Lazy! Have to actually look at the collection. // Note: Lazy! Have to actually look at the collection.
@ -169,7 +170,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_get_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get(); FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
Firewall firewall = api.get("12345"); Firewall firewall = api.get("12345");
@ -206,7 +207,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_update_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_update_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get(); FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
UpdateFirewall updateFirewall = UpdateFirewall.builder() UpdateFirewall updateFirewall = UpdateFirewall.builder()
@ -242,7 +243,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201))); new MockResponse().setResponseCode(201)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get(); FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
boolean result = api.delete("12345"); boolean result = api.delete("12345");
@ -272,7 +273,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_policy_create_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_policy_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get(); FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
CreateFirewallPolicy firewallPolicyRequest = CreateFirewallPolicy.builder() CreateFirewallPolicy firewallPolicyRequest = CreateFirewallPolicy.builder()
@ -313,7 +314,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_policy_get_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_policy_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get(); FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
FirewallPolicy firewallPolicy = api.getFirewallPolicy("12345"); FirewallPolicy firewallPolicy = api.getFirewallPolicy("12345");
@ -350,7 +351,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_policy_get_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_policy_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get(); FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
UpdateFirewallPolicy updateFirewallPolicy = UpdateFirewallPolicy.builder() UpdateFirewallPolicy updateFirewallPolicy = UpdateFirewallPolicy.builder()
@ -391,7 +392,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_policy_insert_rule_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_policy_insert_rule_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get(); FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
FirewallPolicy updatedFirewallPolicy = api.insertFirewallRuleToPolicy("12345", "59585143-e819-48c9-944d-f03e0f049dba"); FirewallPolicy updatedFirewallPolicy = api.insertFirewallRuleToPolicy("12345", "59585143-e819-48c9-944d-f03e0f049dba");
@ -422,7 +423,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_rule_create_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_rule_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get(); FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
CreateFirewallRule firewallRuleRequest = CreateFirewallRule.builder() CreateFirewallRule firewallRuleRequest = CreateFirewallRule.builder()
@ -469,7 +470,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_rule_get_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_rule_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get(); FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
FirewallRule firewallRule = api.getFirewallRule("12345"); FirewallRule firewallRule = api.getFirewallRule("12345");
@ -508,7 +509,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_rule_update_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/firewall_rule_update_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get(); FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
UpdateFirewallRule updateFirewallRule = UpdateFirewallRule.builder() UpdateFirewallRule updateFirewallRule = UpdateFirewallRule.builder()
@ -542,7 +543,7 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201))); new MockResponse().setResponseCode(201)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get(); FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
boolean result = api.deleteFirewallRule("12345"); boolean result = api.deleteFirewallRule("12345");

25
apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java
View File

@ -24,6 +24,9 @@ import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.List; import java.util.List;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.neutron.v2.NeutronApi; import org.jclouds.openstack.neutron.v2.NeutronApi;
import org.jclouds.openstack.neutron.v2.domain.ExternalGatewayInfo; import org.jclouds.openstack.neutron.v2.domain.ExternalGatewayInfo;
import org.jclouds.openstack.neutron.v2.domain.NetworkStatus; import org.jclouds.openstack.neutron.v2.domain.NetworkStatus;
@ -34,8 +37,6 @@ import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest;
import org.jclouds.openstack.v2_0.options.PaginationOptions; import org.jclouds.openstack.v2_0.options.PaginationOptions;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Tests NetworkApi Guice wiring and parsing * Tests NetworkApi Guice wiring and parsing
@ -52,7 +53,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/router_create_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/router_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
RouterApi api = neutronApi.getRouterApi("RegionOne").get(); RouterApi api = neutronApi.getRouterApi("RegionOne").get();
Router.CreateRouter createRouter = Router.createBuilder().name("another_router").adminStateUp(Boolean.TRUE) Router.CreateRouter createRouter = Router.createBuilder().name("another_router").adminStateUp(Boolean.TRUE)
@ -95,7 +96,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/router_list_response_paged1.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/router_list_response_paged1.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
RouterApi api = neutronApi.getRouterApi("RegionOne").get(); RouterApi api = neutronApi.getRouterApi("RegionOne").get();
Routers routers = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg")); Routers routers = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
@ -127,7 +128,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/router_list_response_paged2.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/router_list_response_paged2.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
RouterApi api = neutronApi.getRouterApi("RegionOne").get(); RouterApi api = neutronApi.getRouterApi("RegionOne").get();
// Note: Lazy! Have to actually look at the collection. // Note: Lazy! Have to actually look at the collection.
@ -162,7 +163,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/router_get_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/router_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
RouterApi api = neutronApi.getRouterApi("RegionOne").get(); RouterApi api = neutronApi.getRouterApi("RegionOne").get();
Router router = api.get("12345"); Router router = api.get("12345");
@ -198,7 +199,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/router_update_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/router_update_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
RouterApi api = neutronApi.getRouterApi("RegionOne").get(); RouterApi api = neutronApi.getRouterApi("RegionOne").get();
Router.UpdateRouter updateRouter = Router.updateBuilder() Router.UpdateRouter updateRouter = Router.updateBuilder()
@ -239,7 +240,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201))); new MockResponse().setResponseCode(201)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
RouterApi api = neutronApi.getRouterApi("RegionOne").get(); RouterApi api = neutronApi.getRouterApi("RegionOne").get();
boolean result = api.delete("12345"); boolean result = api.delete("12345");
@ -269,7 +270,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/router_add_interface_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/router_add_interface_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
RouterApi api = neutronApi.getRouterApi("RegionOne").get(); RouterApi api = neutronApi.getRouterApi("RegionOne").get();
RouterInterface routerInterface = api.addInterfaceForSubnet("12345", "a2f1f29d-571b-4533-907f-5803ab96ead1"); RouterInterface routerInterface = api.addInterfaceForSubnet("12345", "a2f1f29d-571b-4533-907f-5803ab96ead1");
@ -300,7 +301,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/router_add_interface_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/router_add_interface_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
RouterApi api = neutronApi.getRouterApi("RegionOne").get(); RouterApi api = neutronApi.getRouterApi("RegionOne").get();
RouterInterface routerInterface = api.addInterfaceForPort("12345", "portid"); RouterInterface routerInterface = api.addInterfaceForPort("12345", "portid");
@ -332,7 +333,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201))); new MockResponse().setResponseCode(201)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
RouterApi api = neutronApi.getRouterApi("RegionOne").get(); RouterApi api = neutronApi.getRouterApi("RegionOne").get();
boolean result = api.removeInterfaceForSubnet("12345", "a2f1f29d-571b-4533-907f-5803ab96ead1"); boolean result = api.removeInterfaceForSubnet("12345", "a2f1f29d-571b-4533-907f-5803ab96ead1");
@ -362,7 +363,7 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201))); new MockResponse().setResponseCode(201)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
RouterApi api = neutronApi.getRouterApi("RegionOne").get(); RouterApi api = neutronApi.getRouterApi("RegionOne").get();
boolean result = api.removeInterfaceForPort("12345", "portid"); boolean result = api.removeInterfaceForPort("12345", "portid");

62
apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiMockTest.java
View File

@ -24,6 +24,9 @@ import static org.testng.Assert.assertTrue;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.neutron.v2.NeutronApi; import org.jclouds.openstack.neutron.v2.NeutronApi;
import org.jclouds.openstack.neutron.v2.domain.lbaas.v1.HealthMonitor; import org.jclouds.openstack.neutron.v2.domain.lbaas.v1.HealthMonitor;
import org.jclouds.openstack.neutron.v2.domain.lbaas.v1.HealthMonitors; import org.jclouds.openstack.neutron.v2.domain.lbaas.v1.HealthMonitors;
@ -44,8 +47,7 @@ import org.testng.annotations.Test;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
@Test @Test
public class LBaaSApiMockTest extends BaseNeutronApiMockTest { public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
@ -56,7 +58,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_with_lbaas_v1_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
Optional<LBaaSApi> lbaasApiExtension = neutronApi.getLBaaSApi("RegionOne"); Optional<LBaaSApi> lbaasApiExtension = neutronApi.getLBaaSApi("RegionOne");
assertAuthentication(server); assertAuthentication(server);
@ -77,7 +79,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_without_lbaas_v1_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/extension_list_without_lbaas_v1_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
Optional<LBaaSApi> lbaasApiExtension = neutronApi.getLBaaSApi("RegionOne"); Optional<LBaaSApi> lbaasApiExtension = neutronApi.getLBaaSApi("RegionOne");
assertAuthentication(server); assertAuthentication(server);
@ -99,7 +101,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/pool_create_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/pool_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
Pool.CreatePool createPool = Pool.createBuilder("8032909d-47a1-4715-90af-5153ffe39861", Protocol.TCP, Pool.ROUND_ROBIN) Pool.CreatePool createPool = Pool.createBuilder("8032909d-47a1-4715-90af-5153ffe39861", Protocol.TCP, Pool.ROUND_ROBIN)
@ -148,7 +150,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/pool_list_response_paged1.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/pool_list_response_paged1.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
Pools pools = lbaasApi.listPools(PaginationOptions.Builder.limit(2).marker("abcdefg")); Pools pools = lbaasApi.listPools(PaginationOptions.Builder.limit(2).marker("abcdefg"));
@ -179,7 +181,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/lbaas/v1/pool_list_response_paged2.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/lbaas/v1/pool_list_response_paged2.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
// Note: Lazy! Have to actually look at the collection. // Note: Lazy! Have to actually look at the collection.
@ -213,7 +215,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/pool_get_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/pool_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
Pool pool = lbaasApi.getPool("72741b06-df4d-4715-b142-276b6bce75ab"); Pool pool = lbaasApi.getPool("72741b06-df4d-4715-b142-276b6bce75ab");
@ -259,7 +261,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/pool_update_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/pool_update_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
Pool.UpdatePool updatePool = Pool.updateBuilder().name("new_name").description("new description").lbMethod("NEW_LB_METHOD") Pool.UpdatePool updatePool = Pool.updateBuilder().name("new_name").description("new description").lbMethod("NEW_LB_METHOD")
@ -310,7 +312,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
boolean result = lbaasApi.deletePool("72741b06-df4d-4715-b142-276b6bce75ab"); boolean result = lbaasApi.deletePool("72741b06-df4d-4715-b142-276b6bce75ab");
@ -338,7 +340,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/member_create_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/member_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
Member.CreateMember createMember = Member.createBuilder("72741b06-df4d-4715-b142-276b6bce75ab", null, 80) Member.CreateMember createMember = Member.createBuilder("72741b06-df4d-4715-b142-276b6bce75ab", null, 80)
@ -378,7 +380,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/member_list_response_paged1.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/member_list_response_paged1.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
Members members = lbaasApi.listMembers(PaginationOptions.Builder.limit(2).marker("abcdefg")); Members members = lbaasApi.listMembers(PaginationOptions.Builder.limit(2).marker("abcdefg"));
@ -409,7 +411,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/lbaas/v1/member_list_response_paged2.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/lbaas/v1/member_list_response_paged2.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
// Note: Lazy! Have to actually look at the collection. // Note: Lazy! Have to actually look at the collection.
@ -443,7 +445,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/member_get_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/member_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
Member member = lbaasApi.getMember("48a471ea-64f1-4eb6-9be7-dae6bbe40a0f"); Member member = lbaasApi.getMember("48a471ea-64f1-4eb6-9be7-dae6bbe40a0f");
@ -480,7 +482,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/member_update_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/member_update_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
Member.UpdateMember updateMember = Member.updateBuilder().poolId("new_pool_id").weight(2) Member.UpdateMember updateMember = Member.updateBuilder().poolId("new_pool_id").weight(2)
@ -520,7 +522,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
boolean result = lbaasApi.deleteMember("48a471ea-64f1-4eb6-9be7-dae6bbe40a0f"); boolean result = lbaasApi.deleteMember("48a471ea-64f1-4eb6-9be7-dae6bbe40a0f");
@ -548,7 +550,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/vip_create_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/vip_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
VIP.CreateVIP createVIP = VIP.createBuilder("8032909d-47a1-4715-90af-5153ffe39861", Protocol.HTTP, 80, "61b1f87a-7a21-4ad3-9dda-7f81d249944f") VIP.CreateVIP createVIP = VIP.createBuilder("8032909d-47a1-4715-90af-5153ffe39861", Protocol.HTTP, 80, "61b1f87a-7a21-4ad3-9dda-7f81d249944f")
@ -594,7 +596,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/vip_list_response_paged1.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/vip_list_response_paged1.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
VIPs vips = lbaasApi.listVIPs(PaginationOptions.Builder.limit(2).marker("abcdefg")); VIPs vips = lbaasApi.listVIPs(PaginationOptions.Builder.limit(2).marker("abcdefg"));
@ -625,7 +627,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/lbaas/v1/vip_list_response_paged2.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/lbaas/v1/vip_list_response_paged2.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
// Note: Lazy! Have to actually look at the collection. // Note: Lazy! Have to actually look at the collection.
@ -659,7 +661,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/vip_get_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/vip_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
VIP vip = lbaasApi.getVIP("4ec89087-d057-4e2c-911f-60a3b47ee304"); VIP vip = lbaasApi.getVIP("4ec89087-d057-4e2c-911f-60a3b47ee304");
@ -703,7 +705,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/vip_update_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/vip_update_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
SessionPersistence sessionPersistence = SessionPersistence.builder().type(SessionPersistence.Type.APP_COOKIE).cookieName("MyNewAppCookie").build(); SessionPersistence sessionPersistence = SessionPersistence.builder().type(SessionPersistence.Type.APP_COOKIE).cookieName("MyNewAppCookie").build();
@ -750,7 +752,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
boolean result = lbaasApi.deleteVIP("c987d2be-9a3c-4ac9-a046-e8716b1350e2"); boolean result = lbaasApi.deleteVIP("c987d2be-9a3c-4ac9-a046-e8716b1350e2");
@ -778,7 +780,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/health_monitor_create_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/health_monitor_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
HealthMonitor.CreateHealthMonitor createHealthMonitor = HealthMonitor.createBuilder(ProbeType.HTTP, Integer.valueOf(1), Integer.valueOf(1), Integer.valueOf(1)) HealthMonitor.CreateHealthMonitor createHealthMonitor = HealthMonitor.createBuilder(ProbeType.HTTP, Integer.valueOf(1), Integer.valueOf(1), Integer.valueOf(1))
@ -823,7 +825,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/health_monitor_list_response_paged1.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/health_monitor_list_response_paged1.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
HealthMonitors healthMonitors = lbaasApi.listHealthMonitors(PaginationOptions.Builder.limit(2).marker("abcdefg")); HealthMonitors healthMonitors = lbaasApi.listHealthMonitors(PaginationOptions.Builder.limit(2).marker("abcdefg"));
@ -854,7 +856,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/lbaas/v1/health_monitor_list_response_paged2.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/lbaas/v1/health_monitor_list_response_paged2.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
// Note: Lazy! Have to actually look at the collection. // Note: Lazy! Have to actually look at the collection.
@ -888,7 +890,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/health_monitor_get_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/health_monitor_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
HealthMonitor healthMonitor = lbaasApi.getHealthMonitor("5d4b5228-33b0-4e60-b225-9b727c1a20e7"); HealthMonitor healthMonitor = lbaasApi.getHealthMonitor("5d4b5228-33b0-4e60-b225-9b727c1a20e7");
@ -930,7 +932,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/health_monitor_update_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/health_monitor_update_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
HealthMonitor.UpdateHealthMonitor updateHealthMonitor = HealthMonitor.updateBuilder().delay(Integer.valueOf(1)).timeout(Integer.valueOf(1)).maxRetries(Integer.valueOf(1)) HealthMonitor.UpdateHealthMonitor updateHealthMonitor = HealthMonitor.updateBuilder().delay(Integer.valueOf(1)).timeout(Integer.valueOf(1)).maxRetries(Integer.valueOf(1))
@ -975,7 +977,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
boolean result = lbaasApi.deleteHealthMonitor("466c8345-28d8-4f84-a246-e04380b0461d"); boolean result = lbaasApi.deleteHealthMonitor("466c8345-28d8-4f84-a246-e04380b0461d");
@ -1003,7 +1005,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/pool_associate_health_monitor_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/lbaas/v1/pool_associate_health_monitor_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
HealthMonitor healthMonitor = lbaasApi.associateHealthMonitor("72741b06-df4d-4715-b142-276b6bce75ab", "5d4b5228-33b0-4e60-b225-9b727c1a20e7"); HealthMonitor healthMonitor = lbaasApi.associateHealthMonitor("72741b06-df4d-4715-b142-276b6bce75ab", "5d4b5228-33b0-4e60-b225-9b727c1a20e7");
@ -1031,7 +1033,7 @@ public class LBaaSApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get(); LBaaSApi lbaasApi = neutronApi.getLBaaSApi("RegionOne").get();
boolean result = lbaasApi.disassociateHealthMonitor("72741b06-df4d-4715-b142-276b6bce75ab", "5d4b5228-33b0-4e60-b225-9b727c1a20e7"); boolean result = lbaasApi.disassociateHealthMonitor("72741b06-df4d-4715-b142-276b6bce75ab", "5d4b5228-33b0-4e60-b225-9b727c1a20e7");

9
apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/ExtensionApiMockTest.java
View File

@ -21,14 +21,15 @@ import static org.testng.Assert.assertNotNull;
import java.util.Set; import java.util.Set;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.neutron.v2.NeutronApi; import org.jclouds.openstack.neutron.v2.NeutronApi;
import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest; import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest;
import org.jclouds.openstack.v2_0.domain.Extension; import org.jclouds.openstack.v2_0.domain.Extension;
import org.jclouds.openstack.v2_0.features.ExtensionApi; import org.jclouds.openstack.v2_0.features.ExtensionApi;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Tests annotation parsing of {@code ExtensionApi} * Tests annotation parsing of {@code ExtensionApi}
@ -43,7 +44,7 @@ public class ExtensionApiMockTest extends BaseNeutronApiMockTest {
.setResponseCode(200).setBody(stringFromResource("/extension_list.json")))); .setResponseCode(200).setBody(stringFromResource("/extension_list.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
ExtensionApi api = neutronApi.getExtensionApi("RegionOne"); ExtensionApi api = neutronApi.getExtensionApi("RegionOne");
Set<Extension> extensions = api.list(); Set<Extension> extensions = api.list();
@ -72,7 +73,7 @@ public class ExtensionApiMockTest extends BaseNeutronApiMockTest {
.setResponseCode(200).setBody(stringFromResource("/extension_details.json")))); .setResponseCode(200).setBody(stringFromResource("/extension_details.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
Extension routerExtension = neutronApi.getExtensionApi("RegionOne").get("router"); Extension routerExtension = neutronApi.getExtensionApi("RegionOne").get("router");

19
apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/FloatingIPApiMockTest.java
View File

@ -25,6 +25,9 @@ import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.List; import java.util.List;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.neutron.v2.NeutronApi; import org.jclouds.openstack.neutron.v2.NeutronApi;
import org.jclouds.openstack.neutron.v2.domain.FloatingIP; import org.jclouds.openstack.neutron.v2.domain.FloatingIP;
import org.jclouds.openstack.neutron.v2.domain.FloatingIPs; import org.jclouds.openstack.neutron.v2.domain.FloatingIPs;
@ -32,8 +35,6 @@ import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest;
import org.jclouds.openstack.v2_0.options.PaginationOptions; import org.jclouds.openstack.v2_0.options.PaginationOptions;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Tests Floating Api Guice wiring and parsing * Tests Floating Api Guice wiring and parsing
@ -49,7 +50,7 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/floatingip_create_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/floatingip_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne"); FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne");
FloatingIP.CreateFloatingIP createFip = FloatingIP.createBuilder("376da547-b977-4cfe-9cba-275c80debf57") FloatingIP.CreateFloatingIP createFip = FloatingIP.createBuilder("376da547-b977-4cfe-9cba-275c80debf57")
@ -88,7 +89,7 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/floatingip_list_response_paged1.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/floatingip_list_response_paged1.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne"); FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne");
FloatingIPs floatingIPs = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg")); FloatingIPs floatingIPs = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
@ -119,7 +120,7 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/floatingip_list_response_paged2.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/floatingip_list_response_paged2.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne"); FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne");
// Note: Lazy! Have to actually look at the collection. // Note: Lazy! Have to actually look at the collection.
@ -152,7 +153,7 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/floatingip_get_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/floatingip_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne"); FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne");
FloatingIP floatingIP = api.get("12345"); FloatingIP floatingIP = api.get("12345");
@ -188,7 +189,7 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/floatingip_update_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/floatingip_update_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne"); FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne");
FloatingIP.UpdateFloatingIP updateFloatingIP = FloatingIP.updateBuilder() FloatingIP.UpdateFloatingIP updateFloatingIP = FloatingIP.updateBuilder()
@ -222,7 +223,7 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/floatingip_update_dissociate_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/floatingip_update_dissociate_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne"); FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne");
FloatingIP.UpdateFloatingIP updateFloatingIP = FloatingIP.updateBuilder().build(); FloatingIP.UpdateFloatingIP updateFloatingIP = FloatingIP.updateBuilder().build();
@ -254,7 +255,7 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201))); new MockResponse().setResponseCode(201)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne"); FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne");
boolean result = api.delete("12345"); boolean result = api.delete("12345");

21
apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/NetworkApiMockTest.java
View File

@ -18,8 +18,9 @@ package org.jclouds.openstack.neutron.v2.features;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer; import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.neutron.v2.NeutronApi; import org.jclouds.openstack.neutron.v2.NeutronApi;
import org.jclouds.openstack.neutron.v2.domain.Network; import org.jclouds.openstack.neutron.v2.domain.Network;
@ -51,7 +52,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/network_create_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/network_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
NetworkApi api = neutronApi.getNetworkApi("RegionOne"); NetworkApi api = neutronApi.getNetworkApi("RegionOne");
Network.CreateNetwork createNetwork = Network.createBuilder("jclouds-wibble") Network.CreateNetwork createNetwork = Network.createBuilder("jclouds-wibble")
@ -86,7 +87,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/network_list_response_paged1.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/network_list_response_paged1.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
NetworkApi api = neutronApi.getNetworkApi("RegionOne"); NetworkApi api = neutronApi.getNetworkApi("RegionOne");
Networks networks = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg")); Networks networks = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
@ -114,7 +115,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/network_list_response_paged1.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/network_list_response_paged1.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
NetworkApi api = neutronApi.getNetworkApi("RegionOne"); NetworkApi api = neutronApi.getNetworkApi("RegionOne");
Networks networks = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg")); Networks networks = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
@ -141,7 +142,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/network_list_response_paged2.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/network_list_response_paged2.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
NetworkApi api = neutronApi.getNetworkApi("RegionOne"); NetworkApi api = neutronApi.getNetworkApi("RegionOne");
// Note: Lazy! Have to actually look at the collection. // Note: Lazy! Have to actually look at the collection.
@ -175,7 +176,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/network_get_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/network_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
NetworkApi api = neutronApi.getNetworkApi("RegionOne"); NetworkApi api = neutronApi.getNetworkApi("RegionOne");
Network network = api.get("12345"); Network network = api.get("12345");
@ -204,7 +205,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/network_bulk_create_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/network_bulk_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
NetworkApi api = neutronApi.getNetworkApi("RegionOne"); NetworkApi api = neutronApi.getNetworkApi("RegionOne");
Network.CreateNetwork createNetwork1 = Network.createBuilder("jclouds-wibble") Network.CreateNetwork createNetwork1 = Network.createBuilder("jclouds-wibble")
@ -250,7 +251,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/network_update_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/network_update_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
NetworkApi api = neutronApi.getNetworkApi("RegionOne"); NetworkApi api = neutronApi.getNetworkApi("RegionOne");
Network.UpdateNetwork updateNetwork = Network.updateBuilder() Network.UpdateNetwork updateNetwork = Network.updateBuilder()
@ -283,7 +284,7 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
NetworkApi api = neutronApi.getNetworkApi("RegionOne"); NetworkApi api = neutronApi.getNetworkApi("RegionOne");
boolean result = api.delete("123456"); boolean result = api.delete("123456");

20
apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java
View File

@ -25,6 +25,9 @@ import java.net.URISyntaxException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.neutron.v2.NeutronApi; import org.jclouds.openstack.neutron.v2.NeutronApi;
import org.jclouds.openstack.neutron.v2.domain.AddressPair; import org.jclouds.openstack.neutron.v2.domain.AddressPair;
import org.jclouds.openstack.neutron.v2.domain.NetworkStatus; import org.jclouds.openstack.neutron.v2.domain.NetworkStatus;
@ -39,8 +42,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Tests NetworkApi Guice wiring and parsing * Tests NetworkApi Guice wiring and parsing
@ -56,7 +58,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/port_create_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/port_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
PortApi api = neutronApi.getPortApi("RegionOne"); PortApi api = neutronApi.getPortApi("RegionOne");
Port.CreatePort createPort = Port.createBuilder("6aeaf34a-c482-4bd3-9dc3-7faf36412f12") Port.CreatePort createPort = Port.createBuilder("6aeaf34a-c482-4bd3-9dc3-7faf36412f12")
@ -101,7 +103,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/port_list_response_paged1.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/port_list_response_paged1.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
PortApi api = neutronApi.getPortApi("RegionOne"); PortApi api = neutronApi.getPortApi("RegionOne");
Ports ports = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg")); Ports ports = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
@ -130,7 +132,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/port_list_response_paged2.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/port_list_response_paged2.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
PortApi api = neutronApi.getPortApi("RegionOne"); PortApi api = neutronApi.getPortApi("RegionOne");
// Note: Lazy! Have to actually look at the collection. // Note: Lazy! Have to actually look at the collection.
@ -163,7 +165,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/port_create_bulk_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/port_create_bulk_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
PortApi api = neutronApi.getPortApi("RegionOne"); PortApi api = neutronApi.getPortApi("RegionOne");
Port.CreatePort createPort1 = Port.createBuilder("64239a54-dcc4-4b39-920b-b37c2144effa") Port.CreatePort createPort1 = Port.createBuilder("64239a54-dcc4-4b39-920b-b37c2144effa")
@ -207,7 +209,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/port_get_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/port_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
PortApi api = neutronApi.getPortApi("RegionOne"); PortApi api = neutronApi.getPortApi("RegionOne");
Port port = api.get("12345"); Port port = api.get("12345");
@ -243,7 +245,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/port_update_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/port_update_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
PortApi api = neutronApi.getPortApi("RegionOne"); PortApi api = neutronApi.getPortApi("RegionOne");
Port.UpdatePort updatePort = Port.updateBuilder() Port.UpdatePort updatePort = Port.updateBuilder()
@ -275,7 +277,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
PortApi api = neutronApi.getPortApi("RegionOne"); PortApi api = neutronApi.getPortApi("RegionOne");
boolean result = api.delete("12345"); boolean result = api.delete("12345");

25
apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApiMockTest.java
View File

@ -25,6 +25,9 @@ import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.List; import java.util.List;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.neutron.v2.NeutronApi; import org.jclouds.openstack.neutron.v2.NeutronApi;
import org.jclouds.openstack.neutron.v2.domain.Rule; import org.jclouds.openstack.neutron.v2.domain.Rule;
import org.jclouds.openstack.neutron.v2.domain.RuleDirection; import org.jclouds.openstack.neutron.v2.domain.RuleDirection;
@ -37,8 +40,6 @@ import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest;
import org.jclouds.openstack.v2_0.options.PaginationOptions; import org.jclouds.openstack.v2_0.options.PaginationOptions;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Tests SecurityGroupApi Guice wiring and parsing * Tests SecurityGroupApi Guice wiring and parsing
@ -54,7 +55,7 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/security_group_create_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/security_group_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne"); SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne");
SecurityGroup.CreateSecurityGroup createSecurityGroup = SecurityGroup.createBuilder().name("new-webservers") SecurityGroup.CreateSecurityGroup createSecurityGroup = SecurityGroup.createBuilder().name("new-webservers")
@ -96,7 +97,7 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/security_group_rule_create_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/security_group_rule_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne"); SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne");
Rule.CreateRule createSecurityGroupRule = Rule.createBuilder( Rule.CreateRule createSecurityGroupRule = Rule.createBuilder(
@ -142,7 +143,7 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/security_group_list_response_paged1.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/security_group_list_response_paged1.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne"); SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne");
SecurityGroups securityGroups = api.listSecurityGroups(PaginationOptions.Builder.limit(2).marker("abcdefg")); SecurityGroups securityGroups = api.listSecurityGroups(PaginationOptions.Builder.limit(2).marker("abcdefg"));
@ -173,7 +174,7 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/security_group_rule_list_response_paged1.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/security_group_rule_list_response_paged1.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne"); SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne");
Rules rules = api.listRules(PaginationOptions.Builder.limit(2).marker("abcdefg")); Rules rules = api.listRules(PaginationOptions.Builder.limit(2).marker("abcdefg"));
@ -205,7 +206,7 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/security_group_list_response_paged2.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/security_group_list_response_paged2.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne"); SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne");
// Note: Lazy! Have to actually look at the collection. // Note: Lazy! Have to actually look at the collection.
@ -240,7 +241,7 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/security_group_rule_list_response_paged2.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/security_group_rule_list_response_paged2.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne"); SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne");
// Note: Lazy! Have to actually look at the collection. // Note: Lazy! Have to actually look at the collection.
@ -275,7 +276,7 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/security_group_get_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/security_group_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne"); SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne");
SecurityGroup securityGroup = api.getSecurityGroup("12345"); SecurityGroup securityGroup = api.getSecurityGroup("12345");
@ -309,7 +310,7 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201).setBody(stringFromResource("/security_group_rule_get_response.json")))); new MockResponse().setResponseCode(201).setBody(stringFromResource("/security_group_rule_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne"); SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne");
Rule rule = api.get("12345"); Rule rule = api.get("12345");
@ -343,7 +344,7 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201))); new MockResponse().setResponseCode(201)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne"); SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne");
boolean result = api.deleteSecurityGroup("12345"); boolean result = api.deleteSecurityGroup("12345");
@ -371,7 +372,7 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest {
new MockResponse().setResponseCode(201))); new MockResponse().setResponseCode(201)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne"); SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne");
boolean result = api.deleteRule("12345"); boolean result = api.deleteRule("12345");

20
apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java
View File

@ -24,6 +24,9 @@ import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.List; import java.util.List;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.neutron.v2.NeutronApi; import org.jclouds.openstack.neutron.v2.NeutronApi;
import org.jclouds.openstack.neutron.v2.domain.IPv6DHCPMode; import org.jclouds.openstack.neutron.v2.domain.IPv6DHCPMode;
import org.jclouds.openstack.neutron.v2.domain.Subnet; import org.jclouds.openstack.neutron.v2.domain.Subnet;
@ -34,8 +37,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Tests NetworkApi Guice wiring and parsing * Tests NetworkApi Guice wiring and parsing
@ -50,7 +52,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/subnet_create_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/subnet_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SubnetApi api = neutronApi.getSubnetApi("RegionOne"); SubnetApi api = neutronApi.getSubnetApi("RegionOne");
Subnet.CreateSubnet createSubnet = Subnet.createBuilder("1234567890", "10.0.3.0/24") Subnet.CreateSubnet createSubnet = Subnet.createBuilder("1234567890", "10.0.3.0/24")
@ -86,7 +88,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/subnet_list_response_pages1.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/subnet_list_response_pages1.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SubnetApi api = neutronApi.getSubnetApi("RegionOne"); SubnetApi api = neutronApi.getSubnetApi("RegionOne");
Subnets subnets = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg")); Subnets subnets = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
@ -114,7 +116,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/subnet_list_response_pages2.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/subnet_list_response_pages2.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SubnetApi api = neutronApi.getSubnetApi("RegionOne"); SubnetApi api = neutronApi.getSubnetApi("RegionOne");
// Note: Lazy! Have to actually look at the collection. // Note: Lazy! Have to actually look at the collection.
@ -146,7 +148,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/subnet_get_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/subnet_get_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SubnetApi api = neutronApi.getSubnetApi("RegionOne"); SubnetApi api = neutronApi.getSubnetApi("RegionOne");
Subnet subnet = api.get("12345"); Subnet subnet = api.get("12345");
@ -177,7 +179,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/subnet_bulk_create_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/subnet_bulk_create_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SubnetApi api = neutronApi.getSubnetApi("RegionOne"); SubnetApi api = neutronApi.getSubnetApi("RegionOne");
Subnet.CreateSubnet createSubnet1 = Subnet.createBuilder("e6031bc2-901a-4c66-82da-f4c32ed89406", Subnet.CreateSubnet createSubnet1 = Subnet.createBuilder("e6031bc2-901a-4c66-82da-f4c32ed89406",
@ -225,7 +227,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/subnet_update_response.json")))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200).setBody(stringFromResource("/subnet_update_response.json"))));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SubnetApi api = neutronApi.getSubnetApi("RegionOne"); SubnetApi api = neutronApi.getSubnetApi("RegionOne");
Subnet.UpdateSubnet updateSubnet = Subnet.updateBuilder() Subnet.UpdateSubnet updateSubnet = Subnet.updateBuilder()
@ -260,7 +262,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(200)));
try { try {
NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); NeutronApi neutronApi = api(server.url("/").toString(), "openstack-neutron", overrides);
SubnetApi api = neutronApi.getSubnetApi("RegionOne"); SubnetApi api = neutronApi.getSubnetApi("RegionOne");
boolean result = api.delete("12345"); boolean result = api.delete("12345");

2
apis/openstack-nova/pom.xml
View File

@ -104,7 +104,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>

7
apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApiMockTest.java
View File

@ -20,6 +20,9 @@ import static com.google.common.collect.Iterables.getFirst;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull; import static org.testng.Assert.assertNull;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.nova.v2_0.NovaApi; import org.jclouds.openstack.nova.v2_0.NovaApi;
import org.jclouds.openstack.nova.v2_0.domain.Console; import org.jclouds.openstack.nova.v2_0.domain.Console;
import org.jclouds.openstack.nova.v2_0.parse.ParseNOVNCConsoleTest; import org.jclouds.openstack.nova.v2_0.parse.ParseNOVNCConsoleTest;
@ -29,8 +32,6 @@ import org.jclouds.openstack.nova.v2_0.parse.ParseXVPVNCConsoleTest;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Tests ConsolesApi Guice wiring and parsing * Tests ConsolesApi Guice wiring and parsing
@ -71,7 +72,7 @@ public class ConsolesApiMockTest extends BaseOpenStackMockTest<NovaApi> {
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource(responseResource)))); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource(responseResource))));
try { try {
NovaApi novaApi = api(server.getUrl("/").toString(), "openstack-nova"); NovaApi novaApi = api(server.url("/").toString(), "openstack-nova");
String regionId = getFirst(novaApi.getConfiguredRegions(), "RegionTwo"); String regionId = getFirst(novaApi.getConfiguredRegions(), "RegionTwo");

14
apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApiMockTest.java
View File

@ -19,8 +19,10 @@ package org.jclouds.openstack.nova.v2_0.extensions;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer; import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.nova.v2_0.NovaApi; import org.jclouds.openstack.nova.v2_0.NovaApi;
import org.jclouds.openstack.nova.v2_0.domain.regionscoped.Hypervisor; import org.jclouds.openstack.nova.v2_0.domain.regionscoped.Hypervisor;
import org.jclouds.openstack.nova.v2_0.domain.regionscoped.HypervisorDetails; import org.jclouds.openstack.nova.v2_0.domain.regionscoped.HypervisorDetails;
@ -58,7 +60,7 @@ public class HypervisorApiMockTest extends BaseOpenStackMockTest<NovaApi> {
MockWebServer server = servers.get(method.getName()); MockWebServer server = servers.get(method.getName());
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list_full.json")))); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list_full.json"))));
NovaApi novaApi = api(server.getUrl("/").toString(), "openstack-nova"); NovaApi novaApi = api(server.url("/").toString(), "openstack-nova");
assertEquals(novaApi.getConfiguredRegions(), ImmutableSet.of("RegionOne", "RegionTwo", "RegionThree")); assertEquals(novaApi.getConfiguredRegions(), ImmutableSet.of("RegionOne", "RegionTwo", "RegionThree"));
Optional<HypervisorApi> hypervisorApi = novaApi.getHypervisorApi("RegionOne"); Optional<HypervisorApi> hypervisorApi = novaApi.getHypervisorApi("RegionOne");
@ -72,7 +74,7 @@ public class HypervisorApiMockTest extends BaseOpenStackMockTest<NovaApi> {
MockWebServer server = servers.get(method.getName()); MockWebServer server = servers.get(method.getName());
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json")))); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
NovaApi novaApi = api(server.getUrl("/").toString(), "openstack-nova"); NovaApi novaApi = api(server.url("/").toString(), "openstack-nova");
assertEquals(novaApi.getConfiguredRegions(), ImmutableSet.of("RegionOne", "RegionTwo", "RegionThree")); assertEquals(novaApi.getConfiguredRegions(), ImmutableSet.of("RegionOne", "RegionTwo", "RegionThree"));
Optional<HypervisorApi> hypervisorApi = novaApi.getHypervisorApi("RegionOne"); Optional<HypervisorApi> hypervisorApi = novaApi.getHypervisorApi("RegionOne");
@ -87,7 +89,7 @@ public class HypervisorApiMockTest extends BaseOpenStackMockTest<NovaApi> {
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list_full.json")))); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list_full.json"))));
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/hypervisor_list.json")))); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/hypervisor_list.json"))));
NovaApi novaApi = api(server.getUrl("/").toString(), "openstack-nova"); NovaApi novaApi = api(server.url("/").toString(), "openstack-nova");
assertEquals(novaApi.getConfiguredRegions(), ImmutableSet.of("RegionOne", "RegionTwo", "RegionThree")); assertEquals(novaApi.getConfiguredRegions(), ImmutableSet.of("RegionOne", "RegionTwo", "RegionThree"));
FluentIterable<? extends Hypervisor> hypervisors = novaApi.getHypervisorApi("RegionOne").get().list(); FluentIterable<? extends Hypervisor> hypervisors = novaApi.getHypervisorApi("RegionOne").get().list();
@ -106,7 +108,7 @@ public class HypervisorApiMockTest extends BaseOpenStackMockTest<NovaApi> {
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list_full.json")))); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list_full.json"))));
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/hypervisor_details.json")))); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/hypervisor_details.json"))));
NovaApi novaApi = api(server.getUrl("/").toString(), "openstack-nova"); NovaApi novaApi = api(server.url("/").toString(), "openstack-nova");
assertEquals(novaApi.getConfiguredRegions(), ImmutableSet.of("RegionOne", "RegionTwo", "RegionThree")); assertEquals(novaApi.getConfiguredRegions(), ImmutableSet.of("RegionOne", "RegionTwo", "RegionThree"));
FluentIterable<? extends HypervisorDetails> hypervisors = novaApi.getHypervisorApi("RegionOne").get().listInDetail(); FluentIterable<? extends HypervisorDetails> hypervisors = novaApi.getHypervisorApi("RegionOne").get().listInDetail();

8
apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiMockTest.java
View File

@ -17,8 +17,10 @@
package org.jclouds.openstack.nova.v2_0.features; package org.jclouds.openstack.nova.v2_0.features;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer; import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.nova.v2_0.NovaApi; import org.jclouds.openstack.nova.v2_0.NovaApi;
import org.jclouds.openstack.nova.v2_0.domain.BlockDeviceMapping; import org.jclouds.openstack.nova.v2_0.domain.BlockDeviceMapping;
import org.jclouds.openstack.nova.v2_0.domain.Image; import org.jclouds.openstack.nova.v2_0.domain.Image;
@ -36,7 +38,7 @@ public class ImageApiMockTest extends BaseOpenStackMockTest<NovaApi> {
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/image_list_with_block_device_mapping.json")))); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/image_list_with_block_device_mapping.json"))));
try { try {
NovaApi novaApi = api(server.getUrl("/").toString(), "openstack-nova"); NovaApi novaApi = api(server.url("/").toString(), "openstack-nova");
ImageApi imageApi = novaApi.getImageApiForZone("RegionOne"); ImageApi imageApi = novaApi.getImageApiForZone("RegionOne");
FluentIterable<? extends Image> images = imageApi.listInDetail().concat(); FluentIterable<? extends Image> images = imageApi.listInDetail().concat();

2
apis/openstack-swift/pom.xml
View File

@ -95,7 +95,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

12
apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java
View File

@ -16,19 +16,19 @@
*/ */
package org.jclouds.openstack.swift.v1; package org.jclouds.openstack.swift.v1;
import static com.google.common.base.Charsets.UTF_8;
import static org.jclouds.openstack.swift.v1.features.AccountApiMockTest.accountResponse; import static org.jclouds.openstack.swift.v1.features.AccountApiMockTest.accountResponse;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import java.util.Properties; import java.util.Properties;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
/** /**
* @see KeystoneProperties#CREDENTIAL_TYPE * @see KeystoneProperties#CREDENTIAL_TYPE
@ -56,14 +56,14 @@ public class AuthenticationMockTest extends BaseOpenStackMockTest<SwiftApi> {
Properties overrides = new Properties(); Properties overrides = new Properties();
overrides.setProperty("jclouds.keystone.credential-type", credentialType); overrides.setProperty("jclouds.keystone.credential-type", credentialType);
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift", overrides); SwiftApi api = api(server.url("/").toString(), "openstack-swift", overrides);
api.getAccountApi("DFW").get(); api.getAccountApi("DFW").get();
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
RecordedRequest authRequest = server.takeRequest(); RecordedRequest authRequest = server.takeRequest();
assertEquals(authRequest.getRequestLine(), "POST /tokens HTTP/1.1"); assertEquals(authRequest.getRequestLine(), "POST /tokens HTTP/1.1");
assertEquals(new String(authRequest.getBody(), UTF_8), expectedPost); assertEquals(authRequest.getBody().readUtf8(), expectedPost);
} finally { } finally {
server.shutdown(); server.shutdown();
} }

16
apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java
View File

@ -26,6 +26,10 @@ import static org.testng.Assert.assertTrue;
import java.io.IOException; import java.io.IOException;
import java.util.Properties; import java.util.Properties;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.concurrent.config.ExecutorServiceModule;
import org.jclouds.openstack.swift.v1.reference.TempAuthHeaders; import org.jclouds.openstack.swift.v1.reference.TempAuthHeaders;
@ -34,9 +38,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(groups = "unit", testName = "TempAuthMockTest", singleThreaded = true) @Test(groups = "unit", testName = "TempAuthMockTest", singleThreaded = true)
public class TempAuthMockTest { public class TempAuthMockTest {
@ -63,11 +65,11 @@ public class TempAuthMockTest {
private void test(Properties overrides, String identityHeaderName, String identityHeaderPass) throws Exception{ private void test(Properties overrides, String identityHeaderName, String identityHeaderPass) throws Exception{
tempAuthServer.enqueue(new MockResponse().setResponseCode(204) tempAuthServer.enqueue(new MockResponse().setResponseCode(204)
.addHeader("X-Auth-Token", "token") .addHeader("X-Auth-Token", "token")
.addHeader("X-Storage-Url", swiftServer.getUrl("").toString())); .addHeader("X-Storage-Url", swiftServer.url("").toString()));
swiftServer.enqueue(new MockResponse().setBody("[{\"name\":\"test_container_1\",\"count\":2,\"bytes\":78}]")); swiftServer.enqueue(new MockResponse().setBody("[{\"name\":\"test_container_1\",\"count\":2,\"bytes\":78}]"));
SwiftApi api = api(tempAuthServer.getUrl("").toString(), overrides); SwiftApi api = api(tempAuthServer.url("").toString(), overrides);
// Region name is derived from the swift server host. // Region name is derived from the swift server host.
assertEquals(api.getConfiguredRegions(), ImmutableSet.of(tempAuthServer.getHostName())); assertEquals(api.getConfiguredRegions(), ImmutableSet.of(tempAuthServer.getHostName()));
@ -100,10 +102,10 @@ public class TempAuthMockTest {
@BeforeMethod @BeforeMethod
public void start() throws IOException { public void start() throws IOException {
tempAuthServer = new MockWebServer(); tempAuthServer = new MockWebServer();
tempAuthServer.play(); tempAuthServer.start();
swiftServer = new MockWebServer(); swiftServer = new MockWebServer();
swiftServer.play(); swiftServer.start();
} }
@AfterMethod(alwaysRun = true) @AfterMethod(alwaysRun = true)

9
apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java
View File

@ -20,11 +20,12 @@ import static org.jclouds.openstack.swift.v1.features.AccountApiMockTest.account
import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.ACCOUNT_TEMPORARY_URL_KEY; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.ACCOUNT_TEMPORARY_URL_KEY;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
@Test(groups = "unit", testName = "TemporaryUrlSignerMockTest") @Test(groups = "unit", testName = "TemporaryUrlSignerMockTest")
public class TemporaryUrlSignerMockTest extends BaseOpenStackMockTest<SwiftApi> { public class TemporaryUrlSignerMockTest extends BaseOpenStackMockTest<SwiftApi> {
@ -40,7 +41,7 @@ public class TemporaryUrlSignerMockTest extends BaseOpenStackMockTest<SwiftApi>
server.enqueue(addCommonHeaders(accountResponse().addHeader(ACCOUNT_TEMPORARY_URL_KEY, "mykey"))); server.enqueue(addCommonHeaders(accountResponse().addHeader(ACCOUNT_TEMPORARY_URL_KEY, "mykey")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
String signature = TemporaryUrlSigner.checkApiEvery(api.getAccountApi("DFW"), 10000) String signature = TemporaryUrlSigner.checkApiEvery(api.getAccountApi("DFW"), 10000)
.sign("GET", "/v1/AUTH_account/container/object", 1323479485L); .sign("GET", "/v1/AUTH_account/container/object", 1323479485L);
@ -62,7 +63,7 @@ public class TemporaryUrlSignerMockTest extends BaseOpenStackMockTest<SwiftApi>
server.enqueue(addCommonHeaders(accountResponse())); server.enqueue(addCommonHeaders(accountResponse()));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
TemporaryUrlSigner.checkApiEvery(api.getAccountApi("DFW"), 10000) TemporaryUrlSigner.checkApiEvery(api.getAccountApi("DFW"), 10000)
.sign("GET", "/v1/AUTH_account/container/object", 1323479485L); .sign("GET", "/v1/AUTH_account/container/object", 1323479485L);
} finally { } finally {

16
apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java
View File

@ -28,15 +28,17 @@ import static org.testng.Assert.assertTrue;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.openstack.swift.v1.SwiftApi; import org.jclouds.openstack.swift.v1.SwiftApi;
import org.jclouds.openstack.swift.v1.domain.Account; import org.jclouds.openstack.swift.v1.domain.Account;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(groups = "unit", testName = "AccountApiMockTest") @Test(groups = "unit", testName = "AccountApiMockTest")
public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> { public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
@ -51,7 +53,7 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader(ACCOUNT_METADATA_PREFIX + "Apiversion", "v1.1"))); .addHeader(ACCOUNT_METADATA_PREFIX + "Apiversion", "v1.1")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
Account account = api.getAccountApi("DFW").get(); Account account = api.getAccountApi("DFW").get();
assertEquals(account.getContainerCount(), 3L); assertEquals(account.getContainerCount(), 3L);
assertEquals(account.getObjectCount(), 42L); assertEquals(account.getObjectCount(), 42L);
@ -76,7 +78,7 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader(ACCOUNT_METADATA_PREFIX + "ApiVersion", "v1.1"))); .addHeader(ACCOUNT_METADATA_PREFIX + "ApiVersion", "v1.1")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
api.getAccountApi("DFW").updateMetadata(metadata); api.getAccountApi("DFW").updateMetadata(metadata);
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -98,7 +100,7 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(accountResponse())); server.enqueue(addCommonHeaders(accountResponse()));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
api.getAccountApi("DFW").updateTemporaryUrlKey("foobar"); api.getAccountApi("DFW").updateTemporaryUrlKey("foobar");
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -118,7 +120,7 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(accountResponse())); server.enqueue(addCommonHeaders(accountResponse()));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertTrue(api.getAccountApi("DFW").deleteMetadata(metadata)); assertTrue(api.getAccountApi("DFW").deleteMetadata(metadata));
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);

12
apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java
View File

@ -19,6 +19,10 @@ package org.jclouds.openstack.swift.v1.features;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jboss.shrinkwrap.api.GenericArchive; import org.jboss.shrinkwrap.api.GenericArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.asset.StringAsset;
@ -32,9 +36,7 @@ import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.io.ByteSource; import com.google.common.io.ByteSource;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(groups = "unit", testName = "BulkApiMockTest") @Test(groups = "unit", testName = "BulkApiMockTest")
public class BulkApiMockTest extends BaseOpenStackMockTest<SwiftApi> { public class BulkApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
@ -53,7 +55,7 @@ public class BulkApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody("{\"Number Files Created\": 10, \"Errors\": []}"))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody("{\"Number Files Created\": 10, \"Errors\": []}")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(tarGz)); Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(tarGz));
ExtractArchiveResponse response = api.getBulkApi("DFW").extractArchive("myContainer", payload, "tar.gz"); ExtractArchiveResponse response = api.getBulkApi("DFW").extractArchive("myContainer", payload, "tar.gz");
@ -64,7 +66,7 @@ public class BulkApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
assertAuthentication(server); assertAuthentication(server);
RecordedRequest extractRequest = server.takeRequest(); RecordedRequest extractRequest = server.takeRequest();
assertRequest(extractRequest, "PUT", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer?extract-archive=tar.gz"); assertRequest(extractRequest, "PUT", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer?extract-archive=tar.gz");
assertEquals(extractRequest.getBody(), tarGz); assertEquals(extractRequest.getBody().readByteArray(), tarGz);
} finally { } finally {
server.shutdown(); server.shutdown();
} }

34
apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java
View File

@ -31,6 +31,10 @@ import static org.testng.Assert.assertTrue;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.blobstore.ContainerNotFoundException; import org.jclouds.blobstore.ContainerNotFoundException;
import org.jclouds.openstack.swift.v1.SwiftApi; import org.jclouds.openstack.swift.v1.SwiftApi;
import org.jclouds.openstack.swift.v1.domain.Container; import org.jclouds.openstack.swift.v1.domain.Container;
@ -40,9 +44,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(groups = "unit", testName = "ContainerApiMockTest") @Test(groups = "unit", testName = "ContainerApiMockTest")
public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
@ -53,7 +55,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/container_list.json")))); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/container_list.json"))));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
ImmutableList<Container> containers = api.getContainerApi("DFW").list().toList(); ImmutableList<Container> containers = api.getContainerApi("DFW").list().toList();
assertEquals(containers, ImmutableList.of( assertEquals(containers, ImmutableList.of(
Container.builder() Container.builder()
@ -82,7 +84,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
assertNotNull(options); assertNotNull(options);
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
ImmutableList<Container> containers = api.getContainerApi("DFW").list(options).toList(); ImmutableList<Container> containers = api.getContainerApi("DFW").list(options).toList();
assertEquals(containers, ImmutableList.of( assertEquals(containers, ImmutableList.of(
Container.builder() Container.builder()
@ -111,7 +113,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader(CONTAINER_METADATA_PREFIX + "ApiVersion", "v1.1"))); .addHeader(CONTAINER_METADATA_PREFIX + "ApiVersion", "v1.1")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertTrue(api.getContainerApi("DFW").create("myContainer", anybodyRead().metadata(metadata))); assertTrue(api.getContainerApi("DFW").create("myContainer", anybodyRead().metadata(metadata)));
Container container = api.getContainerApi("DFW").get("myContainer"); Container container = api.getContainerApi("DFW").get("myContainer");
@ -137,7 +139,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertTrue(api.getContainerApi("DFW").create("myContainer", anybodyRead().metadata(metadata))); assertTrue(api.getContainerApi("DFW").create("myContainer", anybodyRead().metadata(metadata)));
// the head call will throw the ContainerNotFoundException // the head call will throw the ContainerNotFoundException
@ -153,7 +155,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201)));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertTrue(api.getContainerApi("DFW").create("myContainer")); assertTrue(api.getContainerApi("DFW").create("myContainer"));
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -170,7 +172,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201)));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertTrue(api.getContainerApi("DFW").create("myContainer", anybodyRead().metadata(metadata))); assertTrue(api.getContainerApi("DFW").create("myContainer", anybodyRead().metadata(metadata)));
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -195,7 +197,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201)));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertTrue(api.getContainerApi("DFW").create("container # ! special")); assertTrue(api.getContainerApi("DFW").create("container # ! special"));
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -212,7 +214,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(202))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(202)));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertFalse(api.getContainerApi("DFW").create("myContainer")); assertFalse(api.getContainerApi("DFW").create("myContainer"));
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -233,7 +235,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader(CONTAINER_METADATA_PREFIX + "Apiversion", "v1.1"))); .addHeader(CONTAINER_METADATA_PREFIX + "Apiversion", "v1.1")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
Container container = api.getContainerApi("DFW").get("myContainer"); Container container = api.getContainerApi("DFW").get("myContainer");
assertEquals(container.getName(), "myContainer"); assertEquals(container.getName(), "myContainer");
assertEquals(container.getObjectCount(), Long.valueOf(42L)); assertEquals(container.getObjectCount(), Long.valueOf(42L));
@ -258,7 +260,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader(CONTAINER_METADATA_PREFIX + "ApiVersion", "v1.1"))); .addHeader(CONTAINER_METADATA_PREFIX + "ApiVersion", "v1.1")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
api.getContainerApi("DFW").updateMetadata("myContainer", metadata); api.getContainerApi("DFW").updateMetadata("myContainer", metadata);
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -280,7 +282,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(containerResponse())); server.enqueue(addCommonHeaders(containerResponse()));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertTrue(api.getContainerApi("DFW").deleteMetadata("myContainer", metadata)); assertTrue(api.getContainerApi("DFW").deleteMetadata("myContainer", metadata));
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -302,7 +304,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertTrue(api.getContainerApi("DFW").deleteIfEmpty("myContainer")); assertTrue(api.getContainerApi("DFW").deleteIfEmpty("myContainer"));
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -321,7 +323,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(409))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(409)));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertFalse(api.getContainerApi("DFW").deleteIfEmpty("myContainer")); assertFalse(api.getContainerApi("DFW").deleteIfEmpty("myContainer"));
} finally { } finally {

16
apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/DynamicLargeObjectApiMockTest.java
View File

@ -21,6 +21,10 @@ import static com.google.common.net.HttpHeaders.ETAG;
import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.OBJECT_METADATA_PREFIX; import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.OBJECT_METADATA_PREFIX;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.io.Payloads; import org.jclouds.io.Payloads;
import org.jclouds.openstack.swift.v1.SwiftApi; import org.jclouds.openstack.swift.v1.SwiftApi;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
@ -28,9 +32,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.net.HttpHeaders; import com.google.common.net.HttpHeaders;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(groups = "unit", testName = "DynamicLargeObjectApiMockTest") @Test(groups = "unit", testName = "DynamicLargeObjectApiMockTest")
public final class DynamicLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { public final class DynamicLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
@ -48,7 +50,7 @@ public final class DynamicLargeObjectApiMockTest extends BaseOpenStackMockTest<S
server.enqueue(addCommonHeaders(new MockResponse().addHeader("X-Object-Manifest", "myContainer/myObject"))); server.enqueue(addCommonHeaders(new MockResponse().addHeader("X-Object-Manifest", "myContainer/myObject")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertEquals(api.getObjectApi("DFW", containerName).put(objectName.concat("1"), Payloads.newPayload("data1")), assertEquals(api.getObjectApi("DFW", containerName).put(objectName.concat("1"), Payloads.newPayload("data1")),
"89d903bc35dede724fd52c51437ff5fd"); "89d903bc35dede724fd52c51437ff5fd");
assertEquals(api.getDynamicLargeObjectApi("DFW", containerName).putManifest(objectName, assertEquals(api.getDynamicLargeObjectApi("DFW", containerName).putManifest(objectName,
@ -60,7 +62,7 @@ public final class DynamicLargeObjectApiMockTest extends BaseOpenStackMockTest<S
RecordedRequest uploadRequest = server.takeRequest(); RecordedRequest uploadRequest = server.takeRequest();
assertEquals(uploadRequest.getRequestLine(), assertEquals(uploadRequest.getRequestLine(),
"PUT /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/myObjectTest1 HTTP/1.1"); "PUT /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/myObjectTest1 HTTP/1.1");
assertEquals(new String(uploadRequest.getBody()), "data1"); assertEquals(uploadRequest.getBody().readUtf8(), "data1");
RecordedRequest uploadRequestManifest = server.takeRequest(); RecordedRequest uploadRequestManifest = server.takeRequest();
assertRequest(uploadRequestManifest, "PUT", assertRequest(uploadRequestManifest, "PUT",
@ -80,7 +82,7 @@ public final class DynamicLargeObjectApiMockTest extends BaseOpenStackMockTest<S
server.enqueue(addCommonHeaders(new MockResponse().addHeader("X-Object-Manifest", "myContainer/myObject"))); server.enqueue(addCommonHeaders(new MockResponse().addHeader("X-Object-Manifest", "myContainer/myObject")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertEquals(api.getDynamicLargeObjectApi("DFW", "myContainer").putManifest("myObject", assertEquals(api.getDynamicLargeObjectApi("DFW", "myContainer").putManifest("myObject",
ImmutableMap.of("MyFoo", "Bar"), ImmutableMap.of("MyFoo", "Bar")), "abcd"); ImmutableMap.of("MyFoo", "Bar"), ImmutableMap.of("MyFoo", "Bar")), "abcd");
@ -104,7 +106,7 @@ public final class DynamicLargeObjectApiMockTest extends BaseOpenStackMockTest<S
server.enqueue(addCommonHeaders(new MockResponse().addHeader("X-Object-Manifest", "myContainer/myObject"))); server.enqueue(addCommonHeaders(new MockResponse().addHeader("X-Object-Manifest", "myContainer/myObject")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertEquals(api.getDynamicLargeObjectApi("DFW", "myContainer").putManifest("unic₪de", assertEquals(api.getDynamicLargeObjectApi("DFW", "myContainer").putManifest("unic₪de",
ImmutableMap.of("MyFoo", "Bar"), ImmutableMap.of("MyFoo", "Bar")), "abcd"); ImmutableMap.of("MyFoo", "Bar"), ImmutableMap.of("MyFoo", "Bar")), "abcd");

84
apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java
View File

@ -16,10 +16,8 @@
*/ */
package org.jclouds.openstack.swift.v1.features; package org.jclouds.openstack.swift.v1.features;
import static com.google.common.base.Charsets.US_ASCII;
import static com.google.common.io.BaseEncoding.base16; import static com.google.common.io.BaseEncoding.base16;
import static com.google.common.net.HttpHeaders.EXPIRES; import static com.google.common.net.HttpHeaders.EXPIRES;
import static org.assertj.core.api.Assertions.assertThat;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import static org.jclouds.Constants.PROPERTY_RETRY_DELAY_START; import static org.jclouds.Constants.PROPERTY_RETRY_DELAY_START;
import static org.jclouds.Constants.PROPERTY_SO_TIMEOUT; import static org.jclouds.Constants.PROPERTY_SO_TIMEOUT;
@ -40,11 +38,15 @@ import static org.testng.Assert.fail;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Properties; import java.util.Properties;
import okhttp3.Headers;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.blobstore.KeyNotFoundException; import org.jclouds.blobstore.KeyNotFoundException;
import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.date.internal.SimpleDateFormatDateService;
import org.jclouds.http.HttpResponseException; import org.jclouds.http.HttpResponseException;
@ -62,9 +64,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.io.ByteSource; import com.google.common.io.ByteSource;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
/** /**
* Provides mock tests for the {@link ObjectApi}. * Provides mock tests for the {@link ObjectApi}.
@ -106,9 +106,9 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.setBody(stringFromResource("/object_list.json")))); .setBody(stringFromResource("/object_list.json"))));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
ObjectList objects = api.getObjectApi("DFW", "myContainer").list(); ObjectList objects = api.getObjectApi("DFW", "myContainer").list();
assertEquals(objects, parsedObjectsForUrl(server.getUrl("/").toString())); assertEquals(objects, parsedObjectsForUrl(server.url("/").toString()));
assertEquals(objects.getContainer().getName(), "myContainer"); assertEquals(objects.getContainer().getName(), "myContainer");
assertTrue(objects.getContainer().getAnybodyRead().get()); assertTrue(objects.getContainer().getAnybodyRead().get());
@ -133,9 +133,9 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.setBody(stringFromResource("/object_list.json")))); .setBody(stringFromResource("/object_list.json"))));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
ObjectList objects = api.getObjectApi("DFW", "myContainer").list(new ListContainerOptions()); ObjectList objects = api.getObjectApi("DFW", "myContainer").list(new ListContainerOptions());
assertEquals(objects, parsedObjectsForUrl(server.getUrl("/").toString())); assertEquals(objects, parsedObjectsForUrl(server.url("/").toString()));
assertEquals(objects.getContainer().getName(), "myContainer"); assertEquals(objects.getContainer().getName(), "myContainer");
assertTrue(objects.getContainer().getAnybodyRead().get()); assertTrue(objects.getContainer().getAnybodyRead().get());
@ -153,9 +153,9 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(containerResponse().setBody(stringFromResource("/object_list.json")))); server.enqueue(addCommonHeaders(containerResponse().setBody(stringFromResource("/object_list.json"))));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
ObjectList objects = api.getObjectApi("DFW", "myContainer").list(marker("test")); ObjectList objects = api.getObjectApi("DFW", "myContainer").list(marker("test"));
assertEquals(objects, parsedObjectsForUrl(server.getUrl("/").toString())); assertEquals(objects, parsedObjectsForUrl(server.url("/").toString()));
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
assertAuthentication(server); assertAuthentication(server);
@ -174,7 +174,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader("Expires", "1406243553")); .addHeader("Expires", "1406243553"));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertEquals( assertEquals(
api.getObjectApi("DFW", "myContainer").put("myObject", PAYLOAD, api.getObjectApi("DFW", "myContainer").put("myObject", PAYLOAD,
metadata(metadata)), "d9f5eb4bba4e2f2f046e54611bc8196b"); metadata(metadata)), "d9f5eb4bba4e2f2f046e54611bc8196b");
@ -184,7 +184,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
RecordedRequest replace = server.takeRequest(); RecordedRequest replace = server.takeRequest();
assertRequest(replace, "PUT", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/myObject"); assertRequest(replace, "PUT", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/myObject");
assertEquals(new String(replace.getBody()), "swifty"); assertEquals(replace.getBody().readUtf8(), "swifty");
for (Entry<String, String> entry : metadata.entrySet()) { for (Entry<String, String> entry : metadata.entrySet()) {
assertEquals(replace.getHeader(OBJECT_METADATA_PREFIX + entry.getKey().toLowerCase()), entry.getValue()); assertEquals(replace.getHeader(OBJECT_METADATA_PREFIX + entry.getKey().toLowerCase()), entry.getValue());
} }
@ -203,7 +203,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
final String objectName = "object # ! special"; final String objectName = "object # ! special";
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertEquals( assertEquals(
api.getObjectApi("DFW", containerName).put(objectName, PAYLOAD, api.getObjectApi("DFW", containerName).put(objectName, PAYLOAD,
metadata(metadata)), "d9f5eb4bba4e2f2f046e54611bc8196b"); metadata(metadata)), "d9f5eb4bba4e2f2f046e54611bc8196b");
@ -213,7 +213,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
RecordedRequest replace = server.takeRequest(); RecordedRequest replace = server.takeRequest();
assertRequest(replace, "PUT", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/container%20%23%20%21%20special/object%20%23%20%21%20special"); assertRequest(replace, "PUT", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/container%20%23%20%21%20special/object%20%23%20%21%20special");
assertEquals(new String(replace.getBody()), "swifty"); assertEquals(replace.getBody().readUtf8(), "swifty");
} finally { } finally {
server.shutdown(); server.shutdown();
} }
@ -235,7 +235,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
Properties overrides = new Properties(); Properties overrides = new Properties();
overrides.setProperty(PROPERTY_MAX_RETRIES, 5 + ""); overrides.setProperty(PROPERTY_MAX_RETRIES, 5 + "");
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift", overrides); SwiftApi api = api(server.url("/").toString(), "openstack-swift", overrides);
assertEquals( assertEquals(
api.getObjectApi("DFW", "myContainer").put("myObject", PAYLOAD, api.getObjectApi("DFW", "myContainer").put("myObject", PAYLOAD,
metadata(metadata)), "d9f5eb4bba4e2f2f046e54611bc8196b"); metadata(metadata)), "d9f5eb4bba4e2f2f046e54611bc8196b");
@ -246,7 +246,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
// This should take a while. // This should take a while.
assertRequest(replace, "PUT", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/myObject"); assertRequest(replace, "PUT", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/myObject");
assertEquals(new String(replace.getBody()), "swifty"); assertEquals(replace.getBody().readUtf8(), "swifty");
for (Entry<String, String> entry : metadata.entrySet()) { for (Entry<String, String> entry : metadata.entrySet()) {
assertEquals(replace.getHeader(OBJECT_METADATA_PREFIX + entry.getKey().toLowerCase()), entry.getValue()); assertEquals(replace.getHeader(OBJECT_METADATA_PREFIX + entry.getKey().toLowerCase()), entry.getValue());
} }
@ -288,7 +288,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
Properties overrides = new Properties(); Properties overrides = new Properties();
overrides.setProperty(PROPERTY_MAX_RETRIES, 5 + ""); overrides.setProperty(PROPERTY_MAX_RETRIES, 5 + "");
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift", overrides); SwiftApi api = api(server.url("/").toString(), "openstack-swift", overrides);
assertEquals( assertEquals(
api.getObjectApi("DFW", "myContainer").put("myObject1", PAYLOAD, api.getObjectApi("DFW", "myContainer").put("myObject1", PAYLOAD,
metadata(metadata)), "d9f5eb4bba4e2f2f046e54611bc8196b"); metadata(metadata)), "d9f5eb4bba4e2f2f046e54611bc8196b");
@ -336,7 +336,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader(OBJECT_METADATA_PREFIX + "Apiversion", "v1.1"))); .addHeader(OBJECT_METADATA_PREFIX + "Apiversion", "v1.1")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
SwiftObject object = api.getObjectApi("DFW", "myContainer").getWithoutBody("myObject"); SwiftObject object = api.getObjectApi("DFW", "myContainer").getWithoutBody("myObject");
assertEquals(object.getName(), "myObject"); assertEquals(object.getName(), "myObject");
assertEquals(object.getETag(), "8a964ee2a5e88be344f36c22562a6486"); assertEquals(object.getETag(), "8a964ee2a5e88be344f36c22562a6486");
@ -370,7 +370,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader(OBJECT_METADATA_PREFIX + "Apiversion", "v1.1"))); .addHeader(OBJECT_METADATA_PREFIX + "Apiversion", "v1.1")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
SwiftObject object = api.getObjectApi("DFW", "myContainer").get("myObject", tail(1)); SwiftObject object = api.getObjectApi("DFW", "myContainer").get("myObject", tail(1));
assertEquals(object.getName(), "myObject"); assertEquals(object.getName(), "myObject");
assertEquals(object.getETag(), "8a964ee2a5e88be344f36c22562a6486"); assertEquals(object.getETag(), "8a964ee2a5e88be344f36c22562a6486");
@ -409,7 +409,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
overrides.setProperty(PROPERTY_MAX_RETRIES, 0 + ""); // 0 retries == 1 try. Semantics. overrides.setProperty(PROPERTY_MAX_RETRIES, 0 + ""); // 0 retries == 1 try. Semantics.
overrides.setProperty(PROPERTY_RETRY_DELAY_START, 0 + ""); // exponential backoff already working for this call. This is the delay BETWEEN attempts. overrides.setProperty(PROPERTY_RETRY_DELAY_START, 0 + ""); // exponential backoff already working for this call. This is the delay BETWEEN attempts.
final SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift", overrides); final SwiftApi api = api(server.url("/").toString(), "openstack-swift", overrides);
api.getObjectApi("DFW", "myContainer").put("myObject", new ByteSourcePayload(ByteSource.wrap("swifty".getBytes())), metadata(metadata)); api.getObjectApi("DFW", "myContainer").put("myObject", new ByteSourcePayload(ByteSource.wrap("swifty".getBytes())), metadata(metadata));
@ -434,7 +434,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader(OBJECT_METADATA_PREFIX + "ApiVersion", "v1.1"))); .addHeader(OBJECT_METADATA_PREFIX + "ApiVersion", "v1.1")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
api.getObjectApi("DFW", "myContainer").updateMetadata("myObject", metadata); api.getObjectApi("DFW", "myContainer").updateMetadata("myObject", metadata);
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -458,14 +458,14 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader(OBJECT_METADATA_PREFIX + "ApiVersion", "v1.1"))); .addHeader(OBJECT_METADATA_PREFIX + "ApiVersion", "v1.1")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
api.getObjectApi("DFW", "myContainer").updateMetadata("myObject", metadata); api.getObjectApi("DFW", "myContainer").updateMetadata("myObject", metadata);
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1"); assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
RecordedRequest replaceRequest = server.takeRequest(); RecordedRequest replaceRequest = server.takeRequest();
assertEquals(replaceRequest.getHeaders("Content-Type").get(0), "", "updateMetadata should send an empty content-type header, but sent " assertEquals(replaceRequest.getHeader("Content-Type"), "", "updateMetadata should send an empty content-type header, but sent "
+ replaceRequest.getHeaders("Content-Type").get(0).toString()); + replaceRequest.getHeader("Content-Type"));
assertEquals(replaceRequest.getRequestLine(), assertEquals(replaceRequest.getRequestLine(),
"POST /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/myObject HTTP/1.1"); "POST /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/myObject HTTP/1.1");
@ -483,7 +483,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(objectResponse())); server.enqueue(addCommonHeaders(objectResponse()));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertTrue(api.getObjectApi("DFW", "myContainer").deleteMetadata("myObject", metadata)); assertTrue(api.getObjectApi("DFW", "myContainer").deleteMetadata("myObject", metadata));
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -505,7 +505,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(204)));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
api.getObjectApi("DFW", "myContainer").delete("myObject"); api.getObjectApi("DFW", "myContainer").delete("myObject");
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -524,7 +524,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
api.getObjectApi("DFW", "myContainer").delete("myObject"); api.getObjectApi("DFW", "myContainer").delete("myObject");
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -543,7 +543,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201) server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201)
.addHeader(SwiftHeaders.OBJECT_COPY_FROM, "/bar/foo.txt"))); .addHeader(SwiftHeaders.OBJECT_COPY_FROM, "/bar/foo.txt")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
api.getObjectApi("DFW", "foo").copy("bar.txt", "bar", "foo.txt"); api.getObjectApi("DFW", "foo").copy("bar.txt", "bar", "foo.txt");
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -563,7 +563,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201) server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201)
.addHeader(SwiftHeaders.OBJECT_COPY_FROM, "/bar/foo.txt"))); .addHeader(SwiftHeaders.OBJECT_COPY_FROM, "/bar/foo.txt")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
api.getObjectApi("DFW", "foo").copy("bar.txt", "bar", "foo.txt", new CopyOptions().ifMatch("fakeetag")); api.getObjectApi("DFW", "foo").copy("bar.txt", "bar", "foo.txt", new CopyOptions().ifMatch("fakeetag"));
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -573,9 +573,9 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
assertEquals(copyRequest.getRequestLine(), assertEquals(copyRequest.getRequestLine(),
"PUT /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/foo/bar.txt HTTP/1.1"); "PUT /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/foo/bar.txt HTTP/1.1");
List<String> requestHeaders = copyRequest.getHeaders(); Headers requestHeaders = copyRequest.getHeaders();
assertThat(requestHeaders).contains("If-Match: fakeetag"); assertEquals(requestHeaders.get("If-Match"), "fakeetag");
assertThat(requestHeaders).contains(SwiftHeaders.OBJECT_COPY_FROM + ": /bar/foo.txt"); assertEquals(requestHeaders.get(SwiftHeaders.OBJECT_COPY_FROM), "/bar/foo.txt");
} finally { } finally {
server.shutdown(); server.shutdown();
} }
@ -589,7 +589,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader(SwiftHeaders.OBJECT_COPY_FROM, "/bogus/foo.txt"))); .addHeader(SwiftHeaders.OBJECT_COPY_FROM, "/bogus/foo.txt")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
// the following line will throw the KeyNotFoundException // the following line will throw the KeyNotFoundException
api.getObjectApi("DFW", "foo").copy("bar.txt", "bogus", "foo.txt"); api.getObjectApi("DFW", "foo").copy("bar.txt", "bogus", "foo.txt");
} finally { } finally {
@ -604,7 +604,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader(SwiftHeaders.OBJECT_COPY_FROM, "/bar/foo.txt"))); .addHeader(SwiftHeaders.OBJECT_COPY_FROM, "/bar/foo.txt")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
api.getObjectApi("DFW", "foo") api.getObjectApi("DFW", "foo")
.copy("bar.txt", "bar", "foo.txt", ImmutableMap.of("someUserHeader", "someUserMetadataValue"), .copy("bar.txt", "bar", "foo.txt", ImmutableMap.of("someUserHeader", "someUserMetadataValue"),
ImmutableMap.of("Content-Disposition", "attachment; filename=\"fname.ext\"")); ImmutableMap.of("Content-Disposition", "attachment; filename=\"fname.ext\""));
@ -616,10 +616,10 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
assertEquals(copyRequest.getRequestLine(), assertEquals(copyRequest.getRequestLine(),
"PUT /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/foo/bar.txt HTTP/1.1"); "PUT /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/foo/bar.txt HTTP/1.1");
List<String> requestHeaders = copyRequest.getHeaders(); Headers requestHeaders = copyRequest.getHeaders();
assertTrue(requestHeaders.contains("X-Object-Meta-someuserheader: someUserMetadataValue")); assertEquals(requestHeaders.get("X-Object-Meta-someuserheader"), "someUserMetadataValue");
assertTrue(requestHeaders.contains("Content-Disposition: attachment; filename=\"fname.ext\"")); assertEquals(requestHeaders.get("Content-Disposition"), "attachment; filename=\"fname.ext\"");
assertTrue(requestHeaders.contains(SwiftHeaders.OBJECT_COPY_FROM + ": /bar/foo.txt")); assertEquals(requestHeaders.get(SwiftHeaders.OBJECT_COPY_FROM), "/bar/foo.txt");
} finally { } finally {
server.shutdown(); server.shutdown();
} }
@ -633,7 +633,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader(SwiftHeaders.OBJECT_COPY_FROM, "/bar/foo.txt"))); .addHeader(SwiftHeaders.OBJECT_COPY_FROM, "/bar/foo.txt")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
api.getObjectApi("DFW", "foo") api.getObjectApi("DFW", "foo")
.copy("bar.txt", "bar", "foo.txt", ImmutableMap.of("someUserHeader", "someUserMetadataValue"), .copy("bar.txt", "bar", "foo.txt", ImmutableMap.of("someUserHeader", "someUserMetadataValue"),
ImmutableMap.of("Content-Disposition", "attachment; filename=\"fname.ext\"")); ImmutableMap.of("Content-Disposition", "attachment; filename=\"fname.ext\""));
@ -650,7 +650,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
.addHeader("ETag", "8a964ee2a5e88be344f36c22562a6486") .addHeader("ETag", "8a964ee2a5e88be344f36c22562a6486")
// TODO: MWS doesn't allow you to return content length w/o content // TODO: MWS doesn't allow you to return content length w/o content
// on HEAD! // on HEAD!
.setBody("ABCD".getBytes(US_ASCII)) .setBody("ABCD")
.addHeader("Content-Length", "4") .addHeader("Content-Length", "4")
.addHeader("Content-Type", "text/plain; charset=UTF-8") .addHeader("Content-Type", "text/plain; charset=UTF-8")
.addHeader(EXPIRES, "Wed, 23 Jul 2014 14:00:00 GMT"); .addHeader(EXPIRES, "Wed, 23 Jul 2014 14:00:00 GMT");

30
apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiMockTest.java
View File

@ -23,19 +23,21 @@ import static org.testng.Assert.assertNotEquals;
import java.util.List; import java.util.List;
import com.google.common.base.Charsets; import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.openstack.swift.v1.SwiftApi; import org.jclouds.openstack.swift.v1.SwiftApi;
import org.jclouds.openstack.swift.v1.domain.DeleteStaticLargeObjectResponse; import org.jclouds.openstack.swift.v1.domain.DeleteStaticLargeObjectResponse;
import org.jclouds.openstack.swift.v1.domain.Segment; import org.jclouds.openstack.swift.v1.domain.Segment;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.net.HttpHeaders; import com.google.common.net.HttpHeaders;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(groups = "unit", testName = "StaticLargeObjectApiMockTest") @Test(groups = "unit", testName = "StaticLargeObjectApiMockTest")
public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
@ -46,7 +48,7 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi
server.enqueue(addCommonHeaders(new MockResponse().addHeader(HttpHeaders.ETAG, "\"abcd\""))); server.enqueue(addCommonHeaders(new MockResponse().addHeader(HttpHeaders.ETAG, "\"abcd\"")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertEquals( assertEquals(
api.getStaticLargeObjectApi("DFW", "myContainer").replaceManifest( api.getStaticLargeObjectApi("DFW", "myContainer").replaceManifest(
"myObject", "myObject",
@ -67,7 +69,7 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi
assertRequest(replaceRequest, "PUT", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/myObject?multipart-manifest=put"); assertRequest(replaceRequest, "PUT", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/myObject?multipart-manifest=put");
assertEquals(replaceRequest.getHeader(OBJECT_METADATA_PREFIX + "myfoo"), "Bar"); assertEquals(replaceRequest.getHeader(OBJECT_METADATA_PREFIX + "myfoo"), "Bar");
assertEquals( assertEquals(
new String(replaceRequest.getBody()), replaceRequest.getBody().readUtf8(),
"[{\"path\":\"/mycontainer/objseg1\",\"etag\":\"0228c7926b8b642dfb29554cd1f00963\",\"size_bytes\":1468006}," + "[{\"path\":\"/mycontainer/objseg1\",\"etag\":\"0228c7926b8b642dfb29554cd1f00963\",\"size_bytes\":1468006}," +
"{\"path\":\"/mycontainer/pseudodir/seg-obj2\",\"etag\":\"5bfc9ea51a00b790717eeb934fb77b9b\",\"size_bytes\":1572864}," + "{\"path\":\"/mycontainer/pseudodir/seg-obj2\",\"etag\":\"5bfc9ea51a00b790717eeb934fb77b9b\",\"size_bytes\":1572864}," +
"{\"path\":\"/other-container/seg-final\",\"etag\":\"b9c3da507d2557c1ddc51f27c54bae51\",\"size_bytes\":256}]"); "{\"path\":\"/other-container/seg-final\",\"etag\":\"b9c3da507d2557c1ddc51f27c54bae51\",\"size_bytes\":256}]");
@ -82,7 +84,7 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi
server.enqueue(addCommonHeaders(new MockResponse().addHeader(HttpHeaders.ETAG, "\"abcd\""))); server.enqueue(addCommonHeaders(new MockResponse().addHeader(HttpHeaders.ETAG, "\"abcd\"")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertEquals( assertEquals(
api.getStaticLargeObjectApi("DFW", "myContainer").replaceManifest( api.getStaticLargeObjectApi("DFW", "myContainer").replaceManifest(
"unic₪de", "unic₪de",
@ -115,7 +117,7 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi
assertEquals(replaceRequest.getHeader("content-length"), Long.toString(byteLength)); assertEquals(replaceRequest.getHeader("content-length"), Long.toString(byteLength));
assertEquals( assertEquals(
new String(replaceRequest.getBody()), replaceRequest.getBody().readUtf8(),
expectedManifest); expectedManifest);
} finally { } finally {
server.shutdown(); server.shutdown();
@ -128,7 +130,7 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi
server.enqueue(addCommonHeaders(new MockResponse().addHeader(HttpHeaders.ETAG, "\"abcd\""))); server.enqueue(addCommonHeaders(new MockResponse().addHeader(HttpHeaders.ETAG, "\"abcd\"")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
assertEquals( assertEquals(
api.getStaticLargeObjectApi("DFW", "myContainer").replaceManifest( api.getStaticLargeObjectApi("DFW", "myContainer").replaceManifest(
"myObject", "myObject",
@ -158,7 +160,7 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi
assertEquals(replaceRequest.getHeader("some-header1"), "some-header-value"); assertEquals(replaceRequest.getHeader("some-header1"), "some-header-value");
assertEquals( assertEquals(
new String(replaceRequest.getBody()), replaceRequest.getBody().readUtf8(),
"[{\"path\":\"/mycontainer/objseg1\",\"etag\":\"0228c7926b8b642dfb29554cd1f00963\",\"size_bytes\":1468006}," + "[{\"path\":\"/mycontainer/objseg1\",\"etag\":\"0228c7926b8b642dfb29554cd1f00963\",\"size_bytes\":1468006}," +
"{\"path\":\"/mycontainer/pseudodir/seg-obj2\",\"etag\":\"5bfc9ea51a00b790717eeb934fb77b9b\",\"size_bytes\":1572864}," + "{\"path\":\"/mycontainer/pseudodir/seg-obj2\",\"etag\":\"5bfc9ea51a00b790717eeb934fb77b9b\",\"size_bytes\":1572864}," +
"{\"path\":\"/other-container/seg-final\",\"etag\":\"b9c3da507d2557c1ddc51f27c54bae51\",\"size_bytes\":256}]"); "{\"path\":\"/other-container/seg-final\",\"etag\":\"b9c3da507d2557c1ddc51f27c54bae51\",\"size_bytes\":256}]");
@ -174,7 +176,7 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi
stringFromResource("/manifest_get_response.json")) )); stringFromResource("/manifest_get_response.json")) ));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
List<Segment> manifest = api.getStaticLargeObjectApi("DFW", "myContainer").getManifest("myObject"); List<Segment> manifest = api.getStaticLargeObjectApi("DFW", "myContainer").getManifest("myObject");
// Check response // Check response
@ -199,7 +201,7 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/manifest_get_response.json")) )); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/manifest_get_response.json")) ));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
List<Segment> manifest = api.getStaticLargeObjectApi("DFW", "myContainer").getManifest("myObject"); List<Segment> manifest = api.getStaticLargeObjectApi("DFW", "myContainer").getManifest("myObject");
// Check response // Check response
@ -222,7 +224,7 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi
.setBody("{\"Number Not Found\": 0, \"Response Status\": \"200 OK\", \"Errors\": [], \"Number Deleted\": 6, \"Response Body\": \"\"}"))); .setBody("{\"Number Not Found\": 0, \"Response Status\": \"200 OK\", \"Errors\": [], \"Number Deleted\": 6, \"Response Body\": \"\"}")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
DeleteStaticLargeObjectResponse response = api.getStaticLargeObjectApi("DFW", "myContainer").delete("myObject"); DeleteStaticLargeObjectResponse response = api.getStaticLargeObjectApi("DFW", "myContainer").delete("myObject");
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -244,7 +246,7 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi
.setBody("{\"Number Not Found\": 1, \"Response Status\": \"200 OK\", \"Errors\": [], \"Number Deleted\": 0, \"Response Body\": \"\"}"))); .setBody("{\"Number Not Found\": 1, \"Response Status\": \"200 OK\", \"Errors\": [], \"Number Deleted\": 0, \"Response Body\": \"\"}")));
try { try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftApi api = api(server.url("/").toString(), "openstack-swift");
DeleteStaticLargeObjectResponse response = api.getStaticLargeObjectApi("DFW", "myContainer").delete("myObject"); DeleteStaticLargeObjectResponse response = api.getStaticLargeObjectApi("DFW", "myContainer").delete("myObject");
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);

2
apis/rackspace-cloudfiles/pom.xml
View File

@ -109,7 +109,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

40
apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
View File

@ -35,6 +35,9 @@ import static org.testng.Assert.assertTrue;
import java.net.URI; import java.net.URI;
import java.util.List; import java.util.List;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi; import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi;
import org.jclouds.rackspace.cloudfiles.v1.domain.CDNContainer; import org.jclouds.rackspace.cloudfiles.v1.domain.CDNContainer;
@ -43,8 +46,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Tests the behavior of the {@link CloudFilesCDNApi}. * Tests the behavior of the {@link CloudFilesCDNApi}.
@ -60,7 +62,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/cdn_container_list.json")))); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/cdn_container_list.json"))));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
CDNApi cdnApi = api.getCDNApi("DFW"); CDNApi cdnApi = api.getCDNApi("DFW");
ImmutableList<CDNContainer> cdnContainers = cdnApi.list().toList(); ImmutableList<CDNContainer> cdnContainers = cdnApi.list().toList();
@ -81,7 +83,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
CDNApi cdnApi = api.getCDNApi("DFW"); CDNApi cdnApi = api.getCDNApi("DFW");
List<CDNContainer> cdnContainers = cdnApi.list().toList(); List<CDNContainer> cdnContainers = cdnApi.list().toList();
@ -102,7 +104,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/cdn_container_list_at.json")))); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/cdn_container_list_at.json"))));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
ListCDNContainerOptions options = new ListCDNContainerOptions().marker("cdn-container-3"); ListCDNContainerOptions options = new ListCDNContainerOptions().marker("cdn-container-3");
ImmutableList<CDNContainer> containers = api.getCDNApi("DFW").list(options).toList(); ImmutableList<CDNContainer> containers = api.getCDNApi("DFW").list(options).toList();
@ -126,7 +128,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
ListCDNContainerOptions options = ListCDNContainerOptions.Builder.marker("cdn-container-3"); ListCDNContainerOptions options = ListCDNContainerOptions.Builder.marker("cdn-container-3");
FluentIterable<CDNContainer> containers = api.getCDNApi("DFW").list(options); FluentIterable<CDNContainer> containers = api.getCDNApi("DFW").list(options);
@ -147,7 +149,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(201))); server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(201)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
// enable a CDN Container // enable a CDN Container
URI enabledContainer = api.getCDNApi("DFW").enable("container-1"); URI enabledContainer = api.getCDNApi("DFW").enable("container-1");
@ -167,7 +169,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(404))); server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(404)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
// enable a CDN Container // enable a CDN Container
assertNull(api.getCDNApi("DFW").enable("container-1")); assertNull(api.getCDNApi("DFW").enable("container-1"));
@ -185,7 +187,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(201))); server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(201)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
// enable a CDN Container with a TTL // enable a CDN Container with a TTL
URI enabledContainer = api.getCDNApi("DFW").enable("container-1", 777777); URI enabledContainer = api.getCDNApi("DFW").enable("container-1", 777777);
@ -205,7 +207,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(404))); server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(404)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
// enable a CDN Container with a TTL // enable a CDN Container with a TTL
URI enabledContainer = api.getCDNApi("DFW").enable("container-1", 777777); URI enabledContainer = api.getCDNApi("DFW").enable("container-1", 777777);
@ -225,7 +227,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(201))); server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(201)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
// disable a CDN Container // disable a CDN Container
assertTrue(api.getCDNApi("DFW").disable("container-1")); assertTrue(api.getCDNApi("DFW").disable("container-1"));
@ -244,7 +246,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(404))); server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(404)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
// disable a CDN Container // disable a CDN Container
boolean disbledContainer = api.getCDNApi("DFW").disable("container-1"); boolean disbledContainer = api.getCDNApi("DFW").disable("container-1");
@ -264,7 +266,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(201))); server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(201)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1"); CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1");
assertCDNContainerNotNull(cdnContainer); assertCDNContainerNotNull(cdnContainer);
@ -284,7 +286,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(201))); server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(201)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
CDNContainer cdnContainer = api.getCDNApi("DFW").get("cdn-container with spaces"); CDNContainer cdnContainer = api.getCDNApi("DFW").get("cdn-container with spaces");
assertCDNContainerNotNull(cdnContainer); assertCDNContainerNotNull(cdnContainer);
@ -304,7 +306,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1"); CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1");
@ -322,7 +324,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
// purge the object // purge the object
assertTrue(api.getCDNApi("DFW").purgeObject("myContainer", "myObject", emails)); assertTrue(api.getCDNApi("DFW").purgeObject("myContainer", "myObject", emails));
@ -341,7 +343,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
// purge the object // purge the object
assertFalse(api.getCDNApi("DFW").purgeObject("myContainer", "myObject", emails)); assertFalse(api.getCDNApi("DFW").purgeObject("myContainer", "myObject", emails));
@ -362,7 +364,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(updatedResponse().setResponseCode(200))); server.enqueue(addCommonHeaders(updatedResponse().setResponseCode(200)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1"); CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1");
assertCDNContainerNotNull(cdnContainer); assertCDNContainerNotNull(cdnContainer);
@ -403,7 +405,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
server.enqueue(addCommonHeaders(updatedResponse().setResponseCode(404))); server.enqueue(addCommonHeaders(updatedResponse().setResponseCode(404)));
try { try {
CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); CloudFilesApi api = api(server.url("/").toString(), "rackspace-cloudfiles");
CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1"); CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1");
assertCDNContainerNotNull(cdnContainer); assertCDNContainerNotNull(cdnContainer);

2
apis/s3/pom.xml
View File

@ -88,7 +88,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

31
apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java
View File

@ -29,6 +29,11 @@ import java.net.URL;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import okhttp3.mockwebserver.SocketPolicy;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.concurrent.config.ExecutorServiceModule;
import org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule; import org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule;
@ -39,9 +44,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(singleThreaded = true) @Test(singleThreaded = true)
public class S3ClientMockTest { public class S3ClientMockTest {
@ -63,9 +66,9 @@ public class S3ClientMockTest {
public void testZeroLengthPutHasContentLengthHeader() throws IOException, InterruptedException { public void testZeroLengthPutHasContentLengthHeader() throws IOException, InterruptedException {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
server.enqueue(new MockResponse().addHeader(ETAG, "ABCDEF")); server.enqueue(new MockResponse().addHeader(ETAG, "ABCDEF"));
server.play(); server.start();
S3Client client = getS3Client(server.getUrl("/")); S3Client client = getS3Client(server.url("/").url());
S3Object nada = client.newS3Object(); S3Object nada = client.newS3Object();
nada.getMetadata().setKey("object"); nada.getMetadata().setKey("object");
nada.setPayload(new byte[] {}); nada.setPayload(new byte[] {});
@ -74,17 +77,17 @@ public class S3ClientMockTest {
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(request.getRequestLine(), "PUT /bucket/object HTTP/1.1"); assertEquals(request.getRequestLine(), "PUT /bucket/object HTTP/1.1");
assertEquals(request.getHeaders(CONTENT_LENGTH), ImmutableList.of("0")); assertEquals(request.getHeaders().values(CONTENT_LENGTH), ImmutableList.of("0"));
assertThat(request.getHeaders(EXPECT)).isEmpty(); assertThat(request.getHeader(EXPECT)).isNull();
server.shutdown(); server.shutdown();
} }
public void testDirectorySeparator() throws IOException, InterruptedException { public void testDirectorySeparator() throws IOException, InterruptedException {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
server.enqueue(new MockResponse().setBody("").addHeader(ETAG, "ABCDEF")); server.enqueue(new MockResponse().setBody("").addHeader(ETAG, "ABCDEF").setSocketPolicy(SocketPolicy.EXPECT_CONTINUE));
server.play(); server.start();
S3Client client = getS3Client(server.getUrl("/")); S3Client client = getS3Client(server.url("/").url());
S3Object fileInDir = client.newS3Object(); S3Object fileInDir = client.newS3Object();
fileInDir.getMetadata().setKey("someDir/fileName"); fileInDir.getMetadata().setKey("someDir/fileName");
fileInDir.setPayload(new byte[] { 1, 2, 3, 4 }); fileInDir.setPayload(new byte[] { 1, 2, 3, 4 });
@ -93,7 +96,7 @@ public class S3ClientMockTest {
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(request.getRequestLine(), "PUT /bucket/someDir/fileName HTTP/1.1"); assertEquals(request.getRequestLine(), "PUT /bucket/someDir/fileName HTTP/1.1");
assertEquals(request.getHeaders(EXPECT), ImmutableList.of("100-continue")); assertEquals(request.getHeaders().values(EXPECT), ImmutableList.of("100-continue"));
server.shutdown(); server.shutdown();
} }
@ -104,11 +107,11 @@ public class S3ClientMockTest {
" <LastModified>2009-10-28T22:32:00</LastModified>\n" + " <LastModified>2009-10-28T22:32:00</LastModified>\n" +
" <ETag>\"9b2cf535f27731c974343645a3985328\"</ETag>\n" + " <ETag>\"9b2cf535f27731c974343645a3985328\"</ETag>\n" +
" </CopyObjectResult>")); " </CopyObjectResult>"));
server.play(); server.start();
S3Client client = getS3Client(server.getUrl("/")); S3Client client = getS3Client(server.url("/").url());
client.copyObject("sourceBucket", "apples#?:$&'\"<>čॐ", "destinationBucket", "destinationObject", CopyObjectOptions.NONE); client.copyObject("sourceBucket", "apples#?:$&'\"<>čॐ", "destinationBucket", "destinationObject", CopyObjectOptions.NONE);
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(request.getHeaders("x-amz-copy-source"), ImmutableList.of("/sourceBucket/apples%23%3F%3A%24%26%27%22%3C%3E%C4%8D%E0%A5%90")); assertEquals(request.getHeaders().values("x-amz-copy-source"), ImmutableList.of("/sourceBucket/apples%23%3F%3A%24%26%27%22%3C%3E%C4%8D%E0%A5%90"));
server.shutdown(); server.shutdown();
} }
} }

7
core/pom.xml
View File

@ -83,10 +83,15 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-tls</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>com.google.auto.value</groupId> <groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId> <artifactId>auto-value</artifactId>

2
core/src/main/java/org/jclouds/http/config/SSLModule.java
View File

@ -101,7 +101,7 @@ public class SSLModule extends AbstractModule {
@Singleton @Singleton
public static class TrustAllCerts implements X509TrustManager { public static class TrustAllCerts implements X509TrustManager {
public X509Certificate[] getAcceptedIssuers() { public X509Certificate[] getAcceptedIssuers() {
return null; return new X509Certificate[0];
} }
public void checkClientTrusted(X509Certificate[] certs, String authType) { public void checkClientTrusted(X509Certificate[] certs, String authType) {

16
core/src/test/java/org/jclouds/http/BackoffLimitedRetryJavaTest.java
View File

@ -23,12 +23,14 @@ import static org.testng.Assert.fail;
import java.util.Properties; import java.util.Properties;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Tests the retry behavior of the default {@link RetryHandler} implementation * Tests the retry behavior of the default {@link RetryHandler} implementation
@ -57,7 +59,7 @@ public class BackoffLimitedRetryJavaTest extends BaseMockWebServerTest {
@Test @Test
public void testNoRetriesSuccessful() throws Exception { public void testNoRetriesSuccessful() throws Exception {
MockWebServer server = mockWebServer(new MockResponse()); MockWebServer server = mockWebServer(new MockResponse());
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
client.download(""); client.download("");
assertEquals(server.getRequestCount(), 1); assertEquals(server.getRequestCount(), 1);
@ -70,7 +72,7 @@ public class BackoffLimitedRetryJavaTest extends BaseMockWebServerTest {
@Test @Test
public void testSingleRetrySuccessful() throws Exception { public void testSingleRetrySuccessful() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500), new MockResponse()); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500), new MockResponse());
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
client.download(""); client.download("");
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -88,7 +90,7 @@ public class BackoffLimitedRetryJavaTest extends BaseMockWebServerTest {
} }
server.enqueue(new MockResponse()); server.enqueue(new MockResponse());
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
client.download(""); client.download("");
assertEquals(server.getRequestCount(), maxRetries); assertEquals(server.getRequestCount(), maxRetries);
@ -105,7 +107,7 @@ public class BackoffLimitedRetryJavaTest extends BaseMockWebServerTest {
server.enqueue(new MockResponse().setResponseCode(500)); server.enqueue(new MockResponse().setResponseCode(500));
} }
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
client.download(""); client.download("");
@ -126,7 +128,7 @@ public class BackoffLimitedRetryJavaTest extends BaseMockWebServerTest {
server.enqueue(new MockResponse().setResponseCode(500)); server.enqueue(new MockResponse().setResponseCode(500));
} }
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
client.download(""); client.download("");
client.download(""); client.download("");

121
core/src/test/java/org/jclouds/http/BaseHttpCommandExecutorServiceIntegrationTest.java
View File

@ -34,6 +34,13 @@ import java.net.URLDecoder;
import java.util.Random; import java.util.Random;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import okio.Buffer;
import org.jclouds.io.ByteStreams2; import org.jclouds.io.ByteStreams2;
import org.jclouds.io.Payload; import org.jclouds.io.Payload;
import org.jclouds.util.Strings2; import org.jclouds.util.Strings2;
@ -42,16 +49,12 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.base.Charsets;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.io.ByteSource; import com.google.common.io.ByteSource;
import com.google.common.io.Files; import com.google.common.io.Files;
import com.squareup.okhttp.mockwebserver.Dispatcher;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
/** /**
* Tests for functionality all {@link HttpCommandExecutorService} http executor * Tests for functionality all {@link HttpCommandExecutorService} http executor
@ -76,7 +79,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testRequestFilter() throws Exception { public void testRequestFilter() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody("test")); MockWebServer server = mockWebServer(new MockResponse().setBody("test"));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.downloadFilter("", "filterme"); String result = client.downloadFilter("", "filterme");
@ -93,7 +96,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testGetStringWithHeader() throws Exception { public void testGetStringWithHeader() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody("test")); MockWebServer server = mockWebServer(new MockResponse().setBody("test"));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.download("", "test"); String result = client.download("", "test");
@ -109,7 +112,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testGetString() throws Exception { public void testGetString() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(XML)); MockWebServer server = mockWebServer(new MockResponse().setBody(XML));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
assertEquals(client.download(""), XML); assertEquals(client.download(""), XML);
} finally { } finally {
@ -121,7 +124,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testGetStringIsRetriedOnFailure() throws Exception { public void testGetStringIsRetriedOnFailure() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500), new MockResponse().setBody(XML)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500), new MockResponse().setBody(XML));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.download(""); String result = client.download("");
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -135,10 +138,10 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testGetStringViaRequest() throws Exception { public void testGetStringViaRequest() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(XML)); MockWebServer server = mockWebServer(new MockResponse().setBody(XML));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
HttpResponse getStringResponse = client.invoke(HttpRequest.builder().method("GET") HttpResponse getStringResponse = client.invoke(HttpRequest.builder().method("GET")
.endpoint(server.getUrl("/objects").toString()).build()); .endpoint(server.url("/objects").toString()).build());
assertEquals(Strings2.toStringAndClose(getStringResponse.getPayload().openStream()).trim(), XML); assertEquals(Strings2.toStringAndClose(getStringResponse.getPayload().openStream()).trim(), XML);
} finally { } finally {
closeQuietly(client); closeQuietly(client);
@ -154,7 +157,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test(dataProvider = "gets") @Test(dataProvider = "gets")
public void testGetStringSynch(String uri) throws Exception { public void testGetStringSynch(String uri) throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(XML)); MockWebServer server = mockWebServer(new MockResponse().setBody(XML));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.synch(uri); String result = client.synch(uri);
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
@ -169,7 +172,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testGetException() throws Exception { public void testGetException() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(404)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(404));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.downloadException("", tail(1)); String result = client.downloadException("", tail(1));
assertEquals(result, "foo"); assertEquals(result, "foo");
@ -182,7 +185,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testGetSynchException() throws Exception { public void testGetSynchException() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(404)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(404));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.synchException("", ""); String result = client.synchException("", "");
assertEquals(result, "foo"); assertEquals(result, "foo");
@ -195,10 +198,10 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testGetStringRedirect() throws Exception { public void testGetStringRedirect() throws Exception {
MockWebServer redirectTarget = mockWebServer(new MockResponse().setBody(XML2)); MockWebServer redirectTarget = mockWebServer(new MockResponse().setBody(XML2));
redirectTarget.useHttps(sslContext.getSocketFactory(), false); redirectTarget.useHttps(sslSocketFactory(), false);
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(302).setHeader("Location", MockWebServer server = mockWebServer(new MockResponse().setResponseCode(302).setHeader("Location",
redirectTarget.getUrl("/").toString())); redirectTarget.url("/").toString()));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.download("redirect"); String result = client.download("redirect");
assertEquals(result, XML2); assertEquals(result, XML2);
@ -216,10 +219,10 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
String constitutionsMd5 = base64().encode(oneHundredOneConstitutions.hash(md5()).asBytes()); String constitutionsMd5 = base64().encode(oneHundredOneConstitutions.hash(md5()).asBytes());
MockResponse response = new MockResponse().addHeader("Content-MD5", constitutionsMd5) MockResponse response = new MockResponse().addHeader("Content-MD5", constitutionsMd5)
.addHeader("Content-type", "text/plain") .addHeader("Content-type", "text/plain")
.setBody(oneHundredOneConstitutions.openStream(), oneHundredOneConstitutions.size()); .setBody(new Buffer().readFrom(oneHundredOneConstitutions.openStream(), oneHundredOneConstitutions.size()));
MockWebServer server = mockWebServer(response, response); MockWebServer server = mockWebServer(response, response);
InputStream input = server.getUrl("/101constitutions").openStream(); InputStream input = server.url("/101constitutions").url().openStream();
try { try {
assertValidMd5(input, constitutionsMd5); assertValidMd5(input, constitutionsMd5);
@ -240,7 +243,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
try { try {
MockResponse response = new MockResponse(); MockResponse response = new MockResponse();
String expectedMd5 = request.getHeader("Content-MD5"); String expectedMd5 = request.getHeader("Content-MD5");
ByteSource body = ByteSource.wrap(request.getBody()); ByteSource body = ByteSource.wrap(request.getBody().readByteArray());
String realMd5FromRequest = base64().encode(body.hash(md5()).asBytes()); String realMd5FromRequest = base64().encode(body.hash(md5()).asBytes());
boolean matched = expectedMd5.equals(realMd5FromRequest); boolean matched = expectedMd5.equals(realMd5FromRequest);
if (matched) { if (matched) {
@ -259,7 +262,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testUploadBigFile() throws Exception { public void testUploadBigFile() throws Exception {
MockWebServer server = mockWebServer(new MD5CheckDispatcher()); MockWebServer server = mockWebServer(new MD5CheckDispatcher());
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
File f = null; File f = null;
Payload payload = null; Payload payload = null;
@ -295,12 +298,12 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testPost() throws Exception { public void testPost() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody("fooPOST")); MockWebServer server = mockWebServer(new MockResponse().setBody("fooPOST"));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.post("", "foo"); String result = client.post("", "foo");
// Verify that the body is properly populated // Verify that the body is properly populated
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
assertEquals(result, "fooPOST"); assertEquals(result, "fooPOST");
} finally { } finally {
closeQuietly(client); closeQuietly(client);
@ -311,12 +314,12 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testZeroLengthPost() throws Exception { public void testZeroLengthPost() throws Exception {
MockWebServer server = mockWebServer(new MockResponse()); MockWebServer server = mockWebServer(new MockResponse());
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
client.postNothing(""); client.postNothing("");
assertEquals(server.getRequestCount(), 1); assertEquals(server.getRequestCount(), 1);
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), ""); assertEquals(request.getBody().readUtf8(), "");
} finally { } finally {
closeQuietly(client); closeQuietly(client);
server.shutdown(); server.shutdown();
@ -327,16 +330,16 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
public void testPostIsRetriedOnFailure() throws Exception { public void testPostIsRetriedOnFailure() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500), MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500),
new MockResponse().setBody("fooPOST")); new MockResponse().setBody("fooPOST"));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.post("", "foo"); String result = client.post("", "foo");
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
assertEquals(result, "fooPOST"); assertEquals(result, "fooPOST");
// Verify that the body was properly sent in the two requests // Verify that the body was properly sent in the two requests
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
request = server.takeRequest(); request = server.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
} finally { } finally {
closeQuietly(client); closeQuietly(client);
server.shutdown(); server.shutdown();
@ -346,10 +349,10 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testPostRedirect() throws Exception { public void testPostRedirect() throws Exception {
MockWebServer redirectTarget = mockWebServer(new MockResponse().setBody("fooPOSTREDIRECT")); MockWebServer redirectTarget = mockWebServer(new MockResponse().setBody("fooPOSTREDIRECT"));
redirectTarget.useHttps(sslContext.getSocketFactory(), false); redirectTarget.useHttps(sslSocketFactory(), false);
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(302).setHeader("Location", MockWebServer server = mockWebServer(new MockResponse().setResponseCode(302).setHeader("Location",
redirectTarget.getUrl("/").toString())); redirectTarget.url("/").toString()));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.post("redirect", "foo"); String result = client.post("redirect", "foo");
assertEquals(result, "fooPOSTREDIRECT"); assertEquals(result, "fooPOSTREDIRECT");
@ -357,9 +360,9 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
assertEquals(redirectTarget.getRequestCount(), 1); assertEquals(redirectTarget.getRequestCount(), 1);
// Verify that the body was populated after the redirect // Verify that the body was populated after the redirect
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
request = redirectTarget.takeRequest(); request = redirectTarget.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
} finally { } finally {
closeQuietly(client); closeQuietly(client);
redirectTarget.shutdown(); redirectTarget.shutdown();
@ -370,12 +373,12 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testPostAsInputStream() throws Exception { public void testPostAsInputStream() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody("fooPOST")); MockWebServer server = mockWebServer(new MockResponse().setBody("fooPOST"));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.postAsInputStream("", "foo"); String result = client.postAsInputStream("", "foo");
// Verify that the body is properly populated // Verify that the body is properly populated
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
assertEquals(result, "fooPOST"); assertEquals(result, "fooPOST");
} finally { } finally {
closeQuietly(client); closeQuietly(client);
@ -386,7 +389,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testPostAsInputStreamDoesNotRetryOnFailure() throws Exception { public void testPostAsInputStreamDoesNotRetryOnFailure() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500), new MockResponse()); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500), new MockResponse());
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
client.postAsInputStream("", "foo"); client.postAsInputStream("", "foo");
fail("Request should have thrown an exception after a server error"); fail("Request should have thrown an exception after a server error");
@ -401,12 +404,12 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testPostBinder() throws Exception { public void testPostBinder() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody("fooPOSTJSON")); MockWebServer server = mockWebServer(new MockResponse().setBody("fooPOSTJSON"));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.postJson("", "foo"); String result = client.postJson("", "foo");
// Verify that the body is properly populated // Verify that the body is properly populated
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), "{\"key\":\"foo\"}"); assertEquals(request.getBody().readUtf8(), "{\"key\":\"foo\"}");
assertEquals(result, "fooPOSTJSON"); assertEquals(result, "fooPOSTJSON");
} finally { } finally {
closeQuietly(client); closeQuietly(client);
@ -418,7 +421,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
public void testPostContentDisposition() throws Exception { public void testPostContentDisposition() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().addHeader("x-Content-Disposition", MockWebServer server = mockWebServer(new MockResponse().addHeader("x-Content-Disposition",
"attachment; filename=photo.jpg")); "attachment; filename=photo.jpg"));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
Payload payload = null; Payload payload = null;
try { try {
ByteSource body = ByteSource.wrap("foo".getBytes()); ByteSource body = ByteSource.wrap("foo".getBytes());
@ -441,7 +444,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testPostContentEncoding() throws Exception { public void testPostContentEncoding() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().addHeader("x-Content-Encoding", "gzip")); MockWebServer server = mockWebServer(new MockResponse().addHeader("x-Content-Encoding", "gzip"));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
Payload payload = null; Payload payload = null;
try { try {
ByteSource body = ByteSource.wrap("foo".getBytes()); ByteSource body = ByteSource.wrap("foo".getBytes());
@ -464,7 +467,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testPostContentLanguage() throws Exception { public void testPostContentLanguage() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().addHeader("x-Content-Language", "mi, en")); MockWebServer server = mockWebServer(new MockResponse().addHeader("x-Content-Language", "mi, en"));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
Payload payload = null; Payload payload = null;
try { try {
ByteSource body = ByteSource.wrap("foo".getBytes()); ByteSource body = ByteSource.wrap("foo".getBytes());
@ -487,12 +490,12 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testPut() throws Exception { public void testPut() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody("fooPUT")); MockWebServer server = mockWebServer(new MockResponse().setBody("fooPUT"));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.upload("", "foo"); String result = client.upload("", "foo");
// Verify that the body is properly populated // Verify that the body is properly populated
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
assertEquals(result, "fooPUT"); assertEquals(result, "fooPUT");
} finally { } finally {
closeQuietly(client); closeQuietly(client);
@ -503,10 +506,10 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testPutRedirect() throws Exception { public void testPutRedirect() throws Exception {
MockWebServer redirectTarget = mockWebServer(new MockResponse().setBody("fooPUTREDIRECT")); MockWebServer redirectTarget = mockWebServer(new MockResponse().setBody("fooPUTREDIRECT"));
redirectTarget.useHttps(sslContext.getSocketFactory(), false); redirectTarget.useHttps(sslSocketFactory(), false);
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(302).setHeader("Location", MockWebServer server = mockWebServer(new MockResponse().setResponseCode(302).setHeader("Location",
redirectTarget.getUrl("/").toString())); redirectTarget.url("/").toString()));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.upload("redirect", "foo"); String result = client.upload("redirect", "foo");
assertEquals(result, "fooPUTREDIRECT"); assertEquals(result, "fooPUTREDIRECT");
@ -514,9 +517,9 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
assertEquals(redirectTarget.getRequestCount(), 1); assertEquals(redirectTarget.getRequestCount(), 1);
// Verify that the body was populated after the redirect // Verify that the body was populated after the redirect
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
request = redirectTarget.takeRequest(); request = redirectTarget.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
} finally { } finally {
closeQuietly(client); closeQuietly(client);
redirectTarget.shutdown(); redirectTarget.shutdown();
@ -527,12 +530,12 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testZeroLengthPut() throws Exception { public void testZeroLengthPut() throws Exception {
MockWebServer server = mockWebServer(new MockResponse()); MockWebServer server = mockWebServer(new MockResponse());
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
client.putNothing(""); client.putNothing("");
assertEquals(server.getRequestCount(), 1); assertEquals(server.getRequestCount(), 1);
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), ""); assertEquals(request.getBody().readUtf8(), "");
} finally { } finally {
closeQuietly(client); closeQuietly(client);
server.shutdown(); server.shutdown();
@ -543,16 +546,16 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
public void testPutIsRetriedOnFailure() throws Exception { public void testPutIsRetriedOnFailure() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500), MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500),
new MockResponse().setBody("fooPUT")); new MockResponse().setBody("fooPUT"));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.upload("", "foo"); String result = client.upload("", "foo");
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
assertEquals(result, "fooPUT"); assertEquals(result, "fooPUT");
// Verify that the body was properly sent in the two requests // Verify that the body was properly sent in the two requests
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
request = server.takeRequest(); request = server.takeRequest();
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
} finally { } finally {
closeQuietly(client); closeQuietly(client);
server.shutdown(); server.shutdown();
@ -562,7 +565,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testHead() throws Exception { public void testHead() throws Exception {
MockWebServer server = mockWebServer(new MockResponse()); MockWebServer server = mockWebServer(new MockResponse());
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
assertTrue(client.exists("")); assertTrue(client.exists(""));
} finally { } finally {
@ -574,7 +577,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testHeadIsRetriedOnServerError() throws Exception { public void testHeadIsRetriedOnServerError() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500), new MockResponse()); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500), new MockResponse());
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
assertTrue(client.exists("")); assertTrue(client.exists(""));
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -587,7 +590,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testHeadFailure() throws Exception { public void testHeadFailure() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(404)); MockWebServer server = mockWebServer(new MockResponse().setResponseCode(404));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
assertFalse(client.exists("")); assertFalse(client.exists(""));
} finally { } finally {
@ -599,7 +602,7 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
@Test @Test
public void testGetAndParseSax() throws Exception { public void testGetAndParseSax() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody(XML)); MockWebServer server = mockWebServer(new MockResponse().setBody(XML));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
String result = client.downloadAndParse(""); String result = client.downloadAndParse("");
assertEquals(result, "whoppers"); assertEquals(result, "whoppers");
@ -613,11 +616,11 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base
public void testInterruptThrottledGet() throws Exception { public void testInterruptThrottledGet() throws Exception {
long timeoutMillis = 10 * 1000; long timeoutMillis = 10 * 1000;
MockWebServer server = mockWebServer(new MockResponse().setBody(XML).throttleBody(XML.length() / 2, timeoutMillis, TimeUnit.MILLISECONDS)); MockWebServer server = mockWebServer(new MockResponse().setBody(XML).throttleBody(XML.length() / 2, timeoutMillis, TimeUnit.MILLISECONDS));
IntegrationTestClient client = client(server.getUrl("/").toString()); IntegrationTestClient client = client(server.url("/").toString());
try { try {
HttpResponse response = client.invoke(HttpRequest.builder() HttpResponse response = client.invoke(HttpRequest.builder()
.method("GET") .method("GET")
.endpoint(server.getUrl("/").toURI()) .endpoint(server.url("/").uri())
.build()); .build());
InputStream is = response.getPayload().openStream(); InputStream is = response.getPayload().openStream();
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();

35
core/src/test/java/org/jclouds/http/BaseMockWebServerTest.java
View File

@ -23,10 +23,15 @@ import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.security.GeneralSecurityException;
import java.util.Properties; import java.util.Properties;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.tls.HandshakeCertificates;
import okhttp3.tls.HeldCertificate;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.providers.AnonymousProviderMetadata; import org.jclouds.providers.AnonymousProviderMetadata;
@ -34,10 +39,7 @@ import org.testng.annotations.BeforeClass;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.internal.SslContextBuilder;
import com.squareup.okhttp.mockwebserver.Dispatcher;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
/** /**
* Base class for integration tests that use {@link MockWebServer} to verify the * Base class for integration tests that use {@link MockWebServer} to verify the
@ -45,14 +47,19 @@ import com.squareup.okhttp.mockwebserver.MockWebServer;
*/ */
public abstract class BaseMockWebServerTest { public abstract class BaseMockWebServerTest {
protected SSLContext sslContext; protected HandshakeCertificates serverCertificates;
@BeforeClass(groups = "integration") @BeforeClass(groups = "integration")
protected void setupSSL() { protected void setupSSL() {
try { try {
sslContext = new SslContextBuilder(InetAddress.getLocalHost().getHostName()).build(); String localhost = InetAddress.getLocalHost().getHostName();
} catch (GeneralSecurityException ex) { HeldCertificate localhostCertificate = new HeldCertificate.Builder()
throw new RuntimeException(ex); .addSubjectAlternativeName(localhost)
.build();
serverCertificates = new HandshakeCertificates.Builder()
.heldCertificate(localhostCertificate)
.build();
} catch (UnknownHostException ex) { } catch (UnknownHostException ex) {
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
@ -64,7 +71,7 @@ public abstract class BaseMockWebServerTest {
*/ */
protected static MockWebServer mockWebServer(MockResponse... responses) throws IOException { protected static MockWebServer mockWebServer(MockResponse... responses) throws IOException {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
server.play(); server.start();
for (MockResponse response : responses) { for (MockResponse response : responses) {
server.enqueue(response); server.enqueue(response);
} }
@ -76,7 +83,7 @@ public abstract class BaseMockWebServerTest {
*/ */
protected static MockWebServer mockWebServer(Dispatcher dispatcher) throws IOException { protected static MockWebServer mockWebServer(Dispatcher dispatcher) throws IOException {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
server.play(); server.start();
server.setDispatcher(dispatcher); server.setDispatcher(dispatcher);
return server; return server;
} }
@ -100,6 +107,10 @@ public abstract class BaseMockWebServerTest {
.modules(ImmutableSet.copyOf(connectionModules)).overrides(properties).buildApi(apiClass); .modules(ImmutableSet.copyOf(connectionModules)).overrides(properties).buildApi(apiClass);
} }
protected SSLSocketFactory sslSocketFactory() {
return serverCertificates.sslSocketFactory();
}
/** /**
* Add the connection properties used to configure the tests. * Add the connection properties used to configure the tests.
*/ */

16
core/src/test/java/org/jclouds/http/JavaUrlHttpCommandExecutorServiceIntegrationTest.java
View File

@ -26,6 +26,11 @@ import static org.testng.Assert.fail;
import java.util.Properties; import java.util.Properties;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
import org.jclouds.io.Payload; import org.jclouds.io.Payload;
import org.jclouds.io.payloads.StringPayload; import org.jclouds.io.payloads.StringPayload;
@ -34,10 +39,7 @@ import org.jclouds.utils.TestUtils;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.mockwebserver.Dispatcher;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(groups = "integration") @Test(groups = "integration")
public class JavaUrlHttpCommandExecutorServiceIntegrationTest extends BaseHttpCommandExecutorServiceIntegrationTest { public class JavaUrlHttpCommandExecutorServiceIntegrationTest extends BaseHttpCommandExecutorServiceIntegrationTest {
@ -62,9 +64,9 @@ public class JavaUrlHttpCommandExecutorServiceIntegrationTest extends BaseHttpCo
return new MockResponse(); return new MockResponse();
} }
}); });
server.play(); server.start();
HttpClient client = api(HttpClient.class, server.getUrl("/").toString()); HttpClient client = api(HttpClient.class, server.url("/").toString());
// Make a fake payload that has no data, but says there's a lot! // Make a fake payload that has no data, but says there's a lot!
Payload fakePayload = new StringPayload(""); Payload fakePayload = new StringPayload("");
@ -72,7 +74,7 @@ public class JavaUrlHttpCommandExecutorServiceIntegrationTest extends BaseHttpCo
try { try {
try { try {
client.post(server.getUrl("/").toURI(), fakePayload); client.post(server.url("/").uri(), fakePayload);
fail("Should have errored since we didn't sent that much data!"); fail("Should have errored since we didn't sent that much data!");
} catch (HttpResponseException expected) { } catch (HttpResponseException expected) {
} }

7
drivers/gae/pom.xml
View File

@ -49,10 +49,15 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-tls</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId> <artifactId>appengine-api-stubs</artifactId>

9
drivers/okhttp/pom.xml
View File

@ -44,15 +44,20 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
<version>${okhttp.version}</version> <version>${okhttp.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-tls</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

4
drivers/okhttp/src/main/java/org/jclouds/http/okhttp/OkHttpClientSupplier.java
View File

@ -16,12 +16,14 @@
*/ */
package org.jclouds.http.okhttp; package org.jclouds.http.okhttp;
import okhttp3.OkHttpClient;
import org.jclouds.http.okhttp.OkHttpClientSupplier.NewOkHttpClient; import org.jclouds.http.okhttp.OkHttpClientSupplier.NewOkHttpClient;
import com.google.common.annotations.Beta; import com.google.common.annotations.Beta;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.inject.ImplementedBy; import com.google.inject.ImplementedBy;
import com.squareup.okhttp.OkHttpClient;
/** /**
* Provides the OkHttp client used for all requests. This could be used to * Provides the OkHttp client used for all requests. This could be used to

42
drivers/okhttp/src/main/java/org/jclouds/http/okhttp/OkHttpCommandExecutorService.java
View File

@ -29,8 +29,17 @@ import java.net.Proxy;
import java.net.URI; import java.net.URI;
import java.util.Map; import java.util.Map;
import javax.annotation.Nullable;
import javax.inject.Named; import javax.inject.Named;
import okhttp3.internal.http.HttpMethod;
import okhttp3.Headers;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import okio.BufferedSink; import okio.BufferedSink;
import okio.Okio; import okio.Okio;
import okio.Source; import okio.Source;
@ -51,12 +60,7 @@ import com.google.common.base.Function;
import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.ImmutableMultimap.Builder; import com.google.common.collect.ImmutableMultimap.Builder;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.squareup.okhttp.Headers;
import com.squareup.okhttp.MediaType;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.RequestBody;
import com.squareup.okhttp.Response;
public final class OkHttpCommandExecutorService extends BaseHttpCommandExecutorService<Request> { public final class OkHttpCommandExecutorService extends BaseHttpCommandExecutorService<Request> {
private final Function<URI, Proxy> proxyForURI; private final Function<URI, Proxy> proxyForURI;
@ -92,6 +96,11 @@ public final class OkHttpCommandExecutorService extends BaseHttpCommandExecutorS
} }
} }
// OkHttp requires body (at least empty one) for some type of the requests, so let's generate it
if (body == null && HttpMethod.requiresRequestBody(request.getMethod())) {
body = generateEmptyRequestBody(payload);
}
builder.method(request.getMethod(), body); builder.method(request.getMethod(), body);
return builder.build(); return builder.build();
@ -117,6 +126,22 @@ public final class OkHttpCommandExecutorService extends BaseHttpCommandExecutorS
} }
} }
private RequestBody generateEmptyRequestBody(final Payload payload) {
return new RequestBody() {
@Nullable @Override public MediaType contentType() {
return payload != null ? MediaType.parse(payload.getContentMetadata().getContentType()) : null;
}
@Override public void writeTo(BufferedSink sink) throws IOException {
// nothing to do
}
@Override public long contentLength() throws IOException {
return 0;
}
};
}
protected RequestBody generateRequestBody(final HttpRequest request, final Payload payload) { protected RequestBody generateRequestBody(final HttpRequest request, final Payload payload) {
checkNotNull(payload.getContentMetadata().getContentType(), "payload.getContentType"); checkNotNull(payload.getContentMetadata().getContentType(), "payload.getContentType");
return new RequestBody() { return new RequestBody() {
@ -147,8 +172,9 @@ public final class OkHttpCommandExecutorService extends BaseHttpCommandExecutorS
@Override @Override
protected HttpResponse invoke(Request nativeRequest) throws IOException, InterruptedException { protected HttpResponse invoke(Request nativeRequest) throws IOException, InterruptedException {
OkHttpClient requestScopedClient = globalClient.clone(); OkHttpClient requestScopedClient = globalClient.newBuilder()
requestScopedClient.setProxy(proxyForURI.apply(nativeRequest.uri())); .proxy(proxyForURI.apply(nativeRequest.url().uri()))
.build();
Response response = requestScopedClient.newCall(nativeRequest).execute(); Response response = requestScopedClient.newCall(nativeRequest).execute();

24
drivers/okhttp/src/main/java/org/jclouds/http/okhttp/config/OkHttpCommandExecutorServiceModule.java
View File

@ -22,6 +22,8 @@ import javax.inject.Named;
import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import okhttp3.OkHttpClient;
import org.jclouds.http.HttpCommandExecutorService; import org.jclouds.http.HttpCommandExecutorService;
import org.jclouds.http.HttpUtils; import org.jclouds.http.HttpUtils;
import org.jclouds.http.config.ConfiguresHttpCommandExecutorService; import org.jclouds.http.config.ConfiguresHttpCommandExecutorService;
@ -34,7 +36,7 @@ import com.google.inject.AbstractModule;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.Scopes; import com.google.inject.Scopes;
import com.squareup.okhttp.OkHttpClient;
/** /**
* Configures the {@link OkHttpCommandExecutorService}. * Configures the {@link OkHttpCommandExecutorService}.
@ -68,22 +70,22 @@ public class OkHttpCommandExecutorServiceModule extends AbstractModule {
@Override @Override
public OkHttpClient get() { public OkHttpClient get() {
OkHttpClient client = clientSupplier.get(); OkHttpClient.Builder clientBuilder = clientSupplier.get().newBuilder()
client.setConnectTimeout(utils.getConnectionTimeout(), TimeUnit.MILLISECONDS); .connectTimeout(utils.getConnectionTimeout(), TimeUnit.MILLISECONDS)
client.setReadTimeout(utils.getSocketOpenTimeout(), TimeUnit.MILLISECONDS); .readTimeout(utils.getSocketOpenTimeout(), TimeUnit.MILLISECONDS)
// do not follow redirects since https redirects don't work properly // do not follow redirects since https redirects don't work properly
// ex. Caused by: java.io.IOException: HTTPS hostname wrong: should be // ex. Caused by: java.io.IOException: HTTPS hostname wrong: should be
// <adriancole.s3int0.s3-external-3.amazonaws.com> // <adriancole.s3int0.s3-external-3.amazonaws.com>
client.setFollowRedirects(false); .followRedirects(false);
if (utils.relaxHostname()) { if (utils.relaxHostname()) {
client.setHostnameVerifier(verifier); clientBuilder.hostnameVerifier(verifier);
} }
if (utils.trustAllCerts()) { if (utils.trustAllCerts()) {
client.setSslSocketFactory(untrustedSSLContextProvider.get().getSocketFactory()); clientBuilder.sslSocketFactory(untrustedSSLContextProvider.get().getSocketFactory());
} }
return client; return clientBuilder.build();
} }
} }

67
drivers/okhttp/src/test/java/org/jclouds/http/okhttp/OkHttpCommandExecutorServiceTest.java
View File

@ -31,6 +31,13 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam; import javax.ws.rs.PathParam;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import okhttp3.ConnectionSpec;
import okhttp3.OkHttpClient;
import okhttp3.TlsVersion;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.http.BaseHttpCommandExecutorServiceIntegrationTest; import org.jclouds.http.BaseHttpCommandExecutorServiceIntegrationTest;
import org.jclouds.http.HttpResponseException; import org.jclouds.http.HttpResponseException;
import org.jclouds.http.config.ConfiguresHttpCommandExecutorService; import org.jclouds.http.config.ConfiguresHttpCommandExecutorService;
@ -40,16 +47,10 @@ import org.jclouds.rest.annotations.PATCH;
import org.jclouds.rest.binders.BindToStringPayload; import org.jclouds.rest.binders.BindToStringPayload;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.ConnectionSpec;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.TlsVersion;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
/** /**
* Tests the functionality of the {@link OkHttpCommandExecutorService} * Tests the functionality of the {@link OkHttpCommandExecutorService}
@ -83,13 +84,13 @@ public class OkHttpCommandExecutorServiceTest extends BaseHttpCommandExecutorSer
@Test @Test
public void testPatch() throws Exception { public void testPatch() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setBody("fooPATCH")); MockWebServer server = mockWebServer(new MockResponse().setBody("fooPATCH"));
PatchApi api = api(PatchApi.class, server.getUrl("/").toString()); PatchApi api = api(PatchApi.class, server.url("/").toString());
try { try {
String result = api.patch("", "foo"); String result = api.patch("", "foo");
// Verify that the body is properly populated // Verify that the body is properly populated
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(request.getMethod(), "PATCH"); assertEquals(request.getMethod(), "PATCH");
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
assertEquals(result, "fooPATCH"); assertEquals(result, "fooPATCH");
// Verify content headers are sent // Verify content headers are sent
assertNotNull(request.getHeader("Content-Type")); assertNotNull(request.getHeader("Content-Type"));
@ -106,7 +107,7 @@ public class OkHttpCommandExecutorServiceTest extends BaseHttpCommandExecutorSer
public void testPatchIsRetriedOnFailure() throws Exception { public void testPatchIsRetriedOnFailure() throws Exception {
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500), MockWebServer server = mockWebServer(new MockResponse().setResponseCode(500),
new MockResponse().setBody("fooPATCH")); new MockResponse().setBody("fooPATCH"));
PatchApi api = api(PatchApi.class, server.getUrl("/").toString()); PatchApi api = api(PatchApi.class, server.url("/").toString());
try { try {
String result = api.patch("", "foo"); String result = api.patch("", "foo");
assertEquals(server.getRequestCount(), 2); assertEquals(server.getRequestCount(), 2);
@ -114,10 +115,10 @@ public class OkHttpCommandExecutorServiceTest extends BaseHttpCommandExecutorSer
// Verify that the body was properly sent in the two requests // Verify that the body was properly sent in the two requests
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(request.getMethod(), "PATCH"); assertEquals(request.getMethod(), "PATCH");
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
request = server.takeRequest(); request = server.takeRequest();
assertEquals(request.getMethod(), "PATCH"); assertEquals(request.getMethod(), "PATCH");
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
} finally { } finally {
closeQuietly(api); closeQuietly(api);
server.shutdown(); server.shutdown();
@ -127,10 +128,10 @@ public class OkHttpCommandExecutorServiceTest extends BaseHttpCommandExecutorSer
@Test @Test
public void testPatchRedirect() throws Exception { public void testPatchRedirect() throws Exception {
MockWebServer redirectTarget = mockWebServer(new MockResponse().setBody("fooPATCHREDIRECT")); MockWebServer redirectTarget = mockWebServer(new MockResponse().setBody("fooPATCHREDIRECT"));
redirectTarget.useHttps(sslContext.getSocketFactory(), false); redirectTarget.useHttps(sslSocketFactory(), false);
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(302).setHeader("Location", MockWebServer server = mockWebServer(new MockResponse().setResponseCode(302).setHeader("Location",
redirectTarget.getUrl("/").toString())); redirectTarget.url("/").toString()));
PatchApi api = api(PatchApi.class, server.getUrl("/").toString()); PatchApi api = api(PatchApi.class, server.url("/").toString());
try { try {
String result = api.patch("", "foo"); String result = api.patch("", "foo");
assertEquals(result, "fooPATCHREDIRECT"); assertEquals(result, "fooPATCHREDIRECT");
@ -139,10 +140,10 @@ public class OkHttpCommandExecutorServiceTest extends BaseHttpCommandExecutorSer
// Verify that the body was populated after the redirect // Verify that the body was populated after the redirect
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(request.getMethod(), "PATCH"); assertEquals(request.getMethod(), "PATCH");
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
request = redirectTarget.takeRequest(); request = redirectTarget.takeRequest();
assertEquals(request.getMethod(), "PATCH"); assertEquals(request.getMethod(), "PATCH");
assertEquals(new String(request.getBody(), Charsets.UTF_8), "foo"); assertEquals(request.getBody().readUtf8(), "foo");
} finally { } finally {
closeQuietly(api); closeQuietly(api);
redirectTarget.shutdown(); redirectTarget.shutdown();
@ -153,25 +154,25 @@ public class OkHttpCommandExecutorServiceTest extends BaseHttpCommandExecutorSer
@Test @Test
public void testZeroLengthPatch() throws Exception { public void testZeroLengthPatch() throws Exception {
MockWebServer server = mockWebServer(new MockResponse()); MockWebServer server = mockWebServer(new MockResponse());
PatchApi api = api(PatchApi.class, server.getUrl("/").toString()); PatchApi api = api(PatchApi.class, server.url("/").toString());
try { try {
api.patchNothing(""); api.patchNothing("");
assertEquals(server.getRequestCount(), 1); assertEquals(server.getRequestCount(), 1);
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(request.getMethod(), "PATCH"); assertEquals(request.getMethod(), "PATCH");
assertEquals(new String(request.getBody(), Charsets.UTF_8), ""); assertEquals(request.getBody().readUtf8(), "");
} finally { } finally {
closeQuietly(api); closeQuietly(api);
server.shutdown(); server.shutdown();
} }
} }
@Test(expectedExceptions = HttpResponseException.class, expectedExceptionsMessageRegExp = ".*exhausted connection specs.*") @Test(expectedExceptions = HttpResponseException.class, expectedExceptionsMessageRegExp = "Failed to connect to.*")
public void testSSLConnectionFailsIfOnlyHttpConfigured() throws Exception { public void testSSLConnectionFailsIfOnlyHttpConfigured() throws Exception {
MockWebServer server = mockWebServer(new MockResponse()); MockWebServer server = mockWebServer(new MockResponse());
server.useHttps(sslContext.getSocketFactory(), false); server.useHttps(sslSocketFactory(), false);
Module httpConfigModule = new ConnectionSpecModule(ConnectionSpec.CLEARTEXT); Module httpConfigModule = new ConnectionSpecModule(ConnectionSpec.CLEARTEXT);
PatchApi api = api(PatchApi.class, server.getUrl("/").toString(), httpConfigModule); PatchApi api = api(PatchApi.class, server.url("/").toString(), httpConfigModule);
try { try {
api.patchNothing(""); api.patchNothing("");
} finally { } finally {
@ -180,11 +181,11 @@ public class OkHttpCommandExecutorServiceTest extends BaseHttpCommandExecutorSer
} }
} }
@Test(expectedExceptions = HttpResponseException.class, expectedExceptionsMessageRegExp = ".*exhausted connection specs.*") @Test(expectedExceptions = HttpResponseException.class, expectedExceptionsMessageRegExp = "CLEARTEXT communication not enabled for client.*")
public void testHTTPConnectionFailsIfOnlySSLConfigured() throws Exception { public void testHTTPConnectionFailsIfOnlySSLConfigured() throws Exception {
MockWebServer server = mockWebServer(new MockResponse()); MockWebServer server = mockWebServer(new MockResponse());
Module httpConfigModule = new ConnectionSpecModule(ConnectionSpec.MODERN_TLS); Module httpConfigModule = new ConnectionSpecModule(ConnectionSpec.MODERN_TLS);
PatchApi api = api(PatchApi.class, server.getUrl("/").toString(), httpConfigModule); PatchApi api = api(PatchApi.class, server.url("/").toString(), httpConfigModule);
try { try {
api.patchNothing(""); api.patchNothing("");
} finally { } finally {
@ -197,10 +198,10 @@ public class OkHttpCommandExecutorServiceTest extends BaseHttpCommandExecutorSer
public void testBothProtocolsSucceedIfSSLAndHTTPConfigured() throws Exception { public void testBothProtocolsSucceedIfSSLAndHTTPConfigured() throws Exception {
MockWebServer redirectTarget = mockWebServer(new MockResponse()); MockWebServer redirectTarget = mockWebServer(new MockResponse());
MockWebServer server = mockWebServer(new MockResponse().setResponseCode(302).setHeader("Location", MockWebServer server = mockWebServer(new MockResponse().setResponseCode(302).setHeader("Location",
redirectTarget.getUrl("/").toString())); redirectTarget.url("/").toString()));
server.useHttps(sslContext.getSocketFactory(), false); server.useHttps(sslSocketFactory(), false);
Module httpConfigModule = new ConnectionSpecModule(ConnectionSpec.CLEARTEXT, ConnectionSpec.MODERN_TLS); Module httpConfigModule = new ConnectionSpecModule(ConnectionSpec.CLEARTEXT, ConnectionSpec.MODERN_TLS);
PatchApi api = api(PatchApi.class, server.getUrl("/").toString(), httpConfigModule); PatchApi api = api(PatchApi.class, server.url("/").toString(), httpConfigModule);
try { try {
api.patchNothing(""); api.patchNothing("");
assertEquals(server.getRequestCount(), 1); assertEquals(server.getRequestCount(), 1);
@ -215,15 +216,15 @@ public class OkHttpCommandExecutorServiceTest extends BaseHttpCommandExecutorSer
@Test @Test
public void testRestrictedSSLProtocols() throws Exception { public void testRestrictedSSLProtocols() throws Exception {
MockWebServer server = mockWebServer(new MockResponse()); MockWebServer server = mockWebServer(new MockResponse());
server.useHttps(sslContext.getSocketFactory(), false); server.useHttps(sslSocketFactory(), false);
ConnectionSpec spec = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS).tlsVersions(TlsVersion.TLS_1_2) ConnectionSpec spec = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS).tlsVersions(TlsVersion.TLS_1_2)
.build(); .build();
PatchApi api = api(PatchApi.class, server.getUrl("/").toString(), new ConnectionSpecModule(spec)); PatchApi api = api(PatchApi.class, server.url("/").toString(), new ConnectionSpecModule(spec));
try { try {
api.patchNothing(""); api.patchNothing("");
assertEquals(server.getRequestCount(), 1); assertEquals(server.getRequestCount(), 1);
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(request.getSslProtocol(), "TLSv1.2"); assertEquals(request.getTlsVersion().javaName(), "TLSv1.2");
} finally { } finally {
closeQuietly(api); closeQuietly(api);
server.shutdown(); server.shutdown();
@ -244,9 +245,9 @@ public class OkHttpCommandExecutorServiceTest extends BaseHttpCommandExecutorSer
bind(OkHttpClientSupplier.class).toInstance(new OkHttpClientSupplier() { bind(OkHttpClientSupplier.class).toInstance(new OkHttpClientSupplier() {
@Override @Override
public OkHttpClient get() { public OkHttpClient get() {
OkHttpClient client = new OkHttpClient(); return new OkHttpClient.Builder()
client.setConnectionSpecs(connectionSpecs); .connectionSpecs(connectionSpecs)
return client; .build();
} }
}); });
} }

9
project/pom.xml
View File

@ -232,7 +232,7 @@
<guava.version>27.1-jre</guava.version> <guava.version>27.1-jre</guava.version>
<guice.version>4.2.3</guice.version> <guice.version>4.2.3</guice.version>
<okhttp.version>2.2.0</okhttp.version> <okhttp.version>3.14.9</okhttp.version>
<auto-factory.version>0.1-beta1</auto-factory.version> <auto-factory.version>0.1-beta1</auto-factory.version>
<auto-service.version>1.0-rc3</auto-service.version> <auto-service.version>1.0-rc3</auto-service.version>
<auto-value.version>1.4.1</auto-value.version> <auto-value.version>1.4.1</auto-value.version>
@ -407,10 +407,15 @@
<version>${easymock.version}</version> <version>${easymock.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<version>${okhttp.version}</version> <version>${okhttp.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-tls</artifactId>
<version>${okhttp.version}</version>
</dependency>
<!-- Static analysis dependencies --> <!-- Static analysis dependencies -->
<dependency> <dependency>

2
providers/aws-ec2/pom.xml
View File

@ -97,7 +97,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>

3
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceApiMockTest.java
View File

@ -19,6 +19,8 @@ package org.jclouds.aws.ec2.compute;
import static org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions.Builder.blockUntilRunning; import static org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions.Builder.blockUntilRunning;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest; import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest;
import org.jclouds.aws.ec2.options.Tenancy; import org.jclouds.aws.ec2.options.Tenancy;
import org.jclouds.compute.ComputeService; import org.jclouds.compute.ComputeService;
@ -28,7 +30,6 @@ import org.jclouds.compute.predicates.NodePredicates;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "AWSEC2ComputeServiceMockTest", singleThreaded = true) @Test(groups = "unit", testName = "AWSEC2ComputeServiceMockTest", singleThreaded = true)
public class AWSEC2ComputeServiceApiMockTest extends BaseAWSEC2ApiMockTest { public class AWSEC2ComputeServiceApiMockTest extends BaseAWSEC2ApiMockTest {

3
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/AWSAMIApiMockTest.java
View File

@ -25,6 +25,8 @@ import static org.testng.Assert.assertTrue;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest; import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest;
import org.jclouds.ec2.domain.Image; import org.jclouds.ec2.domain.Image;
import org.jclouds.ec2.domain.Permission; import org.jclouds.ec2.domain.Permission;
@ -34,7 +36,6 @@ import org.jclouds.ec2.options.RegisterImageOptions;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "AWSAMIApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "AWSAMIApiMockTest", singleThreaded = true)
public class AWSAMIApiMockTest extends BaseAWSEC2ApiMockTest { public class AWSAMIApiMockTest extends BaseAWSEC2ApiMockTest {

3
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/AWSSecurityGroupApiMockTest.java
View File

@ -20,6 +20,8 @@ import static org.testng.Assert.assertEquals;
import java.util.Set; import java.util.Set;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest; import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest;
import org.jclouds.aws.ec2.options.CreateSecurityGroupOptions; import org.jclouds.aws.ec2.options.CreateSecurityGroupOptions;
import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.domain.SecurityGroup;
@ -32,7 +34,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "AWSSecurityGroupApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "AWSSecurityGroupApiMockTest", singleThreaded = true)
public class AWSSecurityGroupApiMockTest extends BaseAWSEC2ApiMockTest { public class AWSSecurityGroupApiMockTest extends BaseAWSEC2ApiMockTest {

3
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/AWSSubnetApiMockTest.java
View File

@ -20,6 +20,8 @@ import static org.jclouds.aws.ec2.options.ModifySubnetAttributeOptions.Builder.m
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest; import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest;
import org.jclouds.aws.ec2.options.CreateSubnetOptions; import org.jclouds.aws.ec2.options.CreateSubnetOptions;
import org.jclouds.ec2.domain.Subnet; import org.jclouds.ec2.domain.Subnet;
@ -28,7 +30,6 @@ import org.testng.annotations.Test;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "AWSSubnetApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "AWSSubnetApiMockTest", singleThreaded = true)
public class AWSSubnetApiMockTest extends BaseAWSEC2ApiMockTest { public class AWSSubnetApiMockTest extends BaseAWSEC2ApiMockTest {

3
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/InternetGatewayApiMockTest.java
View File

@ -25,6 +25,8 @@ import static org.testng.Assert.assertTrue;
import java.util.List; import java.util.List;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.aws.AWSResponseException; import org.jclouds.aws.AWSResponseException;
import org.jclouds.aws.ec2.domain.InternetGateway; import org.jclouds.aws.ec2.domain.InternetGateway;
import org.jclouds.aws.ec2.domain.InternetGatewayAttachment; import org.jclouds.aws.ec2.domain.InternetGatewayAttachment;
@ -37,7 +39,6 @@ import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "InternetGatewayApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "InternetGatewayApiMockTest", singleThreaded = true)
public class InternetGatewayApiMockTest extends BaseAWSEC2ApiMockTest { public class InternetGatewayApiMockTest extends BaseAWSEC2ApiMockTest {

3
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/PlacementGroupApiMockTest.java
View File

@ -19,13 +19,14 @@ package org.jclouds.aws.ec2.features;
import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.collect.Iterables.getOnlyElement;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.aws.ec2.domain.PlacementGroup; import org.jclouds.aws.ec2.domain.PlacementGroup;
import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest; import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "PlacementGroupApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "PlacementGroupApiMockTest", singleThreaded = true)
public class PlacementGroupApiMockTest extends BaseAWSEC2ApiMockTest { public class PlacementGroupApiMockTest extends BaseAWSEC2ApiMockTest {

3
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/RouteTableApiMockTest.java
View File

@ -26,6 +26,8 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull; import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.aws.AWSResponseException; import org.jclouds.aws.AWSResponseException;
import org.jclouds.aws.ec2.domain.Route; import org.jclouds.aws.ec2.domain.Route;
import org.jclouds.aws.ec2.domain.RouteTable; import org.jclouds.aws.ec2.domain.RouteTable;
@ -34,7 +36,6 @@ import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "RouteTableApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "RouteTableApiMockTest", singleThreaded = true)
public class RouteTableApiMockTest extends BaseAWSEC2ApiMockTest { public class RouteTableApiMockTest extends BaseAWSEC2ApiMockTest {

3
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/SpotInstanceApiMockTest.java
View File

@ -24,6 +24,8 @@ import static org.testng.Assert.assertTrue;
import java.util.Date; import java.util.Date;
import java.util.Set; import java.util.Set;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.aws.ec2.domain.Spot; import org.jclouds.aws.ec2.domain.Spot;
import org.jclouds.aws.ec2.domain.SpotInstanceRequest; import org.jclouds.aws.ec2.domain.SpotInstanceRequest;
import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest; import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest;
@ -31,7 +33,6 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "SpotInstanceApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "SpotInstanceApiMockTest", singleThreaded = true)
public class SpotInstanceApiMockTest extends BaseAWSEC2ApiMockTest { public class SpotInstanceApiMockTest extends BaseAWSEC2ApiMockTest {

3
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/VPCApiMockTest.java
View File

@ -21,6 +21,8 @@ import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.aws.ec2.domain.VPC; import org.jclouds.aws.ec2.domain.VPC;
import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest; import org.jclouds.aws.ec2.internal.BaseAWSEC2ApiMockTest;
import org.jclouds.aws.ec2.options.CreateVpcOptions; import org.jclouds.aws.ec2.options.CreateVpcOptions;
@ -28,7 +30,6 @@ import org.testng.annotations.Test;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "VPCApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "VPCApiMockTest", singleThreaded = true)
public class VPCApiMockTest extends BaseAWSEC2ApiMockTest { public class VPCApiMockTest extends BaseAWSEC2ApiMockTest {

18
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/internal/BaseAWSEC2ApiMockTest.java
View File

@ -33,6 +33,10 @@ import java.util.Set;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.Constants; import org.jclouds.Constants;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.aws.ec2.AWSEC2Api; import org.jclouds.aws.ec2.AWSEC2Api;
@ -48,14 +52,10 @@ import org.jclouds.rest.ConfiguresHttpApi;
import org.testng.annotations.AfterMethod; import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.inject.Module; import com.google.inject.Module;
import com.google.inject.Provides; import com.google.inject.Provides;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
/** /**
* Tests need to run {@code singleThreaded = true} as otherwise tests will clash on the regionToServers field. * Tests need to run {@code singleThreaded = true} as otherwise tests will clash on the regionToServers field.
@ -84,7 +84,7 @@ public class BaseAWSEC2ApiMockTest {
overrides.setProperty(ComputeServiceProperties.TIMEOUT_CLEANUP_INCIDENTAL_RESOURCES, "0"); overrides.setProperty(ComputeServiceProperties.TIMEOUT_CLEANUP_INCIDENTAL_RESOURCES, "0");
return ContextBuilder.newBuilder(new AWSEC2ProviderMetadata()) return ContextBuilder.newBuilder(new AWSEC2ProviderMetadata())
.credentials(ACCESS_KEY, SECRET_KEY) .credentials(ACCESS_KEY, SECRET_KEY)
.endpoint(defaultServer.getUrl("").toString()) .endpoint(defaultServer.url("").toString())
.overrides(overrides) .overrides(overrides)
.modules(modules); .modules(modules);
} }
@ -122,7 +122,7 @@ public class BaseAWSEC2ApiMockTest {
@BeforeMethod(alwaysRun = true) @BeforeMethod(alwaysRun = true)
public void start() throws IOException { public void start() throws IOException {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
server.play(); server.start();
regionToServers.put(DEFAULT_REGION, server); regionToServers.put(DEFAULT_REGION, server);
} }
@ -145,11 +145,11 @@ public class BaseAWSEC2ApiMockTest {
describeRegionsResponse.append("<regionName>").append(region).append("</regionName>"); describeRegionsResponse.append("<regionName>").append(region).append("</regionName>");
if (!regionToServers.containsKey(region)) { if (!regionToServers.containsKey(region)) {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
server.play(); server.start();
regionToServers.put(region, server); regionToServers.put(region, server);
} }
MockWebServer server = regionToServers.get(region); MockWebServer server = regionToServers.get(region);
String regionEndpoint = server.getUrl("").toString(); String regionEndpoint = server.url("").toString();
describeRegionsResponse.append("<regionEndpoint>").append(regionEndpoint).append("</regionEndpoint>"); describeRegionsResponse.append("<regionEndpoint>").append(regionEndpoint).append("</regionEndpoint>");
describeRegionsResponse.append("</item>"); describeRegionsResponse.append("</item>");
} }
@ -196,7 +196,7 @@ public class BaseAWSEC2ApiMockTest {
assertThat( assertThat(
request.getHeader(AUTHORIZATION)).startsWith("AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20120416/" + request.getHeader(AUTHORIZATION)).startsWith("AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20120416/" +
region + "/ec2/aws4_request, SignedHeaders=content-type;host;x-amz-date, Signature="); region + "/ec2/aws4_request, SignedHeaders=content-type;host;x-amz-date, Signature=");
String body = new String(request.getBody(), Charsets.UTF_8); String body = request.getBody().readUtf8();
assertThat(body).contains("&Version=" + apiVersion); assertThat(body).contains("&Version=" + apiVersion);
assertEquals(body.replace("&Version=" + apiVersion, ""), postParams); assertEquals(body.replace("&Version=" + apiVersion, ""), postParams);
return request; return request;

2
providers/aws-s3/pom.xml
View File

@ -90,7 +90,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>

2
providers/azurecompute-arm/pom.xml
View File

@ -113,7 +113,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>

3
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/DeploymentApiMockTest.java
View File

@ -16,9 +16,10 @@
*/ */
package org.jclouds.azurecompute.arm.features; package org.jclouds.azurecompute.arm.features;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.azurecompute.arm.domain.Deployment; import org.jclouds.azurecompute.arm.domain.Deployment;
import org.jclouds.azurecompute.arm.domain.Deployment.ProvisioningState; import org.jclouds.azurecompute.arm.domain.Deployment.ProvisioningState;
import com.squareup.okhttp.mockwebserver.MockResponse;
import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest; import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;

2
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/JobApiMockTest.java
View File

@ -54,7 +54,7 @@ public class JobApiMockTest extends BaseAzureComputeApiMockTest {
} }
public void testGetJobStatusNoContent() throws InterruptedException { public void testGetJobStatusNoContent() throws InterruptedException {
server.enqueue(jsonResponse("/resourcegroup.json").setStatus("HTTP/1.1 204 No Content")); server.enqueue(response204());
JobStatus status = api.getJobApi().jobStatus(URI.create(requestUrl)); JobStatus status = api.getJobApi().jobStatus(URI.create(requestUrl));

4
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LocationApiMockTest.java
View File

@ -17,7 +17,9 @@
package org.jclouds.azurecompute.arm.features; package org.jclouds.azurecompute.arm.features;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.azurecompute.arm.domain.Location; import org.jclouds.azurecompute.arm.domain.Location;
import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest; import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;

3
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/MetricDefinitionsApiMockTest.java
View File

@ -19,13 +19,14 @@ package org.jclouds.azurecompute.arm.features;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.azurecompute.arm.domain.MetricDefinition; import org.jclouds.azurecompute.arm.domain.MetricDefinition;
import org.jclouds.azurecompute.arm.domain.MetricName; import org.jclouds.azurecompute.arm.domain.MetricName;
import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest; import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "MetricDefinitionsApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "MetricDefinitionsApiMockTest", singleThreaded = true)
public class MetricDefinitionsApiMockTest extends BaseAzureComputeApiMockTest { public class MetricDefinitionsApiMockTest extends BaseAzureComputeApiMockTest {

3
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/MetricsApiMockTest.java
View File

@ -21,6 +21,8 @@ import static org.testng.Assert.assertTrue;
import java.util.Date; import java.util.Date;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.azurecompute.arm.domain.Metric; import org.jclouds.azurecompute.arm.domain.Metric;
import org.jclouds.azurecompute.arm.domain.MetricData; import org.jclouds.azurecompute.arm.domain.MetricData;
import org.jclouds.azurecompute.arm.domain.MetricName; import org.jclouds.azurecompute.arm.domain.MetricName;
@ -28,7 +30,6 @@ import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "MetricsApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "MetricsApiMockTest", singleThreaded = true)
public class MetricsApiMockTest extends BaseAzureComputeApiMockTest { public class MetricsApiMockTest extends BaseAzureComputeApiMockTest {

3
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApiMockTest.java
View File

@ -26,6 +26,8 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.azurecompute.arm.domain.IdReference; import org.jclouds.azurecompute.arm.domain.IdReference;
import org.jclouds.azurecompute.arm.domain.IpConfiguration; import org.jclouds.azurecompute.arm.domain.IpConfiguration;
import org.jclouds.azurecompute.arm.domain.IpConfigurationProperties; import org.jclouds.azurecompute.arm.domain.IpConfigurationProperties;
@ -35,7 +37,6 @@ import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "NetworkInterfaceCardApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "NetworkInterfaceCardApiMockTest", singleThreaded = true)
public class NetworkInterfaceCardApiMockTest extends BaseAzureComputeApiMockTest { public class NetworkInterfaceCardApiMockTest extends BaseAzureComputeApiMockTest {

3
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/PublicIPAddressApiMockTest.java
View File

@ -27,6 +27,8 @@ import static org.testng.Assert.assertTrue;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.azurecompute.arm.AzureComputeProviderMetadata; import org.jclouds.azurecompute.arm.AzureComputeProviderMetadata;
import org.jclouds.azurecompute.arm.domain.DnsSettings; import org.jclouds.azurecompute.arm.domain.DnsSettings;
import org.jclouds.azurecompute.arm.domain.publicipaddress.PublicIPAddress; import org.jclouds.azurecompute.arm.domain.publicipaddress.PublicIPAddress;
@ -36,7 +38,6 @@ import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "PublicIPAddressApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "PublicIPAddressApiMockTest", singleThreaded = true)

3
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/StorageAccountApiMockTest.java
View File

@ -19,11 +19,12 @@ package org.jclouds.azurecompute.arm.features;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.azurecompute.arm.domain.StorageService; import org.jclouds.azurecompute.arm.domain.StorageService;
import org.jclouds.azurecompute.arm.domain.Availability; import org.jclouds.azurecompute.arm.domain.Availability;
import org.jclouds.azurecompute.arm.domain.StorageServiceKeys; import org.jclouds.azurecompute.arm.domain.StorageServiceKeys;
import org.jclouds.azurecompute.arm.domain.StorageServiceUpdateParams; import org.jclouds.azurecompute.arm.domain.StorageServiceUpdateParams;
import com.squareup.okhttp.mockwebserver.MockResponse;
import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest; import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest;
import org.jclouds.date.DateService; import org.jclouds.date.DateService;
import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.date.internal.SimpleDateFormatDateService;

3
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VMSizeApiMockTest.java
View File

@ -16,7 +16,8 @@
*/ */
package org.jclouds.azurecompute.arm.features; package org.jclouds.azurecompute.arm.features;
import com.squareup.okhttp.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockResponse;
import org.jclouds.azurecompute.arm.domain.VMSize; import org.jclouds.azurecompute.arm.domain.VMSize;
import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest; import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;

2
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VaultApiMockTest.java
View File

@ -128,7 +128,7 @@ public class VaultApiMockTest extends BaseAzureComputeApiMockTest {
@BeforeMethod @BeforeMethod
public void start() throws IOException, URISyntaxException { public void start() throws IOException, URISyntaxException {
super.start(); super.start();
vaultUri = server.getUrl("").toURI(); vaultUri = server.url("").uri();
} }
public void createVault() throws InterruptedException { public void createVault() throws InterruptedException {

3
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineApiMockTest.java
View File

@ -29,6 +29,8 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.azurecompute.arm.domain.DataDisk; import org.jclouds.azurecompute.arm.domain.DataDisk;
import org.jclouds.azurecompute.arm.domain.DiagnosticsProfile; import org.jclouds.azurecompute.arm.domain.DiagnosticsProfile;
import org.jclouds.azurecompute.arm.domain.HardwareProfile; import org.jclouds.azurecompute.arm.domain.HardwareProfile;
@ -58,7 +60,6 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "VirtualMachineApiMockTest", singleThreaded = true) @Test(groups = "unit", testName = "VirtualMachineApiMockTest", singleThreaded = true)
public class VirtualMachineApiMockTest extends BaseAzureComputeApiMockTest { public class VirtualMachineApiMockTest extends BaseAzureComputeApiMockTest {

18
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java
View File

@ -30,6 +30,10 @@ import java.net.URISyntaxException;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.azurecompute.arm.AzureComputeApi; import org.jclouds.azurecompute.arm.AzureComputeApi;
import org.jclouds.azurecompute.arm.AzureComputeProviderMetadata; import org.jclouds.azurecompute.arm.AzureComputeProviderMetadata;
@ -54,9 +58,7 @@ import com.google.common.io.Resources;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import com.google.inject.Module; import com.google.inject.Module;
import com.google.inject.TypeLiteral; import com.google.inject.TypeLiteral;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
public class BaseAzureComputeApiMockTest { public class BaseAzureComputeApiMockTest {
@ -74,11 +76,11 @@ public class BaseAzureComputeApiMockTest {
@BeforeMethod @BeforeMethod
public void start() throws IOException, URISyntaxException { public void start() throws IOException, URISyntaxException {
server = new MockWebServer(); server = new MockWebServer();
server.play(); server.start();
context = ContextBuilder.newBuilder(testProviderMetadata()) context = ContextBuilder.newBuilder(testProviderMetadata())
.credentials("mock", MOCK_BEARER_TOKEN) .credentials("mock", MOCK_BEARER_TOKEN)
.endpoint(server.getUrl("/").toString() + "subscriptions/SUBSCRIPTIONID") .endpoint(server.url("/").toString() + "subscriptions/SUBSCRIPTIONID")
.modules(setupModules()) .modules(setupModules())
.overrides(setupProperties()) .overrides(setupProperties())
.build(); .build();
@ -118,7 +120,7 @@ public class BaseAzureComputeApiMockTest {
} }
protected String url(String path) { protected String url(String path) {
return server.getUrl(path).toString(); return server.url(path).toString();
} }
protected MockResponse jsonResponse(String resource) { protected MockResponse jsonResponse(String resource) {
@ -180,7 +182,7 @@ public class BaseAzureComputeApiMockTest {
throws InterruptedException { throws InterruptedException {
RecordedRequest request = assertSent(server, method, path); RecordedRequest request = assertSent(server, method, path);
assertEquals(request.getHeader("Content-Type"), "application/json"); assertEquals(request.getHeader("Content-Type"), "application/json");
assertEquals(parser.parse(new String(request.getBody(), Charsets.UTF_8)), parser.parse(json)); assertEquals(parser.parse(request.getBody().readUtf8()), parser.parse(json));
return request; return request;
} }
@ -197,7 +199,7 @@ public class BaseAzureComputeApiMockTest {
// Override the hardcoded service URIs to allow mocking service endpoints // Override the hardcoded service URIs to allow mocking service endpoints
bind(new TypeLiteral<Supplier<URI>>() { bind(new TypeLiteral<Supplier<URI>>() {
}).annotatedWith(GraphRBAC.class).toInstance( }).annotatedWith(GraphRBAC.class).toInstance(
Suppliers.ofInstance(URI.create(server.getUrl("/graphrbac").toString() + "/tenant-id"))); Suppliers.ofInstance(URI.create(server.url("/graphrbac").toString() + "/tenant-id")));
} }
} }
} }

2
providers/b2/pom.xml
View File

@ -76,7 +76,7 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

15
providers/b2/src/test/java/org/jclouds/b2/features/B2TestUtils.java
View File

@ -23,20 +23,21 @@ import java.net.URL;
import java.util.Set; import java.util.Set;
import java.util.Properties; import java.util.Properties;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.concurrent.config.ExecutorServiceModule;
import org.jclouds.b2.B2Api; import org.jclouds.b2.B2Api;
import org.jclouds.util.Strings2; import org.jclouds.util.Strings2;
import com.google.common.base.Charsets;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.MoreExecutors;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
final class B2TestUtils { final class B2TestUtils {
static B2Api api(String uri, String provider, Properties overrides) { static B2Api api(String uri, String provider, Properties overrides) {
@ -57,8 +58,8 @@ final class B2TestUtils {
static MockWebServer createMockWebServer() throws IOException { static MockWebServer createMockWebServer() throws IOException {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
server.play(); server.start();
URL url = server.getUrl(""); URL url = server.url("").url();
return server; return server;
} }
@ -104,7 +105,7 @@ final class B2TestUtils {
JsonParser parser = new JsonParser(); JsonParser parser = new JsonParser();
JsonElement requestJson; JsonElement requestJson;
try { try {
requestJson = parser.parse(new String(request.getBody(), Charsets.UTF_8)); requestJson = parser.parse(request.getBody().readUtf8());
} catch (Exception e) { } catch (Exception e) {
throw Throwables.propagate(e); throw Throwables.propagate(e);
} }
@ -119,7 +120,7 @@ final class B2TestUtils {
* @see RecordedRequest * @see RecordedRequest
*/ */
private static void assertContentTypeIsJson(RecordedRequest request) { private static void assertContentTypeIsJson(RecordedRequest request) {
assertThat(request.getHeaders()).contains("Content-Type: application/json"); assertThat(request.getHeaders().values("Content-Type")).contains("application/json");
} }
/** /**

15
providers/b2/src/test/java/org/jclouds/b2/features/BucketApiMockTest.java
View File

@ -23,13 +23,14 @@ import static org.jclouds.b2.features.B2TestUtils.assertRequest;
import static org.jclouds.b2.features.B2TestUtils.createMockWebServer; import static org.jclouds.b2.features.B2TestUtils.createMockWebServer;
import static org.jclouds.b2.features.B2TestUtils.stringFromResource; import static org.jclouds.b2.features.B2TestUtils.stringFromResource;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.b2.domain.Bucket; import org.jclouds.b2.domain.Bucket;
import org.jclouds.b2.domain.BucketList; import org.jclouds.b2.domain.BucketList;
import org.jclouds.b2.domain.BucketType; import org.jclouds.b2.domain.BucketType;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
@Test(groups = "unit", testName = "BucketApiMockTest") @Test(groups = "unit", testName = "BucketApiMockTest")
public final class BucketApiMockTest { public final class BucketApiMockTest {
@ -39,7 +40,7 @@ public final class BucketApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/bucket.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/bucket.json")));
try { try {
BucketApi api = api(server.getUrl("/").toString(), "b2").getBucketApi(); BucketApi api = api(server.url("/").toString(), "b2").getBucketApi();
Bucket response = api.createBucket("any_name_you_pick", BucketType.ALL_PRIVATE); Bucket response = api.createBucket("any_name_you_pick", BucketType.ALL_PRIVATE);
assertThat(response.bucketId()).isEqualTo("4a48fe8875c6214145260818"); assertThat(response.bucketId()).isEqualTo("4a48fe8875c6214145260818");
assertThat(response.bucketName()).isEqualTo("any_name_you_pick"); assertThat(response.bucketName()).isEqualTo("any_name_you_pick");
@ -59,7 +60,7 @@ public final class BucketApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/bucket.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/bucket.json")));
try { try {
BucketApi api = api(server.getUrl("/").toString(), "b2").getBucketApi(); BucketApi api = api(server.url("/").toString(), "b2").getBucketApi();
Bucket response = api.deleteBucket("4a48fe8875c6214145260818"); Bucket response = api.deleteBucket("4a48fe8875c6214145260818");
assertThat(response.bucketId()).isEqualTo("4a48fe8875c6214145260818"); assertThat(response.bucketId()).isEqualTo("4a48fe8875c6214145260818");
assertThat(response.bucketName()).isEqualTo("any_name_you_pick"); assertThat(response.bucketName()).isEqualTo("any_name_you_pick");
@ -79,7 +80,7 @@ public final class BucketApiMockTest {
server.enqueue(new MockResponse().setResponseCode(400).setBody(stringFromResource("/delete_bucket_already_deleted_response.json"))); server.enqueue(new MockResponse().setResponseCode(400).setBody(stringFromResource("/delete_bucket_already_deleted_response.json")));
try { try {
BucketApi api = api(server.getUrl("/").toString(), "b2").getBucketApi(); BucketApi api = api(server.url("/").toString(), "b2").getBucketApi();
Bucket response = api.deleteBucket("4a48fe8875c6214145260818"); Bucket response = api.deleteBucket("4a48fe8875c6214145260818");
assertThat(response).isNull(); assertThat(response).isNull();
@ -97,7 +98,7 @@ public final class BucketApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/bucket.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/bucket.json")));
try { try {
BucketApi api = api(server.getUrl("/").toString(), "b2").getBucketApi(); BucketApi api = api(server.url("/").toString(), "b2").getBucketApi();
Bucket response = api.updateBucket("4a48fe8875c6214145260818", BucketType.ALL_PRIVATE); Bucket response = api.updateBucket("4a48fe8875c6214145260818", BucketType.ALL_PRIVATE);
assertThat(response.bucketId()).isEqualTo("4a48fe8875c6214145260818"); assertThat(response.bucketId()).isEqualTo("4a48fe8875c6214145260818");
assertThat(response.bucketName()).isEqualTo("any_name_you_pick"); assertThat(response.bucketName()).isEqualTo("any_name_you_pick");
@ -117,7 +118,7 @@ public final class BucketApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/list_buckets_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/list_buckets_response.json")));
try { try {
BucketApi api = api(server.getUrl("/").toString(), "b2").getBucketApi(); BucketApi api = api(server.url("/").toString(), "b2").getBucketApi();
BucketList response = api.listBuckets(); BucketList response = api.listBuckets();
assertThat(response.buckets()).hasSize(3); assertThat(response.buckets()).hasSize(3);

22
providers/b2/src/test/java/org/jclouds/b2/features/MultipartApiMockTest.java
View File

@ -28,6 +28,9 @@ import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.io.Payload; import org.jclouds.io.Payload;
import org.jclouds.io.Payloads; import org.jclouds.io.Payloads;
import org.jclouds.b2.domain.Action; import org.jclouds.b2.domain.Action;
@ -42,8 +45,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
@Test(groups = "unit", testName = "MultipartApiMockTest") @Test(groups = "unit", testName = "MultipartApiMockTest")
public final class MultipartApiMockTest { public final class MultipartApiMockTest {
@ -64,7 +66,7 @@ public final class MultipartApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/start_large_file_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/start_large_file_response.json")));
try { try {
MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); MultipartApi api = api(server.url("/").toString(), "b2").getMultipartApi();
MultipartUploadResponse response = api.startLargeFile(BUCKET_ID, FILE_NAME, CONTENT_TYPE, FILE_INFO); MultipartUploadResponse response = api.startLargeFile(BUCKET_ID, FILE_NAME, CONTENT_TYPE, FILE_INFO);
assertThat(response.accountId()).isEqualTo(ACCOUNT_ID); assertThat(response.accountId()).isEqualTo(ACCOUNT_ID);
assertThat(response.bucketId()).isEqualTo(BUCKET_ID); assertThat(response.bucketId()).isEqualTo(BUCKET_ID);
@ -88,7 +90,7 @@ public final class MultipartApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/cancel_large_file_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/cancel_large_file_response.json")));
try { try {
MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); MultipartApi api = api(server.url("/").toString(), "b2").getMultipartApi();
B2Object response = api.cancelLargeFile(FILE_ID); B2Object response = api.cancelLargeFile(FILE_ID);
assertThat(response.accountId()).isEqualTo(ACCOUNT_ID); assertThat(response.accountId()).isEqualTo(ACCOUNT_ID);
assertThat(response.bucketId()).isEqualTo(BUCKET_ID); assertThat(response.bucketId()).isEqualTo(BUCKET_ID);
@ -112,7 +114,7 @@ public final class MultipartApiMockTest {
"ffffffffffffffffffffffffffffffffffffffff"); "ffffffffffffffffffffffffffffffffffffffff");
try { try {
MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); MultipartApi api = api(server.url("/").toString(), "b2").getMultipartApi();
B2Object response = api.finishLargeFile(FILE_ID, sha1); B2Object response = api.finishLargeFile(FILE_ID, sha1);
assertThat(response.accountId()).isEqualTo(ACCOUNT_ID); assertThat(response.accountId()).isEqualTo(ACCOUNT_ID);
assertThat(response.action()).isEqualTo(Action.UPLOAD); assertThat(response.action()).isEqualTo(Action.UPLOAD);
@ -139,7 +141,7 @@ public final class MultipartApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/get_upload_part_url_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/get_upload_part_url_response.json")));
try { try {
MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); MultipartApi api = api(server.url("/").toString(), "b2").getMultipartApi();
GetUploadPartResponse response = api.getUploadPartUrl(FILE_ID); GetUploadPartResponse response = api.getUploadPartUrl(FILE_ID);
assertThat(response.authorizationToken()).isEqualTo(AUTHORIZATION_TOKEN); assertThat(response.authorizationToken()).isEqualTo(AUTHORIZATION_TOKEN);
assertThat(response.fileId()).isEqualTo(FILE_ID); assertThat(response.fileId()).isEqualTo(FILE_ID);
@ -158,8 +160,8 @@ public final class MultipartApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/upload_part_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/upload_part_response.json")));
try { try {
MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); MultipartApi api = api(server.url("/").toString(), "b2").getMultipartApi();
GetUploadPartResponse uploadPart = GetUploadPartResponse.create(FILE_ID, server.getUrl("/b2api/v2/b2_upload_part/4a48fe8875c6214145260818/c001_v0001007_t0042").toURI(), AUTHORIZATION_TOKEN); GetUploadPartResponse uploadPart = GetUploadPartResponse.create(FILE_ID, server.url("/b2api/v2/b2_upload_part/4a48fe8875c6214145260818/c001_v0001007_t0042").uri(), AUTHORIZATION_TOKEN);
long contentLength = 100 * 1000 * 1000; long contentLength = 100 * 1000 * 1000;
Payload payload = Payloads.newByteSourcePayload(TestUtils.randomByteSource().slice(0, contentLength)); Payload payload = Payloads.newByteSourcePayload(TestUtils.randomByteSource().slice(0, contentLength));
payload.getContentMetadata().setContentLength(contentLength); payload.getContentMetadata().setContentLength(contentLength);
@ -182,7 +184,7 @@ public final class MultipartApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/list_parts_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/list_parts_response.json")));
try { try {
MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); MultipartApi api = api(server.url("/").toString(), "b2").getMultipartApi();
ListPartsResponse response = api.listParts(FILE_ID, 1, 1000); ListPartsResponse response = api.listParts(FILE_ID, 1, 1000);
assertThat(response.nextPartNumber()).isNull(); assertThat(response.nextPartNumber()).isNull();
assertThat(response.parts()).hasSize(3); assertThat(response.parts()).hasSize(3);
@ -222,7 +224,7 @@ public final class MultipartApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/list_unfinished_large_files_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/list_unfinished_large_files_response.json")));
try { try {
MultipartApi api = api(server.getUrl("/").toString(), "b2").getMultipartApi(); MultipartApi api = api(server.url("/").toString(), "b2").getMultipartApi();
ListUnfinishedLargeFilesResponse response = api.listUnfinishedLargeFiles(BUCKET_ID, FILE_ID, 1000); ListUnfinishedLargeFilesResponse response = api.listUnfinishedLargeFiles(BUCKET_ID, FILE_ID, 1000);
assertThat(response.nextFileId()).isNull(); assertThat(response.nextFileId()).isNull();
assertThat(response.files()).hasSize(1); assertThat(response.files()).hasSize(1);

38
providers/b2/src/test/java/org/jclouds/b2/features/ObjectApiMockTest.java
View File

@ -28,6 +28,10 @@ import java.net.URI;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.blobstore.ContainerNotFoundException; import org.jclouds.blobstore.ContainerNotFoundException;
import org.jclouds.blobstore.KeyNotFoundException; import org.jclouds.blobstore.KeyNotFoundException;
import org.jclouds.http.options.GetOptions; import org.jclouds.http.options.GetOptions;
@ -45,9 +49,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.net.HttpHeaders; import com.google.common.net.HttpHeaders;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(groups = "unit", testName = "ObjectApiMockTest") @Test(groups = "unit", testName = "ObjectApiMockTest")
public final class ObjectApiMockTest { public final class ObjectApiMockTest {
@ -66,7 +68,7 @@ public final class ObjectApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/get_upload_url_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/get_upload_url_response.json")));
try { try {
ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); ObjectApi api = api(server.url("/").toString(), "b2").getObjectApi();
UploadUrlResponse response = api.getUploadUrl(BUCKET_ID); UploadUrlResponse response = api.getUploadUrl(BUCKET_ID);
assertThat(response.bucketId()).isEqualTo(BUCKET_ID); assertThat(response.bucketId()).isEqualTo(BUCKET_ID);
assertThat(response.uploadUrl()).isEqualTo(URI.create("https://pod-000-1005-03.backblaze.com/b2api/v2/b2_upload_file?cvt=c001_v0001005_t0027&bucket=4a48fe8875c6214145260818")); assertThat(response.uploadUrl()).isEqualTo(URI.create("https://pod-000-1005-03.backblaze.com/b2api/v2/b2_upload_file?cvt=c001_v0001005_t0027&bucket=4a48fe8875c6214145260818"));
@ -86,7 +88,7 @@ public final class ObjectApiMockTest {
server.enqueue(new MockResponse().setResponseCode(400).setBody(stringFromResource("/get_upload_url_deleted_bucket_response.json"))); server.enqueue(new MockResponse().setResponseCode(400).setBody(stringFromResource("/get_upload_url_deleted_bucket_response.json")));
try { try {
ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); ObjectApi api = api(server.url("/").toString(), "b2").getObjectApi();
try { try {
api.getUploadUrl(BUCKET_ID); api.getUploadUrl(BUCKET_ID);
failBecauseExceptionWasNotThrown(ContainerNotFoundException.class); failBecauseExceptionWasNotThrown(ContainerNotFoundException.class);
@ -107,10 +109,10 @@ public final class ObjectApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/upload_file_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/upload_file_response.json")));
try { try {
ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); ObjectApi api = api(server.url("/").toString(), "b2").getObjectApi();
String accountId = "d522aa47a10f"; String accountId = "d522aa47a10f";
UploadUrlResponse uploadUrl = UploadUrlResponse.create(BUCKET_ID, server.getUrl("/b2api/v2/b2_upload_file/4a48fe8875c6214145260818/c001_v0001007_t0042").toURI(), "FAKE-AUTHORIZATION-TOKEN"); UploadUrlResponse uploadUrl = UploadUrlResponse.create(BUCKET_ID, server.url("/b2api/v2/b2_upload_file/4a48fe8875c6214145260818/c001_v0001007_t0042").uri(), "FAKE-AUTHORIZATION-TOKEN");
Payload payload = Payloads.newStringPayload(PAYLOAD); Payload payload = Payloads.newStringPayload(PAYLOAD);
payload.getContentMetadata().setContentType(CONTENT_TYPE); payload.getContentMetadata().setContentType(CONTENT_TYPE);
UploadFileResponse response = api.uploadFile(uploadUrl, FILE_NAME, SHA1, FILE_INFO, payload); UploadFileResponse response = api.uploadFile(uploadUrl, FILE_NAME, SHA1, FILE_INFO, payload);
@ -137,7 +139,7 @@ public final class ObjectApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/delete_object_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/delete_object_response.json")));
try { try {
ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); ObjectApi api = api(server.url("/").toString(), "b2").getObjectApi();
DeleteFileResponse response = api.deleteFileVersion(FILE_NAME, FILE_ID); DeleteFileResponse response = api.deleteFileVersion(FILE_NAME, FILE_ID);
assertThat(response.fileName()).isEqualTo(FILE_NAME); assertThat(response.fileName()).isEqualTo(FILE_NAME);
assertThat(response.fileId()).isEqualTo(FILE_ID); assertThat(response.fileId()).isEqualTo(FILE_ID);
@ -156,7 +158,7 @@ public final class ObjectApiMockTest {
server.enqueue(new MockResponse().setResponseCode(400).setBody(stringFromResource("/delete_file_version_already_deleted_response.json"))); server.enqueue(new MockResponse().setResponseCode(400).setBody(stringFromResource("/delete_file_version_already_deleted_response.json")));
try { try {
ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); ObjectApi api = api(server.url("/").toString(), "b2").getObjectApi();
try { try {
api.deleteFileVersion(FILE_NAME, FILE_ID); api.deleteFileVersion(FILE_NAME, FILE_ID);
failBecauseExceptionWasNotThrown(KeyNotFoundException.class); failBecauseExceptionWasNotThrown(KeyNotFoundException.class);
@ -178,7 +180,7 @@ public final class ObjectApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/get_file_info_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/get_file_info_response.json")));
try { try {
ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); ObjectApi api = api(server.url("/").toString(), "b2").getObjectApi();
B2Object b2Object = api.getFileInfo("4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001"); B2Object b2Object = api.getFileInfo("4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001");
assertThat(b2Object.fileId()).isEqualTo("4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001"); assertThat(b2Object.fileId()).isEqualTo("4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001");
assertThat(b2Object.fileName()).isEqualTo("akitty.jpg"); assertThat(b2Object.fileName()).isEqualTo("akitty.jpg");
@ -206,7 +208,7 @@ public final class ObjectApiMockTest {
server.enqueue(new MockResponse().setResponseCode(404).setBody(stringFromResource("/get_file_info_deleted_file_response.json"))); server.enqueue(new MockResponse().setResponseCode(404).setBody(stringFromResource("/get_file_info_deleted_file_response.json")));
try { try {
ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); ObjectApi api = api(server.url("/").toString(), "b2").getObjectApi();
B2Object b2Object = api.getFileInfo("4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001"); B2Object b2Object = api.getFileInfo("4_ze73ede9c9c8412db49f60715_f100b4e93fbae6252_d20150824_m224353_c900_v8881000_t0001");
assertThat(b2Object).isNull(); assertThat(b2Object).isNull();
@ -232,7 +234,7 @@ public final class ObjectApiMockTest {
.setBody(PAYLOAD)); .setBody(PAYLOAD));
try { try {
ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); ObjectApi api = api(server.url("/").toString(), "b2").getObjectApi();
B2Object b2Object = api.downloadFileById(FILE_ID); B2Object b2Object = api.downloadFileById(FILE_ID);
@ -272,7 +274,7 @@ public final class ObjectApiMockTest {
.setBody(PAYLOAD)); .setBody(PAYLOAD));
try { try {
ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); ObjectApi api = api(server.url("/").toString(), "b2").getObjectApi();
B2Object b2Object = api.downloadFileById(FILE_ID, new GetOptions().range(42, 69)); B2Object b2Object = api.downloadFileById(FILE_ID, new GetOptions().range(42, 69));
@ -285,7 +287,7 @@ public final class ObjectApiMockTest {
request = server.takeRequest(); request = server.takeRequest();
assertThat(request.getMethod()).isEqualTo("GET"); assertThat(request.getMethod()).isEqualTo("GET");
assertThat(request.getPath()).isEqualTo("/b2api/v2/b2_download_file_by_id?fileId=4_h4a48fe8875c6214145260818_f000000000000472a_d20140104_m032022_c001_v0000123_t0104"); assertThat(request.getPath()).isEqualTo("/b2api/v2/b2_download_file_by_id?fileId=4_h4a48fe8875c6214145260818_f000000000000472a_d20140104_m032022_c001_v0000123_t0104");
assertThat(request.getHeaders()).contains("Range: bytes=42-69"); assertThat(request.getHeaders().values("Range")).contains("bytes=42-69");
} finally { } finally {
server.shutdown(); server.shutdown();
} }
@ -305,7 +307,7 @@ public final class ObjectApiMockTest {
.setBody(PAYLOAD)); .setBody(PAYLOAD));
try { try {
ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); ObjectApi api = api(server.url("/").toString(), "b2").getObjectApi();
B2Object b2Object = api.downloadFileByName(BUCKET_NAME, FILE_NAME); B2Object b2Object = api.downloadFileByName(BUCKET_NAME, FILE_NAME);
@ -337,7 +339,7 @@ public final class ObjectApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/list_file_names_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/list_file_names_response.json")));
try { try {
ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); ObjectApi api = api(server.url("/").toString(), "b2").getObjectApi();
String accountId = "d522aa47a10f"; String accountId = "d522aa47a10f";
B2ObjectList list = api.listFileNames(BUCKET_ID, null, null, null, null); B2ObjectList list = api.listFileNames(BUCKET_ID, null, null, null, null);
@ -373,7 +375,7 @@ public final class ObjectApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/list_file_versions_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/list_file_versions_response.json")));
try { try {
ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); ObjectApi api = api(server.url("/").toString(), "b2").getObjectApi();
String accountId = "d522aa47a10f"; String accountId = "d522aa47a10f";
B2ObjectList list = api.listFileVersions(BUCKET_ID, null, null, null, null, null); B2ObjectList list = api.listFileVersions(BUCKET_ID, null, null, null, null, null);
@ -417,7 +419,7 @@ public final class ObjectApiMockTest {
server.enqueue(new MockResponse().setBody(stringFromResource("/hide_file_response.json"))); server.enqueue(new MockResponse().setBody(stringFromResource("/hide_file_response.json")));
try { try {
ObjectApi api = api(server.getUrl("/").toString(), "b2").getObjectApi(); ObjectApi api = api(server.url("/").toString(), "b2").getObjectApi();
String accountId = "d522aa47a10f"; String accountId = "d522aa47a10f";
HideFileResponse response = api.hideFile(BUCKET_ID, FILE_NAME); HideFileResponse response = api.hideFile(BUCKET_ID, FILE_NAME);

2
providers/digitalocean2/pom.xml
View File

@ -96,7 +96,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>

3
providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/exceptions/RateLimitExceptionMockTest.java
View File

@ -24,10 +24,11 @@ import static org.testng.Assert.fail;
import java.util.Properties; import java.util.Properties;
import okhttp3.mockwebserver.MockResponse;
import org.jclouds.digitalocean2.internal.BaseDigitalOcean2ApiMockTest; import org.jclouds.digitalocean2.internal.BaseDigitalOcean2ApiMockTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
@Test(groups = "unit", testName = "RateLimitExceptionMockTest", singleThreaded = true) @Test(groups = "unit", testName = "RateLimitExceptionMockTest", singleThreaded = true)
public class RateLimitExceptionMockTest extends BaseDigitalOcean2ApiMockTest { public class RateLimitExceptionMockTest extends BaseDigitalOcean2ApiMockTest {

14
providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/internal/BaseDigitalOcean2ApiMockTest.java
View File

@ -26,6 +26,10 @@ import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.concurrent.config.ExecutorServiceModule;
import org.jclouds.digitalocean2.DigitalOcean2Api; import org.jclouds.digitalocean2.DigitalOcean2Api;
@ -42,9 +46,7 @@ import com.google.common.io.Resources;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
public class BaseDigitalOcean2ApiMockTest { public class BaseDigitalOcean2ApiMockTest {
@ -63,7 +65,7 @@ public class BaseDigitalOcean2ApiMockTest {
@BeforeMethod @BeforeMethod
public void start() throws IOException { public void start() throws IOException {
server = new MockWebServer(); server = new MockWebServer();
server.play(); server.start();
ApiContext<DigitalOcean2Api> ctx = ContextBuilder.newBuilder("digitalocean2") ApiContext<DigitalOcean2Api> ctx = ContextBuilder.newBuilder("digitalocean2")
.credentials("", MOCK_BEARER_TOKEN) .credentials("", MOCK_BEARER_TOKEN)
.endpoint(url("")) .endpoint(url(""))
@ -85,7 +87,7 @@ public class BaseDigitalOcean2ApiMockTest {
} }
protected String url(String path) { protected String url(String path) {
return server.getUrl(path).toString(); return server.url(path).toString();
} }
protected MockResponse jsonResponse(String resource) { protected MockResponse jsonResponse(String resource) {
@ -136,7 +138,7 @@ public class BaseDigitalOcean2ApiMockTest {
throws InterruptedException { throws InterruptedException {
RecordedRequest request = assertSent(server, method, path); RecordedRequest request = assertSent(server, method, path);
assertEquals(request.getHeader("Content-Type"), "application/json"); assertEquals(request.getHeader("Content-Type"), "application/json");
assertEquals(parser.parse(new String(request.getBody(), Charsets.UTF_8)), parser.parse(json)); assertEquals(parser.parse(request.getBody().readUtf8()), parser.parse(json));
return request; return request;
} }
} }

2
providers/dynect/pom.xml
View File

@ -52,7 +52,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

18
providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java
View File

@ -24,6 +24,9 @@ import java.io.IOException;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.concurrent.config.ExecutorServiceModule;
import org.jclouds.dynect.v3.DynECTExceptions.JobStillRunningException; import org.jclouds.dynect.v3.DynECTExceptions.JobStillRunningException;
@ -32,8 +35,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.inject.Module; import com.google.inject.Module;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
@Test(singleThreaded = true) @Test(singleThreaded = true)
public class DynectApiMockTest { public class DynectApiMockTest {
@ -61,9 +63,9 @@ public class DynectApiMockTest {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
server.enqueue(new MockResponse().setResponseCode(OK.getStatusCode()).setBody(session)); server.enqueue(new MockResponse().setResponseCode(OK.getStatusCode()).setBody(session));
server.enqueue(new MockResponse().setResponseCode(OK.getStatusCode()).setBody(running)); server.enqueue(new MockResponse().setResponseCode(OK.getStatusCode()).setBody(running));
server.play(); server.start();
DynECTApi api = mockDynectApi(server.getUrl("/").toString()); DynECTApi api = mockDynectApi(server.url("/").toString());
try { try {
api.getZoneApi().list(); api.getZoneApi().list();
@ -80,9 +82,9 @@ public class DynectApiMockTest {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
server.enqueue(new MockResponse().setResponseCode(OK.getStatusCode()).setBody(session)); server.enqueue(new MockResponse().setResponseCode(OK.getStatusCode()).setBody(session));
server.enqueue(new MockResponse().setResponseCode(OK.getStatusCode()).setBody(taskBlocking)); server.enqueue(new MockResponse().setResponseCode(OK.getStatusCode()).setBody(taskBlocking));
server.play(); server.start();
DynECTApi api = mockDynectApi(server.getUrl("/").toString()); DynECTApi api = mockDynectApi(server.url("/").toString());
try { try {
api.getZoneApi().list(); api.getZoneApi().list();
@ -98,9 +100,9 @@ public class DynectApiMockTest {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
server.enqueue(new MockResponse().setResponseCode(OK.getStatusCode()).setBody(session)); server.enqueue(new MockResponse().setResponseCode(OK.getStatusCode()).setBody(session));
server.enqueue(new MockResponse().setResponseCode(OK.getStatusCode()).setBody(targetExists)); server.enqueue(new MockResponse().setResponseCode(OK.getStatusCode()).setBody(targetExists));
server.play(); server.start();
DynECTApi api = mockDynectApi(server.getUrl("/").toString()); DynECTApi api = mockDynectApi(server.url("/").toString());
try { try {
api.getZoneApi().list(); api.getZoneApi().list();

2
providers/google-cloud-storage/pom.xml
View File

@ -116,7 +116,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>

Some files were not shown because too many files have changed in this diff Show More