Merge "Correct Block Storage v1 and v2 list versions and show version"

This commit is contained in:
Jenkins 2015-10-14 15:08:29 +00:00 committed by Gerrit Code Review
commit 2112de3666
5 changed files with 57 additions and 78 deletions

View File

@ -1,26 +1,26 @@
{ {
"versions": [ "versions": [
{ {
"status": "CURRENT",
"updated": "2012-01-04T11:33:21Z",
"id": "v1.0", "id": "v1.0",
"links": [ "links": [
{ {
"href": "http://23.253.228.211:8776/v1/", "href": "http://23.253.211.234:8776/v1/",
"rel": "self" "rel": "self"
} }
] ],
"status": "SUPPORTED",
"updated": "2014-06-28T12:20:21Z"
}, },
{ {
"status": "CURRENT",
"updated": "2012-11-21T11:33:21Z",
"id": "v2.0", "id": "v2.0",
"links": [ "links": [
{ {
"href": "http://23.253.228.211:8776/v2/", "href": "http://23.253.211.234:8776/v2/",
"rel": "self" "rel": "self"
} }
] ],
"status": "CURRENT",
"updated": "2012-11-21T11:33:21Z"
} }
] ]
} }

View File

@ -1,7 +1,17 @@
{ {
"version": { "version": {
"status": "CURRENT", "id": "v1.0",
"updated": "2012-01-04T11:33:21Z", "links": [
{
"href": "http://23.253.211.234:8776/v1/",
"rel": "self"
},
{
"href": "http://docs.openstack.org/",
"rel": "describedby",
"type": "text/html"
}
],
"media-types": [ "media-types": [
{ {
"base": "application/xml", "base": "application/xml",
@ -12,22 +22,7 @@
"type": "application/vnd.openstack.volume+json;version=1" "type": "application/vnd.openstack.volume+json;version=1"
} }
], ],
"id": "v1.0", "status": "SUPPORTED",
"links": [ "updated": "2014-06-28T12:20:21Z"
{
"href": "http://23.253.228.211:8776/v1/",
"rel": "self"
},
{
"href": "http://jorgew.github.com/block-storage-api/content/os-block-storage-1.0.pdf",
"type": "application/pdf",
"rel": "describedby"
},
{
"href": "http://docs.rackspacecloud.com/servers/api/v1.1/application.wadl",
"type": "application/vnd.sun.wadl+xml",
"rel": "describedby"
}
]
} }
} }

View File

@ -1,7 +1,17 @@
{ {
"version": { "version": {
"status": "CURRENT", "id": "v1.0",
"updated": "2012-01-04T11:33:21Z", "links": [
{
"href": "http://23.253.211.234:8776/v1/",
"rel": "self"
},
{
"href": "http://docs.openstack.org/",
"rel": "describedby",
"type": "text/html"
}
],
"media-types": [ "media-types": [
{ {
"base": "application/xml", "base": "application/xml",
@ -12,22 +22,7 @@
"type": "application/vnd.openstack.volume+json;version=1" "type": "application/vnd.openstack.volume+json;version=1"
} }
], ],
"id": "v1.0", "status": "SUPPORTED",
"links": [ "updated": "2014-06-28T12:20:21Z"
{
"href": "http://23.253.228.211:8776/v1/",
"rel": "self"
},
{
"href": "http://jorgew.github.com/block-storage-api/content/os-block-storage-1.0.pdf",
"type": "application/pdf",
"rel": "describedby"
},
{
"href": "http://docs.rackspacecloud.com/servers/api/v1.1/application.wadl",
"type": "application/vnd.sun.wadl+xml",
"rel": "describedby"
}
]
} }
} }

View File

@ -1,26 +1,26 @@
{ {
"versions": [ "versions": [
{ {
"status": "CURRENT",
"updated": "2012-01-04T11:33:21Z",
"id": "v1.0", "id": "v1.0",
"links": [ "links": [
{ {
"href": "http://23.253.228.211:8776/v1/", "href": "http://23.253.211.234:8776/v1/",
"rel": "self" "rel": "self"
} }
] ],
"status": "SUPPORTED",
"updated": "2014-06-28T12:20:21Z"
}, },
{ {
"status": "CURRENT",
"updated": "2012-11-21T11:33:21Z",
"id": "v2.0", "id": "v2.0",
"links": [ "links": [
{ {
"href": "http://23.253.228.211:8776/v2/", "href": "http://23.253.211.234:8776/v2/",
"rel": "self" "rel": "self"
} }
] ],
"status": "CURRENT",
"updated": "2012-11-21T11:33:21Z"
} }
] ]
} }

View File

@ -1,7 +1,12 @@
{ {
"version": { "version": {
"status": "CURRENT", "id": "v2.0",
"updated": "2012-01-04T11:33:21Z", "links": [
{
"href": "http://23.253.211.234:8776/v2/v2.0",
"rel": "self"
}
],
"media-types": [ "media-types": [
{ {
"base": "application/xml", "base": "application/xml",
@ -12,22 +17,6 @@
"type": "application/vnd.openstack.volume+json;version=1" "type": "application/vnd.openstack.volume+json;version=1"
} }
], ],
"id": "v1.0", "status": "CURRENT"
"links": [
{
"href": "http://23.253.228.211:8776/v2/",
"rel": "self"
},
{
"href": "http://jorgew.github.com/block-storage-api/content/os-block-storage-1.0.pdf",
"type": "application/pdf",
"rel": "describedby"
},
{
"href": "http://docs.rackspacecloud.com/servers/api/v1.1/application.wadl",
"type": "application/vnd.sun.wadl+xml",
"rel": "describedby"
}
]
} }
} }