From a45d079b8cf52abc94b8aa7bcd065ecb7d7fd240 Mon Sep 17 00:00:00 2001 From: Adam Lowe Date: Tue, 8 May 2012 19:07:44 +0100 Subject: [PATCH] openstack-nova: adding EXTENDED_STATUS to ExtensionNamespaces --- .../org/jclouds/openstack/nova/v1_1/domain/Server.java | 10 ++++++++-- .../nova/v1_1/domain/ServerExtendedAttributes.java | 4 +++- .../nova/v1_1/domain/ServerExtendedStatus.java | 4 +++- .../nova/v1_1/extensions/ExtensionNamespaces.java | 6 ++++++ ...tionNamespaceEqualsAnyNamespaceInExtensionsSet.java | 2 ++ 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Server.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Server.java index 72cb75eb96..514903c5ec 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Server.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Server.java @@ -463,18 +463,24 @@ public class Server extends Resource { /** - * Retrieves the extended server status fields + * Retrieves the extended server status fields (alias "OS-EXT-STS") *

* NOTE: This field is only present if the Extended Status extension is installed. + * + * @see org.jclouds.openstack.nova.v1_1.features.ExtensionClient#getExtensionByAlias + * @see org.jclouds.openstack.nova.v1_1.extensions.ExtensionNamespaces#EXTENDED_STATUS (extended status?) */ public Optional getExtendedStatus() { return this.extendedStatus; } /** - * Retrieves the extended server attributes fields + * Retrieves the extended server attributes fields (alias "OS-EXT-SRV-ATTR") *

* NOTE: This field is only present if the The Extended Server Attributes API extension is installed. + * + * @see org.jclouds.openstack.nova.v1_1.features.ExtensionClient#getExtensionByAlias + * @see org.jclouds.openstack.nova.v1_1.extensions.ExtensionNamespaces#EXTENDED_STATUS (extended status?) */ public Optional getExtendedAttributes() { return this.extendedAttributes; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/ServerExtendedAttributes.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/ServerExtendedAttributes.java index 400f075a04..9dcd471e8b 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/ServerExtendedAttributes.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/ServerExtendedAttributes.java @@ -23,12 +23,14 @@ import com.google.common.base.Objects.ToStringHelper; import com.google.gson.annotations.SerializedName; /** - * Additional attributes delivered by Extended Server Attributes extension + * Additional attributes delivered by Extended Server Attributes extension (alias "OS-EXT-SRV-ATTR") * * @author Adam Lowe * @see + * @see org.jclouds.openstack.nova.v1_1.features.ExtensionClient#getExtensionByAlias + * @see org.jclouds.openstack.nova.v1_1.extensions.ExtensionNamespaces#EXTENDED_STATUS (extended status?) */ public class ServerExtendedAttributes { public static final String PREFIX = "OS-EXT-SRV-ATTR:"; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/ServerExtendedStatus.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/ServerExtendedStatus.java index 8bef032193..02908d4a66 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/ServerExtendedStatus.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/ServerExtendedStatus.java @@ -25,12 +25,14 @@ import com.google.common.base.Objects.ToStringHelper; import com.google.gson.annotations.SerializedName; /** - * Additional attributes delivered by Extended Server Status extension + * Additional attributes delivered by Extended Server Status extension (alias "OS-EXT-STS") * * @author Adam Lowe * @see + * @see org.jclouds.openstack.nova.v1_1.features.ExtensionClient#getExtensionByAlias + * @see org.jclouds.openstack.nova.v1_1.extensions.ExtensionNamespaces#EXTENDED_STATUS (extended status?) */ public class ServerExtendedStatus { public static final String PREFIX = "OS-EXT-STS:"; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ExtensionNamespaces.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ExtensionNamespaces.java index 85f0931a1c..3c172cf9e3 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ExtensionNamespaces.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ExtensionNamespaces.java @@ -89,4 +89,10 @@ public interface ExtensionNamespaces { * Admin Action extension */ public static final String ADMIN_ACTIONS = "http://docs.openstack.org/ext/admin-actions/api/v1.1"; + + /** + * Extended Server Status extension + */ + public static final String EXTENDED_STATUS = "http://docs.openstack.org/ext/extended_status/api/v1.1"; + } diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet.java index 5d82fbed1f..3d023c397f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet.java @@ -74,6 +74,8 @@ public class PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensio URI.create("http://docs.openstack.org/compute/ext/createserverext/api/v1.1")) .put(URI.create(ExtensionNamespaces.ADMIN_ACTIONS), URI.create("http://docs.openstack.org/compute/ext/admin-actions/api/v1.1")) + .put(URI.create(ExtensionNamespaces.EXTENDED_STATUS), + URI.create("http://docs.openstack.org/compute/ext/extended_status/api/v1.1")) .build(); @Inject