openstack/nova
Code Issues Proposed changes

Merge "Change v2.1 API status to CURRENT"

Browse Source
This commit is contained in:
Jenkins 2015-02-24 08:37:02 +00:00 committed by Gerrit Code Review
commit 10a7974b3a
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/api_samples/versions-get-resp.json
View File

@ -8,7 +8,7 @@
"rel": "self" "rel": "self"
} }
], ],
"status": "CURRENT", "status": "SUPPORTED",
"updated": "2011-01-21T11:33:21Z" "updated": "2011-01-21T11:33:21Z"
}, },
{ {
@ -19,7 +19,7 @@
"rel": "self" "rel": "self"
} }
], ],
"status": "EXPERIMENTAL", "status": "CURRENT",
"updated": "2013-07-23T11:33:21Z" "updated": "2013-07-23T11:33:21Z"
} }
] ]

4
nova/api/openstack/compute/versions.py
View File

@ -35,7 +35,7 @@ LINKS = {
VERSIONS = { VERSIONS = {
"v2.0": { "v2.0": {
"id": "v2.0", "id": "v2.0",
"status": "CURRENT", "status": "SUPPORTED",
"updated": "2011-01-21T11:33:21Z", "updated": "2011-01-21T11:33:21Z",
"links": [ "links": [
{ {
@ -53,7 +53,7 @@ VERSIONS = {
}, },
"v2.1": { "v2.1": {
"id": "v2.1", "id": "v2.1",
"status": "EXPERIMENTAL", "status": "CURRENT",
"updated": "2013-07-23T11:33:21Z", "updated": "2013-07-23T11:33:21Z",
"links": [ "links": [
{ {

4
nova/tests/functional/api_samples/versions-get-resp.json.tpl
View File

@ -8,7 +8,7 @@
"rel": "self" "rel": "self"
} }
], ],
"status": "CURRENT", "status": "SUPPORTED",
"updated": "2011-01-21T11:33:21Z" "updated": "2011-01-21T11:33:21Z"
}, },
{ {
@ -19,7 +19,7 @@
"rel": "self" "rel": "self"
} }
], ],
"status": "EXPERIMENTAL", "status": "CURRENT",
"updated": "2013-07-23T11:33:21Z" "updated": "2013-07-23T11:33:21Z"
} }
] ]

18
nova/tests/unit/api/openstack/compute/test_versions.py
View File

@ -44,7 +44,7 @@ EXP_LINKS = {
EXP_VERSIONS = { EXP_VERSIONS = {
"v2.0": { "v2.0": {
"id": "v2.0", "id": "v2.0",
"status": "CURRENT", "status": "SUPPORTED",
"updated": "2011-01-21T11:33:21Z", "updated": "2011-01-21T11:33:21Z",
"links": [ "links": [
{ {
@ -62,7 +62,7 @@ EXP_VERSIONS = {
}, },
"v2.1": { "v2.1": {
"id": "v2.1", "id": "v2.1",
"status": "EXPERIMENTAL", "status": "CURRENT",
"updated": "2013-07-23T11:33:21Z", "updated": "2013-07-23T11:33:21Z",
"links": [ "links": [
{ {
@ -97,7 +97,7 @@ class VersionsTestV20(test.NoDBTestCase):
expected = [ expected = [
{ {
"id": "v2.0", "id": "v2.0",
"status": "CURRENT", "status": "SUPPORTED",
"updated": "2011-01-21T11:33:21Z", "updated": "2011-01-21T11:33:21Z",
"links": [ "links": [
{ {
@ -107,7 +107,7 @@ class VersionsTestV20(test.NoDBTestCase):
}, },
{ {
"id": "v2.1", "id": "v2.1",
"status": "EXPERIMENTAL", "status": "CURRENT",
"updated": "2013-07-23T11:33:21Z", "updated": "2013-07-23T11:33:21Z",
"links": [ "links": [
{ {
@ -138,7 +138,7 @@ class VersionsTestV20(test.NoDBTestCase):
expected = { expected = {
"version": { "version": {
"id": "v2.0", "id": "v2.0",
"status": "CURRENT", "status": "SUPPORTED",
"updated": "2011-01-21T11:33:21Z", "updated": "2011-01-21T11:33:21Z",
"links": [ "links": [
{ {
@ -186,7 +186,7 @@ class VersionsTestV20(test.NoDBTestCase):
"choices": [ "choices": [
{ {
"id": "v2.0", "id": "v2.0",
"status": "CURRENT", "status": "SUPPORTED",
"links": [ "links": [
{ {
"href": "http://localhost/v2/images/1", "href": "http://localhost/v2/images/1",
@ -203,7 +203,7 @@ class VersionsTestV20(test.NoDBTestCase):
}, },
{ {
"id": "v2.1", "id": "v2.1",
"status": "EXPERIMENTAL", "status": "CURRENT",
"links": [ "links": [
{ {
"href": "http://localhost/v2.1/images/1", "href": "http://localhost/v2.1/images/1",
@ -245,7 +245,7 @@ class VersionsTestV20(test.NoDBTestCase):
"choices": [ "choices": [
{ {
"id": "v2.0", "id": "v2.0",
"status": "CURRENT", "status": "SUPPORTED",
"links": [ "links": [
{ {
"href": "http://localhost/v2/servers/" + uuid, "href": "http://localhost/v2/servers/" + uuid,
@ -262,7 +262,7 @@ class VersionsTestV20(test.NoDBTestCase):
}, },
{ {
"id": "v2.1", "id": "v2.1",
"status": "EXPERIMENTAL", "status": "CURRENT",
"links": [ "links": [
{ {
"href": "http://localhost/v2.1/servers/" + uuid, "href": "http://localhost/v2.1/servers/" + uuid,