diff --git a/api-ref/src/docbkx/ch_blockstorage-api-v2.xml b/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
index 76ded3b89..553e409cd 100644
--- a/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
+++ b/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
@@ -381,6 +381,13 @@
+
+ Volume image metadata extension (os-vol-image-meta)
+
+ Shows image metadata that is associated with a specified volume.
+
+
+
Volume type access (volumes)
diff --git a/api-ref/src/docbkx/ch_netconn-v2.xml b/api-ref/src/docbkx/ch_netconn-v2.xml
index 90a4ea6f7..85b289faf 100644
--- a/api-ref/src/docbkx/ch_netconn-v2.xml
+++ b/api-ref/src/docbkx/ch_netconn-v2.xml
@@ -12,15 +12,18 @@
Use virtual networking services among devices that are managed by the
OpenStack Compute service. The Networking (neutron) API v2.0 combines
the API v1.1 functionality with some essential Internet Protocol
- Address Management (IPAM) functionality. Enables users to associate IP
- address blocks and other network configuration settings with an
- OpenStack Networking network. You can choose a specific IP address
- from the block or let OpenStack Networking choose the first available
- IP address.
+ Address Management (IPAM) functionality. The API enables users to
+ associate IP address blocks and other network configuration settings
+ with an OpenStack Networking network. You can choose a specific IP
+ address from the block or let OpenStack Networking choose the first
+ available IP address.
+ Effective in the OpenStack Liberty release, XML support in requests
+ and responses was removed for the Networking API v2.0.
API versions
- Lists information for all Networking API versions and shows details about API v2.
+ Lists information for all Networking API versions and shows
+ details about API v2.0.
@@ -36,28 +39,28 @@
Networks
Lists, shows information for, creates, updates, and deletes
networks.
-
+
-
-
-
-
-
+
+
+
+
Subnets
- Lists, shows information for, creates, updates, and deletes
- subnet resources.
-
+ Lists, shows information for, creates, updates, and deletes subnet
+ resources.
+
+
diff --git a/api-ref/src/wadls/volume-api/src/v2/os-vol-image-meta-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/os-vol-image-meta-v2.wadl
new file mode 100644
index 000000000..cfd468aa6
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/os-vol-image-meta-v2.wadl
@@ -0,0 +1,138 @@
+
+
+
+
+
+
+
+
+ The unique identifier of the tenant or
+ account.
+
+
+
+
+
+
+
+
+
+
+ Shows image metadata that is associated with a specified
+ volume.
+
+ When the request is made, the caller must specify
+ (in the ref element) a
+ reference to an existing storage volume. Each storage
+ driver may interpret the existing storage volume
+ reference differently, but should accept a reference
+ structure containing either a
+ source-volume-id or
+ source-volume-name element if
+ possible.
+
+
+
+
+
+
+
+
+ A volume
+ object.
+
+
+
+
+ The OpenStack Block Storage host where the
+ existing volume resides.
+
+
+
+
+
+ A reference to the existing volume.
+ The internal structure of this reference
+ is dependent on the implementation of the
+ volume driver, see the specific driver's
+ documentation for details of the required
+ elements in the structure.
+
+
+
+ The volume name.
+
+
+
+ The availability zone.
+
+
+
+ The volume
+ description.
+
+
+
+ The associated volume
+ type.
+
+
+
+ Enables or disables the bootable
+ attribute. You can boot an instance from a
+ bootable volume.
+
+
+
+ One or more metadata key and value pairs
+ to associate with the
+ volume.
+
+
+
+
+
+
+ The response is the same as for a volume
+ create API call. The size of the volume is chosen
+ by inspecting the size of the existing storage
+ volume and rounding up to the next
+ gibibyte (GiB).
+
+
+
+
+
+