You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by me...@apache.org on 2014/03/05 07:17:20 UTC
git commit: Adding vcloud API 1.5 support
Repository: incubator-stratos
Updated Branches:
refs/heads/master 4cbbd29e8 -> f583e13ba
Adding vcloud API 1.5 support
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f583e13b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f583e13b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f583e13b
Branch: refs/heads/master
Commit: f583e13ba6e63d0266c960c45325bd9fab3abafc
Parents: 4cbbd29
Author: Melan Nimesh <me...@apache.org>
Authored: Wed Mar 5 11:47:07 2014 +0530
Committer: Melan Nimesh <me...@apache.org>
Committed: Wed Mar 5 11:47:07 2014 +0530
----------------------------------------------------------------------
.../org/jclouds/vcloud/VCloudMediaType.java | 9 ++++++++
.../org/jclouds/vcloud/VCloudVersionsApi.java | 3 +++
.../jclouds/vcloud/domain/ReferenceType.java | 6 +++++-
.../vcloud/domain/internal/CatalogImpl.java | 5 +++++
.../domain/internal/ReferenceTypeImpl.java | 17 ++++++++++++++-
...ddVCloudAuthorizationAndCookieToRequest.java | 22 +++++++++++++-------
.../jclouds/vcloud/functions/CatalogsInOrg.java | 19 ++++++++++++++++-
.../jclouds/vcloud/internal/VCloudLoginApi.java | 6 +++---
.../java/org/jclouds/vcloud/util/Utils.java | 3 ++-
.../org/jclouds/vcloud/xml/OrgListHandler.java | 2 +-
.../jclouds/vcloud/VCloudVersionsApiTest.java | 2 +-
.../BaseVCloudComputeServiceExpectTest.java | 16 +++++++-------
...ThenCustomizeDeployAndPowerOnExpectTest.java | 4 ++--
...loudAuthorizationAndCookieToRequestTest.java | 4 ++--
.../vcloud/internal/VCloudLoginApiTest.java | 6 +++---
...VCloudVirtualHardwareSectionHandlerTest.java | 4 ++--
16 files changed, 95 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/VCloudMediaType.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/VCloudMediaType.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/VCloudMediaType.java
index f698b3e..e670157 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/VCloudMediaType.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/VCloudMediaType.java
@@ -208,5 +208,14 @@ public interface VCloudMediaType {
* "application/vnd.vmware.vcloud.rasdItem+xml"
*/
public static final MediaType RASDITEM_XML_TYPE = new MediaType("application", "vnd.vmware.vcloud.rasdItem+xml");
+ /**
+ * "application/vnd.vmware.vcloud.session+xml"
+ */
+ public static final String SESSION_XML = "application/vnd.vmware.vcloud.session+xml";
+
+ /**
+ * "application/vnd.vmware.vcloud.session+xml"
+ */
+ public static final MediaType SESSION_XML_TYPE = new MediaType("application", "vnd.vmware.vcloud.session+xml");
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/VCloudVersionsApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/VCloudVersionsApi.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/VCloudVersionsApi.java
index 01ec045..db22b1a 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/VCloudVersionsApi.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/VCloudVersionsApi.java
@@ -24,8 +24,11 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path;
import org.jclouds.rest.annotations.XMLResponseParser;
+import org.jclouds.rest.annotations.RequestFilters;
import org.jclouds.vcloud.xml.SupportedVersionsHandler;
+import org.jclouds.vcloud.http.filters.VCloudSupportedVersions;
+@RequestFilters(VCloudSupportedVersions.class)
public interface VCloudVersionsApi extends Closeable {
@GET
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/ReferenceType.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/ReferenceType.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/ReferenceType.java
index c99a1ef..98712f9 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/ReferenceType.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/ReferenceType.java
@@ -47,5 +47,9 @@ public interface ReferenceType extends Comparable<ReferenceType> {
* @see VCloudMediaType
*/
String getType();
-
+
+ /**
+ * @return relationship to the referenced object.
+ */
+ String getRelationship();
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java
index a7df6b1..983600e 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java
@@ -185,4 +185,9 @@ public class CatalogImpl extends LinkedHashMap<String, ReferenceType> implements
return (this == o) ? 0 : getHref().compareTo(o.getHref());
}
+ @Override
+ public String getRelationship() {
+ throw new UnsupportedOperationException();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java
index e0747a8..b0ed12f 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java
@@ -35,11 +35,20 @@ public class ReferenceTypeImpl implements ReferenceType {
private final String name;
private final String type;
private final URI href;
+ private final String relationship;
public ReferenceTypeImpl(String name, String type, URI href) {
this.name = name;
this.type = type;
this.href = href;
+ this.relationship = null;
+ }
+
+ public ReferenceTypeImpl(String name, String type, URI href, String relationship) {
+ this.name = name;
+ this.type = type;
+ this.href = href;
+ this.relationship = relationship;
}
@Override
@@ -83,6 +92,12 @@ public class ReferenceTypeImpl implements ReferenceType {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues().add("href", href).add("name", name).add("type", type);
+ return Objects.toStringHelper("").omitNullValues().add("href", href).add("name", name).add("type", type).add("relationship", relationship);
+ }
+
+ @Override
+ public String getRelationship() {
+ return relationship;
}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/filters/AddVCloudAuthorizationAndCookieToRequest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/filters/AddVCloudAuthorizationAndCookieToRequest.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/filters/AddVCloudAuthorizationAndCookieToRequest.java
index 6b06ea5..9edbad4 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/filters/AddVCloudAuthorizationAndCookieToRequest.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/filters/AddVCloudAuthorizationAndCookieToRequest.java
@@ -24,6 +24,7 @@ import org.jclouds.http.HttpException;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpRequestFilter;
import org.jclouds.vcloud.VCloudToken;
+import org.jclouds.rest.annotations.ApiVersion;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableMultimap;
@@ -37,19 +38,26 @@ import com.google.common.collect.ImmutableMultimap;
@Singleton
public class AddVCloudAuthorizationAndCookieToRequest implements HttpRequestFilter {
private Supplier<String> vcloudTokenProvider;
+ private final String apiVersion;
@Inject
- public AddVCloudAuthorizationAndCookieToRequest(@VCloudToken Supplier<String> authTokenProvider) {
+ public AddVCloudAuthorizationAndCookieToRequest(@VCloudToken Supplier<String> authTokenProvider, @ApiVersion final String apiVersion) {
this.vcloudTokenProvider = authTokenProvider;
+ this.apiVersion = apiVersion;
}
@Override
public HttpRequest filter(HttpRequest request) throws HttpException {
- String token = vcloudTokenProvider.get();
- return request
- .toBuilder()
- .replaceHeaders(
- ImmutableMultimap.of("x-vcloud-authorization", token, HttpHeaders.COOKIE, "vcloud-token="
- + token)).build();
+ String token = vcloudTokenProvider.get();
+ String acceptType = request.getFirstHeaderOrNull(HttpHeaders.ACCEPT) == null
+ ? "application/*+xml"
+ : request.getFirstHeaderOrNull(HttpHeaders.ACCEPT);
+ String version = ";version=" + apiVersion;
+ String acceptHeader = acceptType + version;
+ return request.toBuilder()
+ .replaceHeaders(ImmutableMultimap.of(HttpHeaders.ACCEPT,
+ acceptHeader, "x-vcloud-authorization", token,
+ HttpHeaders.COOKIE, "vcloud-token=" +
+ token)).build();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/functions/CatalogsInOrg.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/functions/CatalogsInOrg.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/functions/CatalogsInOrg.java
index 11be749..212569c 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/functions/CatalogsInOrg.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/functions/CatalogsInOrg.java
@@ -18,6 +18,7 @@ package org.jclouds.vcloud.functions;
import static com.google.common.collect.Iterables.transform;
+import java.util.Collection;
import javax.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -29,6 +30,9 @@ import org.jclouds.vcloud.domain.Org;
import org.jclouds.vcloud.domain.ReferenceType;
import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableSet;
/**
* @author Adrian Cole
@@ -47,7 +51,20 @@ public class CatalogsInOrg implements Function<Org, Iterable<Catalog>> {
@Override
public Iterable<Catalog> apply(final Org org) {
- return transform(org.getCatalogs().values(), new Function<ReferenceType, Catalog>() {
+
+ Collection<ReferenceType> filtered = Collections2.filter(
+ org.getCatalogs().values(), new Predicate<ReferenceType>() {
+ @Override
+ public boolean apply(ReferenceType type) {
+ if(type == null){
+ return false;
+ }
+ return !ImmutableSet.of("add", "remove").contains(type.getRelationship());
+ }
+ });
+
+
+ return transform(filtered, new Function<ReferenceType, Catalog>() {
public Catalog apply(ReferenceType from) {
return aclient.getCatalogApi().getCatalog(from.getHref());
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/internal/VCloudLoginApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/internal/VCloudLoginApi.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/internal/VCloudLoginApi.java
index acf77c5..5f9b9c6 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/internal/VCloudLoginApi.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/internal/VCloudLoginApi.java
@@ -21,7 +21,7 @@ import java.io.Closeable;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
-import org.jclouds.http.filters.BasicAuthentication;
+import org.jclouds.vcloud.http.filters.VCloudBasicAuthentication;
import org.jclouds.rest.annotations.Endpoint;
import org.jclouds.rest.annotations.RequestFilters;
import org.jclouds.rest.annotations.ResponseParser;
@@ -30,7 +30,7 @@ import org.jclouds.vcloud.domain.VCloudSession;
import org.jclouds.vcloud.functions.ParseLoginResponseFromHeaders;
@Endpoint(org.jclouds.vcloud.endpoints.VCloudLogin.class)
-@RequestFilters(BasicAuthentication.class)
+@RequestFilters(VCloudBasicAuthentication.class)
public interface VCloudLoginApi extends Closeable {
/**
@@ -39,6 +39,6 @@ public interface VCloudLoginApi extends Closeable {
*/
@POST
@ResponseParser(ParseLoginResponseFromHeaders.class)
- @Consumes(VCloudMediaType.ORGLIST_XML)
+ @Consumes({VCloudMediaType.SESSION_XML,VCloudMediaType.ORGLIST_XML})
VCloudSession login();
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/util/Utils.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/util/Utils.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/util/Utils.java
index 7c16d10..9945bba 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/util/Utils.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/util/Utils.java
@@ -34,9 +34,10 @@ public class Utils {
public static ReferenceType newReferenceType(Map<String, String> attributes, String defaultType) {
String uri = attributes.get("href");
String type = attributes.get("type");
+ String relationship = attributes.get("rel");
// savvis org has null href
URI href = (uri != null) ? URI.create(uri) : null;
- return new ReferenceTypeImpl(attributes.get("name"), type != null ? type : defaultType, href);
+ return new ReferenceTypeImpl(attributes.get("name"), type != null ? type : defaultType, href, relationship);
}
public static ReferenceType newReferenceType(Map<String, String> attributes) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/xml/OrgListHandler.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/xml/OrgListHandler.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/xml/OrgListHandler.java
index 7f734b4..ad5b40a 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/xml/OrgListHandler.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/main/java/org/jclouds/vcloud/xml/OrgListHandler.java
@@ -42,7 +42,7 @@ public class OrgListHandler extends ParseSax.HandlerWithResult<Map<String, Refer
@Override
public void startElement(String uri, String localName, String qName, Attributes attrs) throws SAXException {
Map<String, String> attributes = SaxUtils.cleanseAttributes(attrs);
- if (qName.endsWith("Org")) {
+ if (qName.endsWith("Link") || qName.endsWith("Org")) {
String type = attributes.get("type");
if (type != null) {
if (type.indexOf("org+xml") != -1) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/VCloudVersionsApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/VCloudVersionsApiTest.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/VCloudVersionsApiTest.java
index 3df78b6..569903d 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/VCloudVersionsApiTest.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/VCloudVersionsApiTest.java
@@ -58,7 +58,7 @@ public class VCloudVersionsApiTest extends BaseAsyncClientTest<VCloudVersionsApi
@Override
protected void checkFilters(HttpRequest request) {
- assertEquals(request.getFilters().size(), 0);
+ assertEquals(request.getFilters().size(), 1);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java
index 8dc8f40..bc4be3a 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/compute/BaseVCloudComputeServiceExpectTest.java
@@ -42,7 +42,7 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
protected static final String ENDPOINT = "https://zone.myvcloud.com/api";
protected HttpRequest versionsRequest = HttpRequest.builder().method("GET").endpoint(
- URI.create(ENDPOINT + "/versions")).build();
+ URI.create(ENDPOINT + "/versions")).addHeader(HttpHeaders.ACCEPT, "*/*").build();
protected HttpResponse versionsResponseFromVCD1_5 = HttpResponse.builder().statusCode(200)
.message("HTTP/1.1 200 OK").payload(payloadFromResourceWithContentType("/versions-vcd15.xml", "text/xml"))
@@ -50,7 +50,7 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
// initial auth is using basic
protected HttpRequest version1_0LoginRequest = HttpRequest.builder().method("POST").endpoint(ENDPOINT + "/v1.0/login")
- .addHeader(HttpHeaders.ACCEPT, VCloudMediaType.ORGLIST_XML)
+ .addHeader(HttpHeaders.ACCEPT, "application/vnd.vmware.vcloud.session+xml;version=1.0")
.addHeader(HttpHeaders.AUTHORIZATION, "Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==").build();
protected String sessionToken = "AtatAgvJMrwOc9pDQq4RRCRLazThpnTKJDxSVH9oB2I=";
@@ -66,7 +66,7 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
protected String orgId = "c076f90a-397a-49fa-89b8-b294c1599cd0";
protected HttpRequest version1_0GetOrgRequest = HttpRequest.builder().method("GET").endpoint(ENDPOINT + "/v1.0/org/" + orgId)
- .addHeader(HttpHeaders.ACCEPT, VCloudMediaType.ORG_XML)
+ .addHeader(HttpHeaders.ACCEPT, VCloudMediaType.ORG_XML+";version=1.0")
.addHeader("x-vcloud-authorization", sessionToken)
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken).build();
@@ -78,7 +78,7 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
protected String vdcId = "e9cd3387-ac57-4d27-a481-9bee75e0690f";
protected HttpRequest version1_0GetCatalogRequest = HttpRequest.builder().method("GET").endpoint(ENDPOINT + "/v1.0/catalog/" + catalogId)
- .addHeader(HttpHeaders.ACCEPT, VCloudMediaType.CATALOG_XML)
+ .addHeader(HttpHeaders.ACCEPT, VCloudMediaType.CATALOG_XML +";version=1.0")
.addHeader("x-vcloud-authorization", sessionToken)
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken).build();
@@ -89,7 +89,7 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
protected String catalogItemId = "ceb369f7-1d07-4e32-9dbd-ebb5aa6ca55c";
protected HttpRequest version1_0GetCatalogItemRequest = HttpRequest.builder().method("GET").endpoint(ENDPOINT + "/v1.0/catalogItem/" + catalogItemId)
- .addHeader(HttpHeaders.ACCEPT, VCloudMediaType.CATALOGITEM_XML)
+ .addHeader(HttpHeaders.ACCEPT, VCloudMediaType.CATALOGITEM_XML +";version=1.0")
.addHeader("x-vcloud-authorization", sessionToken)
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken).build();
@@ -101,7 +101,7 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
protected String templateId = "vappTemplate-51891b97-c5dd-47dc-a687-aabae354f728";
protected HttpRequest version1_0GetVDCRequest = HttpRequest.builder().method("GET").endpoint(ENDPOINT + "/v1.0/vdc/" + vdcId)
- .addHeader(HttpHeaders.ACCEPT, VCloudMediaType.VDC_XML)
+ .addHeader(HttpHeaders.ACCEPT, VCloudMediaType.VDC_XML +";version=1.0")
.addHeader("x-vcloud-authorization", sessionToken)
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken).build();
@@ -112,7 +112,7 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
protected String networkId = "b466c0c5-8a5c-4335-b703-a2e2e6b5f3e1";
protected HttpRequest version1_0GetVAppTemplateRequest = HttpRequest.builder().method("GET").endpoint(ENDPOINT + "/v1.0/vAppTemplate/" + templateId)
- .addHeader(HttpHeaders.ACCEPT, VCloudMediaType.VAPPTEMPLATE_XML)
+ .addHeader(HttpHeaders.ACCEPT, VCloudMediaType.VAPPTEMPLATE_XML +";version=1.0")
.addHeader("x-vcloud-authorization", sessionToken)
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken).build();
@@ -125,7 +125,7 @@ public abstract class BaseVCloudComputeServiceExpectTest extends BaseRestClientE
.build();
protected HttpRequest version1_0GetOVFForVAppTemplateRequest = HttpRequest.builder().method("GET").endpoint(ENDPOINT + "/v1.0/vAppTemplate/" + templateId + "/ovf")
- .addHeader(HttpHeaders.ACCEPT, MediaType.TEXT_XML)
+ .addHeader(HttpHeaders.ACCEPT, MediaType.TEXT_XML +";version=1.0")
.addHeader("x-vcloud-authorization", sessionToken)
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken).build();
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOnExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOnExpectTest.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOnExpectTest.java
index 8ee0a29..0e786ab 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOnExpectTest.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOnExpectTest.java
@@ -86,7 +86,7 @@ public class InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployA
HttpRequest version1_0InstantiateWithNetworkNamedSameAsOrgNetwork = HttpRequest.builder().method("POST")
.endpoint(ENDPOINT + "/v1.0/vdc/" + vdcId + "/action/instantiateVAppTemplate")
- .addHeader(HttpHeaders.ACCEPT, "application/vnd.vmware.vcloud.vApp+xml")
+ .addHeader(HttpHeaders.ACCEPT, "application/vnd.vmware.vcloud.vApp+xml;version=1.0")
.addHeader("x-vcloud-authorization", sessionToken)
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken)
.payload(payloadFromStringWithContentType(instantiateXML, "application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml")).build();
@@ -143,7 +143,7 @@ public class InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployA
HttpRequest version1_0InstantiateWithCustomizedNetwork = HttpRequest.builder().method("POST")
.endpoint(ENDPOINT + "/v1.0/vdc/" + vdcId + "/action/instantiateVAppTemplate")
- .addHeader(HttpHeaders.ACCEPT, "application/vnd.vmware.vcloud.vApp+xml")
+ .addHeader(HttpHeaders.ACCEPT, "application/vnd.vmware.vcloud.vApp+xml;version=1.0")
.addHeader("x-vcloud-authorization", sessionToken)
.addHeader(HttpHeaders.COOKIE, "vcloud-token=" + sessionToken)
.payload(payloadFromStringWithContentType(instantiateXML, "application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml")).build();
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/filters/AddVCloudAuthorizationAndCookieToRequestTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/filters/AddVCloudAuthorizationAndCookieToRequestTest.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/filters/AddVCloudAuthorizationAndCookieToRequestTest.java
index fd93b69..d4a0c06 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/filters/AddVCloudAuthorizationAndCookieToRequestTest.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/filters/AddVCloudAuthorizationAndCookieToRequestTest.java
@@ -40,14 +40,14 @@ public class AddVCloudAuthorizationAndCookieToRequestTest {
public String get() {
return "token";
}
- });
+ }, "1.0");
}
@Test
public void testApply() {
HttpRequest request = HttpRequest.builder().method("GET").endpoint("http://localhost").build();
request = filter.filter(request);
- assertEquals(request.getHeaders().size(), 2);
+ assertEquals(request.getHeaders().size(), 3);
assertEquals(request.getFirstHeaderOrNull(HttpHeaders.COOKIE), "vcloud-token=token");
assertEquals(request.getFirstHeaderOrNull("x-vcloud-authorization"), "token");
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/internal/VCloudLoginApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/internal/VCloudLoginApiTest.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/internal/VCloudLoginApiTest.java
index b8eef72..4652e5e 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/internal/VCloudLoginApiTest.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/internal/VCloudLoginApiTest.java
@@ -25,7 +25,6 @@ import java.net.URI;
import javax.ws.rs.core.HttpHeaders;
import org.jclouds.http.HttpRequest;
-import org.jclouds.http.filters.BasicAuthentication;
import org.jclouds.location.Provider;
import org.jclouds.providers.AnonymousProviderMetadata;
import org.jclouds.providers.ProviderMetadata;
@@ -33,6 +32,7 @@ import org.jclouds.rest.internal.BaseAsyncClientTest;
import org.jclouds.rest.internal.GeneratedHttpRequest;
import org.jclouds.vcloud.endpoints.VCloudLogin;
import org.jclouds.vcloud.functions.ParseLoginResponseFromHeaders;
+import org.jclouds.vcloud.http.filters.VCloudBasicAuthentication;
import org.testng.annotations.Test;
import com.google.common.base.Supplier;
@@ -55,7 +55,7 @@ public class VCloudLoginApiTest extends BaseAsyncClientTest<VCloudLoginApi> {
GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.of());
assertEquals(request.getRequestLine(), "POST http://localhost:8080/login HTTP/1.1");
- assertNonPayloadHeadersEqual(request, HttpHeaders.ACCEPT + ": application/vnd.vmware.vcloud.orgList+xml\n");
+ assertNonPayloadHeadersEqual(request, HttpHeaders.ACCEPT + ": application/vnd.vmware.vcloud.orgList+xml\n" + HttpHeaders.ACCEPT + ": application/vnd.vmware.vcloud.session+xml\n");
assertPayloadEquals(request, null, null, false);
assertResponseParserClassEquals(method, request, ParseLoginResponseFromHeaders.class);
@@ -68,7 +68,7 @@ public class VCloudLoginApiTest extends BaseAsyncClientTest<VCloudLoginApi> {
@Override
protected void checkFilters(HttpRequest request) {
assertEquals(request.getFilters().size(), 1);
- assertEquals(request.getFilters().get(0).getClass(), BasicAuthentication.class);
+ assertEquals(request.getFilters().get(0).getClass(), VCloudBasicAuthentication.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f583e13b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java
index 90b1470..65f4560 100755
--- a/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java
+++ b/dependencies/jclouds/vcloud/1.7.1-stratos/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java
@@ -127,7 +127,7 @@ public class VCloudVirtualHardwareSectionHandlerTest extends BaseHandlerTest {
null,
"application/vnd.vmware.vcloud.rasdItem+xml",
URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu")))
+ .create("https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu"),"edit"))
.build().toString());
assertEquals(
@@ -147,7 +147,7 @@ public class VCloudVirtualHardwareSectionHandlerTest extends BaseHandlerTest {
null,
"application/vnd.vmware.vcloud.rasdItem+xml",
URI
- .create("https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory")))
+ .create("https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory"),"edit"))
.build().toString());
}
}