diff --git a/doc/api_samples/OS-DCF/image-get-resp.json b/doc/api_samples/OS-DCF/image-get-resp.json index feae88fb74..9105de415f 100644 --- a/doc/api_samples/OS-DCF/image-get-resp.json +++ b/doc/api_samples/OS-DCF/image-get-resp.json @@ -13,7 +13,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -31,4 +31,4 @@ "status": "ACTIVE", "updated": "2011-01-01T01:02:03Z" } -} \ No newline at end of file +} diff --git a/doc/api_samples/OS-DCF/image-get-resp.xml b/doc/api_samples/OS-DCF/image-get-resp.xml index fc0317742a..448fd33837 100644 --- a/doc/api_samples/OS-DCF/image-get-resp.xml +++ b/doc/api_samples/OS-DCF/image-get-resp.xml @@ -8,5 +8,5 @@ - - \ No newline at end of file + + diff --git a/doc/api_samples/OS-DCF/image-list-resp.json b/doc/api_samples/OS-DCF/image-list-resp.json index fe18205f85..d3fa4d567e 100644 --- a/doc/api_samples/OS-DCF/image-list-resp.json +++ b/doc/api_samples/OS-DCF/image-list-resp.json @@ -14,7 +14,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -45,7 +45,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -75,7 +75,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -105,7 +105,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -136,7 +136,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -165,7 +165,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -194,7 +194,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -211,4 +211,4 @@ "updated": "2011-01-01T01:02:03Z" } ] -} \ No newline at end of file +} diff --git a/doc/api_samples/OS-DCF/image-list-resp.xml b/doc/api_samples/OS-DCF/image-list-resp.xml index f5c463e25d..eadb6c01bf 100644 --- a/doc/api_samples/OS-DCF/image-list-resp.xml +++ b/doc/api_samples/OS-DCF/image-list-resp.xml @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -66,6 +66,6 @@ - + - \ No newline at end of file + diff --git a/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json b/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json index 1548aeb590..fd3faa4755 100644 --- a/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json +++ b/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json @@ -13,7 +13,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -31,4 +31,4 @@ "status": "ACTIVE", "updated": "2011-01-01T01:02:03Z" } -} \ No newline at end of file +} diff --git a/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml b/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml index 49fe2ee31b..c713e3a207 100644 --- a/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml +++ b/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml @@ -8,5 +8,5 @@ - - \ No newline at end of file + + diff --git a/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.json b/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.json index bbd9dcfb19..2ef90648e4 100644 --- a/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.json +++ b/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.json @@ -14,7 +14,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -46,7 +46,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -77,7 +77,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -107,7 +107,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -139,7 +139,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -169,7 +169,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -199,7 +199,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -216,4 +216,4 @@ "updated": "2011-01-01T01:02:03Z" } ] -} \ No newline at end of file +} diff --git a/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml b/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml index d0b5787ca8..bb3dcbaa87 100644 --- a/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml +++ b/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -66,6 +66,6 @@ - + - \ No newline at end of file + diff --git a/doc/api_samples/image-get-resp.json b/doc/api_samples/image-get-resp.json index da419650d3..068f8a6744 100644 --- a/doc/api_samples/image-get-resp.json +++ b/doc/api_samples/image-get-resp.json @@ -12,7 +12,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -30,4 +30,4 @@ "status": "ACTIVE", "updated": "2011-01-01T01:02:03Z" } -} \ No newline at end of file +} diff --git a/doc/api_samples/image-get-resp.xml b/doc/api_samples/image-get-resp.xml index 77fa67bb1a..09ac3e1508 100644 --- a/doc/api_samples/image-get-resp.xml +++ b/doc/api_samples/image-get-resp.xml @@ -8,5 +8,5 @@ - - \ No newline at end of file + + diff --git a/doc/api_samples/images-details-get-resp.json b/doc/api_samples/images-details-get-resp.json index 44a0e1d771..1ca98ac47d 100644 --- a/doc/api_samples/images-details-get-resp.json +++ b/doc/api_samples/images-details-get-resp.json @@ -13,7 +13,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -44,7 +44,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -74,7 +74,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -103,7 +103,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -134,7 +134,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -163,7 +163,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -192,7 +192,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -209,4 +209,4 @@ "updated": "2011-01-01T01:02:03Z" } ] -} \ No newline at end of file +} diff --git a/doc/api_samples/images-details-get-resp.xml b/doc/api_samples/images-details-get-resp.xml index 654251a33f..22c533cbd5 100644 --- a/doc/api_samples/images-details-get-resp.xml +++ b/doc/api_samples/images-details-get-resp.xml @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -66,6 +66,6 @@ - + - \ No newline at end of file + diff --git a/doc/api_samples/images-list-get-resp.json b/doc/api_samples/images-list-get-resp.json index eb14ed3c71..451ce12688 100644 --- a/doc/api_samples/images-list-get-resp.json +++ b/doc/api_samples/images-list-get-resp.json @@ -12,7 +12,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -31,7 +31,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -50,7 +50,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -69,7 +69,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -88,7 +88,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -107,7 +107,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -126,7 +126,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -134,4 +134,4 @@ "name": "fakeimage123456" } ] -} \ No newline at end of file +} diff --git a/doc/api_samples/images-list-get-resp.xml b/doc/api_samples/images-list-get-resp.xml index 0674afb09a..685345739b 100644 --- a/doc/api_samples/images-list-get-resp.xml +++ b/doc/api_samples/images-list-get-resp.xml @@ -3,36 +3,36 @@ - + - + - + - + - + - + - + - \ No newline at end of file + diff --git a/doc/v3/api_samples/image-size/image-get-resp.json b/doc/v3/api_samples/image-size/image-get-resp.json index a6d9d20e1b..b1cf0bc446 100644 --- a/doc/v3/api_samples/image-size/image-get-resp.json +++ b/doc/v3/api_samples/image-size/image-get-resp.json @@ -13,7 +13,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } diff --git a/doc/v3/api_samples/image-size/images-details-get-resp.json b/doc/v3/api_samples/image-size/images-details-get-resp.json index 01ebc60b59..ca63df5131 100644 --- a/doc/v3/api_samples/image-size/images-details-get-resp.json +++ b/doc/v3/api_samples/image-size/images-details-get-resp.json @@ -14,7 +14,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -46,7 +46,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -77,7 +77,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -107,7 +107,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -139,7 +139,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -169,7 +169,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -199,7 +199,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } diff --git a/doc/v3/api_samples/images/image-get-resp.json b/doc/v3/api_samples/images/image-get-resp.json index 9b1abf02d2..57ae88548d 100644 --- a/doc/v3/api_samples/images/image-get-resp.json +++ b/doc/v3/api_samples/images/image-get-resp.json @@ -12,7 +12,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -30,4 +30,4 @@ "status": "ACTIVE", "updated": "2011-01-01T01:02:03Z" } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/images/images-details-get-resp.json b/doc/v3/api_samples/images/images-details-get-resp.json index 91e9750def..df8ecad0b8 100644 --- a/doc/v3/api_samples/images/images-details-get-resp.json +++ b/doc/v3/api_samples/images/images-details-get-resp.json @@ -13,7 +13,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -44,7 +44,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -74,7 +74,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -103,7 +103,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -134,7 +134,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -163,7 +163,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -192,7 +192,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -209,4 +209,4 @@ "updated": "2011-01-01T01:02:03Z" } ] -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/images/images-list-get-resp.json b/doc/v3/api_samples/images/images-list-get-resp.json index 19b39fdc5a..32ebd60cfa 100644 --- a/doc/v3/api_samples/images/images-list-get-resp.json +++ b/doc/v3/api_samples/images/images-list-get-resp.json @@ -12,7 +12,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -31,7 +31,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -50,7 +50,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -69,7 +69,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -88,7 +88,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -107,7 +107,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -126,7 +126,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -134,4 +134,4 @@ "name": "fakeimage123456" } ] -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-disk-config/image-get-resp.json b/doc/v3/api_samples/os-disk-config/image-get-resp.json index 86cbc4937b..6947e395ab 100644 --- a/doc/v3/api_samples/os-disk-config/image-get-resp.json +++ b/doc/v3/api_samples/os-disk-config/image-get-resp.json @@ -13,7 +13,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -31,4 +31,4 @@ "status": "ACTIVE", "updated": "2011-01-01T01:02:03Z" } -} \ No newline at end of file +} diff --git a/doc/v3/api_samples/os-disk-config/image-list-resp.json b/doc/v3/api_samples/os-disk-config/image-list-resp.json index a613d731cb..0e3ae990a0 100644 --- a/doc/v3/api_samples/os-disk-config/image-list-resp.json +++ b/doc/v3/api_samples/os-disk-config/image-list-resp.json @@ -14,7 +14,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -45,7 +45,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -75,7 +75,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -105,7 +105,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -136,7 +136,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -165,7 +165,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -194,7 +194,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -211,4 +211,4 @@ "updated": "2011-01-01T01:02:03Z" } ] -} \ No newline at end of file +} diff --git a/nova/api/openstack/compute/views/images.py b/nova/api/openstack/compute/views/images.py index 0a33844b40..275ed08b42 100644 --- a/nova/api/openstack/compute/views/images.py +++ b/nova/api/openstack/compute/views/images.py @@ -119,7 +119,6 @@ class ViewBuilder(common.ViewBuilder): glance_url = glance.generate_glance_url() glance_url = self._update_glance_link_prefix(glance_url) return '/'.join([glance_url, - request.environ["nova.context"].project_id, self._collection_name, str(identifier)]) diff --git a/nova/tests/api/openstack/compute/test_images.py b/nova/tests/api/openstack/compute/test_images.py index c428681e9b..62dc3d8218 100644 --- a/nova/tests/api/openstack/compute/test_images.py +++ b/nova/tests/api/openstack/compute/test_images.py @@ -69,7 +69,7 @@ class ImagesControllerTestV21(test.NoDBTestCase): self.server_bookmark = ( "http://localhost%s/servers/%s" % (self.bookmark_base, self.server_uuid)) - self.alternate = "%s/fake/images/%s" + self.alternate = "%s/images/%s" self.expected_image_123 = { "image": {'id': '123', @@ -165,7 +165,7 @@ class ImagesControllerTestV21(test.NoDBTestCase): expected_image["image"]["links"][1]["href"] = ( "https://zoo.com:42%s/images/124" % self.bookmark_base) expected_image["image"]["links"][2]["href"] = ( - "http://circus.com:34/fake/images/124") + "http://circus.com:34/images/124") expected_image["image"]["server"]["links"][0]["href"] = ( "https://zoo.com:42%s/servers/%s" % (self.url_base, self.server_uuid)) @@ -196,7 +196,7 @@ class ImagesControllerTestV21(test.NoDBTestCase): image_125["links"][0]["href"] = "%s/125" % self.url_prefix image_125["links"][1]["href"] = "%s/125" % self.bookmark_prefix image_125["links"][2]["href"] = ( - "%s/fake/images/125" % glance.generate_glance_url()) + "%s/images/125" % glance.generate_glance_url()) image_126 = copy.deepcopy(self.expected_image_124["image"]) image_126['id'] = '126' @@ -206,7 +206,7 @@ class ImagesControllerTestV21(test.NoDBTestCase): image_126["links"][0]["href"] = "%s/126" % self.url_prefix image_126["links"][1]["href"] = "%s/126" % self.bookmark_prefix image_126["links"][2]["href"] = ( - "%s/fake/images/126" % glance.generate_glance_url()) + "%s/images/126" % glance.generate_glance_url()) image_127 = copy.deepcopy(self.expected_image_124["image"]) image_127['id'] = '127' @@ -216,7 +216,7 @@ class ImagesControllerTestV21(test.NoDBTestCase): image_127["links"][0]["href"] = "%s/127" % self.url_prefix image_127["links"][1]["href"] = "%s/127" % self.bookmark_prefix image_127["links"][2]["href"] = ( - "%s/fake/images/127" % glance.generate_glance_url()) + "%s/images/127" % glance.generate_glance_url()) image_128 = copy.deepcopy(self.expected_image_124["image"]) image_128['id'] = '128' @@ -226,7 +226,7 @@ class ImagesControllerTestV21(test.NoDBTestCase): image_128["links"][0]["href"] = "%s/128" % self.url_prefix image_128["links"][1]["href"] = "%s/128" % self.bookmark_prefix image_128["links"][2]["href"] = ( - "%s/fake/images/128" % glance.generate_glance_url()) + "%s/images/128" % glance.generate_glance_url()) image_129 = copy.deepcopy(self.expected_image_124["image"]) image_129['id'] = '129' @@ -236,7 +236,7 @@ class ImagesControllerTestV21(test.NoDBTestCase): image_129["links"][0]["href"] = "%s/129" % self.url_prefix image_129["links"][1]["href"] = "%s/129" % self.bookmark_prefix image_129["links"][2]["href"] = ( - "%s/fake/images/129" % glance.generate_glance_url()) + "%s/images/129" % glance.generate_glance_url()) image_130 = copy.deepcopy(self.expected_image_123["image"]) image_130['id'] = '130' @@ -247,7 +247,7 @@ class ImagesControllerTestV21(test.NoDBTestCase): image_130["links"][0]["href"] = "%s/130" % self.url_prefix image_130["links"][1]["href"] = "%s/130" % self.bookmark_prefix image_130["links"][2]["href"] = ( - "%s/fake/images/130" % glance.generate_glance_url()) + "%s/images/130" % glance.generate_glance_url()) image_131 = copy.deepcopy(self.expected_image_123["image"]) image_131['id'] = '131' @@ -258,7 +258,7 @@ class ImagesControllerTestV21(test.NoDBTestCase): image_131["links"][0]["href"] = "%s/131" % self.url_prefix image_131["links"][1]["href"] = "%s/131" % self.bookmark_prefix image_131["links"][2]["href"] = ( - "%s/fake/images/131" % glance.generate_glance_url()) + "%s/images/131" % glance.generate_glance_url()) expected = [self.expected_image_123["image"], self.expected_image_124["image"], @@ -352,7 +352,7 @@ class ImagesControllerTestV21(test.NoDBTestCase): view = images_view.ViewBuilder() request = self.http_request.blank(self.url_base + 'images/1') generated_url = view._get_alternate_link(request, 1) - actual_url = "%s/fake/images/1" % glance.generate_glance_url() + actual_url = "%s/images/1" % glance.generate_glance_url() self.assertEqual(generated_url, actual_url) def _check_response(self, controller_method, response, expected_code): diff --git a/nova/tests/integrated/api_samples/OS-DCF/image-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-DCF/image-get-resp.json.tpl index c1d470e912..72ff4448b8 100644 --- a/nova/tests/integrated/api_samples/OS-DCF/image-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-DCF/image-get-resp.json.tpl @@ -13,7 +13,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(image_id)s", + "href": "%(glance_host)s/images/%(image_id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } diff --git a/nova/tests/integrated/api_samples/OS-DCF/image-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-DCF/image-get-resp.xml.tpl index a68b578e99..bf82d296d1 100644 --- a/nova/tests/integrated/api_samples/OS-DCF/image-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-DCF/image-get-resp.xml.tpl @@ -8,5 +8,5 @@ - + diff --git a/nova/tests/integrated/api_samples/OS-DCF/image-list-resp.json.tpl b/nova/tests/integrated/api_samples/OS-DCF/image-list-resp.json.tpl index 25672ff66b..62f02287f8 100644 --- a/nova/tests/integrated/api_samples/OS-DCF/image-list-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-DCF/image-list-resp.json.tpl @@ -14,7 +14,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(id)s", + "href": "%(glance_host)s/images/%(id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -45,7 +45,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(id)s", + "href": "%(glance_host)s/images/%(id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -75,7 +75,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(uuid)s", + "href": "%(glance_host)s/images/%(uuid)s", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -105,7 +105,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(uuid)s", + "href": "%(glance_host)s/images/%(uuid)s", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -136,7 +136,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(id)s", + "href": "%(glance_host)s/images/%(id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -165,7 +165,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(id)s", + "href": "%(glance_host)s/images/%(id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -194,7 +194,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(id)s", + "href": "%(glance_host)s/images/%(id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } diff --git a/nova/tests/integrated/api_samples/OS-DCF/image-list-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-DCF/image-list-resp.xml.tpl index e63c31a974..b4213312d7 100644 --- a/nova/tests/integrated/api_samples/OS-DCF/image-list-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-DCF/image-list-resp.xml.tpl @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -66,6 +66,6 @@ - + diff --git a/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json.tpl index 6a54c469a1..c460cd0260 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json.tpl @@ -12,7 +12,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(image_id)s", + "href": "%(glance_host)s/images/%(image_id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } diff --git a/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml.tpl index e36ddc76c8..e8dffa3ba4 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml.tpl @@ -8,5 +8,5 @@ - + diff --git a/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.json.tpl index a29172bf42..16d62deb4d 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.json.tpl @@ -13,7 +13,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "%(glance_host)s/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -45,7 +45,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "%(glance_host)s/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -76,7 +76,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "%(glance_host)s/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -106,7 +106,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "%(glance_host)s/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -138,7 +138,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "%(glance_host)s/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -168,7 +168,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "%(glance_host)s/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -198,7 +198,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "%(glance_host)s/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } diff --git a/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml.tpl index 4c1e4c4bed..586c8ed46d 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml.tpl @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -66,6 +66,6 @@ - + diff --git a/nova/tests/integrated/api_samples/image-get-resp.json.tpl b/nova/tests/integrated/api_samples/image-get-resp.json.tpl index cc6fb1735d..3d260b7e90 100644 --- a/nova/tests/integrated/api_samples/image-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/image-get-resp.json.tpl @@ -12,7 +12,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(image_id)s", + "href": "%(glance_host)s/images/%(image_id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } diff --git a/nova/tests/integrated/api_samples/image-get-resp.xml.tpl b/nova/tests/integrated/api_samples/image-get-resp.xml.tpl index 7e5bd4d0e5..2a69728071 100644 --- a/nova/tests/integrated/api_samples/image-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/image-get-resp.xml.tpl @@ -8,5 +8,5 @@ - + diff --git a/nova/tests/integrated/api_samples/images-details-get-resp.json.tpl b/nova/tests/integrated/api_samples/images-details-get-resp.json.tpl index 5cd76d6c6b..e353b98956 100644 --- a/nova/tests/integrated/api_samples/images-details-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/images-details-get-resp.json.tpl @@ -13,7 +13,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "%(glance_host)s/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -44,7 +44,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "%(glance_host)s/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -74,7 +74,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "%(glance_host)s/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -103,7 +103,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "%(glance_host)s/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -134,7 +134,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "%(glance_host)s/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -163,7 +163,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "%(glance_host)s/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -192,7 +192,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "%(glance_host)s/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } diff --git a/nova/tests/integrated/api_samples/images-details-get-resp.xml.tpl b/nova/tests/integrated/api_samples/images-details-get-resp.xml.tpl index aa1d973b9a..2194789790 100644 --- a/nova/tests/integrated/api_samples/images-details-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/images-details-get-resp.xml.tpl @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -66,6 +66,6 @@ - + diff --git a/nova/tests/integrated/api_samples/images-list-get-resp.json.tpl b/nova/tests/integrated/api_samples/images-list-get-resp.json.tpl index 6ed1616770..83e6accada 100644 --- a/nova/tests/integrated/api_samples/images-list-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/images-list-get-resp.json.tpl @@ -12,7 +12,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "%(glance_host)s/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -31,7 +31,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "%(glance_host)s/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -50,7 +50,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "%(glance_host)s/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -69,7 +69,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "%(glance_host)s/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -88,7 +88,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "%(glance_host)s/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -107,7 +107,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "%(glance_host)s/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -126,7 +126,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "%(glance_host)s/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } diff --git a/nova/tests/integrated/api_samples/images-list-get-resp.xml.tpl b/nova/tests/integrated/api_samples/images-list-get-resp.xml.tpl index 701e958926..71b9bfc8bf 100644 --- a/nova/tests/integrated/api_samples/images-list-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/images-list-get-resp.xml.tpl @@ -3,36 +3,36 @@ - + - + - + - + - + - + - + diff --git a/nova/tests/integrated/v3/api_samples/image-size/image-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/image-size/image-get-resp.json.tpl index 791d6a0310..9a5ebfbc11 100644 --- a/nova/tests/integrated/v3/api_samples/image-size/image-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/image-size/image-get-resp.json.tpl @@ -12,7 +12,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(image_id)s", + "href": "%(glance_host)s/images/%(image_id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } diff --git a/nova/tests/integrated/v3/api_samples/image-size/images-details-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/image-size/images-details-get-resp.json.tpl index 09c0b1fe27..2eba334009 100644 --- a/nova/tests/integrated/v3/api_samples/image-size/images-details-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/image-size/images-details-get-resp.json.tpl @@ -13,7 +13,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "%(glance_host)s/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -45,7 +45,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "%(glance_host)s/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -76,7 +76,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "%(glance_host)s/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -106,7 +106,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "%(glance_host)s/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -138,7 +138,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "%(glance_host)s/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -168,7 +168,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "%(glance_host)s/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -198,7 +198,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "%(glance_host)s/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } diff --git a/nova/tests/integrated/v3/api_samples/images/image-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/images/image-get-resp.json.tpl index 9b1abf02d2..57ae88548d 100644 --- a/nova/tests/integrated/v3/api_samples/images/image-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/images/image-get-resp.json.tpl @@ -12,7 +12,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -30,4 +30,4 @@ "status": "ACTIVE", "updated": "2011-01-01T01:02:03Z" } -} \ No newline at end of file +} diff --git a/nova/tests/integrated/v3/api_samples/images/images-details-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/images/images-details-get-resp.json.tpl index 91e9750def..df8ecad0b8 100644 --- a/nova/tests/integrated/v3/api_samples/images/images-details-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/images/images-details-get-resp.json.tpl @@ -13,7 +13,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -44,7 +44,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -74,7 +74,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -103,7 +103,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -134,7 +134,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -163,7 +163,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -192,7 +192,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -209,4 +209,4 @@ "updated": "2011-01-01T01:02:03Z" } ] -} \ No newline at end of file +} diff --git a/nova/tests/integrated/v3/api_samples/images/images-list-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/images/images-list-get-resp.json.tpl index 19b39fdc5a..32ebd60cfa 100644 --- a/nova/tests/integrated/v3/api_samples/images/images-list-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/images/images-list-get-resp.json.tpl @@ -12,7 +12,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -31,7 +31,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -50,7 +50,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -69,7 +69,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -88,7 +88,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -107,7 +107,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -126,7 +126,7 @@ "rel": "bookmark" }, { - "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -134,4 +134,4 @@ "name": "fakeimage123456" } ] -} \ No newline at end of file +} diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/image-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-disk-config/image-get-resp.json.tpl index f18eff6ddb..b79c7c857e 100644 --- a/nova/tests/integrated/v3/api_samples/os-disk-config/image-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-disk-config/image-get-resp.json.tpl @@ -13,7 +13,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(image_id)s", + "href": "%(glance_host)s/images/%(image_id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } diff --git a/nova/tests/integrated/v3/api_samples/os-disk-config/image-list-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-disk-config/image-list-resp.json.tpl index 348bb3a61c..f74aeb7c85 100644 --- a/nova/tests/integrated/v3/api_samples/os-disk-config/image-list-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-disk-config/image-list-resp.json.tpl @@ -14,7 +14,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(id)s", + "href": "%(glance_host)s/images/%(id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -45,7 +45,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(id)s", + "href": "%(glance_host)s/images/%(id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -75,7 +75,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(uuid)s", + "href": "%(glance_host)s/images/%(uuid)s", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -105,7 +105,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(uuid)s", + "href": "%(glance_host)s/images/%(uuid)s", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -136,7 +136,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(id)s", + "href": "%(glance_host)s/images/%(id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -165,7 +165,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(id)s", + "href": "%(glance_host)s/images/%(id)s", "rel": "alternate", "type": "application/vnd.openstack.image" } @@ -194,7 +194,7 @@ "rel": "bookmark" }, { - "href": "%(glance_host)s/openstack/images/%(id)s", + "href": "%(glance_host)s/images/%(id)s", "rel": "alternate", "type": "application/vnd.openstack.image" }