Apache/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2025-02-16 06:56:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

add tests for createImage, switch argument order.

Browse Source
This commit is contained in:
Tim Miller 2012-04-04 16:09:34 -07:00
parent 3cab636f29
commit c8939ac0da
3 changed files with 66 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ServerAsyncClient.java
View File

@ -196,6 +196,6 @@ public interface ServerAsyncClient {
@Payload("%7B\"createImage\":%7B\"name\":\"{name}\", \"metadata\": %7B%7D%7D%7D")
@ExceptionParser(MapHttp4xxCodesToExceptions.class)
@ResponseParser(ParseImageIdFromLocationHeader.class)
ListenableFuture<String> createImageFromServer(@PathParam("id") String id, @PayloadParam("name") String name);
ListenableFuture<String> createImageFromServer(@PayloadParam("name") String name, @PathParam("id") String id);
}

6
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ServerClient.java
View File

@ -160,13 +160,13 @@ public interface ServerClient {
/**
* Create an image from a server.
*
* @param id
* id of the server
* @param name
* The name of the new image
* @param id
* id of the server
*
* @return ID of the new / updated image
*/
String createImageFromServer(String id, String name);
String createImageFromServer(String name, String id);
}

66
apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientExpectTest.java
View File

@ -20,6 +20,7 @@ package org.jclouds.openstack.nova.v1_1.features;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import java.net.URI;
@ -37,7 +38,7 @@ import com.google.common.collect.ImmutableSet;
/**
* Tests annotation parsing of {@code ServerAsyncClient}
*
*
* @author Adrian Cole
*/
@Test(groups = "unit", testName = "ServerAsyncClientTest")
@ -80,7 +81,7 @@ public class ServerClientExpectTest extends BaseNovaClientExpectTest {
assertTrue(clientWhenNoServersExist.getServerClientForZone("az-1.region-a.geo-1").listServers().isEmpty());
}
public void testCreateServerWhenResponseIs202() throws Exception {
HttpRequest createServer = HttpRequest
.builder()
@ -93,7 +94,7 @@ public class ServerClientExpectTest extends BaseNovaClientExpectTest {
"{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\"}}","application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
.payload(payloadFromResourceWithContentType("/new_server.json","application/json; charset=UTF-8")).build();
@ -117,7 +118,7 @@ public class ServerClientExpectTest extends BaseNovaClientExpectTest {
"{\"server\":{\"name\":\"test-e92\",\"imageRef\":\"1241\",\"flavorRef\":\"100\",\"security_groups\":[{\"name\":\"group2\"},{\"name\":\"group1\"}]}}","application/json"))
.build();
HttpResponse createServerResponse = HttpResponse.builder().statusCode(202).message("HTTP/1.1 202 Accepted")
.payload(payloadFromResourceWithContentType("/new_server.json","application/json; charset=UTF-8")).build();
@ -130,4 +131,61 @@ public class ServerClientExpectTest extends BaseNovaClientExpectTest {
new ParseCreatedServerTest().expected().toString());
}
public void testCreateImageWhenResponseIs2xx() throws Exception {
String serverId = "123";
String imageId = "456";
String imageName = "foo";
HttpRequest createImage = HttpRequest
.builder()
.method("POST")
.endpoint(URI.create("https://compute.north.host/v1.1/3456/servers/" + serverId + "/action"))
.headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json")
.put("X-Auth-Token", authToken).build())
.payload(payloadFromStringWithContentType(
"{\"createImage\":{\"name\":\"" + imageName + "\", \"metadata\": {}}}", "application/json"))
.build();
HttpResponse createImageResponse = HttpResponse.builder()
.statusCode(200)
.headers(
ImmutableMultimap.<String, String> builder()
.put("Location", "https://compute.north.host/v1.1/3456/images/" + imageId).build()).build();
NovaClient clientWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
responseWithKeystoneAccess, createImage, createImageResponse);
assertEquals(clientWhenServerExists.getServerClientForZone("az-1.region-a.geo-1").createImageFromServer(imageName, serverId),
imageId);
}
public void testCreateImageWhenResponseIs404IsEmpty() throws Exception {
String serverId = "123";
String imageName = "foo";
HttpRequest createImage = HttpRequest
.builder()
.method("POST")
.endpoint(URI.create("https://compute.north.host/v1.1/3456/servers/" + serverId + "/action"))
.headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json")
.put("X-Auth-Token", authToken)
.put("Content-Type", "application/json").build())
.payload(payloadFromStringWithContentType(
"{\"createImage\":{\"name\": " + imageName + ", \"metadata\": {}}}", "application/json"))
.build();
HttpResponse createImageResponse = HttpResponse.builder().statusCode(404).build();
NovaClient clientWhenServerDoesNotExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
responseWithKeystoneAccess, createImage, createImageResponse);
try {
clientWhenServerDoesNotExist.getServerClientForZone("az-1.region-a.geo-1").createImageFromServer(imageName, serverId);
fail("Expected an exception.");
} catch (Exception e) {
;
}
}
}