Adds more information about the neutron extensions. Name can already be used for automatic resolution. Needed because namespace is being deprecated. Alias should also be added at some point.

This commit is contained in:
Zack Shoylev 2016-02-08 14:34:26 -06:00
parent 01ca3425cc
commit 288235f2d5
5 changed files with 13 additions and 8 deletions

View File

@ -62,12 +62,12 @@ public class NeutronHttpApiModule extends HttpApiModule<NeutronApi> {
} }
private void bindAliases() { private void bindAliases() {
MapBinder<URI, URI> aliases = namespaceAliasBinder(binder()); MapBinder<URI, URI> namespaceAliases = namespaceAliasBinder(binder());
aliases.addBinding(URI.create(ExtensionNamespaces.L3_ROUTER)).toInstance( namespaceAliases.addBinding(URI.create(ExtensionNamespaces.L3_ROUTER)).toInstance(
URI.create("http://docs.openstack.org/ext/neutron/router/api/v1.0")); URI.create("http://docs.openstack.org/ext/neutron/router/api/v1.0"));
aliases.addBinding(URI.create(ExtensionNamespaces.SECURITY_GROUPS)).toInstance( namespaceAliases.addBinding(URI.create(ExtensionNamespaces.SECURITY_GROUPS)).toInstance(
URI.create("http://docs.openstack.org/ext/securitygroups/api/v2.0")); URI.create("http://docs.openstack.org/ext/securitygroups/api/v2.0"));
aliases.addBinding(URI.create(ExtensionNamespaces.LBAAS)).toInstance( namespaceAliases.addBinding(URI.create(ExtensionNamespaces.LBAAS)).toInstance(
URI.create("http://docs.openstack.org/networking/ext/lbaas/api/v1.0")); URI.create("http://docs.openstack.org/networking/ext/lbaas/api/v1.0"));
} }

View File

@ -67,12 +67,14 @@ import com.google.common.annotations.Beta;
* *
* @see <a href= * @see <a href=
* "http://specs.openstack.org/openstack/neutron-specs/specs/api/firewall_as_a_service__fwaas_.html">api doc</a> * "http://specs.openstack.org/openstack/neutron-specs/specs/api/firewall_as_a_service__fwaas_.html">api doc</a>
* @see <a href=
* "http://git.openstack.org/cgit/openstack/neutron-fwaas/tree/neutron_fwaas/extensions/firewall.py">extension info</a>
*/ */
@Beta @Beta
@Path("/fw") @Path("/fw")
@RequestFilters(AuthenticateRequest.class) @RequestFilters(AuthenticateRequest.class)
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Extension(of = ServiceType.NETWORK, namespace = ExtensionNamespaces.FWAAS) @Extension(of = ServiceType.NETWORK, namespace = ExtensionNamespaces.FWAAS, name = "Firewall service", alias = "fwaas")
public interface FWaaSApi { public interface FWaaSApi {
/** /**

View File

@ -61,7 +61,7 @@ import com.google.common.annotations.Beta;
@Path("/floatingips") @Path("/floatingips")
@RequestFilters(AuthenticateRequest.class) @RequestFilters(AuthenticateRequest.class)
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Extension(of = ServiceType.NETWORK, namespace = ExtensionNamespaces.L3_ROUTER) @Extension(of = ServiceType.NETWORK, namespace = ExtensionNamespaces.L3_ROUTER, name = "Neutron L3 Router", alias = "router")
public interface FloatingIPApi { public interface FloatingIPApi {
/** /**

View File

@ -61,12 +61,15 @@ import com.google.common.annotations.Beta;
* *
* @see <a href= * @see <a href=
* "http://docs.openstack.org/api/openstack-network/2.0/content/router_ext.html">api doc</a> * "http://docs.openstack.org/api/openstack-network/2.0/content/router_ext.html">api doc</a>
*
* @see <a href=
* "https://github.com/openstack/neutron/tree/master/neutron/extensions">neutron extensions</a>
*/ */
@Beta @Beta
@Path("/routers") @Path("/routers")
@RequestFilters(AuthenticateRequest.class) @RequestFilters(AuthenticateRequest.class)
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Extension(of = ServiceType.NETWORK, namespace = ExtensionNamespaces.L3_ROUTER) @Extension(of = ServiceType.NETWORK, namespace = ExtensionNamespaces.L3_ROUTER, name = "Neutron L3 Router", alias = "router")
public interface RouterApi { public interface RouterApi {
/** /**

View File

@ -64,7 +64,7 @@ import com.google.common.annotations.Beta;
@RequestFilters(AuthenticateRequest.class) @RequestFilters(AuthenticateRequest.class)
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@Extension(of = ServiceType.NETWORK, namespace = ExtensionNamespaces.SECURITY_GROUPS) @Extension(of = ServiceType.NETWORK, namespace = ExtensionNamespaces.SECURITY_GROUPS, name = "security-group", alias = "security-group")
public interface SecurityGroupApi { public interface SecurityGroupApi {
/** /**
* Groups * Groups