Repository: jclouds-labs Updated Branches: refs/heads/2.0.x 061cefafc -> de26ec2c0
Updating Mock & Live tests. There was a bug due to not including /caas in path. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/de26ec2c Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/de26ec2c Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/de26ec2c Branch: refs/heads/2.0.x Commit: de26ec2c0149f31e19c3fbaf2625655853b194ec Parents: 061cefa Author: Trevor Flanagan <[email protected]> Authored: Tue Apr 18 15:09:35 2017 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Tue Apr 18 16:34:52 2017 +0200 ---------------------------------------------------------------------- dimensiondata/pom.xml | 1 + .../features/InfrastructureApi.java | 1 + .../cloudcontrol/features/ServerImageApi.java | 12 ++++----- .../filters/DatacenterIdFilter.java | 2 +- .../DatacenterIdListDatacentersFilter.java | 8 ++++-- .../filters/OrganisationIdFilter.java | 2 +- .../features/AccountApiMockTest.java | 4 +-- .../features/InfrastructureApiLiveTest.java | 16 +++++++++--- .../features/InfrastructureApiMockTest.java | 4 +-- .../features/ServerImageApiLiveTest.java | 27 +++++++++++++++++--- .../features/ServerImageApiMockTest.java | 8 +++--- .../filters/OrganisationIdFilterTest.java | 12 ++++----- .../BaseAccountAwareCloudControlMockTest.java | 2 +- .../BaseDimensionDataCloudControlMockTest.java | 2 +- 14 files changed, 69 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/pom.xml ---------------------------------------------------------------------- diff --git a/dimensiondata/pom.xml b/dimensiondata/pom.xml index 5e82508..7e110cb 100644 --- a/dimensiondata/pom.xml +++ b/dimensiondata/pom.xml @@ -144,6 +144,7 @@ <test.dimensiondata-cloudcontrol.credential> ${test.dimensiondata-cloudcontrol.credential} </test.dimensiondata-cloudcontrol.credential> + <jclouds.zones>LAB04_N2_VMWARE_1</jclouds.zones> </systemPropertyVariables> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApi.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApi.java b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApi.java index 436883e..eafef2e 100644 --- a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApi.java +++ b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApi.java @@ -57,6 +57,7 @@ public interface InfrastructureApi { @GET @Path("/datacenter") @ResponseParser(ParseDatacenters.class) + @RequestFilters(DatacenterIdListDatacentersFilter.class) @Fallback(Fallbacks.EmptyIterableWithMarkerOnNotFoundOr404.class) PaginatedCollection<Datacenter> listDatacenters(PaginationOptions options); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApi.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApi.java b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApi.java index 22db3a2..2736a3a 100644 --- a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApi.java +++ b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApi.java @@ -17,11 +17,12 @@ package org.jclouds.dimensiondata.cloudcontrol.features; import com.google.common.base.Function; +import com.google.common.base.Optional; import com.google.inject.TypeLiteral; import org.jclouds.Fallbacks; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.PagedIterable; -import org.jclouds.collect.internal.ArgsToPagedIterable; +import org.jclouds.collect.internal.Arg0ToPagedIterable; import org.jclouds.dimensiondata.cloudcontrol.DimensionDataCloudControlApi; import org.jclouds.dimensiondata.cloudcontrol.domain.CustomerImage; import org.jclouds.dimensiondata.cloudcontrol.domain.CustomerImages; @@ -46,7 +47,6 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.core.MediaType; -import java.util.List; @RequestFilters({ BasicAuthentication.class, OrganisationIdFilter.class }) @Consumes(MediaType.APPLICATION_JSON) @@ -106,7 +106,7 @@ public interface ServerImageApi { super(json, TypeLiteral.get(OsImages.class)); } - private static class ToPagedIterable extends ArgsToPagedIterable<OsImage, ToPagedIterable> { + private static class ToPagedIterable extends Arg0ToPagedIterable<OsImage, ToPagedIterable> { private DimensionDataCloudControlApi api; @@ -116,7 +116,7 @@ public interface ServerImageApi { } @Override - protected Function<Object, IterableWithMarker<OsImage>> markerToNextForArgs(List<Object> args) { + protected Function<Object, IterableWithMarker<OsImage>> markerToNextForArg0(Optional<Object> arg0) { return new Function<Object, IterableWithMarker<OsImage>>() { @Override public IterableWithMarker<OsImage> apply(Object input) { @@ -135,7 +135,7 @@ public interface ServerImageApi { super(json, TypeLiteral.get(CustomerImages.class)); } - private static class ToPagedIterable extends ArgsToPagedIterable<CustomerImage, ToPagedIterable> { + private static class ToPagedIterable extends Arg0ToPagedIterable<CustomerImage, ToPagedIterable> { private DimensionDataCloudControlApi api; @@ -145,7 +145,7 @@ public interface ServerImageApi { } @Override - protected Function<Object, IterableWithMarker<CustomerImage>> markerToNextForArgs(List<Object> args) { + protected Function<Object, IterableWithMarker<CustomerImage>> markerToNextForArg0(Optional<Object> arg0) { return new Function<Object, IterableWithMarker<CustomerImage>>() { @Override public IterableWithMarker<CustomerImage> apply(Object input) { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/DatacenterIdFilter.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/DatacenterIdFilter.java b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/DatacenterIdFilter.java index 436cd67..41dab36 100644 --- a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/DatacenterIdFilter.java +++ b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/DatacenterIdFilter.java @@ -30,7 +30,7 @@ import java.util.Set; */ public class DatacenterIdFilter implements HttpRequestFilter { - protected final Supplier<Set<String>> datacenterIdsSupplier; + private final Supplier<Set<String>> datacenterIdsSupplier; @Inject DatacenterIdFilter(@Zone Supplier<Set<String>> datacenterIdsSupplier) { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/DatacenterIdListDatacentersFilter.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/DatacenterIdListDatacentersFilter.java b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/DatacenterIdListDatacentersFilter.java index ffb7a82..a805867 100644 --- a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/DatacenterIdListDatacentersFilter.java +++ b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/DatacenterIdListDatacentersFilter.java @@ -29,9 +29,13 @@ import java.util.Set; * Adds set of Datacenter IDs as set in jclouds.zones JVM property. */ public class DatacenterIdListDatacentersFilter implements HttpRequestFilter { + + private final Supplier<Set<String>> datacenterIdsSupplier; + @Inject - @Zone - protected Supplier<Set<String>> datacenterIdsSupplier; + DatacenterIdListDatacentersFilter(@Zone Supplier<Set<String>> datacenterIdsSupplier) { + this.datacenterIdsSupplier = datacenterIdsSupplier; + } @Override public HttpRequest filter(HttpRequest request) throws HttpException { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/OrganisationIdFilter.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/OrganisationIdFilter.java b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/OrganisationIdFilter.java index f530b02..cf1ec1b 100644 --- a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/OrganisationIdFilter.java +++ b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/filters/OrganisationIdFilter.java @@ -37,7 +37,7 @@ import java.util.List; @Singleton public class OrganisationIdFilter implements HttpRequestFilter { - private static final int ORGANIZATION_ID_INDEX = 2; + private static final int ORGANIZATION_ID_INDEX = 3; private final Supplier<String> organisationIdSupplier; @Inject http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/AccountApiMockTest.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/AccountApiMockTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/AccountApiMockTest.java index efaa7d9..01a7b3a 100644 --- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/AccountApiMockTest.java +++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/AccountApiMockTest.java @@ -33,7 +33,7 @@ public class AccountApiMockTest extends BaseDimensionDataCloudControlMockTest { server.enqueue(jsonResponse("/account.json")); Account account = api.getAccountApi().getMyAccount(); assertNotNull(account); - assertSent(HttpMethod.GET, "/" + VERSION + "/user/myUser"); + assertSent(HttpMethod.GET, "/caas/" + VERSION + "/user/myUser"); } @Test @@ -41,7 +41,7 @@ public class AccountApiMockTest extends BaseDimensionDataCloudControlMockTest { server.enqueue(response404()); Account account = api.getAccountApi().getMyAccount(); assertNull(account); - assertSent(HttpMethod.GET, "/" + VERSION + "/user/myUser"); + assertSent(HttpMethod.GET, "/caas/" + VERSION + "/user/myUser"); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApiLiveTest.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApiLiveTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApiLiveTest.java index 7e95fc2..20f3b29 100644 --- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApiLiveTest.java +++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApiLiveTest.java @@ -23,23 +23,33 @@ import org.jclouds.dimensiondata.cloudcontrol.internal.BaseDimensionDataCloudCon import org.testng.annotations.Test; import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; @Test(groups = "live", testName = "InfrastructureApiLiveTest", singleThreaded = true) public class InfrastructureApiLiveTest extends BaseDimensionDataCloudControlApiLiveTest { @Test public void testListDatacenters() { - FluentIterable<Datacenter> datacenters = api().listDatacenters().concat(); - assertNotNull(datacenters); + FluentIterable<Datacenter> datacenters = getDatacenters(); + assertTrue(!datacenters.isEmpty()); for (Datacenter datacenter : datacenters) { assertNotNull(datacenter); } } + private FluentIterable<Datacenter> getDatacenters() { + FluentIterable<Datacenter> datacenters = api().listDatacenters().concat(); + assertNotNull(datacenters); + return datacenters; + } + @Test public void testListOperatingSystems() { - FluentIterable<OperatingSystem> operatingSystems = api().listOperatingSystems("NA9").concat(); + FluentIterable<Datacenter> datacenters = getDatacenters(); + FluentIterable<OperatingSystem> operatingSystems = api().listOperatingSystems(datacenters.first().get().id()) + .concat(); assertNotNull(operatingSystems); + assertTrue(!operatingSystems.isEmpty()); for (OperatingSystem operatingSystem : operatingSystems) { assertNotNull(operatingSystem); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApiMockTest.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApiMockTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApiMockTest.java index 5b287d9..577428c 100644 --- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApiMockTest.java +++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/InfrastructureApiMockTest.java @@ -65,7 +65,7 @@ public class InfrastructureApiMockTest extends BaseAccountAwareCloudControlMockT private Uris.UriBuilder expectedListDatacentersUriBuilder() { Uris.UriBuilder uriBuilder = Uris - .uriBuilder("/" + VERSION + "/6ac1e746-b1ea-4da5-a24e-caf1a978789d/infrastructure/datacenter"); + .uriBuilder("/caas/" + VERSION + "/6ac1e746-b1ea-4da5-a24e-caf1a978789d/infrastructure/datacenter"); Set<String> zones = ctx.utils().injector().getInstance(ZoneIdsSupplier.class).get(); for (String zone : zones) { uriBuilder.addQuery("id", zone); @@ -103,7 +103,7 @@ public class InfrastructureApiMockTest extends BaseAccountAwareCloudControlMockT private Uris.UriBuilder expectedListOperatingSystemsUriBuilder() { Uris.UriBuilder uriBuilder = Uris - .uriBuilder("/" + VERSION + "/6ac1e746-b1ea-4da5-a24e-caf1a978789d/infrastructure/operatingSystem"); + .uriBuilder("/caas/" + VERSION + "/6ac1e746-b1ea-4da5-a24e-caf1a978789d/infrastructure/operatingSystem"); uriBuilder.addQuery("datacenterId", "NA9"); return uriBuilder; } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApiLiveTest.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApiLiveTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApiLiveTest.java index ba60e96..4a1b05a 100644 --- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApiLiveTest.java +++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApiLiveTest.java @@ -17,34 +17,55 @@ package org.jclouds.dimensiondata.cloudcontrol.features; import com.google.common.collect.FluentIterable; +import org.jclouds.collect.PagedIterable; import org.jclouds.dimensiondata.cloudcontrol.domain.CustomerImage; import org.jclouds.dimensiondata.cloudcontrol.domain.OsImage; import org.jclouds.dimensiondata.cloudcontrol.internal.BaseDimensionDataCloudControlApiLiveTest; import org.testng.annotations.Test; import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; @Test(groups = "live", testName = "ServerImageApiLiveTest", singleThreaded = true) public class ServerImageApiLiveTest extends BaseDimensionDataCloudControlApiLiveTest { @Test public void testListOsImages() { - FluentIterable<OsImage> osImages = api().listOsImages().concat(); - assertNotNull(osImages); + FluentIterable<OsImage> osImages = getOsImages().concat(); + assertTrue(!osImages.isEmpty()); for (OsImage osImage : osImages) { assertNotNull(osImage); } } + private PagedIterable<OsImage> getOsImages() { + PagedIterable<OsImage> osImages = api().listOsImages(); + assertNotNull(osImages); + return osImages; + } + + @Test + public void testGetOsImage() { + FluentIterable<OsImage> osImages = getOsImages().concat(); + final OsImage osImage = api().getOsImage(osImages.iterator().next().id()); + assertNotNull(osImage); + } + @Test public void testListCustomerImages() { - FluentIterable<CustomerImage> customerImages = api().listCustomerImages().concat(); + FluentIterable<CustomerImage> customerImages = getCustomerImages(); assertNotNull(customerImages); for (CustomerImage customerImage : customerImages) { assertNotNull(customerImage); } } + private FluentIterable<CustomerImage> getCustomerImages() { + FluentIterable<CustomerImage> customerImages = api().listCustomerImages().concat(); + assertNotNull(customerImages); + return customerImages; + } + private ServerImageApi api() { return api.getServerImageApi(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApiMockTest.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApiMockTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApiMockTest.java index a7e3f29..1d45ff0 100644 --- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApiMockTest.java +++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerImageApiMockTest.java @@ -83,7 +83,7 @@ public class ServerImageApiMockTest extends BaseAccountAwareCloudControlMockTest Uris.UriBuilder uriBuilder = getOsImageUrl(); Set<String> zones = ctx.utils().injector().getInstance(ZoneIdsSupplier.class).get(); for (String zone : zones) { - uriBuilder.addQuery("datacanterId", zone); + uriBuilder.addQuery("datacenterId", zone); } return uriBuilder; } @@ -134,20 +134,20 @@ public class ServerImageApiMockTest extends BaseAccountAwareCloudControlMockTest Uris.UriBuilder uriBuilder = getCustomerImageUrl(); Set<String> zones = ctx.utils().injector().getInstance(ZoneIdsSupplier.class).get(); for (String zone : zones) { - uriBuilder.addQuery("datacanterId", zone); + uriBuilder.addQuery("datacenterId", zone); } return uriBuilder; } private Uris.UriBuilder getOsImageUrl() { Uris.UriBuilder uriBuilder = Uris - .uriBuilder("/" + VERSION + "/6ac1e746-b1ea-4da5-a24e-caf1a978789d/image/osImage"); + .uriBuilder("/caas/" + VERSION + "/6ac1e746-b1ea-4da5-a24e-caf1a978789d/image/osImage"); return uriBuilder; } private Uris.UriBuilder getCustomerImageUrl() { Uris.UriBuilder uriBuilder = Uris - .uriBuilder("/" + VERSION + "/6ac1e746-b1ea-4da5-a24e-caf1a978789d/image/customerImage"); + .uriBuilder("/caas/" + VERSION + "/6ac1e746-b1ea-4da5-a24e-caf1a978789d/image/customerImage"); return uriBuilder; } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/filters/OrganisationIdFilterTest.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/filters/OrganisationIdFilterTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/filters/OrganisationIdFilterTest.java index a3c2d64..4d32b00 100644 --- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/filters/OrganisationIdFilterTest.java +++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/filters/OrganisationIdFilterTest.java @@ -35,24 +35,24 @@ public class OrganisationIdFilterTest { @Test public void testCaasUrl() { - String expectedPath = "/2.4/6ac1e746-b1ea-4da5-a24e-caf1a978789d/server/0896551e-4fe3-4450-a627-ad5548e7e83a?clone=trevor-test2&desc=trevor-description2"; + String expectedPath = "/caas/2.4/6ac1e746-b1ea-4da5-a24e-caf1a978789d/server/0896551e-4fe3-4450-a627-ad5548e7e83a?clone=trevor-test2&desc=trevor-description2"; String updatedPath = new OrganisationIdFilter(orgIdSupplier).injectOrganisationId( - "/2.4/server/0896551e-4fe3-4450-a627-ad5548e7e83a?clone=trevor-test2&desc=trevor-description2"); + "/caas/2.4/server/0896551e-4fe3-4450-a627-ad5548e7e83a?clone=trevor-test2&desc=trevor-description2"); assertEquals(updatedPath, expectedPath); } @Test public void testDontAddIfAlreadyPresent() { - String expectedPath = "/2.4/6ac1e746-b1ea-4da5-a24e-caf1a978789d/server/0896551e-4fe3-4450-a627-ad5548e7e83a"; + String expectedPath = "/caas/2.4/6ac1e746-b1ea-4da5-a24e-caf1a978789d/server/0896551e-4fe3-4450-a627-ad5548e7e83a"; String updatedPath = new OrganisationIdFilter(orgIdSupplier).injectOrganisationId( - "/2.4/6ac1e746-b1ea-4da5-a24e-caf1a978789d/server/0896551e-4fe3-4450-a627-ad5548e7e83a"); + "/caas/2.4/6ac1e746-b1ea-4da5-a24e-caf1a978789d/server/0896551e-4fe3-4450-a627-ad5548e7e83a"); assertEquals(updatedPath, expectedPath); } @Test public void testPathSegmentsLessThan2() { - String expectedPath = "/2.4"; - String updatedPath = new OrganisationIdFilter(orgIdSupplier).injectOrganisationId("/2.4"); + String expectedPath = "/caas/2.4"; + String updatedPath = new OrganisationIdFilter(orgIdSupplier).injectOrganisationId("/caas/2.4"); assertEquals(updatedPath, expectedPath); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseAccountAwareCloudControlMockTest.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseAccountAwareCloudControlMockTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseAccountAwareCloudControlMockTest.java index a1f2887..b15b469 100644 --- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseAccountAwareCloudControlMockTest.java +++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseAccountAwareCloudControlMockTest.java @@ -44,7 +44,7 @@ public class BaseAccountAwareCloudControlMockTest extends BaseDimensionDataCloud @Override protected RecordedRequest assertSent(String method, String path) throws InterruptedException { if (!accountRetrieved) { - super.assertSent(HttpMethod.GET, "/" + VERSION + "/user/myUser"); + super.assertSent(HttpMethod.GET, "/caas/" + VERSION + "/user/myUser"); accountRetrieved = true; } return super.assertSent(method, path); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/de26ec2c/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java index 8c38085..92079a0 100644 --- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java +++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java @@ -75,7 +75,7 @@ public class BaseDimensionDataCloudControlMockTest implements IHookable { server = new MockWebServer(); server.play(); ctx = ContextBuilder.newBuilder(DimensionDataCloudControlProviderMetadata.builder().build()).credentials("", "") - .endpoint(url("")).modules(modules).overrides(overrides()).build(); + .endpoint(url("/caas/")).modules(modules).overrides(overrides()).build(); json = ctx.utils().injector().getInstance(Json.class); api = ctx.getApi(); applyAdditionalServerConfig();
