From 961d8e3cd3b8be1424559180144e7ce0ad5cfe43 Mon Sep 17 00:00:00 2001
From: Diane Fleming
Date: Thu, 11 Apr 2013 10:58:54 -0500
Subject: [PATCH] Updated description of availability zones extension
bug: #1107419
Change-Id: Ice456a9c822ea84a21bf5e49bd19e04cfac77d69
author: Diane Fleming
---
api-ref/src/docbkx/api-ref.xml | 3 ++-
.../compute-api/src/ext/os-aggregates.wadl | 22 +++++++++----------
.../wadls/compute-api/src/ext/os-ext-az.wadl | 2 +-
.../wadls/compute-api/src/ext/os-hosts.wadl | 5 +++--
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/api-ref/src/docbkx/api-ref.xml b/api-ref/src/docbkx/api-ref.xml
index 20412bcb0..f099d1479 100644
--- a/api-ref/src/docbkx/api-ref.xml
+++ b/api-ref/src/docbkx/api-ref.xml
@@ -109,7 +109,8 @@
Extended Availability Zones
- Shows the instance availability zone.
+ Shows the instance availability zone for compute nodes (nova-compute).
+ Internal services appear in their own internal availability zone.
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-aggregates.wadl b/api-ref/src/wadls/compute-api/src/ext/os-aggregates.wadl
index 102856443..fa1249e9c 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-aggregates.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-aggregates.wadl
@@ -10,7 +10,7 @@
-
+
The ID for the tenant or account in a multi-tenancy cloud.
@@ -20,7 +20,7 @@
-
+
The ID associated with an aggregate.
@@ -66,12 +66,12 @@
-
+
Name of aggregate
-
+
Availability zone of aggregate
@@ -133,14 +133,14 @@
-
+
- Name of aggregate
+ Name of aggregate.
-
+
- Availability zone of aggregate
+ Availability zone of aggregate.
@@ -186,7 +186,7 @@
-
+
Metadata value to be set.
@@ -222,7 +222,7 @@
-
+
Host ID to add to an aggregate, which is a collection of multiple groups of hosts that share common resources like storage and network.
@@ -259,7 +259,7 @@
-
+
Host ID to add to an aggregate.
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-ext-az.wadl b/api-ref/src/wadls/compute-api/src/ext/os-ext-az.wadl
index 0a92a4a76..633a07a61 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-ext-az.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-ext-az.wadl
@@ -1,6 +1,6 @@
-
+
-
+
+ xmlns:wadl="http://wadl.dev.java.net/2009/02"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">