diff --git a/doc/api_samples/os-aggregates/aggregate-add-host-post-req.json b/doc/api_samples/os-aggregates/aggregate-add-host-post-req.json
new file mode 100644
index 000000000..cd6fc6e08
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-add-host-post-req.json
@@ -0,0 +1,6 @@
+{
+ "add_host":
+ {
+ "host": "581d29b9e3504d8a895caddb13839b15"
+ }
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-add-host-post-req.xml b/doc/api_samples/os-aggregates/aggregate-add-host-post-req.xml
new file mode 100644
index 000000000..5f48f043d
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-add-host-post-req.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-metadata-post-req.json b/doc/api_samples/os-aggregates/aggregate-metadata-post-req.json
new file mode 100644
index 000000000..7331e06a8
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-metadata-post-req.json
@@ -0,0 +1,9 @@
+{
+ "set_metadata":
+ {
+ "metadata":
+ {
+ "key": "value"
+ }
+ }
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-metadata-post-req.xml b/doc/api_samples/os-aggregates/aggregate-metadata-post-req.xml
new file mode 100644
index 000000000..d9b935fd4
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-metadata-post-req.xml
@@ -0,0 +1,6 @@
+
+
+
+ value
+
+
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-post-req.json b/doc/api_samples/os-aggregates/aggregate-post-req.json
new file mode 100644
index 000000000..82272c293
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-post-req.json
@@ -0,0 +1,7 @@
+{
+ "aggregate":
+ {
+ "name": "name",
+ "availability_zone": "nova"
+ }
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-post-req.xml b/doc/api_samples/os-aggregates/aggregate-post-req.xml
new file mode 100644
index 000000000..d25f5f848
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-post-req.xml
@@ -0,0 +1,2 @@
+
+
\ 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
new file mode 100644
index 000000000..6dd939b36
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-post-resp.json
@@ -0,0 +1,11 @@
+{
+ "aggregate": {
+ "availability_zone": "nova",
+ "created_at": "2012-10-01T18:50:27.781065",
+ "deleted": false,
+ "deleted_at": null,
+ "id": 1,
+ "name": "name",
+ "updated_at": null
+ }
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-post-resp.xml b/doc/api_samples/os-aggregates/aggregate-post-resp.xml
new file mode 100644
index 000000000..544271bdc
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-post-resp.xml
@@ -0,0 +1,10 @@
+
+
+ name
+ nova
+ False
+ 2012-10-01 18:50:35.506667
+ None
+ None
+ 1
+
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.json b/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.json
new file mode 100644
index 000000000..e5165cbab
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.json
@@ -0,0 +1,6 @@
+{
+ "remove_host":
+ {
+ "host": "581d29b9e3504d8a895caddb13839b15"
+ }
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.xml b/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.xml
new file mode 100644
index 000000000..87e5d64f9
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-update-post-req.json b/doc/api_samples/os-aggregates/aggregate-update-post-req.json
new file mode 100644
index 000000000..0af1a37a4
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-update-post-req.json
@@ -0,0 +1,7 @@
+{
+ "aggregate":
+ {
+ "name": "newname",
+ "availability_zone": "nova2"
+ }
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-update-post-req.xml b/doc/api_samples/os-aggregates/aggregate-update-post-req.xml
new file mode 100644
index 000000000..1eb9c38fd
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-update-post-req.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-update-post-resp.json b/doc/api_samples/os-aggregates/aggregate-update-post-resp.json
new file mode 100644
index 000000000..81869e730
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-update-post-resp.json
@@ -0,0 +1,13 @@
+{
+ "aggregate": {
+ "availability_zone": "nova2",
+ "created_at": "2012-10-01T18:50:27.781065",
+ "deleted": false,
+ "deleted_at": null,
+ "hosts": [],
+ "id": 1,
+ "metadata": {},
+ "name": "newname",
+ "updated_at": "2012-10-01T18:50:27.791392"
+ }
+}
\ 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
new file mode 100644
index 000000000..ad9498aa0
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregate-update-post-resp.xml
@@ -0,0 +1,12 @@
+
+
+ newname
+ nova2
+ False
+ 2012-10-01 18:50:35.506667
+ 2012-10-01 18:50:35.517397
+
+ None
+ 1
+
+
\ 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
new file mode 100644
index 000000000..518f4176a
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.json
@@ -0,0 +1,15 @@
+{
+ "aggregate": {
+ "availability_zone": "nova",
+ "created_at": "2012-10-01T18:50:27.511586",
+ "deleted": false,
+ "deleted_at": null,
+ "hosts": [
+ "581d29b9e3504d8a895caddb13839b15"
+ ],
+ "id": 1,
+ "metadata": {},
+ "name": "name",
+ "updated_at": null
+ }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..a4c9de5fd
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml
@@ -0,0 +1,14 @@
+
+
+ name
+ nova
+ False
+ 2012-10-01 18:50:35.236556
+ None
+
+ 7c9e00dbca5e4fb88538b021c0f933a5
+
+ None
+ 1
+
+
\ 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
new file mode 100644
index 000000000..cde446e51
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregates-get-resp.json
@@ -0,0 +1,13 @@
+{
+ "aggregate": {
+ "availability_zone": "nova",
+ "created_at": "2012-10-01T18:50:27.048605",
+ "deleted": false,
+ "deleted_at": null,
+ "hosts": [],
+ "id": 1,
+ "metadata": {},
+ "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
new file mode 100644
index 000000000..be1349bd2
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregates-get-resp.xml
@@ -0,0 +1,12 @@
+
+
+ name
+ nova
+ False
+ 2012-10-01 18:50:34.764838
+ None
+
+ None
+ 1
+
+
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregates-list-get-resp.json b/doc/api_samples/os-aggregates/aggregates-list-get-resp.json
new file mode 100644
index 000000000..75b412b53
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregates-list-get-resp.json
@@ -0,0 +1,15 @@
+{
+ "aggregates": [
+ {
+ "availability_zone": "nova",
+ "created_at": "2012-10-01T18:50:27.252869",
+ "deleted": false,
+ "deleted_at": null,
+ "hosts": [],
+ "id": 1,
+ "metadata": {},
+ "name": "name",
+ "updated_at": null
+ }
+ ]
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregates-list-get-resp.xml b/doc/api_samples/os-aggregates/aggregates-list-get-resp.xml
new file mode 100644
index 000000000..c5590855b
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregates-list-get-resp.xml
@@ -0,0 +1,14 @@
+
+
+
+ name
+ nova
+ False
+ 2012-10-01 18:50:34.970677
+ None
+
+ None
+ 1
+
+
+
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json b/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json
new file mode 100644
index 000000000..dc4806a4f
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json
@@ -0,0 +1,15 @@
+{
+ "aggregate": {
+ "availability_zone": "nova",
+ "created_at": "2012-10-01T18:50:26.604176",
+ "deleted": false,
+ "deleted_at": null,
+ "hosts": [],
+ "id": 1,
+ "metadata": {
+ "key": "value"
+ },
+ "name": "name",
+ "updated_at": null
+ }
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml b/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml
new file mode 100644
index 000000000..7eeefb8b7
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml
@@ -0,0 +1,14 @@
+
+
+ name
+ nova
+ False
+ 2012-10-01 18:50:34.313003
+ None
+
+ None
+ 1
+
+ value
+
+
\ 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
new file mode 100644
index 000000000..497fcb7fb
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.json
@@ -0,0 +1,13 @@
+{
+ "aggregate": {
+ "availability_zone": "nova",
+ "created_at": "2012-10-01T18:50:27.511586",
+ "deleted": false,
+ "deleted_at": null,
+ "hosts": [],
+ "id": 1,
+ "metadata": {},
+ "name": "name",
+ "updated_at": null
+ }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..dc8a55330
--- /dev/null
+++ b/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml
@@ -0,0 +1,12 @@
+
+
+ name
+ nova
+ False
+ 2012-10-01 18:50:35.236556
+ None
+
+ None
+ 1
+
+
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/server-post-req.json b/doc/api_samples/os-aggregates/server-post-req.json
new file mode 100644
index 000000000..d88eb4122
--- /dev/null
+++ b/doc/api_samples/os-aggregates/server-post-req.json
@@ -0,0 +1,16 @@
+{
+ "server" : {
+ "name" : "new-server-test",
+ "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+ "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
+ "metadata" : {
+ "My Server Name" : "Apache1"
+ },
+ "personality" : [
+ {
+ "path" : "/etc/banner.txt",
+ "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/server-post-resp.json b/doc/api_samples/os-aggregates/server-post-resp.json
new file mode 100644
index 000000000..0eba66ae6
--- /dev/null
+++ b/doc/api_samples/os-aggregates/server-post-resp.json
@@ -0,0 +1,16 @@
+{
+ "server": {
+ "adminPass": "kWaKB9zfiMsq",
+ "id": "d261e7aa-50ea-45bb-827c-61bd94deb012",
+ "links": [
+ {
+ "href": "http://openstack.example.com/v2/openstack/servers/d261e7aa-50ea-45bb-827c-61bd94deb012",
+ "rel": "self"
+ },
+ {
+ "href": "http://openstack.example.com/openstack/servers/d261e7aa-50ea-45bb-827c-61bd94deb012",
+ "rel": "bookmark"
+ }
+ ]
+ }
+}
\ No newline at end of file