You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2015/04/07 23:33:08 UTC

[10/32] jclouds git commit: JCLOUDS-545: Use established conventions for OpenStack APIs, updates JavaDocs and tests

JCLOUDS-545: Use established conventions for OpenStack APIs, updates JavaDocs and tests


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/010400c1
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/010400c1
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/010400c1

Branch: refs/heads/master
Commit: 010400c143b5dc2947871905924b5b5fe28cd0ae
Parents: 5677b0b
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Wed Apr 23 12:39:14 2014 -0700
Committer: Jeremy Daggett <je...@rackspace.com>
Committed: Thu May 22 07:56:37 2014 -0700

----------------------------------------------------------------------
 .../rackspace/cloudfiles/v1/CloudFilesApi.java  |  4 +--
 .../cloudfiles/v1/features/CDNApi.java          | 15 ++++----
 .../features/CloudFilesAccountApiLiveTest.java  |  4 ++-
 .../v1/features/CloudFilesCDNApiLiveTest.java   | 38 ++++++++++----------
 .../v1/features/CloudFilesCDNApiMockTest.java   | 38 ++++++++++----------
 5 files changed, 49 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/010400c1/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java
index 9a7dbeb..0d33913 100644
--- a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java
+++ b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java
@@ -33,8 +33,6 @@ import com.google.common.annotations.Beta;
  * Additionally, Cloud Files provides a simple yet powerful way to publish and distribute content
  * behind a Content Distribution Network.
  * 
- * @author Jeremy Daggett
- * 
  * @see CDNApi
  * @see SwiftApi
  */
@@ -49,5 +47,5 @@ public interface CloudFilesApi extends SwiftApi {
     * @return the {@link CDNApi} for the specified region.
     */
    @Delegate
-   CDNApi cdnApiInRegion(@EndpointParam(parser = RegionToCDNEndpoint.class) @Nullable String region);
+   CDNApi getCDNApiForRegion(@EndpointParam(parser = RegionToCDNEndpoint.class) @Nullable String region);
 }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/010400c1/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java
index 5161fee..306c66d 100644
--- a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java
+++ b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java
@@ -40,6 +40,7 @@ import org.jclouds.Fallbacks.NullOnNotFoundOr404;
 import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
 import org.jclouds.openstack.swift.v1.options.ListContainerOptions;
+import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi;
 import org.jclouds.rackspace.cloudfiles.v1.binders.BindCDNPurgeEmailAddressesToHeaders;
 import org.jclouds.rackspace.cloudfiles.v1.domain.CDNContainer;
 import org.jclouds.rackspace.cloudfiles.v1.functions.ParseCDNContainerFromHeaders;
@@ -64,9 +65,7 @@ import com.google.common.collect.FluentIterable;
  * noted in the service catalog for Cloud Files during Authentication and set the 
  * <code>X-CDN-Enabled</code> header to <code>true</code>.
  * 
