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

Merge pull request #541 from dhogan/security-group-delete 

fix Accept header in delete
This commit is contained in:
Adrian Cole 2012-04-04 22:39:45 -07:00
parent deb8ac326a 12e8a366fc
commit 94edcbf00d
2 changed files with 2 additions and 2 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/extensions/SecurityGroupAsyncClient.java
View File

@ -104,7 +104,7 @@ public interface SecurityGroupAsyncClient {
@DELETE @DELETE
@Path("/os-security-groups/{id}") @Path("/os-security-groups/{id}")
@ExceptionParser(ReturnNullOnNotFoundOr404.class) @ExceptionParser(ReturnNullOnNotFoundOr404.class)
@Consumes @Consumes(MediaType.APPLICATION_JSON)
ListenableFuture<Boolean> deleteSecurityGroup(@PathParam("id") String id); ListenableFuture<Boolean> deleteSecurityGroup(@PathParam("id") String id);
/** /**

2
apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientExpectTest.java
View File

@ -142,7 +142,7 @@ public class SecurityGroupClientExpectTest extends BaseNovaClientExpectTest {
HttpRequest deleteSecurityGroup = HttpRequest.builder().method("DELETE").endpoint( HttpRequest deleteSecurityGroup = HttpRequest.builder().method("DELETE").endpoint(
URI.create("https://compute.north.host/v1.1/3456/os-security-groups/160")) URI.create("https://compute.north.host/v1.1/3456/os-security-groups/160"))
.headers( .headers(
ImmutableMultimap.<String, String> builder().put("Accept", "*/*") ImmutableMultimap.<String, String> builder().put("Accept", "application/json")
.put("X-Auth-Token", authToken).build()).build(); .put("X-Auth-Token", authToken).build()).build();
HttpResponse deleteSecurityGroupResponse = HttpResponse.builder().statusCode(202).build(); HttpResponse deleteSecurityGroupResponse = HttpResponse.builder().statusCode(202).build();