Repository: jclouds-labs-openstack Updated Branches: refs/heads/master 484cd264e -> 80a5aaf00
JCLOUDS-560: Removed references to an extension API in Glance. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/80a5aaf0 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/80a5aaf0 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/80a5aaf0 Branch: refs/heads/master Commit: 80a5aaf006b54542221bc7a1f147230c930679d6 Parents: 484cd26 Author: Jeremy Daggett <[email protected]> Authored: Tue Jul 1 09:39:51 2014 -0700 Committer: Jeremy Daggett <[email protected]> Committed: Thu Jul 10 10:10:44 2014 -0700 ---------------------------------------------------------------------- .../openstack/glance/v1_0/GlanceApi.java | 18 +++------- .../glance/v1_0/config/GlanceHttpApiModule.java | 37 -------------------- .../v1_0/internal/BaseGlanceExpectTest.java | 4 +-- 3 files changed, 6 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/80a5aaf0/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java ---------------------------------------------------------------------- diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java index 2f8ba61..c2d43e0 100644 --- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java +++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java @@ -23,35 +23,27 @@ import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Zone; import org.jclouds.openstack.glance.functions.ZoneToEndpointNegotiateVersion; import org.jclouds.openstack.glance.v1_0.features.ImageApi; -import org.jclouds.openstack.v2_0.features.ExtensionApi; import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.EndpointParam; import com.google.inject.Provides; /** - * Provides access to Glance. + * Provides access to the OpenStack Image (Glance) v1 API. * <p/> - * - * @see <a href="http://glance.openstack.org/glanceapi.html";>api doc</a> + * */ public interface GlanceApi extends Closeable { /** - * - * @return the Zone codes configured + * Gets the configured zones. + * + * @return the zone codes currently configured */ @Provides @Zone Set<String> getConfiguredZones(); /** - * Provides access to Extension features. - */ - @Delegate - ExtensionApi getExtensionApiForZone( - @EndpointParam(parser = ZoneToEndpointNegotiateVersion.class) @Nullable String zone); - - /** * Provides access to Image features. */ @Delegate http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/80a5aaf0/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceHttpApiModule.java ---------------------------------------------------------------------- diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceHttpApiModule.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceHttpApiModule.java index 62553fe..f2da6e0 100644 --- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceHttpApiModule.java +++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceHttpApiModule.java @@ -17,13 +17,6 @@ package org.jclouds.openstack.glance.v1_0.config; -import java.net.URI; -import java.util.Set; -import java.util.concurrent.TimeUnit; - -import javax.inject.Provider; -import javax.inject.Singleton; - import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.annotation.ClientError; import org.jclouds.http.annotation.Redirection; @@ -32,18 +25,8 @@ import org.jclouds.json.config.GsonModule.DateAdapter; import org.jclouds.json.config.GsonModule.Iso8601DateAdapter; import org.jclouds.openstack.glance.v1_0.GlanceApi; import org.jclouds.openstack.glance.v1_0.handlers.GlanceErrorHandler; -import org.jclouds.openstack.v2_0.domain.Extension; -import org.jclouds.openstack.v2_0.functions.PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet; import org.jclouds.rest.ConfiguresHttpApi; import org.jclouds.rest.config.HttpApiModule; -import org.jclouds.rest.functions.ImplicitOptionalConverter; - -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.Multimap; -import com.google.inject.Provides; /** * Configures the Glance connection. @@ -57,29 +40,9 @@ public class GlanceHttpApiModule extends HttpApiModule<GlanceApi> { @Override protected void configure() { bind(DateAdapter.class).to(Iso8601DateAdapter.class); - bind(ImplicitOptionalConverter.class).to(PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet.class); super.configure(); } - - @Provides - @Singleton - public Multimap<URI, URI> aliases() { - return ImmutableMultimap.<URI, URI>builder() - .build(); - } - @Provides - @Singleton - public LoadingCache<String, Set<? extends Extension>> provideExtensionsByZone(final Provider<GlanceApi> glanceApi) { - return CacheBuilder.newBuilder().expireAfterWrite(23, TimeUnit.HOURS) - .build(new CacheLoader<String, Set<? extends Extension>>() { - @Override - public Set<? extends Extension> load(String key) throws Exception { - return glanceApi.get().getExtensionApiForZone(key).list(); - } - }); - } - @Override protected void bindErrorHandlers() { bind(HttpErrorHandler.class).annotatedWith(Redirection.class).to(GlanceErrorHandler.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/80a5aaf0/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java ---------------------------------------------------------------------- diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java index 6b2b680..c4e6d26 100644 --- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java +++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java @@ -32,8 +32,6 @@ public class BaseGlanceExpectTest<T> extends BaseRestApiExpectTest<T> { protected HttpResponse responseWithKeystoneAccess; protected HttpRequest versionNegotiationRequest; protected HttpResponse versionNegotiationResponse; - protected HttpRequest extensionsOfGlanceRequest; - protected HttpResponse extensionsOfGlanceResponse; protected HttpResponse unmatchedExtensionsOfGlanceResponse; public BaseGlanceExpectTest() { @@ -42,7 +40,7 @@ public class BaseGlanceExpectTest<T> extends BaseRestApiExpectTest<T> { credential); keystoneAuthWithAccessKeyAndSecretKey = KeystoneFixture.INSTANCE.initialAuthWithAccessKeyAndSecretKeyAndTenantName(identity, credential); - + authToken = KeystoneFixture.INSTANCE.getAuthToken(); responseWithKeystoneAccess = KeystoneFixture.INSTANCE.responseWithAccess(); // now, createContext arg will need tenant prefix