- * @author Jeremy Daggett
- * 
- * @see {@link CloudFilesApi#cdnApiInRegion(String)}
+ * @see {@link CloudFilesApi#getCDNApiForRegion(String)}
  */
 @Beta
 @RequestFilters(AuthenticateRequest.class)
@@ -84,7 +83,7 @@ public interface CDNApi extends Closeable {
    @Fallback(EmptyFluentIterableOnNotFoundOr404.class)
    @Path("/")
    FluentIterable<CDNContainer> list();
-   
+
    /**
     * Lists CDN containers, with the given options.
     * 
@@ -137,7 +136,7 @@ public interface CDNApi extends Closeable {
     * Enables the {@link CDNContainer} with a TTL.
     * 
     * @param containerName
-    *           corresponds to {@link CDNContainer#name()}.
+    *           corresponds to {@link CDNContainer#getName()}.
     * @param ttl
     *           the TTL for the CDN Container.
     *           
@@ -157,7 +156,7 @@ public interface CDNApi extends Closeable {
     * Disables the {@link CDNContainer}.
     * 
     * @param containerName
-    *           corresponds to {@link CDNContainer#name()}.
+    *           corresponds to {@link CDNContainer#getName()}.
     *           
     * @return {@code true} if the container was disabled, {@code false} if not.
     */
@@ -172,7 +171,7 @@ public interface CDNApi extends Closeable {
     * Purges an object from the CDN.
     * 
     * @param containerName
-    *           corresponds to {@link CDNContainer#name()}.
+    *           corresponds to {@link CDNContainer#getName()}.
     * @param objectName
     *           the object in the {@link CDNContainer} to purge.
     * @param emails
@@ -193,7 +192,7 @@ public interface CDNApi extends Closeable {
     * Updates a CDN container with the supplied {@link UpdateCDNContainerOptions} options.
     * 
     * @param containerName
-    *           corresponds to {@link CDNContainer#name()}.
+    *           corresponds to {@link CDNContainer#getName()}.
     *           
     * @param options
     *           the {@link UpdateCDNContainerOptions} options.

http://git-wip-us.apache.org/repos/asf/jclouds/blob/010400c1/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java b/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java
index 6c2e4a2..f1431d9 100644
--- a/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java
+++ b/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java
@@ -19,7 +19,9 @@ package org.jclouds.rackspace.cloudfiles.v1.features;
 import static org.testng.Assert.assertTrue;
 
 import org.jclouds.openstack.swift.v1.domain.Account;
+import org.jclouds.openstack.swift.v1.features.AccountApi;
 import org.jclouds.openstack.swift.v1.features.AccountApiLiveTest;
+import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi;
 import org.testng.annotations.Test;
 
 /**
@@ -37,7 +39,7 @@ public class CloudFilesAccountApiLiveTest extends AccountApiLiveTest {
 
    public void testUrlKeyExists() throws Exception {
       for (String regionId : regions) {
-         Account account = api.accountApiInRegion(regionId).get();
+         Account account = api.getAccountApiForRegion(regionId).get();
          assertTrue(account.getTemporaryUrlKey().isPresent());
       }
    }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/010400c1/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java b/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java
index 5c073fb..785ae61 100644
--- a/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java
+++ b/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java
@@ -58,9 +58,9 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest {
 
    public void testEnable() throws Exception {
       for (String regionId : regions) {
-         assertNotNull(api.cdnApiInRegion(regionId).enable(name));
+         assertNotNull(api.getCDNApiForRegion(regionId).enable(name));
          
-         CDNContainer container = api.cdnApiInRegion(regionId).get(name);
+         CDNContainer container = api.getCDNApiForRegion(regionId).get(name);
          assertCDNContainerNotNull(container);
          assertTrue(container.isEnabled());
       }
@@ -68,9 +68,9 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest {
 
    public void testEnableWithTTL() throws Exception {
       for (String regionId : regions) {
-         assertNotNull(api.cdnApiInRegion(regionId).enable(name, 777777));
+         assertNotNull(api.getCDNApiForRegion(regionId).enable(name, 777777));
 
-         CDNContainer container = api.cdnApiInRegion(regionId).get(name);
+         CDNContainer container = api.getCDNApiForRegion(regionId).get(name);
          assertCDNContainerNotNull(container);
          assertTrue(container.isEnabled());
          assertTrue(container.getTtl() == 777777);
@@ -79,16 +79,16 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest {
 
    public void testDisable() throws Exception {
       for (String regionId : regions) {
-         assertTrue(api.cdnApiInRegion(regionId).disable(name));
+         assertTrue(api.getCDNApiForRegion(regionId).disable(name));
 
-         CDNContainer container = api.cdnApiInRegion(regionId).get(name);
+         CDNContainer container = api.getCDNApiForRegion(regionId).get(name);
          assertFalse(container.isEnabled());
       }
    }
 
    public void testList() throws Exception {
       for (String regionId : regions) {
-         List<CDNContainer> cdnResponse = api.cdnApiInRegion(regionId).list().toList();
+         List<CDNContainer> cdnResponse = api.getCDNApiForRegion(regionId).list().toList();
          assertNotNull(cdnResponse);
          
          for (CDNContainer cdnContainer : cdnResponse) {
@@ -103,7 +103,7 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest {
       for (String regionId : regions) {
          ListContainerOptions options = ListContainerOptions.Builder.marker(lexicographicallyBeforeName);
           
-         CDNContainer cdnContainer = api.cdnApiInRegion(regionId).list(options).get(0);
+         CDNContainer cdnContainer = api.getCDNApiForRegion(regionId).list(options).get(0);
          assertCDNContainerNotNull(cdnContainer);
          assertTrue(cdnContainer.isEnabled());
       }
@@ -111,7 +111,7 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest {
 
    public void testGet() throws Exception {
       for (String regionId : regions) {
-         CDNContainer container = api.cdnApiInRegion(regionId).get(name);
+         CDNContainer container = api.getCDNApiForRegion(regionId).get(name);
          assertCDNContainerNotNull(container);
          assertTrue(container.isEnabled());
       }
@@ -121,12 +121,12 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest {
       for (String regionId : regions) {
          String objectName = "testPurge";
          Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(new byte[] {1, 2, 3}));
-         ObjectApi objectApi = api.objectApiInRegionForContainer(regionId, name);
+         ObjectApi objectApi = api.getObjectApiForRegionAndContainer(regionId, name);
          
          // create a new object
-         objectApi.replace(objectName, payload, ImmutableMap.<String, String>of());
+         objectApi.put(objectName, payload);
          
-         CDNApi cdnApi = api.cdnApiInRegion(regionId);
+         CDNApi cdnApi = api.getCDNApiForRegion(regionId);
          assertTrue(cdnApi.purgeObject(name, "testPurge", ImmutableList.<String>of()));
          
          // delete the object
@@ -138,10 +138,10 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest {
    public void testUpdate() throws Exception {
       for (String regionId : regions) {
          // enable with a ttl
-         assertNotNull(api.cdnApiInRegion(regionId).enable(name, 777777));
+         assertNotNull(api.getCDNApiForRegion(regionId).enable(name, 777777));
          
          // now get the container
-         CDNContainer original = api.cdnApiInRegion(regionId).get(name);
+         CDNContainer original = api.getCDNApiForRegion(regionId).get(name);
          assertTrue(original.isEnabled());
          assertCDNContainerNotNull(original);
 
@@ -151,10 +151,10 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest {
                                                 .logRetention(true)
                                                 .enabled(false);
          // update the container
-         assertTrue(api.cdnApiInRegion(regionId).update(name, opts));
+         assertTrue(api.getCDNApiForRegion(regionId).update(name, opts));
          
          // now get the updated container
-         CDNContainer updated = api.cdnApiInRegion(regionId).get(name);
+         CDNContainer updated = api.getCDNApiForRegion(regionId).get(name);
          assertFalse(updated.isEnabled());
          assertCDNContainerNotNull(updated);
          
@@ -178,7 +178,7 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest {
    public void setup() {
       super.setup();
       for (String regionId : regions) {
-         api.containerApiInRegion(regionId).createIfAbsent(name, CreateContainerOptions.NONE);
+         api.getContainerApiForRegion(regionId).create(name);
       }
    }
 
@@ -186,8 +186,8 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest {
    @AfterClass(groups = "live")
    public void tearDown() {
       for (String regionId : regions) {
-         api.cdnApiInRegion(regionId).disable(name);
-         api.containerApiInRegion(regionId).deleteIfEmpty(name);
+         api.getCDNApiForRegion(regionId).disable(name);
+         api.getContainerApiForRegion(regionId).deleteIfEmpty(name);
       }
       super.tearDown();
    }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/010400c1/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java b/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
index 8a98dee..3e07de5 100644
--- a/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
+++ b/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
@@ -63,7 +63,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
 
       try {
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
-         CDNApi cdnApi = api.cdnApiInRegion("DFW");
+         CDNApi cdnApi = api.getCDNApiForRegion("DFW");
 
          ImmutableList<CDNContainer> cdnContainers = cdnApi.list().toList();
 
@@ -84,7 +84,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
 
       try {
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
-         CDNApi cdnApi = api.cdnApiInRegion("DFW");
+         CDNApi cdnApi = api.getCDNApiForRegion("DFW");
 
          List<CDNContainer> cdnContainers = cdnApi.list().toList();
 
@@ -106,7 +106,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
       try {
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
          ListContainerOptions options = ListContainerOptions.Builder.marker("cdn-container-3");
-         ImmutableList<CDNContainer> containers = api.cdnApiInRegion("DFW").list(options).toList();
+         ImmutableList<CDNContainer> containers = api.getCDNApiForRegion("DFW").list(options).toList();
 
          for (CDNContainer container : containers) {
             assertCDNContainerNotNull(container);
@@ -130,7 +130,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
       try {
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
          ListContainerOptions options = ListContainerOptions.Builder.marker("cdn-container-3");
-         FluentIterable<CDNContainer> containers = api.cdnApiInRegion("DFW").list(options);
+         FluentIterable<CDNContainer> containers = api.getCDNApiForRegion("DFW").list(options);
 
          assertEquals(server.getRequestCount(), 2);
          assertAuthentication(server);
@@ -152,7 +152,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
 
          // enable a CDN Container
-         URI enabledContainer = api.cdnApiInRegion("DFW").enable("container-1");
+         URI enabledContainer = api.getCDNApiForRegion("DFW").enable("container-1");
          assertNotNull(enabledContainer);
 
          assertEquals(server.getRequestCount(), 2);
@@ -171,7 +171,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
       try {
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
          // enable a CDN Container
-         assertNull(api.cdnApiInRegion("DFW").enable("container-1"));
+         assertNull(api.getCDNApiForRegion("DFW").enable("container-1"));
 
          assertEquals(server.getRequestCount(), 2);
          assertAuthentication(server);
@@ -190,7 +190,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
 
          // enable a CDN Container with a TTL
-         URI enabledContainer = api.cdnApiInRegion("DFW").enable("container-1", 777777);
+         URI enabledContainer = api.getCDNApiForRegion("DFW").enable("container-1", 777777);
          assertNotNull(enabledContainer);
 
          assertEquals(server.getRequestCount(), 2);
@@ -210,7 +210,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
 
          // enable a CDN Container with a TTL
-         URI enabledContainer = api.cdnApiInRegion("DFW").enable("container-1", 777777);
+         URI enabledContainer = api.getCDNApiForRegion("DFW").enable("container-1", 777777);
          assertNull(enabledContainer);
 
          assertEquals(server.getRequestCount(), 2);
@@ -230,7 +230,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
 
          // disable a CDN Container
-         assertTrue(api.cdnApiInRegion("DFW").disable("container-1"));
+         assertTrue(api.getCDNApiForRegion("DFW").disable("container-1"));
 
          assertEquals(server.getRequestCount(), 2);
          assertAuthentication(server);
@@ -249,7 +249,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
 
          // disable a CDN Container
-         boolean disbledContainer = api.cdnApiInRegion("DFW").disable("container-1");
+         boolean disbledContainer = api.getCDNApiForRegion("DFW").disable("container-1");
          assertFalse(disbledContainer);
 
          assertEquals(server.getRequestCount(), 2);
@@ -268,7 +268,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
       try {
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
 
-         CDNContainer cdnContainer = api.cdnApiInRegion("DFW").get("container-1");
+         CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("container-1");
          assertCDNContainerNotNull(cdnContainer);
          assertEquals(mockCDNContainer, cdnContainer);
 
@@ -288,7 +288,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
       try {
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
 
-         CDNContainer cdnContainer = api.cdnApiInRegion("DFW").get("container-1");
+         CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("container-1");
 
          assertAuthentication(server);
          assertRequest(server.takeRequest(), "HEAD", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/container-1");
@@ -307,7 +307,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
 
          // purge the object
-         assertTrue(api.cdnApiInRegion("DFW").purgeObject("myContainer", "myObject", emails));
+         assertTrue(api.getCDNApiForRegion("DFW").purgeObject("myContainer", "myObject", emails));
 
          assertEquals(server.getRequestCount(), 2);
          assertAuthentication(server);
@@ -326,7 +326,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
 
          // purge the object
-         assertFalse(api.cdnApiInRegion("DFW").purgeObject("myContainer", "myObject", emails));
+         assertFalse(api.getCDNApiForRegion("DFW").purgeObject("myContainer", "myObject", emails));
 
          assertEquals(server.getRequestCount(), 2);
          assertAuthentication(server);
@@ -346,13 +346,13 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
       try {
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
 
-         CDNContainer cdnContainer = api.cdnApiInRegion("DFW").get("container-1");
+         CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("container-1");
          assertCDNContainerNotNull(cdnContainer);
 
          // update the CDN Container
-         assertTrue(api.cdnApiInRegion("DFW").update("container-1", enabled(false).logRetention(true).ttl(7654321)));
+         assertTrue(api.getCDNApiForRegion("DFW").update("container-1", enabled(false).logRetention(true).ttl(7654321)));
 
-         cdnContainer = api.cdnApiInRegion("DFW").get("container-1");
+         cdnContainer = api.getCDNApiForRegion("DFW").get("container-1");
          assertCDNContainerNotNull(cdnContainer);
 
          CDNContainer updatedContainer = CDNContainer.builder()
@@ -387,11 +387,11 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
       try {
          CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
 
-         CDNContainer cdnContainer = api.cdnApiInRegion("DFW").get("container-1");
+         CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("container-1");
          assertCDNContainerNotNull(cdnContainer);
 
          // update the CDN Container
-         assertFalse(api.cdnApiInRegion("DFW").update("container-1", enabled(false).logRetention(true).ttl(7654321)));
+         assertFalse(api.getCDNApiForRegion("DFW").update("container-1", enabled(false).logRetention(true).ttl(7654321)));
 
          assertEquals(server.getRequestCount(), 3);
          assertAuthentication(server);