From d2c8d41878615f9165f539c05c26f7cb50e8d7f0 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Sun, 10 Sep 2017 18:24:33 +0000
Subject: [PATCH] Revert "Revert "Fix AZ related API docs""

Fix AZ related API docs

While we have a big fat comment in the development docs explaining why it's so
terrible to use default AZ values for either booting an instance or setting
an aggregate AZ metadata, we still have confusing API docs that provide the
wrong name for the AZ...

Fixing that and trying to explain the problem within the docs, too.

This reverts commit 92ca21abd61b6df7fc8bc5ffe7502f03b3eca2dd.

Co-Authored-By: Sylvain Bauza <sbauza@redhat.com>
Co-Authored-By: Stephen Finucane <stephenfin@redhat.com>

Change-Id: Ie4bfe32bbef0f8060bfc0ad4190f262d4a8bd3b2
---
 doc/api_samples/os-aggregates/aggregate-post-req.json       | 4 ++--
 doc/api_samples/os-aggregates/aggregate-post-resp.json      | 2 +-
 .../os-aggregates/aggregates-add-host-post-resp.json        | 4 ++--
 doc/api_samples/os-aggregates/aggregates-get-resp.json      | 4 ++--
 doc/api_samples/os-aggregates/aggregates-list-get-resp.json | 4 ++--
 .../os-aggregates/aggregates-metadata-post-resp.json        | 4 ++--
 .../os-aggregates/aggregates-remove-host-post-resp.json     | 4 ++--
 .../os-aggregates/v2.41/aggregate-post-resp.json            | 4 ++--
 .../os-aggregates/v2.41/aggregates-add-host-post-resp.json  | 6 +++---
 .../os-aggregates/v2.41/aggregates-get-resp.json            | 6 +++---
 .../os-aggregates/v2.41/aggregates-list-get-resp.json       | 6 +++---
 .../os-aggregates/v2.41/aggregates-metadata-post-resp.json  | 6 +++---
 .../v2.41/aggregates-remove-host-post-resp.json             | 6 +++---
 .../api_samples/os-aggregates/aggregate-post-req.json.tpl   | 2 +-
 .../api_samples/os-aggregates/aggregate-post-resp.json.tpl  | 2 +-
 .../os-aggregates/aggregates-add-host-post-resp.json.tpl    | 4 ++--
 .../api_samples/os-aggregates/aggregates-get-resp.json.tpl  | 4 ++--
 .../os-aggregates/aggregates-list-get-resp.json.tpl         | 4 ++--
 .../os-aggregates/aggregates-metadata-post-resp.json.tpl    | 4 ++--
 .../os-aggregates/aggregates-remove-host-post-resp.json.tpl | 4 ++--
 .../os-aggregates/v2.41/aggregate-post-req.json.tpl         | 2 +-
 .../os-aggregates/v2.41/aggregate-post-resp.json.tpl        | 2 +-
 .../v2.41/aggregates-add-host-post-resp.json.tpl            | 4 ++--
 .../os-aggregates/v2.41/aggregates-get-resp.json.tpl        | 4 ++--
 .../os-aggregates/v2.41/aggregates-list-get-resp.json.tpl   | 4 ++--
 .../v2.41/aggregates-metadata-post-resp.json.tpl            | 4 ++--
 .../v2.41/aggregates-remove-host-post-resp.json.tpl         | 4 ++--
 27 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/doc/api_samples/os-aggregates/aggregate-post-req.json b/doc/api_samples/os-aggregates/aggregate-post-req.json
index 82272c293..deeb3bc55 100644
--- a/doc/api_samples/os-aggregates/aggregate-post-req.json
+++ b/doc/api_samples/os-aggregates/aggregate-post-req.json
@@ -2,6 +2,6 @@
     "aggregate":
     {
         "name": "name",
-        "availability_zone": "nova"
+        "availability_zone": "london"
     }
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-aggregates/aggregate-post-resp.json b/doc/api_samples/os-aggregates/aggregate-post-resp.json
index 1f8ab1809..c265bcc84 100644
--- a/doc/api_samples/os-aggregates/aggregate-post-resp.json
+++ b/doc/api_samples/os-aggregates/aggregate-post-resp.json
@@ -1,6 +1,6 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "2013-08-18T12:17:55.751757",
         "deleted": false,
         "deleted_at": null,
diff --git a/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.json b/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.json
index 568be44eb..0952cdfb8 100644
--- a/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.json
+++ b/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.json
@@ -1,6 +1,6 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "2013-08-18T12:17:56.297823",
         "deleted": false,
         "deleted_at": null,
@@ -9,7 +9,7 @@
         ],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova"
+            "availability_zone": "london"
         },
         "name": "name",
         "updated_at": null
diff --git a/doc/api_samples/os-aggregates/aggregates-get-resp.json b/doc/api_samples/os-aggregates/aggregates-get-resp.json
index 08f4b8ed0..8b9248caa 100644
--- a/doc/api_samples/os-aggregates/aggregates-get-resp.json
+++ b/doc/api_samples/os-aggregates/aggregates-get-resp.json
@@ -1,13 +1,13 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "2013-08-18T12:17:56.380226",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova"
+            "availability_zone": "london"
         },
         "name": "name",
         "updated_at": null
diff --git a/doc/api_samples/os-aggregates/aggregates-list-get-resp.json b/doc/api_samples/os-aggregates/aggregates-list-get-resp.json
index 3887b096f..1913a7dee 100644
--- a/doc/api_samples/os-aggregates/aggregates-list-get-resp.json
+++ b/doc/api_samples/os-aggregates/aggregates-list-get-resp.json
@@ -1,14 +1,14 @@
 {
     "aggregates": [
         {
-            "availability_zone": "nova",
+            "availability_zone": "london",
             "created_at": "2013-08-18T12:17:56.856455",
             "deleted": false,
             "deleted_at": null,
             "hosts": ["21549b2f665945baaa7101926a00143c"],
             "id": 1,
             "metadata": {
-                "availability_zone": "nova"
+                "availability_zone": "london"
             },
             "name": "name",
             "updated_at": null
diff --git a/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json b/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json
index bcfeacd8f..d4c65717a 100644
--- a/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json
+++ b/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json
@@ -1,13 +1,13 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "2013-08-18T12:17:55.959571",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova",
+            "availability_zone": "london",
             "key": "value"
         },
         "name": "name",
diff --git a/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.json b/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.json
index 732766b1f..f543eec11 100644
--- a/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.json
+++ b/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.json
@@ -1,13 +1,13 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "2013-08-18T12:17:56.990581",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova"
+            "availability_zone": "london"
         },
         "name": "name",
         "updated_at": null
diff --git a/doc/api_samples/os-aggregates/v2.41/aggregate-post-resp.json b/doc/api_samples/os-aggregates/v2.41/aggregate-post-resp.json
index 07b9ca318..357e4d4eb 100644
--- a/doc/api_samples/os-aggregates/v2.41/aggregate-post-resp.json
+++ b/doc/api_samples/os-aggregates/v2.41/aggregate-post-resp.json
@@ -1,6 +1,6 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "2016-12-27T22:51:32.877711",
         "deleted": false,
         "deleted_at": null,
@@ -9,4 +9,4 @@
         "updated_at": null,
         "uuid": "86a0da0e-9f0c-4f51-a1e0-3c25edab3783"
     }
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-aggregates/v2.41/aggregates-add-host-post-resp.json b/doc/api_samples/os-aggregates/v2.41/aggregates-add-host-post-resp.json
index 0f1a40f2c..f0e3f06f3 100644
--- a/doc/api_samples/os-aggregates/v2.41/aggregates-add-host-post-resp.json
+++ b/doc/api_samples/os-aggregates/v2.41/aggregates-add-host-post-resp.json
@@ -1,6 +1,6 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "2016-12-27T23:47:30.594805",
         "deleted": false,
         "deleted_at": null,
@@ -9,10 +9,10 @@
         ],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova"
+            "availability_zone": "london"
         },
         "name": "name",
         "updated_at": null,
         "uuid": "d1842372-89c5-4fbd-ad5a-5d2e16c85456"
     }
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-aggregates/v2.41/aggregates-get-resp.json b/doc/api_samples/os-aggregates/v2.41/aggregates-get-resp.json
index 5cd1cf75f..5ce65fb49 100644
--- a/doc/api_samples/os-aggregates/v2.41/aggregates-get-resp.json
+++ b/doc/api_samples/os-aggregates/v2.41/aggregates-get-resp.json
@@ -1,16 +1,16 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "2016-12-27T23:47:30.563527",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova"
+            "availability_zone": "london"
         },
         "name": "name",
         "updated_at": null,
         "uuid": "fd0a5b12-7e8d-469d-bfd5-64a6823e7407"
     }
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-aggregates/v2.41/aggregates-list-get-resp.json b/doc/api_samples/os-aggregates/v2.41/aggregates-list-get-resp.json
index 6b68451fd..0f4dc47c3 100644
--- a/doc/api_samples/os-aggregates/v2.41/aggregates-list-get-resp.json
+++ b/doc/api_samples/os-aggregates/v2.41/aggregates-list-get-resp.json
@@ -1,7 +1,7 @@
 {
     "aggregates": [
         {
-            "availability_zone": "nova",
+            "availability_zone": "london",
             "created_at": "2016-12-27T23:47:32.911515",
             "deleted": false,
             "deleted_at": null,
@@ -10,11 +10,11 @@
             ],
             "id": 1,
             "metadata": {
-                "availability_zone": "nova"
+                "availability_zone": "london"
             },
             "name": "name",
             "updated_at": null,
             "uuid": "6ba28ba7-f29b-45cc-a30b-6e3a40c2fb14"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-aggregates/v2.41/aggregates-metadata-post-resp.json b/doc/api_samples/os-aggregates/v2.41/aggregates-metadata-post-resp.json
index 9dda7f83e..e85034f50 100644
--- a/doc/api_samples/os-aggregates/v2.41/aggregates-metadata-post-resp.json
+++ b/doc/api_samples/os-aggregates/v2.41/aggregates-metadata-post-resp.json
@@ -1,17 +1,17 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "2016-12-27T23:59:18.623100",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova",
+            "availability_zone": "london",
             "key": "value"
         },
         "name": "name",
         "updated_at": "2016-12-27T23:59:18.723348",
         "uuid": "26002bdb-62cc-41bd-813a-0ad22db32625"
     }
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-aggregates/v2.41/aggregates-remove-host-post-resp.json b/doc/api_samples/os-aggregates/v2.41/aggregates-remove-host-post-resp.json
index f1fde0d33..657efe08f 100644
--- a/doc/api_samples/os-aggregates/v2.41/aggregates-remove-host-post-resp.json
+++ b/doc/api_samples/os-aggregates/v2.41/aggregates-remove-host-post-resp.json
@@ -1,16 +1,16 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "2016-12-27T23:47:30.594805",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova"
+            "availability_zone": "london"
         },
         "name": "name",
         "updated_at": null,
         "uuid": "d1842372-89c5-4fbd-ad5a-5d2e16c85456"
     }
-}
\ No newline at end of file
+}
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-req.json.tpl
index fc806061e..deeb3bc55 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-req.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-req.json.tpl
@@ -2,6 +2,6 @@
     "aggregate":
     {
         "name": "name",
-        "availability_zone": "nova"
+        "availability_zone": "london"
     }
 }
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-resp.json.tpl
index 935643d03..a6e6a0bdf 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "%(strtime)s",
         "deleted": false,
         "deleted_at": null,
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl
index e5775c206..0ba15b501 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "%(strtime)s",
         "deleted": false,
         "deleted_at": null,
@@ -9,7 +9,7 @@
         ],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova"
+            "availability_zone": "london"
         },
         "name": "name",
         "updated_at": null
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-get-resp.json.tpl
index b91781fae..b1c5a3683 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-get-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-get-resp.json.tpl
@@ -1,13 +1,13 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "%(strtime)s",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova"
+            "availability_zone": "london"
         },
         "name": "name",
         "updated_at": null
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl
index 3cfe0a5d8..ae699f96d 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "aggregates": [
         {
-            "availability_zone": "nova",
+            "availability_zone": "london",
             "created_at": "%(strtime)s",
             "deleted": false,
             "deleted_at": null,
@@ -10,7 +10,7 @@
             ],
             "id": 1,
             "metadata": {
-                "availability_zone": "nova"
+                "availability_zone": "london"
             },
             "name": "name",
             "updated_at": null
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl
index 98bf8bb63..116fca374 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl
@@ -1,13 +1,13 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "%(strtime)s",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova",
+            "availability_zone": "london",
             "key": "value"
         },
         "name": "name",
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl
index b91781fae..b1c5a3683 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl
@@ -1,13 +1,13 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "%(strtime)s",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova"
+            "availability_zone": "london"
         },
         "name": "name",
         "updated_at": null
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregate-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregate-post-req.json.tpl
index fc806061e..deeb3bc55 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregate-post-req.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregate-post-req.json.tpl
@@ -2,6 +2,6 @@
     "aggregate":
     {
         "name": "name",
-        "availability_zone": "nova"
+        "availability_zone": "london"
     }
 }
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregate-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregate-post-resp.json.tpl
index dadf45cee..fe125c194 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregate-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregate-post-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "%(strtime)s",
         "deleted": false,
         "deleted_at": null,
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-add-host-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-add-host-post-resp.json.tpl
index 73a158619..9e08704ad 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-add-host-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-add-host-post-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "%(strtime)s",
         "deleted": false,
         "deleted_at": null,
@@ -9,7 +9,7 @@
         ],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova"
+            "availability_zone": "london"
         },
         "name": "name",
         "updated_at": null,
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-get-resp.json.tpl
index e0a3cecc3..710a837db 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-get-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-get-resp.json.tpl
@@ -1,13 +1,13 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "%(strtime)s",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova"
+            "availability_zone": "london"
         },
         "name": "name",
         "updated_at": null,
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-list-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-list-get-resp.json.tpl
index b90fe786e..6ff95d01d 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-list-get-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-list-get-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "aggregates": [
         {
-            "availability_zone": "nova",
+            "availability_zone": "london",
             "created_at": "%(strtime)s",
             "deleted": false,
             "deleted_at": null,
@@ -10,7 +10,7 @@
             ],
             "id": 1,
             "metadata": {
-                "availability_zone": "nova"
+                "availability_zone": "london"
             },
             "name": "name",
             "updated_at": null,
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-metadata-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-metadata-post-resp.json.tpl
index 8b1f6d3ec..689c5fc91 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-metadata-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-metadata-post-resp.json.tpl
@@ -1,13 +1,13 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "%(strtime)s",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova",
+            "availability_zone": "london",
             "key": "value"
         },
         "name": "name",
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-remove-host-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-remove-host-post-resp.json.tpl
index e0a3cecc3..710a837db 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-remove-host-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/v2.41/aggregates-remove-host-post-resp.json.tpl
@@ -1,13 +1,13 @@
 {
     "aggregate": {
-        "availability_zone": "nova",
+        "availability_zone": "london",
         "created_at": "%(strtime)s",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
         "metadata": {
-            "availability_zone": "nova"
+            "availability_zone": "london"
         },
         "name": "name",
         "updated_at": null,