diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/image-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/image-get-resp.json
new file mode 100644
index 000000000..6947e395a
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/image-get-resp.json
@@ -0,0 +1,34 @@
+{
+    "image": {
+        "OS-DCF:diskConfig": "AUTO",
+        "created": "2011-01-01T01:02:03Z",
+        "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+        "links": [
+            {
+                "href": "http://openstack.example.com/v3/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                "rel": "self"
+            },
+            {
+                "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                "rel": "bookmark"
+            },
+            {
+                "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                "rel": "alternate",
+                "type": "application/vnd.openstack.image"
+            }
+        ],
+        "metadata": {
+            "architecture": "x86_64",
+            "auto_disk_config": "True",
+            "kernel_id": "nokernel",
+            "ramdisk_id": "nokernel"
+        },
+        "minDisk": 0,
+        "minRam": 0,
+        "name": "fakeimage7",
+        "progress": 100,
+        "status": "ACTIVE",
+        "updated": "2011-01-01T01:02:03Z"
+    }
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/image-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/image-list-resp.json
new file mode 100644
index 000000000..0e3ae990a
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/image-list-resp.json
@@ -0,0 +1,214 @@
+{
+    "images": [
+        {
+            "OS-DCF:diskConfig": "AUTO",
+            "created": "2011-01-01T01:02:03Z",
+            "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v3/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "architecture": "x86_64",
+                "auto_disk_config": "True",
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage7",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v3/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "architecture": "x86_64",
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "a2459075-d96c-40d5-893e-577ff92e721c",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v3/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "OS-DCF:diskConfig": "MANUAL",
+            "created": "2011-01-01T01:02:03Z",
+            "id": "a440c04b-79fa-479c-bed1-0b816eaec379",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v3/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "architecture": "x86_64",
+                "auto_disk_config": "False",
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage6",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v3/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "kernel_id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                "ramdisk_id": null
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "cedef40a-ed67-4d10-800e-17455edce175",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v3/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v3/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        }
+    ]
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/list-servers-detail-get.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/list-servers-detail-get.json
index f5fa9280a..89746ce82 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/list-servers-detail-get.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/list-servers-detail-get.json
@@ -1,17 +1,18 @@
 {
     "servers": [
         {
+            "OS-DCF:diskConfig": "AUTO",
             "addresses": {
                 "private": [
                     {
                         "addr": "192.168.0.3",
-                        "mac_addr": "aa:bb:cc:dd:ee:ff",
-                        "type": "fixed",
+                        "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
+                        "OS-EXT-IPS:type": "fixed",
                         "version": 4
                     }
                 ]
             },
-            "created": "2013-10-15T02:10:25Z",
+            "created": "2012-12-02T02:11:55Z",
             "flavor": {
                 "id": "1",
                 "links": [
@@ -21,25 +22,24 @@
                     }
                 ]
             },
-            "host_id": "6cf06d723b64cccf68dd9d40429588cd215879d518a2699b2b947c19",
-            "id": "e1f469a7-1d3c-44ad-ac17-312596b84e0c",
+            "hostId": "99428f32351a5d89d0f7727c6eec68c1777c545a0972aaac645508dc",
+            "id": "05372e62-05b9-4ee2-9343-9a1fdf2a5fda",
             "image": {
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
             },
-            "key_name": null,
             "links": [
                 {
-                    "href": "http://openstack.example.com/v3/servers/e1f469a7-1d3c-44ad-ac17-312596b84e0c",
+                    "href": "http://openstack.example.com/v3/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/servers/e1f469a7-1d3c-44ad-ac17-312596b84e0c",
+                    "href": "http://openstack.example.com/servers/05372e62-05b9-4ee2-9343-9a1fdf2a5fda",
                     "rel": "bookmark"
                 }
             ],
@@ -47,12 +47,12 @@
                 "My Server Name": "Apache1"
             },
             "name": "new-server-test",
-            "os-disk-config:disk_config": "AUTO",
             "progress": 0,
             "status": "ACTIVE",
             "tenant_id": "openstack",
-            "updated": "2013-10-15T02:10:25Z",
+            "updated": "2012-12-02T02:11:56Z",
+            "key_name": null,
             "user_id": "fake"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-action-rebuild-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-action-rebuild-req.json
index 5ce8cc39b..745f0b26d 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-action-rebuild-req.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-action-rebuild-req.json
@@ -1,6 +1,6 @@
 {
     "rebuild": {
-        "image_ref": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "os-disk-config:disk_config": "AUTO"
+        "imageRef" : "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "OS-DCF:diskConfig": "AUTO"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-action-rebuild-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-action-rebuild-resp.json
index 2b6c30a41..6ff94acce 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-action-rebuild-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-action-rebuild-resp.json
@@ -1,17 +1,18 @@
 {
     "server": {
+        "OS-DCF:diskConfig": "AUTO",
         "addresses": {
             "private": [
                 {
                     "addr": "192.168.0.3",
-                    "mac_addr": "aa:bb:cc:dd:ee:ff",
-                    "type": "fixed",
+                    "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
+                    "OS-EXT-IPS:type": "fixed",
                     "version": 4
                 }
             ]
         },
-        "admin_password": "secretsecret",
-        "created": "2013-10-15T02:10:35Z",
+        "adminPass": "NBjMaJoFL4EF",
+        "created": "2012-12-02T02:11:56Z",
         "flavor": {
             "id": "1",
             "links": [
@@ -21,24 +22,24 @@
                 }
             ]
         },
-        "host_id": "0052256b3afffc50ce0b1e6cdbee47df8398935d1e76fb8bb4a202c7",
-        "id": "4c69ad8c-5d0f-4fc8-83f8-c031b2769b0e",
+        "hostId": "c076393ad900d62c4805a42df10d9b364f629842681c00cce035487f",
+        "id": "63a8aa13-60fe-41c4-b079-77f6fdf3c841",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
         },
         "links": [
             {
-                "href": "http://openstack.example.com/v3/servers/4c69ad8c-5d0f-4fc8-83f8-c031b2769b0e",
+                "href": "http://openstack.example.com/v3/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841",
                 "rel": "self"
             },
             {
-                "href": "http://openstack.example.com/servers/4c69ad8c-5d0f-4fc8-83f8-c031b2769b0e",
+                "href": "http://openstack.example.com/servers/63a8aa13-60fe-41c4-b079-77f6fdf3c841",
                 "rel": "bookmark"
             }
         ],
@@ -46,11 +47,10 @@
             "My Server Name": "Apache1"
         },
         "name": "new-server-test",
-        "os-disk-config:disk_config": "AUTO",
         "progress": 0,
         "status": "ACTIVE",
         "tenant_id": "openstack",
-        "updated": "2013-10-15T02:10:35Z",
+        "updated": "2012-12-02T02:11:56Z",
         "user_id": "fake"
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-get-resp.json
index c05e9f6d2..3d266d38c 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-get-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-get-resp.json
@@ -1,16 +1,17 @@
 {
     "server": {
+        "OS-DCF:diskConfig": "AUTO",
         "addresses": {
             "private": [
                 {
                     "addr": "192.168.0.3",
-                    "mac_addr": "aa:bb:cc:dd:ee:ff",
-                    "type": "fixed",
+                    "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
+                    "OS-EXT-IPS:type": "fixed",
                     "version": 4
                 }
             ]
         },
-        "created": "2013-10-15T02:10:34Z",
+        "created": "2012-12-02T02:11:55Z",
         "flavor": {
             "id": "1",
             "links": [
@@ -20,25 +21,24 @@
                 }
             ]
         },
-        "host_id": "060592f7d211654f26c403eeb86fe3a0ce60f29b4338b37f1c88b15e",
-        "id": "5b5e7d2e-720b-404e-81ae-4faa7aa43c6a",
+        "hostId": "c949ab4256cea23b6089b710aa2df48bf6577ed915278b62e33ad8bb",
+        "id": "5046e2f2-3b33-4041-b3cf-e085f73e78e7",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
         },
-        "key_name": null,
         "links": [
             {
-                "href": "http://openstack.example.com/v3/servers/5b5e7d2e-720b-404e-81ae-4faa7aa43c6a",
+                "href": "http://openstack.example.com/v3/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7",
                 "rel": "self"
             },
             {
-                "href": "http://openstack.example.com/servers/5b5e7d2e-720b-404e-81ae-4faa7aa43c6a",
+                "href": "http://openstack.example.com/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7",
                 "rel": "bookmark"
             }
         ],
@@ -46,11 +46,11 @@
             "My Server Name": "Apache1"
         },
         "name": "new-server-test",
-        "os-disk-config:disk_config": "AUTO",
         "progress": 0,
         "status": "ACTIVE",
         "tenant_id": "openstack",
-        "updated": "2013-10-15T02:10:34Z",
+        "updated": "2012-12-02T02:11:55Z",
+        "key_name": null,
         "user_id": "fake"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-post-req.json
index ad72813f0..6a4bc8ede 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-post-req.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-post-req.json
@@ -1,10 +1,16 @@
 {
-    "server": {
-        "name": "new-server-test",
-        "image_ref": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavor_ref": "http://openstack.example.com/flavors/1",
-        "metadata": {
-            "My Server Name": "Apache1"
-        }
+    "server" : {
+        "name" : "new-server-test",
+        "imageRef" : "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavorRef" : "http://openstack.example.com/flavors/1",
+        "metadata" : {
+            "My Server Name" : "Apache1"
+        },
+        "personality" : [
+            {
+                "path" : "/etc/banner.txt",
+                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
+            }
+        ]
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-post-resp.json
index 24396d37e..3d2b22a8c 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-post-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-post-resp.json
@@ -1,17 +1,17 @@
 {
     "server": {
-        "admin_password": "secretsecret",
-        "id": "e1f469a7-1d3c-44ad-ac17-312596b84e0c",
+        "OS-DCF:diskConfig": "AUTO",
+        "adminPass": "CQH9gWzgkVno",
+        "id": "324dfb7d-f4a9-419a-9a19-237df04b443b",
         "links": [
             {
-                "href": "http://openstack.example.com/v3/servers/e1f469a7-1d3c-44ad-ac17-312596b84e0c",
+                "href": "http://openstack.example.com/v3/servers/324dfb7d-f4a9-419a-9a19-237df04b443b",
                 "rel": "self"
             },
             {
-                "href": "http://openstack.example.com/servers/e1f469a7-1d3c-44ad-ac17-312596b84e0c",
+                "href": "http://openstack.example.com/servers/324dfb7d-f4a9-419a-9a19-237df04b443b",
                 "rel": "bookmark"
             }
-        ],
-        "os-disk-config:disk_config": "AUTO"
+        ]
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-resize-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-resize-post-req.json
index cf326cca1..a290485e1 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-resize-post-req.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-resize-post-req.json
@@ -1,6 +1,6 @@
 {
     "resize": {
-        "flavor_ref": "3",
-        "os-disk-config:disk_config": "AUTO"
+        "flavorRef": "3",
+        "OS-DCF:diskConfig": "AUTO"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-update-put-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-update-put-req.json
index 0cd8d51da..4ac22820d 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-update-put-req.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-update-put-req.json
@@ -1,5 +1,5 @@
 {
     "server": {
-        "os-disk-config:disk_config": "AUTO"
+        "OS-DCF:diskConfig": "AUTO"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-update-put-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-update-put-resp.json
index d478c3219..4f9168d4d 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-update-put-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-update-put-resp.json
@@ -1,16 +1,17 @@
 {
     "server": {
+        "OS-DCF:diskConfig": "AUTO",
         "addresses": {
             "private": [
                 {
                     "addr": "192.168.0.3",
-                    "mac_addr": "aa:bb:cc:dd:ee:ff",
-                    "type": "fixed",
+                    "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
+                    "OS-EXT-IPS:type": "fixed",
                     "version": 4
                 }
             ]
         },
-        "created": "2013-10-15T02:10:28Z",
+        "created": "2012-12-02T02:11:57Z",
         "flavor": {
             "id": "1",
             "links": [
@@ -20,24 +21,24 @@
                 }
             ]
         },
-        "host_id": "1ccbc449599c02938647dcf0956213555a5e36e8c1dd0962763a89a3",
-        "id": "5deb985c-1409-42a9-995d-0a07c31f5459",
+        "hostId": "6e84af987b4e7ec1c039b16d21f508f4a505672bd94fb0218b668d07",
+        "id": "324dfb7d-f4a9-419a-9a19-237df04b443b",
         "image": {
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
         },
         "links": [
             {
-                "href": "http://openstack.example.com/v3/servers/5deb985c-1409-42a9-995d-0a07c31f5459",
+                "href": "http://openstack.example.com/v3/servers/324dfb7d-f4a9-419a-9a19-237df04b443b",
                 "rel": "self"
             },
             {
-                "href": "http://openstack.example.com/servers/5deb985c-1409-42a9-995d-0a07c31f5459",
+                "href": "http://openstack.example.com/servers/324dfb7d-f4a9-419a-9a19-237df04b443b",
                 "rel": "bookmark"
             }
         ],
@@ -45,11 +46,10 @@
             "My Server Name": "Apache1"
         },
         "name": "new-server-test",
-        "os-disk-config:disk_config": "AUTO",
         "progress": 0,
         "status": "ACTIVE",
         "tenant_id": "openstack",
-        "updated": "2013-10-15T02:10:29Z",
+        "updated": "2012-12-02T02:11:58Z",
         "user_id": "fake"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-disk-config-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-disk-config-v2.1.wadl
new file mode 100644
index 000000000..cf15de323
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-disk-config-v2.1.wadl
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- (C) 2013-2014 OpenStack Foundation, All Rights Reserved -->
+<!DOCTYPE application [<!ENTITY % common  SYSTEM "../common.ent">
+%common;]>
+<application xmlns="http://wadl.dev.java.net/2009/02"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
+    xmlns:csapi="http://docs.openstack.org/compute/api/v2"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02">
+    <resources base="https://servers.api.openstack.com"
+        xml:id="disk-config">
+        <resource id="version" type="#VersionDetails" path="//v2">
+            <resource id="tenant_id" path="{tenant_id}">
+                <param name="tenant_id" style="template"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN">
+                        <para>The ID for the tenant or account in a
+                            multi-tenancy cloud.</para>
+                    </wadl:doc>
+                </param>
+                <resource id="Servers" path="servers">
+                    <method href="#createServer"/>
+                    <resource path="{server_id}" id="server_id">
+                        <param name="server_id" style="template"
+                            type="csapi:UUID">
+                            <wadl:doc
+                                xmlns="http://docbook.org/ns/docbook"
+                                xml:lang="EN">
+                                <para>The UUID for the server of
+                                   interest to you.</para>
+                            </wadl:doc>
+                        </param>
+                        <param name="os-disk-config:diskConfig" style="plain">
+                            <wadl:doc
+                                xmlns="http://docbook.org/ns/docbook"
+                                xml:lang="EN">
+                                <para>Valid value is AUTO or
+                                   MANUAL.</para>
+                            </wadl:doc>
+                        </param>
+                        <method href="#getServer"/>
+                        <method href="#updateServer"/>
+                        <resource path="action" id="action">
+                            <method href="#resize"/>
+                            <method href="#rebuild"/>
+                        </resource>
+                    </resource>
+                    <resource path="detail" id="detail">
+                        <method href="#getServersDetailed"/>
+                    </resource>
+                </resource>
+                <resource id="images" path="images">
+                    <resource path="{image_id}">
+                        <param name="image_id" style="template">
+                            <wadl:doc
+                                xmlns="http://docbook.org/ns/docbook"
+                                xml:lang="EN">
+                                <para>The UUID for the image of
+                                   interest to you.</para>
+                            </wadl:doc>
+                        </param>
+                        <method href="#getImage"/>
+                    </resource>
+                    <resource path="detail" id="image_detail">
+                        <method href="#getImagesDetailed"/>
+                    </resource>
+                </resource>
+            </resource>
+        </resource>
+    </resources>
+    <method name="POST" id="createServer">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Create server">
+            <para role="shortdesc">Creates a server.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-post-req.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-post-req.xml"
+                    />
+                </wadl:doc>&serverCreateParameters; <param
+                    name="os-disk-config:diskConfig" style="plain">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN">
+                        <para>A valid value is AUTO or MANUAL.</para>
+                    </wadl:doc>
+                </param>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-post-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-post-resp.xml"
+                    />
+                </wadl:doc> &serverCreateParameters; </representation>
+        </response>
+    </method>
+    <method name="PUT" id="updateServer">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Update server">
+            <para role="shortdesc">Updates a specified server.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-update-put-req.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-update-put-req.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </request>
+        <response status="200">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-update-put-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-update-put-resp.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="POST" id="resize">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Resize server">
+            <para role="shortdesc">Resizes a server.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-resize-post-req.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-resize-post-req.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </request>
+        <response status="202"/>
+    </method>
+    <method name="POST" id="rebuild">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Rebuild server">
+            <para role="shortdesc">Rebuilds a specified server.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-action-rebuild-req.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-action-rebuild-req.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-action-rebuild-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-action-rebuild-resp.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="GET" id="getServersDetailed">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="List servers">
+            <para role="shortdesc">Lists servers with detailed config drive information.</para>
+        </wadl:doc>
+        <response status="200">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/list-servers-detail-get.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/list-servers-detail-get.xml"
+                    />
+                </wadl:doc>
+                <param name="os-disk-config:diskConfig" style="plain"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN"><para>Valid value is AUTO or
+                            MANUAL.</para>
+                    </wadl:doc>
+                </param>
+            </representation>
+        </response>
+    </method>
+    <method name="GET" id="getServer">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Show server information">
+            <para role="shortdesc">Shows information for a specified
+                server.</para>
+        </wadl:doc>
+        <response status="200">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-get-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/server-get-resp.xml"
+                    />
+                </wadl:doc>
+                <param name="os-disk-config:diskConfig" style="plain"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN"><para>Valid value is AUTO or
+                            MANUAL.</para>
+                    </wadl:doc>
+                </param>
+            </representation>
+        </response>
+    </method>
+    <method name="GET" id="getImage">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Get image information">
+            <para role="shortdesc">Gets information for a specified
+                image.</para>
+        </wadl:doc>
+        <response status="200">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/image-get-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/image-get-resp.xml"
+                    />
+                </wadl:doc>
+                <param name="os-disk-config:diskConfig" style="plain"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN"><para>Valid value is AUTO or
+                            MANUAL.</para>
+                    </wadl:doc>
+                </param>
+            </representation>
+        </response>
+    </method>
+    <method name="GET" id="getImagesDetailed">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="List images">
+            <para role="shortdesc">Lists images.</para>
+        </wadl:doc>
+        <response status="200">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/image-list-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../api_samples/os-disk-config/image-list-resp.xml"
+                    />
+                </wadl:doc>
+                <param name="os-disk-config:diskConfig" style="plain"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN"><para>Valid value is AUTO or
+                            MANUAL.</para>
+                    </wadl:doc>
+                </param>
+            </representation>
+        </response>
+    </method>
+</application>
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/OS-DCF/server-post-req.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/OS-DCF/server-post-req.xml
index 0a3c8bb53..467d85d50 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/OS-DCF/server-post-req.xml
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/OS-DCF/server-post-req.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1"
+  xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1"
+  imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test" OS-DCF:diskConfig="AUTO">
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>
@@ -16,4 +18,4 @@
         b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
     </file>
   </personality>
-</server>
\ No newline at end of file
+</server>