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

vcloud director 1.5 adds suffix of ;1.0 on content type

This commit is contained in:
Adrian Cole 2012-01-12 19:06:06 -08:00
parent 260c23170b
commit 61f2ff6468
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apis/vcloud/src/main/java/org/jclouds/vcloud/handlers/ParseVCloudErrorFromHttpResponse.java
View File

@ -37,7 +37,6 @@ import org.jclouds.logging.Logger;
import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.ResourceNotFoundException; import org.jclouds.rest.ResourceNotFoundException;
import org.jclouds.util.Strings2; import org.jclouds.util.Strings2;
import org.jclouds.vcloud.VCloudMediaType;
import org.jclouds.vcloud.VCloudResponseException; import org.jclouds.vcloud.VCloudResponseException;
import org.jclouds.vcloud.domain.VCloudError; import org.jclouds.vcloud.domain.VCloudError;
import org.jclouds.vcloud.domain.VCloudError.MinorCode; import org.jclouds.vcloud.domain.VCloudError.MinorCode;
@ -68,19 +67,18 @@ public class ParseVCloudErrorFromHttpResponse implements HttpErrorHandler {
VCloudError error = null; VCloudError error = null;
String message = null; String message = null;
if (response.getPayload() != null) { if (response.getPayload() != null) {
String contentType = response.getPayload().getContentMetadata().getContentType(); try {
if (VCloudMediaType.ERROR_XML.equals(contentType)) {
error = utils.parseErrorFromContent(request, response); error = utils.parseErrorFromContent(request, response);
if (error != null) { if (error != null) {
message = error.getMessage(); message = error.getMessage();
exception = new VCloudResponseException(command, response, error); exception = new VCloudResponseException(command, response, error);
} } else {
} else {
try {
message = Strings2.toStringAndClose(response.getPayload().getInput()); message = Strings2.toStringAndClose(response.getPayload().getInput());
exception = message != null ? new HttpResponseException(command, response, message) : exception; exception = message != null ? new HttpResponseException(command, response, message) : exception;
} catch (IOException e) {
} }
} catch (IOException e) {
} finally {
response.getPayload().release();
} }
} }
message = message != null ? message : String.format("%s -> %s", request.getRequestLine(), response message = message != null ? message : String.format("%s -> %s", request.getRequestLine(), response

5
apis/vcloud/src/main/java/org/jclouds/vcloud/util/VCloudUtils.java
View File

@ -54,7 +54,10 @@ public class VCloudUtils {
// HEAD has no content // HEAD has no content
if (response.getPayload() == null) if (response.getPayload() == null)
return null; return null;
if (VCloudMediaType.ERROR_XML.equals(response.getPayload().getContentMetadata().getContentType())) { // NOTE in vCloud Datacenter 1.5, if you make vCloud 1.0 requests, the content type
// header is suffixed with ;1.0
String contentType = response.getPayload().getContentMetadata().getContentType();
if (contentType != null && contentType.startsWith(VCloudMediaType.ERROR_XML)) {
try { try {
return (VCloudError) factory.create(errorHandlerProvider.get()).setContext(request).apply(response); return (VCloudError) factory.create(errorHandlerProvider.get()).setContext(request).apply(response);
} catch (RuntimeException e) { } catch (RuntimeException e) {

13
apis/vcloud/src/test/java/org/jclouds/vcloud/handlers/ParseVCloudErrorFromHttpResponseTest.java
View File

@ -53,6 +53,19 @@ public class ParseVCloudErrorFromHttpResponseTest extends BaseHttpErrorHandlerTe
ResourceNotFoundException.class); ResourceNotFoundException.class);
} }
@Test
public void testGet403NoAcessToEntitySetsResourceNotFoundExceptionOnAPI1_0AgainstVCD1_5() {
assertCodeMakes(
"GET",
URI.create("https://mycloud.greenhousedata.com/api/v1.0/vApp/vapp-d3a1f2cd-d07b-4ddc-bf7b-fb7468b4d95a"),
403,
"HTTP/1.1 403",
// NOTE VCD 1.5 appends the api version to the media type
VCloudMediaType.ERROR_XML + ";1.0",
"<Error xmlns=\"http://www.vmware.com/vcloud/v1\" minorErrorCode=\"ACCESS_TO_RESOURCE_IS_FORBIDDEN\" message=\"No access to entity &quot;(com.vmware.vcloud.entity.vapp:d3a1f2cd-d07b-4ddc-bf7b-fb7468b4d95a)&quot;.\" majorErrorCode=\"403\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.vmware.com/vcloud/v1 http://mycloud.greenhousedata.com/api/v1.0/schema/master.xsd\"></Error>",
ResourceNotFoundException.class);
}
@Test @Test
public void testDelete404SetsHttpResponseException() { public void testDelete404SetsHttpResponseException() {
assertCodeMakes("DELETE", URI.create("https://services.vcloudexpress.terremark.com/api/v0.8a-ext1.6/vdc/32"), assertCodeMakes("DELETE", URI.create("https://services.vcloudexpress.terremark.com/api/v0.8a-ext1.6/vdc/32"),