Repository: jclouds Updated Branches: refs/heads/master 9a8b4d074 -> 243afed27
Add alias fallback info to keystone and nova extensions. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/243afed2 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/243afed2 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/243afed2 Branch: refs/heads/master Commit: 243afed278d0b16efc6e2f80be4673bda0884996 Parents: 9a8b4d0 Author: Zack Shoylev <[email protected]> Authored: Fri Feb 19 16:24:29 2016 -0600 Committer: Zack Shoylev <[email protected]> Committed: Wed Feb 24 11:22:10 2016 -0600 ---------------------------------------------------------------------- .../v2_0/extensions/ExtensionAliases.java | 33 ++++++++++++++ .../v2_0/extensions/ExtensionNames.java | 33 ++++++++++++++ .../keystone/v2_0/extensions/RoleAdminApi.java | 3 +- .../v2_0/extensions/ServiceAdminApi.java | 3 +- .../v2_0/extensions/TenantAdminApi.java | 3 +- .../keystone/v2_0/extensions/UserAdminApi.java | 3 +- .../v2_0/extensions/AttachInterfaceApi.java | 3 +- .../v2_0/extensions/AvailabilityZoneApi.java | 3 +- .../nova/v2_0/extensions/ConsolesApi.java | 3 +- .../nova/v2_0/extensions/ExtensionAliases.java | 45 ++++++++++++++++++++ .../nova/v2_0/extensions/ExtensionNames.java | 4 +- .../v2_0/extensions/FlavorExtraSpecsApi.java | 3 +- .../nova/v2_0/extensions/FloatingIPApi.java | 3 +- .../nova/v2_0/extensions/FloatingIPPoolApi.java | 3 +- .../v2_0/extensions/HostAdministrationApi.java | 3 +- .../nova/v2_0/extensions/HostAggregateApi.java | 3 +- .../nova/v2_0/extensions/HypervisorApi.java | 3 +- .../nova/v2_0/extensions/KeyPairApi.java | 3 +- .../nova/v2_0/extensions/QuotaApi.java | 3 +- .../nova/v2_0/extensions/SecurityGroupApi.java | 3 +- .../nova/v2_0/extensions/ServerAdminApi.java | 3 +- .../extensions/ServerWithSecurityGroupsApi.java | 3 +- .../v2_0/extensions/SimpleTenantUsageApi.java | 3 +- .../v2_0/extensions/VirtualInterfaceApi.java | 3 +- .../nova/v2_0/extensions/VolumeApi.java | 3 +- .../v2_0/extensions/VolumeAttachmentApi.java | 3 +- .../nova/v2_0/extensions/VolumeTypeApi.java | 4 +- 27 files changed, 161 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ExtensionAliases.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ExtensionAliases.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ExtensionAliases.java new file mode 100644 index 0000000..cb98515 --- /dev/null +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ExtensionAliases.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jclouds.openstack.keystone.v2_0.extensions; + +/** + * Extension aliases + * + * @see <a href= "http://docs.openstack.org/developer/keystone/extension_development.html"; /> + */ +public final class ExtensionAliases { + /** + * OpenStack Keystone Admin Support + */ + public static final String OS_KSADM = "OS-KSADM"; + + private ExtensionAliases() { + throw new AssertionError("intentionally unimplemented"); + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ExtensionNames.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ExtensionNames.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ExtensionNames.java new file mode 100644 index 0000000..7cd2123 --- /dev/null +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ExtensionNames.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jclouds.openstack.keystone.v2_0.extensions; + +/** + * Extension names + * + * @see <a href= "http://docs.openstack.org/developer/keystone/extension_development.html"; /> + */ +public final class ExtensionNames { + /** + * OpenStack Keystone Admin Support + */ + public static final String OS_KSADM = "OpenStack Keystone Admin"; + + private ExtensionNames() { + throw new AssertionError("intentionally unimplemented"); + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java index f164a4d..2d11b16 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java @@ -48,7 +48,8 @@ import com.google.common.collect.FluentIterable; * */ @Beta -@Extension(of = ServiceType.IDENTITY, namespace = ExtensionNamespaces.OS_KSADM) +@Extension(of = ServiceType.IDENTITY, namespace = ExtensionNamespaces.OS_KSADM, + name = ExtensionNames.OS_KSADM, alias = ExtensionAliases.OS_KSADM) @RequestFilters(AuthenticateRequest.class) @Path("OS-KSADM/roles") public interface RoleAdminApi { http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApi.java index 6de37c8..8c9b8cf 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/ServiceAdminApi.java @@ -54,7 +54,8 @@ import com.google.common.annotations.Beta; */ @Beta @Consumes(MediaType.APPLICATION_JSON) -@Extension(of = ServiceType.IDENTITY, namespace = ExtensionNamespaces.OS_KSADM) +@Extension(of = ServiceType.IDENTITY, namespace = ExtensionNamespaces.OS_KSADM, + name = ExtensionNames.OS_KSADM, alias = ExtensionAliases.OS_KSADM) @RequestFilters(AuthenticateRequest.class) @Path("OS-KSADM/services") public interface ServiceAdminApi { http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApi.java index 82c0591..93489b3 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/TenantAdminApi.java @@ -47,7 +47,8 @@ import com.google.common.annotations.Beta; */ @Beta @Consumes(MediaType.APPLICATION_JSON) -@Extension(of = ServiceType.IDENTITY, namespace = ExtensionNamespaces.OS_KSADM) +@Extension(of = ServiceType.IDENTITY, namespace = ExtensionNamespaces.OS_KSADM, + name = ExtensionNames.OS_KSADM, alias = ExtensionAliases.OS_KSADM) @RequestFilters(AuthenticateRequest.class) @Path("/tenants") public interface TenantAdminApi { http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApi.java index 0255505..952b4a1 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApi.java @@ -46,7 +46,8 @@ import com.google.common.annotations.Beta; */ @Beta @Consumes(MediaType.APPLICATION_JSON) -@Extension(of = ServiceType.IDENTITY, namespace = ExtensionNamespaces.OS_KSADM) +@Extension(of = ServiceType.IDENTITY, namespace = ExtensionNamespaces.OS_KSADM, + name = ExtensionNames.OS_KSADM, alias = ExtensionAliases.OS_KSADM) @RequestFilters(AuthenticateRequest.class) @Path("/users") public interface UserAdminApi { http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AttachInterfaceApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AttachInterfaceApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AttachInterfaceApi.java index 1604581..65bd198 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AttachInterfaceApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AttachInterfaceApi.java @@ -46,7 +46,8 @@ import com.google.common.collect.FluentIterable; * Provides access to the OpenStack Compute (Nova) Attach Interfaces API. */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.ATTACH_INTERFACES, name = ExtensionNames.ATTACH_INTERFACES) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.ATTACH_INTERFACES, + name = ExtensionNames.ATTACH_INTERFACES, alias = ExtensionAliases.ATTACH_INTERFACES) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) @Path("/servers") http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApi.java index f2b6478..9aa9b21 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApi.java @@ -39,7 +39,8 @@ import com.google.common.collect.FluentIterable; * Provides access to the OpenStack Compute (Nova) Availability Zone Extension API. */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.AVAILABILITY_ZONE, name = ExtensionNames.AVAILABILITY_ZONE) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.AVAILABILITY_ZONE, + name = ExtensionNames.AVAILABILITY_ZONE, alias = ExtensionAliases.AVAILABILITY_ZONE) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) @Path("/os-availability-zone") http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApi.java index ab54c31..7aa1f60 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApi.java @@ -44,7 +44,8 @@ import com.google.common.annotations.Beta; * */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.CONSOLES, name = ExtensionNames.CONSOLES) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.CONSOLES, + name = ExtensionNames.CONSOLES, alias = ExtensionAliases.CONSOLES) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) public interface ConsolesApi { http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionAliases.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionAliases.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionAliases.java new file mode 100644 index 0000000..4b9cfd2 --- /dev/null +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionAliases.java @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jclouds.openstack.nova.v2_0.extensions; + +/** + * OpenStack Nova Extension Aliases + */ +public final class ExtensionAliases { + public static final String FLOATING_IPS = "os-floating-ips"; + public static final String ATTACH_INTERFACES = "os-attach-interfaces"; + public static final String AVAILABILITY_ZONE = "os-availability-zone"; + public static final String CONSOLES = "os-consoles"; + public static final String CREATESERVEREXT = "os-create-server-ext"; + public static final String FLAVOR_EXTRA_SPECS = "os-flavor-extra-specs"; + public static final String HOST_ADMINISTRATION = "os-hosts"; + public static final String HOST_AGGREGATE = "os-aggregates"; + public static final String HYPERVISORS = "os-hypervisors"; + public static final String KEYPAIRS = "os-keypairs"; + public static final String QUOTAS = "os-quota-sets"; + public static final String SECURITY_GROUPS = "os-security-groups"; + public static final String SERVER_ADMIN = "os-admin-actions"; + public static final String VIRTUAL_INTERFACES = "os-virtual-interfaces"; + public static final String SIMPLE_TENANT_USAGE = "os-simple-tenant-usage"; + public static final String VOLUME_ATTACHMENT = "os-volumes"; + public static final String FLOATING_IP_POOLS = "os-floating-ip-pools"; + public static final String VOLUMES = "os-volumes"; + + private ExtensionAliases() { + throw new AssertionError("intentionally unimplemented"); + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNames.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNames.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNames.java index f7e4227..8058dbb 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNames.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNames.java @@ -17,13 +17,14 @@ package org.jclouds.openstack.nova.v2_0.extensions; /** - * OpenStack Nova Extension Namespaces + * OpenStack Nova Extension Names */ public final class ExtensionNames { public static final String FLOATING_IPS = "FloatingIps"; public static final String ATTACH_INTERFACES = "AttachInterfaces"; public static final String AVAILABILITY_ZONE = "AvailabilityZone"; public static final String CONSOLES = "Consoles"; + public static final String CREATESERVEREXT = "Createserverext"; public static final String FLAVOR_EXTRA_SPECS = "FlavorExtraSpecs"; public static final String HOST_ADMINISTRATION = "Hosts"; public static final String HOST_AGGREGATE = "Aggregates"; @@ -36,6 +37,7 @@ public final class ExtensionNames { public static final String SIMPLE_TENANT_USAGE = "SimpleTenantUsage"; public static final String VOLUME_ATTACHMENT = "VolumeAttachmentUpdate"; public static final String FLOATING_IP_POOLS = "FloatingIpPools"; + public static final String VOLUMES = "Volumes"; private ExtensionNames() { throw new AssertionError("intentionally unimplemented"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java index 02ab260..0db8cee 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java @@ -53,7 +53,8 @@ import com.google.common.annotations.Beta; * @see org.jclouds.openstack.nova.v2_0.features.FlavorApi */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLAVOR_EXTRA_SPECS, name = ExtensionNames.FLAVOR_EXTRA_SPECS) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLAVOR_EXTRA_SPECS, + name = ExtensionNames.FLAVOR_EXTRA_SPECS, alias = ExtensionAliases.FLAVOR_EXTRA_SPECS) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) @Path("/flavors") http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java index c37aa90..626ee2d 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java @@ -46,7 +46,8 @@ import com.google.common.collect.FluentIterable; * Provides access to the OpenStack Compute (Nova) Floating IP extension API. */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLOATING_IPS, name = ExtensionNames.FLOATING_IPS) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLOATING_IPS, + name = ExtensionNames.FLOATING_IPS, alias = ExtensionAliases.FLOATING_IPS) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) public interface FloatingIPApi { http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApi.java index c4eaf4a..ead37ab 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApi.java @@ -34,7 +34,8 @@ import com.google.common.annotations.Beta; import com.google.common.collect.FluentIterable; @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLOATING_IP_POOLS, name = ExtensionNames.FLOATING_IP_POOLS) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLOATING_IP_POOLS, + name = ExtensionNames.FLOATING_IP_POOLS, alias = ExtensionAliases.FLOATING_IP_POOLS) @Consumes(MediaType.APPLICATION_JSON) @Path("/os-floating-ip-pools") @RequestFilters(AuthenticateRequest.class) http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java index bc1abd2..8a07d3f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java @@ -51,7 +51,8 @@ import com.google.common.collect.FluentIterable; * Provides access to OpenStack Compute (Nova) Host Administration extension API. */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.HOSTS, name = ExtensionNames.HOST_ADMINISTRATION) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.HOSTS, + name = ExtensionNames.HOST_ADMINISTRATION, alias = ExtensionAliases.HOST_ADMINISTRATION) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) @Path("/os-hosts") http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java index 9e2cc79..889bb4f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java @@ -49,7 +49,8 @@ import com.google.common.collect.FluentIterable; * Provide access to the OpenStack Compute (Nova) Host Aggregates extension API. */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.AGGREGATES, name = ExtensionNames.HOST_AGGREGATE) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.AGGREGATES, + name = ExtensionNames.HOST_AGGREGATE, alias = ExtensionAliases.HOST_AGGREGATE) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) @Path("/os-aggregates") http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApi.java index a882f7e..8da914c 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApi.java @@ -39,7 +39,8 @@ import com.google.common.collect.FluentIterable; * Provides access to the OpenStack Compute (Nova) Hypervisor Extension API. */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.HYPERVISORS, name = ExtensionNames.HYPERVISORS) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.HYPERVISORS, + name = ExtensionNames.HYPERVISORS, alias = ExtensionAliases.HYPERVISORS) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) @Path("/os-hypervisors") http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java index d806545..d9f87d3 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java @@ -51,7 +51,8 @@ import com.google.common.collect.FluentIterable; * Provides access to the OpenStack Compute (Nova) Key Pair Extension API. */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.KEYPAIRS, name = ExtensionNames.KEYPAIRS) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.KEYPAIRS, + name = ExtensionNames.KEYPAIRS, alias = ExtensionAliases.KEYPAIRS) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) @Path("/os-keypairs") http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java index a8e2027..5790620 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java @@ -51,7 +51,8 @@ import com.google.common.annotations.Beta; * */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.QUOTAS, name = ExtensionNames.QUOTAS) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.QUOTAS, + name = ExtensionNames.QUOTAS, alias = ExtensionAliases.QUOTAS) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) @Path("/os-quota-sets") http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java index 6435b1d..7e2b503 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java @@ -51,7 +51,8 @@ import com.google.common.collect.FluentIterable; * Provides access to the OpenStack Compute (Nova) Security Group extension API. */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.SECURITY_GROUPS, name = ExtensionNames.SECURITY_GROUPS) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.SECURITY_GROUPS, + name = ExtensionNames.SECURITY_GROUPS, alias = ExtensionAliases.SECURITY_GROUPS) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) public interface SecurityGroupApi { http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java index 3e7167d..e054bd9 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java @@ -49,7 +49,8 @@ import com.google.common.annotations.Beta; * */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.ADMIN_ACTIONS, name = ExtensionNames.SERVER_ADMIN) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.ADMIN_ACTIONS, + name = ExtensionNames.SERVER_ADMIN, alias = ExtensionAliases.SERVER_ADMIN) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) @Path("/servers/{id}/action") http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java index 02bebd5..3d1ecba 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java @@ -47,7 +47,8 @@ import com.google.common.annotations.Beta; * @see org.jclouds.openstack.nova.v2_0.features.ServerApi */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.CREATESERVEREXT) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.CREATESERVEREXT, + name = ExtensionNames.CREATESERVEREXT, alias = ExtensionAliases.CREATESERVEREXT) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) @Path("/os-create-server-ext") http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java index 6e74d17..269059b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java @@ -41,7 +41,8 @@ import com.google.common.collect.FluentIterable; * Provides access to the OpenStack Compute (Nova) Simple Tenant Usage extension API. */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.SIMPLE_TENANT_USAGE, name = ExtensionNames.SIMPLE_TENANT_USAGE) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.SIMPLE_TENANT_USAGE, + name = ExtensionNames.SIMPLE_TENANT_USAGE, alias = ExtensionAliases.SIMPLE_TENANT_USAGE) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) @Path("/os-simple-tenant-usage") http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java index 8f6f147..eff19a0 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java @@ -39,7 +39,8 @@ import com.google.common.collect.FluentIterable; * Provides access to the OpenStack Compute (Nova) Virtual Interface (VIFs) extension API. */ @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.VIRTUAL_INTERFACES, name = ExtensionNames.VIRTUAL_INTERFACES) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.VIRTUAL_INTERFACES, + name = ExtensionNames.VIRTUAL_INTERFACES, alias = ExtensionAliases.VIRTUAL_INTERFACES) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) @Path("/servers") http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java index 1a0b17f..eeaa992 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java @@ -54,7 +54,8 @@ import com.google.common.collect.FluentIterable; */ @Deprecated @Beta -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.VOLUMES) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.VOLUMES, + name = ExtensionNames.VOLUMES, alias = ExtensionAliases.VOLUMES) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) public interface VolumeApi { http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java index 7fbe8ae..4445b3e 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java @@ -48,7 +48,8 @@ import com.google.common.collect.FluentIterable; * This API strictly handles attaching Volumes to Servers. To create and manage Volumes you need to use the Cinder API. * @see org.jclouds.openstack.cinder.v1.features.VolumeApi */ -@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.VOLUME_ATTACHMENTS, name = ExtensionNames.VOLUME_ATTACHMENT) +@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.VOLUME_ATTACHMENTS, + name = ExtensionNames.VOLUME_ATTACHMENT, alias = ExtensionAliases.VOLUME_ATTACHMENT) @RequestFilters(AuthenticateRequest.class) @Consumes(MediaType.APPLICATION_JSON) @Path("/servers") http://git-wip-us.apache.org/repos/asf/jclouds/blob/243afed2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java index 01ae826..1204066 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java @@ -54,7 +54,9 @@ import com.google.common.collect.FluentIterable; /** * Provides access to the OpenStack Compute (Nova) Volume Type extension API. - * + * This extension is no longer supported in OpenStack Liberty. + * You can use the Block Storage API and endpoint to list volume types, + * see <a href="http://developer.openstack.org/api-ref-blockstorage-v2.html#volumes-v2-types";>volume types v2</a>. * @see VolumeApi */ @Beta
