From 1bfc8fe81b954be2200735c0349df405fdfd0305 Mon Sep 17 00:00:00 2001 From: andreaturli Date: Tue, 21 Nov 2017 12:34:12 +0100 Subject: [PATCH] remove Neutron direct hard-link from openstack services --- .../jclouds/openstack/glance/v1_0/GlanceApiMetadata.java | 6 ------ .../java/org/jclouds/openstack/heat/v1/HeatApiMetadata.java | 6 ------ .../jclouds/openstack/marconi/v1/MarconiApiMetadata.java | 6 ------ .../jclouds/openstack/neutron/v2/NeutronApiMetadata.java | 6 ------ .../org/jclouds/openstack/poppy/v1/PoppyApiMetadata.java | 6 ------ 5 files changed, 30 deletions(-) diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java index 8a541f1125..cfbe5984c4 100644 --- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java +++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java @@ -24,10 +24,7 @@ import org.jclouds.apis.ApiMetadata; import org.jclouds.openstack.glance.v1_0.config.GlanceHttpApiModule; -import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.rest.internal.BaseHttpApiMetadata; @@ -74,9 +71,6 @@ protected Builder() { .defaultEndpoint("http://localhost:5000/v2.0/") .defaultProperties(GlanceApiMetadata.defaultProperties()) .defaultModules(ImmutableSet.>builder() - .add(AuthenticationApiModule.class) - .add(KeystoneAuthenticationModule.class) - .add(RegionModule.class) .add(GlanceHttpApiModule.class).build()); } diff --git a/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/HeatApiMetadata.java b/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/HeatApiMetadata.java index e31b3edde4..f88712935c 100644 --- a/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/HeatApiMetadata.java +++ b/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/HeatApiMetadata.java @@ -24,10 +24,7 @@ import org.jclouds.apis.ApiMetadata; import org.jclouds.openstack.heat.v1.config.HeatHttpApiModule; -import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; import org.jclouds.rest.internal.BaseHttpApiMetadata; import com.google.auto.service.AutoService; @@ -73,9 +70,6 @@ protected Builder() { .defaultEndpoint("http://localhost:5000/v2.0/") .defaultProperties(HeatApiMetadata.defaultProperties()) .defaultModules(ImmutableSet.>builder() - .add(AuthenticationApiModule.class) - .add(KeystoneAuthenticationModule.class) - .add(RegionModule.class) .add(HeatHttpApiModule.class).build()); } diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApiMetadata.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApiMetadata.java index db4744041a..bb2f207873 100644 --- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApiMetadata.java +++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApiMetadata.java @@ -24,10 +24,7 @@ import org.jclouds.apis.ApiMetadata; import org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule; -import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; import org.jclouds.openstack.marconi.v1.config.MarconiHttpApiModule; import org.jclouds.openstack.marconi.v1.config.MarconiTypeAdapters; import org.jclouds.openstack.v2_0.ServiceType; @@ -77,10 +74,7 @@ protected Builder() { .defaultEndpoint("http://localhost:5000/v2.0/") .defaultProperties(MarconiApiMetadata.defaultProperties()) .defaultModules(ImmutableSet.>builder() - .add(AuthenticationApiModule.class) - .add(KeystoneAuthenticationModule.class) .add(OkHttpCommandExecutorServiceModule.class) - .add(RegionModule.class) .add(MarconiTypeAdapters.class) .add(MarconiHttpApiModule.class).build()); } diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java index fec4e6ac9c..9e1232ba21 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java @@ -23,10 +23,7 @@ import java.util.Properties; import org.jclouds.apis.ApiMetadata; -import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule; import org.jclouds.openstack.neutron.v2.config.NeutronHttpApiModule; import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.rest.internal.BaseHttpApiMetadata; @@ -76,9 +73,6 @@ protected Builder() { .defaultEndpoint("http://localhost:5000/v2.0/") .defaultProperties(NeutronApiMetadata.defaultProperties()) .defaultModules(ImmutableSet.>builder() - .add(AuthenticationApiModule.class) - .add(KeystoneAuthenticationModule.class) - .add(RegionModule.class) .add(NeutronHttpApiModule.class).build()); } diff --git a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/PoppyApiMetadata.java b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/PoppyApiMetadata.java index b5e9a44fa1..f0ff05b658 100644 --- a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/PoppyApiMetadata.java +++ b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/PoppyApiMetadata.java @@ -24,10 +24,7 @@ import org.jclouds.apis.ApiMetadata; import org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule; -import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule; import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ProviderModule; import org.jclouds.openstack.poppy.v1.config.PoppyHttpApiModule; import org.jclouds.rest.internal.BaseHttpApiMetadata; @@ -74,10 +71,7 @@ protected Builder() { .defaultEndpoint("http://localhost:5000/v2.0/") .defaultProperties(PoppyApiMetadata.defaultProperties()) .defaultModules(ImmutableSet.>builder() - .add(AuthenticationApiModule.class) - .add(KeystoneAuthenticationModule.class) .add(OkHttpCommandExecutorServiceModule.class) - .add(ProviderModule.class) .add(PoppyHttpApiModule.class).build()); }