mirror of https://github.com/apache/jclouds.git
Initial contribution to metadata APIs
This commit is contained in:
parent
2543c0abd7
commit
c078cb2170
|
@ -18,6 +18,7 @@
|
|||
*/
|
||||
package org.jclouds.openstack.nova.v2_0.features;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.jclouds.collect.PagedIterable;
|
||||
|
@ -75,5 +76,71 @@ public interface ImageApi {
|
|||
* @return server or null if not found
|
||||
*/
|
||||
void delete(String id);
|
||||
|
||||
/**
|
||||
* List all metadata for an image.
|
||||
*
|
||||
* @param id
|
||||
* id of the image
|
||||
* @return the metadata as a Map<String, String>
|
||||
*/
|
||||
Map<String, String> listMetadata(String id);
|
||||
|
||||
/**
|
||||
* Sets the metadata for an image.
|
||||
*
|
||||
* @param id
|
||||
* id of the image
|
||||
* @param metadata
|
||||
* a Map containing the metadata
|
||||
* @return the metadata as a Map<String, String>
|
||||
*/
|
||||
Map<String, String> setMetadata(String id, Map<String, String> metadata);
|
||||
|
||||
/**
|
||||
* Update the metadata for a server.
|
||||
*
|
||||
* @param id
|
||||
* id of the image
|
||||
* @param metadata
|
||||
* a Map containing the metadata
|
||||
* @return the metadata as a Map<String, String>
|
||||
*/
|
||||
Map<String, String> updateMetadata(String id, Map<String, String> metadata);
|
||||
|
||||
/**
|
||||
* Update the metadata for an image.
|
||||
*
|
||||
* @param id
|
||||
* id of the image
|
||||
* @param metadata
|
||||
* a Map containing the metadata
|
||||
* @return the metadata as a Map<String, String>
|
||||
*/
|
||||
Map<String, String> getMetadataItem(String id, String key);
|
||||
|
||||
|
||||
/**
|
||||
* Set a metadata item for an image.
|
||||
*
|
||||
* @param id
|
||||
* id of the image
|
||||
* @param key
|
||||
* the name of the metadata item
|
||||
* @param value
|
||||
* the value of the metadata item
|
||||
* @return the metadata as a Map<String, String>
|
||||
*/
|
||||
Map<String, String> setMetadataItem(String id, String key, String value);
|
||||
|
||||
/**
|
||||
* Delete a metadata item from an image.
|
||||
*
|
||||
* @param id
|
||||
* id of the image
|
||||
* @param key
|
||||
* the name of the metadata item
|
||||
*/
|
||||
void deleteMetadataItem(String id, String key);
|
||||
|
||||
}
|
||||
|
|
|
@ -18,11 +18,16 @@
|
|||
*/
|
||||
package org.jclouds.openstack.nova.v2_0.features;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
import javax.ws.rs.DELETE;
|
||||
import javax.ws.rs.GET;
|
||||
import javax.ws.rs.POST;
|
||||
import javax.ws.rs.PUT;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.PathParam;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
|
||||
import org.jclouds.collect.PagedIterable;
|
||||
|
@ -35,11 +40,16 @@ import org.jclouds.openstack.nova.v2_0.functions.internal.ParseImages;
|
|||
import org.jclouds.openstack.v2_0.domain.Resource;
|
||||
import org.jclouds.openstack.v2_0.options.PaginationOptions;
|
||||
import org.jclouds.rest.annotations.ExceptionParser;
|
||||
import org.jclouds.rest.annotations.MapBinder;
|
||||
import org.jclouds.rest.annotations.Payload;
|
||||
import org.jclouds.rest.annotations.PayloadParam;
|
||||
import org.jclouds.rest.annotations.RequestFilters;
|
||||
import org.jclouds.rest.annotations.ResponseParser;
|
||||
import org.jclouds.rest.annotations.SelectJson;
|
||||
import org.jclouds.rest.annotations.SkipEncoding;
|
||||
import org.jclouds.rest.annotations.Transform;
|
||||
import org.jclouds.rest.binders.BindToJsonPayload;
|
||||
import org.jclouds.rest.functions.ReturnEmptyMapOnNotFoundOr404;
|
||||
import org.jclouds.rest.functions.ReturnEmptyPagedIterableOnNotFoundOr404;
|
||||
import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
|
||||
import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
|
||||
|
@ -117,5 +127,70 @@ public interface ImageAsyncApi {
|
|||
@Path("/images/{id}")
|
||||
@ExceptionParser(ReturnVoidOnNotFoundOr404.class)
|
||||
ListenableFuture<Void> delete(@PathParam("id") String id);
|
||||
|
||||
/**
|
||||
* @see ImageApi#listMetadata
|
||||
*/
|
||||
@GET
|
||||
@SelectJson("metadata")
|
||||
@Path("/images/{id}/metadata")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@ExceptionParser(ReturnEmptyMapOnNotFoundOr404.class)
|
||||
ListenableFuture<Map<String, String>> listMetadata(@PathParam("id") String id);
|
||||
|
||||
/**
|
||||
* @see ImageApi#setMetadata
|
||||
*/
|
||||
@PUT
|
||||
@SelectJson("metadata")
|
||||
@Path("/images/{id}/metadata")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@ExceptionParser(ReturnEmptyMapOnNotFoundOr404.class)
|
||||
@MapBinder(BindToJsonPayload.class)
|
||||
ListenableFuture<Map<String, String>> setMetadata(@PathParam("id") String id, @PayloadParam("metadata") Map<String, String> metadata);
|
||||
|
||||
/**
|
||||
* @see ImageApi#updateMetadata
|
||||
*/
|
||||
@POST
|
||||
@SelectJson("metadata")
|
||||
@Path("/images/{id}/metadata")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@ExceptionParser(ReturnEmptyMapOnNotFoundOr404.class)
|
||||
@MapBinder(BindToJsonPayload.class)
|
||||
ListenableFuture<? extends Map<String, String>> updateMetadata(@PathParam("id") String id, @PayloadParam("metadata") Map<String, String> metadata);
|
||||
|
||||
/**
|
||||
* @see ImageApi#getMetadataItem
|
||||
*/
|
||||
@GET
|
||||
@SelectJson("metadata")
|
||||
@Path("/images/{id}/metadata/{key}")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@ExceptionParser(ReturnNullOnNotFoundOr404.class)
|
||||
ListenableFuture<? extends Map<String, String>> getMetadataItem(@PathParam("id") String id, @PathParam("key") String key);
|
||||
|
||||
/**
|
||||
* @see ImageApi#setMetadataItem
|
||||
*/
|
||||
@PUT
|
||||
@SelectJson("metadata")
|
||||
@Path("/images/{id}/metadata/{key}")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@ExceptionParser(ReturnEmptyMapOnNotFoundOr404.class)
|
||||
@Payload("%7B\"metadata\":%7B\"{key}\":\"{value}\"%7D%7D")
|
||||
ListenableFuture<? extends Map<String, String>> setMetadataItem(@PathParam("id") String id, @PathParam("key") String key, @PathParam("value") String value);
|
||||
|
||||
|
||||
/**
|
||||
* @see ImageApi#deleteMetadataItem
|
||||
*/
|
||||
@DELETE
|
||||
@Consumes
|
||||
@Path("/images/{id}/metadata/{key}")
|
||||
@ExceptionParser(ReturnVoidOnNotFoundOr404.class)
|
||||
ListenableFuture<Void> deleteMetadataItem(@PathParam("id") String id, @PathParam("key") String key);
|
||||
}
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
*/
|
||||
package org.jclouds.openstack.nova.v2_0.features;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.jclouds.collect.PagedIterable;
|
||||
|
@ -191,5 +192,71 @@ public interface ServerApi {
|
|||
* @return ID of the new / updated image
|
||||
*/
|
||||
String createImageFromServer(String name, String id);
|
||||
|
||||
/**
|
||||
* List all metadata for a server.
|
||||
*
|
||||
* @param id
|
||||
* id of the server
|
||||
*
|
||||
* @return the metadata as a Map<String, String>
|
||||
*/
|
||||
Map<String, String> listMetadata(String id);
|
||||
|
||||
/**
|
||||
* Set the metadata for a server.
|
||||
*
|
||||
* @param id
|
||||
* id of the server
|
||||
* @param metadata
|
||||
* a Map containing the metadata
|
||||
* @return the metadata as a Map<String, String>
|
||||
*/
|
||||
Map<String, String> setMetadata(String id, Map<String, String> metadata);
|
||||
|
||||
/**
|
||||
* Update the metadata for a server.
|
||||
*
|
||||
* @param id
|
||||
* id of the server
|
||||
* @param metadata
|
||||
* a Map containing the metadata
|
||||
* @return the metadata as a Map<String, String>
|
||||
*/
|
||||
Map<String, String> updateMetadata(String id, Map<String, String> metadata);
|
||||
|
||||
/**
|
||||
* Update the metadata for a server.
|
||||
*
|
||||
* @param id
|
||||
* id of the image
|
||||
* @param metadata
|
||||
* a Map containing the metadata
|
||||
* @return the metadata as a Map<String, String>
|
||||
*/
|
||||
Map<String, String> getMetadataItem(String id, String key);
|
||||
|
||||
/**
|
||||
* Set a metadata item for a server.
|
||||
*
|
||||
* @param id
|
||||
* id of the image
|
||||
* @param key
|
||||
* the name of the metadata item
|
||||
* @param value
|
||||
* the value of the metadata item
|
||||
* @return the metadata as a Map<String, String>
|
||||
*/
|
||||
Map<String, String> setMetadataItem(String id, String key, String value);
|
||||
|
||||
/**
|
||||
* Delete a metadata item from a server.
|
||||
*
|
||||
* @param id
|
||||
* id of the image
|
||||
* @param key
|
||||
* the name of the metadata item
|
||||
*/
|
||||
void deleteMetadataItem(String id, String key);
|
||||
|
||||
}
|
||||
|
|
|
@ -18,6 +18,8 @@
|
|||
*/
|
||||
package org.jclouds.openstack.nova.v2_0.features;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
import javax.ws.rs.DELETE;
|
||||
import javax.ws.rs.GET;
|
||||
|
@ -52,10 +54,13 @@ import org.jclouds.rest.annotations.SelectJson;
|
|||
import org.jclouds.rest.annotations.SkipEncoding;
|
||||
import org.jclouds.rest.annotations.Transform;
|
||||
import org.jclouds.rest.annotations.Unwrap;
|
||||
import org.jclouds.rest.binders.BindToJsonPayload;
|
||||
import org.jclouds.rest.functions.MapHttp4xxCodesToExceptions;
|
||||
import org.jclouds.rest.functions.ReturnEmptyMapOnNotFoundOr404;
|
||||
import org.jclouds.rest.functions.ReturnEmptyPagedIterableOnNotFoundOr404;
|
||||
import org.jclouds.rest.functions.ReturnFalseOnNotFoundOr404;
|
||||
import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
|
||||
import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
|
||||
|
||||
import com.google.common.util.concurrent.ListenableFuture;
|
||||
|
||||
|
@ -247,4 +252,69 @@ public interface ServerAsyncApi {
|
|||
@ResponseParser(ParseImageIdFromLocationHeader.class)
|
||||
ListenableFuture<String> createImageFromServer(@PayloadParam("name") String name, @PathParam("id") String id);
|
||||
|
||||
/**
|
||||
* @see ServerApi#listMetadata
|
||||
*/
|
||||
@GET
|
||||
@SelectJson("metadata")
|
||||
@Path("/servers/{id}/metadata")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@ExceptionParser(ReturnEmptyMapOnNotFoundOr404.class)
|
||||
ListenableFuture<? extends Map<String, String>> listMetadata(@PathParam("id") String id);
|
||||
|
||||
/**
|
||||
* @see ServerApi#setMetadata
|
||||
*/
|
||||
@PUT
|
||||
@SelectJson("metadata")
|
||||
@Path("/servers/{id}/metadata")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@ExceptionParser(ReturnEmptyMapOnNotFoundOr404.class)
|
||||
@MapBinder(BindToJsonPayload.class)
|
||||
ListenableFuture<? extends Map<String, String>> setMetadata(@PathParam("id") String id, @PayloadParam("metadata") Map<String, String> metadata);
|
||||
|
||||
/**
|
||||
* @see ServerApi#updateMetadata
|
||||
*/
|
||||
@POST
|
||||
@SelectJson("metadata")
|
||||
@Path("/servers/{id}/metadata")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@ExceptionParser(ReturnEmptyMapOnNotFoundOr404.class)
|
||||
@MapBinder(BindToJsonPayload.class)
|
||||
ListenableFuture<? extends Map<String, String>> updateMetadata(@PathParam("id") String id, @PayloadParam("metadata") Map<String, String> metadata);
|
||||
|
||||
/**
|
||||
* @see ServerApi#getMetadataItem
|
||||
*/
|
||||
@GET
|
||||
@SelectJson("metadata")
|
||||
@Path("/servers/{id}/metadata/{key}")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@ExceptionParser(ReturnNullOnNotFoundOr404.class)
|
||||
ListenableFuture<? extends Map<String, String>> getMetadataItem(@PathParam("id") String id, @PathParam("key") String key);
|
||||
|
||||
/**
|
||||
* @see ServerApi#setMetadataItem
|
||||
*/
|
||||
@PUT
|
||||
@SelectJson("metadata")
|
||||
@Path("/servers/{id}/metadata/{key}")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@ExceptionParser(ReturnEmptyMapOnNotFoundOr404.class)
|
||||
@Payload("%7B\"metadata\":%7B\"{key}\":\"{value}\"%7D%7D")
|
||||
ListenableFuture<? extends Map<String, String>> setMetadataItem(@PathParam("id") String id, @PathParam("key") String key, @PathParam("value") String value);
|
||||
|
||||
/**
|
||||
* @see ServerApi#deleteMetadataItem
|
||||
*/
|
||||
@DELETE
|
||||
@Consumes
|
||||
@Path("/servers/{id}/metadata/{key}")
|
||||
@ExceptionParser(ReturnVoidOnNotFoundOr404.class)
|
||||
ListenableFuture<Void> deleteMetadataItem(@PathParam("id") String id, @PathParam("key") String key);
|
||||
|
||||
}
|
||||
|
|
|
@ -21,6 +21,7 @@ package org.jclouds.openstack.nova.v2_0.features;
|
|||
import static org.testng.Assert.assertEquals;
|
||||
import static org.testng.Assert.assertNull;
|
||||
import static org.testng.Assert.assertTrue;
|
||||
import static org.testng.Assert.fail;
|
||||
|
||||
import org.jclouds.http.HttpRequest;
|
||||
import org.jclouds.http.HttpResponse;
|
||||
|
@ -28,8 +29,11 @@ import org.jclouds.openstack.nova.v2_0.NovaApi;
|
|||
import org.jclouds.openstack.nova.v2_0.internal.BaseNovaApiExpectTest;
|
||||
import org.jclouds.openstack.nova.v2_0.parse.ParseImageListTest;
|
||||
import org.jclouds.openstack.nova.v2_0.parse.ParseImageTest;
|
||||
import org.jclouds.openstack.nova.v2_0.parse.ParseMetadataListTest;
|
||||
import org.jclouds.openstack.nova.v2_0.parse.ParseMetadataUpdateTest;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
|
||||
/**
|
||||
|
@ -113,4 +117,285 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
|
|||
|
||||
}
|
||||
|
||||
public void testListMetadataWhenResponseIs2xx() throws Exception {
|
||||
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
|
||||
HttpRequest listMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("GET")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata")
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken).build();
|
||||
|
||||
HttpResponse listMetadataResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromResource("/metadata_list.json")).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, listMetadata, listMetadataResponse);
|
||||
|
||||
assertEquals(apiWhenServerExists.getImageApiForZone("az-1.region-a.geo-1").listMetadata(imageId).toString(),
|
||||
new ParseMetadataListTest().expected().toString());
|
||||
}
|
||||
|
||||
public void testListMetadataWhenResponseIs404() throws Exception {
|
||||
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
|
||||
HttpRequest listMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("GET")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata")
|
||||
.addHeader("Accept", "*/*")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.build();
|
||||
|
||||
HttpResponse listMetadataResponse = HttpResponse.builder().statusCode(404).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, listMetadata, listMetadataResponse);
|
||||
|
||||
try {
|
||||
apiWhenServerExists.getImageApiForZone("az-1.region-a.geo-1").listMetadata(imageId);
|
||||
fail("Expected an exception.");
|
||||
} catch (Exception e) {
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
public void testSetMetadataWhenResponseIs2xx() throws Exception {
|
||||
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
|
||||
ImmutableMap<String, String> metadata = new ImmutableMap.Builder<String, String>()
|
||||
.put("Server Label", "Web Head 1")
|
||||
.put("Image Version", "2.1")
|
||||
.build();
|
||||
|
||||
HttpRequest setMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("PUT")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata")
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 1\",\"Image Version\":\"2.1\"}}","application/json"))
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromResource("/metadata_list.json")).build();
|
||||
|
||||
NovaApi apiWhenImageExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadata, setMetadataResponse);
|
||||
|
||||
assertEquals(apiWhenImageExists.getImageApiForZone("az-1.region-a.geo-1").setMetadata(imageId, metadata).toString(),
|
||||
new ParseMetadataListTest().expected().toString());
|
||||
}
|
||||
|
||||
public void testSetMetadataWhenResponseIs404() throws Exception {
|
||||
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
|
||||
ImmutableMap<String, String> metadata = new ImmutableMap.Builder<String, String>()
|
||||
.put("Server Label", "Web Head 1")
|
||||
.put("Image Version", "2.1")
|
||||
.build();
|
||||
|
||||
HttpRequest setMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("PUT")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" +imageId + "/metadata")
|
||||
.addHeader("Accept", "*/*")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 1\",\"Image Version\":\"2.1\"}}","application/json"))
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(404).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadata, setMetadataResponse);
|
||||
|
||||
try {
|
||||
apiWhenServerExists.getImageApiForZone("az-1.region-a.geo-1").setMetadata(imageId, metadata);
|
||||
fail("Expected an exception.");
|
||||
} catch (Exception e) {
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
public void testUpdateMetadataWhenResponseIs2xx() throws Exception {
|
||||
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
|
||||
ImmutableMap<String, String> metadata = new ImmutableMap.Builder<String, String>()
|
||||
.put("Server Label", "Web Head 2")
|
||||
.put("Server Description", "Simple Server")
|
||||
.build();
|
||||
|
||||
HttpRequest setMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("POST")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + imageId + "/metadata")
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromResource("/metadata_updated.json")).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadata, setMetadataResponse);
|
||||
|
||||
assertEquals(apiWhenServerExists.getImageApiForZone("az-1.region-a.geo-1").updateMetadata(imageId, metadata).toString(),
|
||||
new ParseMetadataUpdateTest().expected().toString());
|
||||
}
|
||||
|
||||
public void testUpdateMetadataWhenResponseIs404() throws Exception {
|
||||
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
|
||||
ImmutableMap<String, String> metadata = new ImmutableMap.Builder<String, String>()
|
||||
.put("Server Label", "Web Head 2")
|
||||
.put("Server Description", "Simple Server")
|
||||
.build();
|
||||
|
||||
HttpRequest setMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("POST")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + imageId + "/metadata")
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(404)
|
||||
.payload(payloadFromResource("/metadata_updated.json")).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadata, setMetadataResponse);
|
||||
|
||||
try {
|
||||
apiWhenServerExists.getImageApiForZone("az-1.region-a.geo-1").setMetadata(imageId, metadata);
|
||||
fail("Expected an exception.");
|
||||
} catch (Exception e) {
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
public void testGetMetadataItemWhenResponseIs2xx() throws Exception {
|
||||
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
|
||||
String key = "Image%20Version";
|
||||
|
||||
HttpRequest getMetadataItem = HttpRequest
|
||||
.builder()
|
||||
.method("GET")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata/" + key)
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.build();
|
||||
|
||||
HttpResponse getMetadataItemResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromString("{\"metadata\":{\"Image Version\":\"2.5\"}}")).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, getMetadataItem, getMetadataItemResponse);
|
||||
|
||||
System.out.println(apiWhenServerExists.getImageApiForZone("az-1.region-a.geo-1").getMetadataItem(imageId, "Image Version").toString());
|
||||
assertEquals(apiWhenServerExists.getImageApiForZone("az-1.region-a.geo-1").getMetadataItem(imageId, "Image Version").toString(),
|
||||
"{Image Version=2.5}");
|
||||
}
|
||||
|
||||
public void testGetMetadataItemWhenResponseIs404() throws Exception {
|
||||
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
|
||||
String key = "Image%20Version";
|
||||
|
||||
HttpRequest getMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("GET")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata/" + key)
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.build();
|
||||
|
||||
HttpResponse getMetadataResponse = HttpResponse.builder().statusCode(404)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Image Version\":\"2.5\"}}", "application/json")).build();
|
||||
|
||||
NovaApi apiWhenImageExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, getMetadata, getMetadataResponse);
|
||||
|
||||
assertNull(apiWhenImageExists.getImageApiForZone("az-1.region-a.geo-1").getMetadataItem(imageId, key));
|
||||
}
|
||||
|
||||
public void testSetMetadataItemWhenResponseIs2xx() throws Exception {
|
||||
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
|
||||
String key = "Image%20Version";
|
||||
|
||||
HttpRequest setMetadataItem = HttpRequest
|
||||
.builder()
|
||||
.method("PUT")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata/" + key)
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Image Version\":\"2.5\"}}", "application/json"))
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataItemResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Image Version\":\"2.5\"}}", "application/json")).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadataItem, setMetadataItemResponse);
|
||||
|
||||
assertEquals(apiWhenServerExists.getImageApiForZone("az-1.region-a.geo-1").setMetadataItem(imageId, key, "2.5").toString(),
|
||||
"Image Version=2.5");
|
||||
}
|
||||
|
||||
public void testSetMetadataItemWhenResponseIs404() throws Exception {
|
||||
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
|
||||
String key = "Image%20Version";
|
||||
|
||||
HttpRequest setMetadataItem = HttpRequest
|
||||
.builder()
|
||||
.method("PUT")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata/" + key)
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataItemResponse = HttpResponse.builder().statusCode(404).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadataItem, setMetadataItemResponse);
|
||||
|
||||
assertNull(apiWhenServerExists.getImageApiForZone("az-1.region-a.geo-1").setMetadataItem(imageId, key, "2.5"));
|
||||
|
||||
}
|
||||
|
||||
public void testDeleteMetadataItemWhenResponseIs2xx() throws Exception {
|
||||
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
|
||||
String key = "Image%20Version";
|
||||
|
||||
HttpRequest deleteMetadataItem = HttpRequest
|
||||
.builder()
|
||||
.method("DELETE")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata/" + key)
|
||||
.addHeader("Accept", "*/*")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.build();
|
||||
|
||||
HttpResponse deleteMetadataItemResponse = HttpResponse.builder().statusCode(204).build();
|
||||
|
||||
NovaApi apiWhenImageExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, deleteMetadataItem, deleteMetadataItemResponse);
|
||||
|
||||
apiWhenImageExists.getImageApiForZone("az-1.region-a.geo-1").deleteMetadataItem(imageId, key);
|
||||
}
|
||||
|
||||
public void testDeleteMetadataItemWhenResponseIs404() throws Exception {
|
||||
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
|
||||
String key = "Image%20Version";
|
||||
|
||||
HttpRequest deleteMetadataItem = HttpRequest
|
||||
.builder()
|
||||
.method("DELETE")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata/" + key)
|
||||
.addHeader("Accept", "*/*")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.build();
|
||||
|
||||
HttpResponse deleteMetadataItemResponse = HttpResponse.builder().statusCode(404).build();
|
||||
|
||||
NovaApi apiWhenImageExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, deleteMetadataItem, deleteMetadataItemResponse);
|
||||
|
||||
apiWhenImageExists.getImageApiForZone("az-1.region-a.geo-1").deleteMetadataItem(imageId, key);
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -28,9 +28,13 @@ import org.jclouds.openstack.nova.v2_0.NovaApi;
|
|||
import org.jclouds.openstack.nova.v2_0.internal.BaseNovaApiExpectTest;
|
||||
import org.jclouds.openstack.nova.v2_0.options.CreateServerOptions;
|
||||
import org.jclouds.openstack.nova.v2_0.parse.ParseCreatedServerTest;
|
||||
import org.jclouds.openstack.nova.v2_0.parse.ParseMetadataItemTest;
|
||||
import org.jclouds.openstack.nova.v2_0.parse.ParseMetadataListTest;
|
||||
import org.jclouds.openstack.nova.v2_0.parse.ParseMetadataUpdateTest;
|
||||
import org.jclouds.openstack.nova.v2_0.parse.ParseServerListTest;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.ImmutableMultimap;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
|
||||
|
@ -271,4 +275,307 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
|
|||
}
|
||||
}
|
||||
|
||||
public void testListMetadataWhenResponseIs2xx() throws Exception {
|
||||
String serverId = "123";
|
||||
|
||||
HttpRequest listMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("GET")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken).build();
|
||||
|
||||
HttpResponse listMetadataResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromResource("/metadata_list.json")).build();
|
||||
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, listMetadata, listMetadataResponse);
|
||||
|
||||
assertEquals(apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").listMetadata(serverId).toString(),
|
||||
new ParseMetadataListTest().expected().toString());
|
||||
}
|
||||
|
||||
public void testListMetadataWhenResponseIs404() throws Exception {
|
||||
String serverId = "123";
|
||||
HttpRequest listMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("GET")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
|
||||
.addHeader("Accept", "*/*")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.build();
|
||||
|
||||
HttpResponse listMetadataResponse = HttpResponse.builder().statusCode(404).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, listMetadata, listMetadataResponse);
|
||||
|
||||
try {
|
||||
apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").listMetadata(serverId);
|
||||
fail("Expected an exception.");
|
||||
} catch (Exception e) {
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
public void testSetMetadataWhenResponseIs2xx() throws Exception {
|
||||
String serverId = "123";
|
||||
ImmutableMap<String, String> metadata = new ImmutableMap.Builder<String, String>()
|
||||
.put("Server Label", "Web Head 1")
|
||||
.put("Image Version", "2.1")
|
||||
.build();
|
||||
|
||||
HttpRequest setMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("PUT")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 1\",\"Image Version\":\"2.1\"}}","application/json"))
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromResource("/metadata_list.json")).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadata, setMetadataResponse);
|
||||
|
||||
assertEquals(apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").setMetadata(serverId, metadata).toString(),
|
||||
new ParseMetadataListTest().expected().toString());
|
||||
}
|
||||
|
||||
public void testSetMetadataWhenResponseIs404() throws Exception {
|
||||
String serverId = "123";
|
||||
ImmutableMap<String, String> metadata = new ImmutableMap.Builder<String, String>()
|
||||
.put("Server Label", "Web Head 1")
|
||||
.put("Image Version", "2.1")
|
||||
.build();
|
||||
|
||||
HttpRequest setMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("PUT")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
|
||||
.addHeader("Accept", "*/*")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 1\",\"Image Version\":\"2.1\"}}","application/json"))
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(404).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadata, setMetadataResponse);
|
||||
|
||||
try {
|
||||
apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").setMetadata(serverId, metadata);
|
||||
fail("Expected an exception.");
|
||||
} catch (Exception e) {
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
public void testUpdateMetadataWhenResponseIs2xx() throws Exception {
|
||||
String serverId = "123";
|
||||
ImmutableMap<String, String> metadata = new ImmutableMap.Builder<String, String>()
|
||||
.put("Server Label", "Web Head 2")
|
||||
.put("Server Description", "Simple Server")
|
||||
.build();
|
||||
|
||||
HttpRequest setMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("POST")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromResource("/metadata_updated.json")).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadata, setMetadataResponse);
|
||||
|
||||
assertEquals(apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").updateMetadata(serverId, metadata).toString(),
|
||||
new ParseMetadataUpdateTest().expected().toString());
|
||||
}
|
||||
|
||||
public void testUpdateMetadataWhenResponseIs404() throws Exception {
|
||||
String serverId = "123";
|
||||
ImmutableMap<String, String> metadata = new ImmutableMap.Builder<String, String>()
|
||||
.put("Server Label", "Web Head 2")
|
||||
.put("Server Description", "Simple Server")
|
||||
.build();
|
||||
|
||||
HttpRequest setMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("POST")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(404)
|
||||
.payload(payloadFromResource("/metadata_updated.json")).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadata, setMetadataResponse);
|
||||
|
||||
try {
|
||||
apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").setMetadata(serverId, metadata);
|
||||
fail("Expected an exception.");
|
||||
} catch (Exception e) {
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
public void testGetMetadataItemWhenResponseIs2xx() throws Exception {
|
||||
String serverId = "123";
|
||||
String key = "Server%20Label";
|
||||
|
||||
HttpRequest getMetadataItem = HttpRequest
|
||||
.builder()
|
||||
.method("GET")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata/" + key)
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.build();
|
||||
|
||||
HttpResponse getMetadataItemResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromResource("/metadata_item.json")).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, getMetadataItem, getMetadataItemResponse);
|
||||
|
||||
assertEquals(apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").getMetadataItem(serverId, "Server Label").toString(),
|
||||
new ParseMetadataItemTest().expected().toString());
|
||||
}
|
||||
|
||||
public void testGetMetadataItemWhenResponseIs404() throws Exception {
|
||||
String serverId = "123";
|
||||
ImmutableMap<String, String> metadata = new ImmutableMap.Builder<String, String>()
|
||||
.put("Server Label", "Web Head 1")
|
||||
.build();
|
||||
|
||||
HttpRequest setMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("GET")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(404)
|
||||
.payload(payloadFromResource("/metadata_updated.json")).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadata, setMetadataResponse);
|
||||
|
||||
try {
|
||||
apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").setMetadata(serverId, metadata);
|
||||
fail("Expected an exception.");
|
||||
} catch (Exception e) {
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
public void testSetMetadataItemWhenResponseIs2xx() throws Exception {
|
||||
String serverId = "123";
|
||||
ImmutableMap<String, String> metadata = new ImmutableMap.Builder<String, String>()
|
||||
.put("Server Label", "Web Head 2")
|
||||
.put("Server Description", "Simple Server")
|
||||
.build();
|
||||
|
||||
HttpRequest setMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("POST")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromResource("/metadata_updated.json")).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadata, setMetadataResponse);
|
||||
|
||||
assertEquals(apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").updateMetadata(serverId, metadata).toString(),
|
||||
new ParseMetadataUpdateTest().expected().toString());
|
||||
}
|
||||
|
||||
public void testSetMetadataItemWhenResponseIs404() throws Exception {
|
||||
String serverId = "123";
|
||||
ImmutableMap<String, String> metadata = new ImmutableMap.Builder<String, String>()
|
||||
.put("Server Label", "Web Head 2")
|
||||
.put("Server Description", "Simple Server")
|
||||
.build();
|
||||
|
||||
HttpRequest setMetadata = HttpRequest
|
||||
.builder()
|
||||
.method("POST")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
|
||||
.addHeader("Accept", "application/json")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}","application/json"))
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataResponse = HttpResponse.builder().statusCode(404)
|
||||
.payload(payloadFromResource("/metadata_updated.json")).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadata, setMetadataResponse);
|
||||
|
||||
try {
|
||||
apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").setMetadata(serverId, metadata);
|
||||
fail("Expected an exception.");
|
||||
} catch (Exception e) {
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
public void testDeleteMetadataItemWhenResponseIs2xx() throws Exception {
|
||||
String serverId = "123";
|
||||
String key = "Server%20Label";
|
||||
|
||||
HttpRequest setMetadataItem = HttpRequest
|
||||
.builder()
|
||||
.method("DELETE")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata/" + key)
|
||||
.addHeader("Accept", "*/*")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.build();
|
||||
|
||||
HttpResponse setMetadataItemResponse = HttpResponse.builder().statusCode(204).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, setMetadataItem, setMetadataItemResponse);
|
||||
|
||||
apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").deleteMetadataItem(serverId, key);
|
||||
|
||||
}
|
||||
|
||||
public void testDeleteMetadataItemWhenResponseIs404() throws Exception {
|
||||
String serverId = "123";
|
||||
String key = "Server%20Label";
|
||||
|
||||
HttpRequest deleteMetadataItem = HttpRequest
|
||||
.builder()
|
||||
.method("DELETE")
|
||||
.endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata/" + key)
|
||||
.addHeader("Accept", "*/*")
|
||||
.addHeader("X-Auth-Token", authToken)
|
||||
.build();
|
||||
|
||||
HttpResponse deleteMetadataItemResponse = HttpResponse.builder().statusCode(404).build();
|
||||
|
||||
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
|
||||
responseWithKeystoneAccess, deleteMetadataItem, deleteMetadataItemResponse);
|
||||
|
||||
apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").deleteMetadataItem(serverId, key);
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,60 @@
|
|||
/**
|
||||
* Licensed to jclouds, Inc. (jclouds) under one or more
|
||||
* contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. jclouds licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.jclouds.openstack.nova.v2_0.parse;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
|
||||
import org.jclouds.json.BaseItemParserTest;
|
||||
import org.jclouds.json.config.GsonModule;
|
||||
import org.jclouds.openstack.nova.v2_0.config.NovaParserModule;
|
||||
import org.jclouds.rest.annotations.SelectJson;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.inject.Guice;
|
||||
import com.google.inject.Injector;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Jeremy Daggett
|
||||
*/
|
||||
@Test(groups = "unit", testName = "ParseMetadataItemTest")
|
||||
public class ParseMetadataItemTest extends BaseItemParserTest<Map<String, String>> {
|
||||
|
||||
@Override
|
||||
public String resource() {
|
||||
return "/metadata_item.json";
|
||||
}
|
||||
|
||||
@Override
|
||||
@SelectJson("metadata")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
public Map<String, String> expected() {
|
||||
ImmutableMap<String, String> metadata = ImmutableMap.of("Server Label", "Web Head 1");
|
||||
return metadata;
|
||||
}
|
||||
|
||||
protected Injector injector() {
|
||||
return Guice.createInjector(new NovaParserModule(), new GsonModule());
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,65 @@
|
|||
/**
|
||||
* Licensed to jclouds, Inc. (jclouds) under one or more
|
||||
* contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. jclouds licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.jclouds.openstack.nova.v2_0.parse;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
|
||||
import org.jclouds.json.BaseItemParserTest;
|
||||
import org.jclouds.json.config.GsonModule;
|
||||
import org.jclouds.openstack.nova.v2_0.config.NovaParserModule;
|
||||
import org.jclouds.rest.annotations.SelectJson;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.inject.Guice;
|
||||
import com.google.inject.Injector;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Jeremy Daggett
|
||||
*/
|
||||
@Test(groups = "unit", testName = "ParseMetadataListTest")
|
||||
public class ParseMetadataListTest extends BaseItemParserTest<Map<String, String>> {
|
||||
|
||||
@Override
|
||||
public String resource() {
|
||||
return "/metadata_list.json";
|
||||
}
|
||||
|
||||
@Override
|
||||
@SelectJson("metadata")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
public Map<String, String> expected() {
|
||||
ImmutableMap<String, String> metadata =
|
||||
new ImmutableMap.Builder<String, String>()
|
||||
.put("Server Label", "Web Head 1")
|
||||
.put("Image Version", "2.1")
|
||||
.build();
|
||||
|
||||
return metadata;
|
||||
}
|
||||
|
||||
protected Injector injector() {
|
||||
return Guice.createInjector(new NovaParserModule(), new GsonModule());
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,66 @@
|
|||
/**
|
||||
* Licensed to jclouds, Inc. (jclouds) under one or more
|
||||
* contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. jclouds licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.jclouds.openstack.nova.v2_0.parse;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
|
||||
import org.jclouds.json.BaseItemParserTest;
|
||||
import org.jclouds.json.config.GsonModule;
|
||||
import org.jclouds.openstack.nova.v2_0.config.NovaParserModule;
|
||||
import org.jclouds.rest.annotations.SelectJson;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.inject.Guice;
|
||||
import com.google.inject.Injector;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Jeremy Daggett
|
||||
*/
|
||||
@Test(groups = "unit", testName = "ParseMetadataUpdateTest")
|
||||
public class ParseMetadataUpdateTest extends BaseItemParserTest<Map<String, String>> {
|
||||
|
||||
@Override
|
||||
public String resource() {
|
||||
return "/metadata_updated.json";
|
||||
}
|
||||
|
||||
@Override
|
||||
@SelectJson("metadata")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
public Map<String, String> expected() {
|
||||
ImmutableMap<String, String> metadata =
|
||||
new ImmutableMap.Builder<String, String>()
|
||||
.put("Server Label", "Web Head 2")
|
||||
.put("Image Version", "2.1")
|
||||
.put("Server Description", "Simple Server")
|
||||
.build();
|
||||
|
||||
return metadata;
|
||||
}
|
||||
|
||||
protected Injector injector() {
|
||||
return Guice.createInjector(new NovaParserModule(), new GsonModule());
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"metadata": {
|
||||
"Server Label": "Web Head 1"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"metadata": {
|
||||
"Server Label": "Web Head 1",
|
||||
"Image Version": "2.1"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"metadata": {
|
||||
"Server Label": "Web Head 2",
|
||||
"Image Version": "2.1",
|
||||
"Server Description": "Simple Server"
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue