From 9f4534ab584faeee1e24d4c1bb38a2b194f24626 Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo@cloudscaling.com>
Date: Thu, 2 Aug 2012 17:44:18 -0700
Subject: Enable Aggregate based availability zones

Instead of implementing availability zones in the service table,
availability zones are implemented using general aggregate metadata.

This patch does not remove availability zones from the service table, a
latter patch will do that.

* In theory supports a single compute node in multiple availability zones
* Drop availability_zone column from Aggregate table (is now a property)
* map aggregate metadata 'availability_zone' so API does not change

Implements blueprint aggregate-based-availability-zones

Change-Id: I2a2ac5bfaa526d639dff5efa392c051347dbd9bb
---
 doc/api_samples/os-aggregates/aggregate-update-post-resp.json     | 8 +++++---
 doc/api_samples/os-aggregates/aggregate-update-post-resp.xml      | 8 +++++---
 doc/api_samples/os-aggregates/aggregates-add-host-post-resp.json  | 8 +++++---
 doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml   | 8 +++++---
 doc/api_samples/os-aggregates/aggregates-get-resp.json            | 8 +++++---
 doc/api_samples/os-aggregates/aggregates-get-resp.xml             | 8 +++++---
 doc/api_samples/os-aggregates/aggregates-list-get-resp.json       | 6 ++++--
 doc/api_samples/os-aggregates/aggregates-list-get-resp.xml        | 8 +++++---
 doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json  | 3 ++-
 doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml   | 3 ++-
 .../os-aggregates/aggregates-remove-host-post-resp.json           | 6 ++++--
 .../os-aggregates/aggregates-remove-host-post-resp.xml            | 6 ++++--
 12 files changed, 51 insertions(+), 29 deletions(-)

(limited to 'doc')

diff --git a/doc/api_samples/os-aggregates/aggregate-update-post-resp.json b/doc/api_samples/os-aggregates/aggregate-update-post-resp.json
index 81869e730..6636f0a17 100644
--- a/doc/api_samples/os-aggregates/aggregate-update-post-resp.json
+++ b/doc/api_samples/os-aggregates/aggregate-update-post-resp.json
@@ -1,13 +1,15 @@
 {
     "aggregate": {
         "availability_zone": "nova2",
-        "created_at": "2012-10-01T18:50:27.781065",
+        "created_at": "2012-12-04T12:04:27.075065",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
-        "metadata": {},
+        "metadata": {
+            "availability_zone": "nova2"
+        },
         "name": "newname",
-        "updated_at": "2012-10-01T18:50:27.791392"
+        "updated_at": "2012-12-04T12:04:27.242597"
     }
 }
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-update-post-resp.xml b/doc/api_samples/os-aggregates/aggregate-update-post-resp.xml
index ad9498aa0..25227669b 100644
--- a/doc/api_samples/os-aggregates/aggregate-update-post-resp.xml
+++ b/doc/api_samples/os-aggregates/aggregate-update-post-resp.xml
@@ -3,10 +3,12 @@
   <name>newname</name>
   <availability_zone>nova2</availability_zone>
   <deleted>False</deleted>
-  <created_at>2012-10-01 18:50:35.506667</created_at>
-  <updated_at>2012-10-01 18:50:35.517397</updated_at>
+  <created_at>2012-12-04 12:04:30.245284</created_at>
+  <updated_at>2012-12-04 12:04:30.357795</updated_at>
   <hosts/>
   <deleted_at>None</deleted_at>
   <id>1</id>
-  <metadata/>
+  <metadata>
+    <availability_zone>nova2</availability_zone>
+  </metadata>
 </aggregate>
\ No newline at end of file
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 518f4176a..1f7918ba8 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,14 +1,16 @@
 {
     "aggregate": {
         "availability_zone": "nova",
-        "created_at": "2012-10-01T18:50:27.511586",
+        "created_at": "2012-12-04T12:04:24.399784",
         "deleted": false,
         "deleted_at": null,
         "hosts": [
-            "581d29b9e3504d8a895caddb13839b15"
+            "0438c6a4e8d841ad823b801d681f4680"
         ],
         "id": 1,
-        "metadata": {},
+        "metadata": {
+            "availability_zone": "nova"
+        },
         "name": "name",
         "updated_at": null
     }
diff --git a/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml b/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml
index a4c9de5fd..ad11f3859 100644
--- a/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml
+++ b/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml
@@ -3,12 +3,14 @@
   <name>name</name>
   <availability_zone>nova</availability_zone>
   <deleted>False</deleted>
-  <created_at>2012-10-01 18:50:35.236556</created_at>
+  <created_at>2012-12-04 12:04:27.574038</created_at>
   <updated_at>None</updated_at>
   <hosts>
-    <host>7c9e00dbca5e4fb88538b021c0f933a5</host>
+    <host>392adba19dd449179804eaff16ff4a97</host>
   </hosts>
   <deleted_at>None</deleted_at>
   <id>1</id>
-  <metadata/>
+  <metadata>
+    <availability_zone>nova</availability_zone>
+  </metadata>
 </aggregate>
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregates-get-resp.json b/doc/api_samples/os-aggregates/aggregates-get-resp.json
index cde446e51..101a6584d 100644
--- a/doc/api_samples/os-aggregates/aggregates-get-resp.json
+++ b/doc/api_samples/os-aggregates/aggregates-get-resp.json
@@ -1,13 +1,15 @@
 {
     "aggregate": {
         "availability_zone": "nova",
-        "created_at": "2012-10-01T18:50:27.048605",
+        "created_at": "2012-11-16T06:22:23.032493",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
-        "metadata": {},
+        "metadata": {
+            "availability_zone": "nova"
+        },
         "name": "name",
         "updated_at": null
     }
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/os-aggregates/aggregates-get-resp.xml b/doc/api_samples/os-aggregates/aggregates-get-resp.xml
index be1349bd2..431e59cf4 100644
--- a/doc/api_samples/os-aggregates/aggregates-get-resp.xml
+++ b/doc/api_samples/os-aggregates/aggregates-get-resp.xml
@@ -3,10 +3,12 @@
   <name>name</name>
   <availability_zone>nova</availability_zone>
   <deleted>False</deleted>
-  <created_at>2012-10-01 18:50:34.764838</created_at>
+  <created_at>2012-11-16 06:22:25.587739</created_at>
   <updated_at>None</updated_at>
   <hosts/>
   <deleted_at>None</deleted_at>
   <id>1</id>
-  <metadata/>
-</aggregate>
\ No newline at end of file
+  <metadata>
+    <availability_zone>nova</availability_zone>
+  </metadata>
+</aggregate>
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 75b412b53..53d278c63 100644
--- a/doc/api_samples/os-aggregates/aggregates-list-get-resp.json
+++ b/doc/api_samples/os-aggregates/aggregates-list-get-resp.json
@@ -2,12 +2,14 @@
     "aggregates": [
         {
             "availability_zone": "nova",
-            "created_at": "2012-10-01T18:50:27.252869",
+            "created_at": "2012-11-16T06:22:23.361359",
             "deleted": false,
             "deleted_at": null,
             "hosts": [],
             "id": 1,
-            "metadata": {},
+            "metadata": {
+                "availability_zone": "nova"
+            },
             "name": "name",
             "updated_at": null
         }
diff --git a/doc/api_samples/os-aggregates/aggregates-list-get-resp.xml b/doc/api_samples/os-aggregates/aggregates-list-get-resp.xml
index c5590855b..8d92e1466 100644
--- a/doc/api_samples/os-aggregates/aggregates-list-get-resp.xml
+++ b/doc/api_samples/os-aggregates/aggregates-list-get-resp.xml
@@ -4,11 +4,13 @@
     <name>name</name>
     <availability_zone>nova</availability_zone>
     <deleted>False</deleted>
-    <created_at>2012-10-01 18:50:34.970677</created_at>
+    <created_at>2012-11-16 06:22:25.935099</created_at>
     <updated_at>None</updated_at>
     <hosts/>
     <deleted_at>None</deleted_at>
     <id>1</id>
-    <metadata/>
+    <metadata>
+      <availability_zone>nova</availability_zone>
+    </metadata>
   </aggregate>
-</aggregates>
\ No newline at end of file
+</aggregates>
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 dc4806a4f..33b4702ef 100644
--- a/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json
+++ b/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json
@@ -1,12 +1,13 @@
 {
     "aggregate": {
         "availability_zone": "nova",
-        "created_at": "2012-10-01T18:50:26.604176",
+        "created_at": "2012-11-16T06:22:22.342791",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
         "metadata": {
+            "availability_zone": "nova",
             "key": "value"
         },
         "name": "name",
diff --git a/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml b/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml
index 7eeefb8b7..5e2193d06 100644
--- a/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml
+++ b/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml
@@ -3,12 +3,13 @@
   <name>name</name>
   <availability_zone>nova</availability_zone>
   <deleted>False</deleted>
-  <created_at>2012-10-01 18:50:34.313003</created_at>
+  <created_at>2012-11-16 06:22:24.864471</created_at>
   <updated_at>None</updated_at>
   <hosts/>
   <deleted_at>None</deleted_at>
   <id>1</id>
   <metadata>
     <key>value</key>
+    <availability_zone>nova</availability_zone>
   </metadata>
 </aggregate>
\ No newline at end of file
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 497fcb7fb..ba9d4e00a 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,12 +1,14 @@
 {
     "aggregate": {
         "availability_zone": "nova",
-        "created_at": "2012-10-01T18:50:27.511586",
+        "created_at": "2012-12-04T12:04:26.557909",
         "deleted": false,
         "deleted_at": null,
         "hosts": [],
         "id": 1,
-        "metadata": {},
+        "metadata": {
+            "availability_zone": "nova"
+        },
         "name": "name",
         "updated_at": null
     }
diff --git a/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml b/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml
index dc8a55330..33dce2838 100644
--- a/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml
+++ b/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml
@@ -3,10 +3,12 @@
   <name>name</name>
   <availability_zone>nova</availability_zone>
   <deleted>False</deleted>
-  <created_at>2012-10-01 18:50:35.236556</created_at>
+  <created_at>2012-12-04 12:04:29.722109</created_at>
   <updated_at>None</updated_at>
   <hosts/>
   <deleted_at>None</deleted_at>
   <id>1</id>
-  <metadata/>
+  <metadata>
+    <availability_zone>nova</availability_zone>
+  </metadata>
 </aggregate>
\ No newline at end of file
-- 
cgit