scheduler: Add an ephemeral encryption pre filter

Change-Id: I20b21f39c46895448b172f79a3e4603d124f2c53

2 files changed, 260 insertions, 66 deletions

diff --git a/doc/api_samples/images/images-details-get-resp.json b/doc/api_samples/images/images-details-get-resp.json
index 034c35f0c0..33cf667287 100644
--- a/doc/api_samples/images/images-details-get-resp.json
+++ b/doc/api_samples/images/images-details-get-resp.json
@@ -1,59 +1,56 @@
 {
     "images": [
         {
-            "OS-DCF:diskConfig": "AUTO",
-            "OS-EXT-IMG-SIZE:size": "74185822",
+            "OS-EXT-IMG-SIZE:size": "25165824",
             "created": "2011-01-01T01:02:03Z",
-            "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+            "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "links": [
                 {
-                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
                     "rel": "bookmark"
                 },
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
                     "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",
+            "name": "fakeimage123456",
             "progress": 100,
             "status": "ACTIVE",
             "updated": "2011-01-01T01:02:03Z"
         },
         {
-            "OS-EXT-IMG-SIZE:size": "74185822",
+            "OS-EXT-IMG-SIZE:size": "58145823",
             "created": "2011-01-01T01:02:03Z",
-            "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
+            "id": "a2459075-d96c-40d5-893e-577ff92e721c",
             "links": [
                 {
-                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/a2459075-d96c-40d5-893e-577ff92e721c",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/a2459075-d96c-40d5-893e-577ff92e721c",
                     "rel": "bookmark"
                 },
                 {
-                    "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c",
                     "rel": "alternate",
                     "type": "application/vnd.openstack.image"
                 }
             ],
             "metadata": {
-                "architecture": "x86_64",
                 "kernel_id": "nokernel",
                 "ramdisk_id": "nokernel"
             },
@@ -65,25 +62,26 @@
             "updated": "2011-01-01T01:02:03Z"
         },
         {
-            "OS-EXT-IMG-SIZE:size": "74185822",
+            "OS-EXT-IMG-SIZE:size": "83594576",
             "created": "2011-01-01T01:02:03Z",
-            "id": "a2459075-d96c-40d5-893e-577ff92e721c",
+            "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
             "links": [
                 {
-                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
                     "rel": "bookmark"
                 },
                 {
-                    "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
                     "rel": "alternate",
                     "type": "application/vnd.openstack.image"
                 }
             ],
             "metadata": {
+                "architecture": "x86_64",
                 "kernel_id": "nokernel",
                 "ramdisk_id": "nokernel"
             },
@@ -95,40 +93,37 @@
             "updated": "2011-01-01T01:02:03Z"
         },
         {
-            "OS-DCF:diskConfig": "MANUAL",
-            "OS-EXT-IMG-SIZE:size": "74185822",
+            "OS-EXT-IMG-SIZE:size": "84035174",
             "created": "2011-01-01T01:02:03Z",
-            "id": "a440c04b-79fa-479c-bed1-0b816eaec379",
+            "id": "cedef40a-ed67-4d10-800e-17455edce175",
             "links": [
                 {
-                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/cedef40a-ed67-4d10-800e-17455edce175",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/cedef40a-ed67-4d10-800e-17455edce175",
                     "rel": "bookmark"
                 },
                 {
-                    "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175",
                     "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",
+            "name": "fakeimage123456",
             "progress": 100,
             "status": "ACTIVE",
             "updated": "2011-01-01T01:02:03Z"
         },
         {
-            "OS-EXT-IMG-SIZE:size": "74185822",
+            "OS-EXT-IMG-SIZE:size": "26360814",
             "created": "2011-01-01T01:02:03Z",
             "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77",
             "links": [
@@ -158,65 +153,188 @@
             "updated": "2011-01-01T01:02:03Z"
         },
         {
-            "OS-EXT-IMG-SIZE:size": "74185822",
+            "OS-DCF:diskConfig": "MANUAL",
+            "OS-EXT-IMG-SIZE:size": "49163826",
             "created": "2011-01-01T01:02:03Z",
-            "id": "cedef40a-ed67-4d10-800e-17455edce175",
+            "id": "a440c04b-79fa-479c-bed1-0b816eaec379",
             "links": [
                 {
-                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/a440c04b-79fa-479c-bed1-0b816eaec379",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/a440c04b-79fa-479c-bed1-0b816eaec379",
                     "rel": "bookmark"
                 },
                 {
-                    "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "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": "fakeimage123456",
+            "name": "fakeimage6",
             "progress": 100,
             "status": "ACTIVE",
             "updated": "2011-01-01T01:02:03Z"
         },
         {
+            "OS-DCF:diskConfig": "AUTO",
             "OS-EXT-IMG-SIZE:size": "74185822",
             "created": "2011-01-01T01:02:03Z",
-            "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+            "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 },
                 {
-                    "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "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"
+        },
+        {
+            "OS-EXT-IMG-SIZE:size": "25165824",
+            "created": "2011-01-01T01:02:03Z",
+            "id": "95fad737-9325-4855-b37e-20a62268ec88",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/95fad737-9325-4855-b37e-20a62268ec88",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/95fad737-9325-4855-b37e-20a62268ec88",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/images/95fad737-9325-4855-b37e-20a62268ec88",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "hw_ephemeral_encryption": "True"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "OS-EXT-IMG-SIZE:size": "25165824",
+            "created": "2011-01-01T01:02:03Z",
+            "id": "535426d4-5d75-44f4-9591-a2123d23c33f",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/535426d4-5d75-44f4-9591-a2123d23c33f",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/535426d4-5d75-44f4-9591-a2123d23c33f",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/images/535426d4-5d75-44f4-9591-a2123d23c33f",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "hw_ephemeral_encryption": "False"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "OS-EXT-IMG-SIZE:size": "25165824",
+            "created": "2011-01-01T01:02:03Z",
+            "id": "5f7d4f5b-3781-4a4e-9046-a2a800e807e5",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/5f7d4f5b-3781-4a4e-9046-a2a800e807e5",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/5f7d4f5b-3781-4a4e-9046-a2a800e807e5",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/images/5f7d4f5b-3781-4a4e-9046-a2a800e807e5",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "hw_ephemeral_encryption": "True",
+                "hw_ephemeral_encryption_format": "luks"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "OS-EXT-IMG-SIZE:size": "25165824",
+            "created": "2011-01-01T01:02:03Z",
+            "id": "261b52ed-f693-4147-8f3b-d25df5efd968",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/261b52ed-f693-4147-8f3b-d25df5efd968",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/261b52ed-f693-4147-8f3b-d25df5efd968",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/images/261b52ed-f693-4147-8f3b-d25df5efd968",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "hw_ephemeral_encryption": "True",
+                "hw_ephemeral_encryption_format": "plain"
+            },
+            "minDisk": 0,
+            "minRam": 0,
             "name": "fakeimage123456",
             "progress": 100,
             "status": "ACTIVE",
             "updated": "2011-01-01T01:02:03Z"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/doc/api_samples/images/images-list-get-resp.json b/doc/api_samples/images/images-list-get-resp.json
index 00d06f96b3..e2207b9271 100644
--- a/doc/api_samples/images/images-list-get-resp.json
+++ b/doc/api_samples/images/images-list-get-resp.json
@@ -1,37 +1,37 @@
 {
     "images": [
         {
-            "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+            "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "links": [
                 {
-                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
                     "rel": "bookmark"
                 },
                 {
-                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
                     "rel": "alternate",
                     "type": "application/vnd.openstack.image"
                 }
             ],
-            "name": "fakeimage7"
+            "name": "fakeimage123456"
         },
         {
-            "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
+            "id": "a2459075-d96c-40d5-893e-577ff92e721c",
             "links": [
                 {
-                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/a2459075-d96c-40d5-893e-577ff92e721c",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/a2459075-d96c-40d5-893e-577ff92e721c",
                     "rel": "bookmark"
                 },
                 {
-                    "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c",
                     "rel": "alternate",
                     "type": "application/vnd.openstack.image"
                 }
@@ -39,18 +39,56 @@
             "name": "fakeimage123456"
         },
         {
-            "id": "a2459075-d96c-40d5-893e-577ff92e721c",
+            "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
             "links": [
                 {
-                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
                     "rel": "bookmark"
                 },
                 {
-                    "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage123456"
+        },
+        {
+            "id": "cedef40a-ed67-4d10-800e-17455edce175",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/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"
+                }
+            ],
+            "name": "fakeimage123456"
+        },
+        {
+            "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/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"
                 }
@@ -77,18 +115,37 @@
             "name": "fakeimage6"
         },
         {
-            "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+            "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 },
                 {
-                    "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage7"
+        },
+        {
+            "id": "a2293931-dc33-45cc-85ef-232aa9491710",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/a2293931-dc33-45cc-85ef-232aa9491710",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/a2293931-dc33-45cc-85ef-232aa9491710",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/images/a2293931-dc33-45cc-85ef-232aa9491710",
                     "rel": "alternate",
                     "type": "application/vnd.openstack.image"
                 }
@@ -96,18 +153,18 @@
             "name": "fakeimage123456"
         },
         {
-            "id": "cedef40a-ed67-4d10-800e-17455edce175",
+            "id": "e78f0ee9-96ef-4ce7-accf-e816f273be45",
             "links": [
                 {
-                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/e78f0ee9-96ef-4ce7-accf-e816f273be45",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/e78f0ee9-96ef-4ce7-accf-e816f273be45",
                     "rel": "bookmark"
                 },
                 {
-                    "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "href": "http://glance.openstack.example.com/images/e78f0ee9-96ef-4ce7-accf-e816f273be45",
                     "rel": "alternate",
                     "type": "application/vnd.openstack.image"
                 }
@@ -115,18 +172,37 @@
             "name": "fakeimage123456"
         },
         {
-            "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+            "id": "54eadb78-eeb6-4b13-beed-20b9894eeadf",
             "links": [
                 {
-                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/54eadb78-eeb6-4b13-beed-20b9894eeadf",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/54eadb78-eeb6-4b13-beed-20b9894eeadf",
                     "rel": "bookmark"
                 },
                 {
-                    "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "href": "http://glance.openstack.example.com/images/54eadb78-eeb6-4b13-beed-20b9894eeadf",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage123456"
+        },
+        {
+            "id": "eb7458f3-d003-4187-8027-595591dc2723",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/eb7458f3-d003-4187-8027-595591dc2723",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/6f70656e737461636b20342065766572/images/eb7458f3-d003-4187-8027-595591dc2723",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/images/eb7458f3-d003-4187-8027-595591dc2723",
                     "rel": "alternate",
                     "type": "application/vnd.openstack.image"
                 }
@@ -134,4 +210,4 @@
             "name": "fakeimage123456"
         }
     ]
-}
+}
\ No newline at end of file