enable_[v1|v2]_api does not modify versions API response

[Brian Waldon]

I set enable_v2_api=false yet if I GET /, I see the following response:

{"versions": [{"status": "CURRENT", "updated": "2012-01-04T11:33:21Z", "id": "v1.0", "links": [{"href": "http://localhost:8776/v1/", "rel": "self"}]}, {"status": "CURRENT", "updated": "2012-11-21T11:33:21Z", "id": "v2.0", "links": [{"href": "http://localhost:8776/v1/", "rel": "self"}]}]}

Additionally, if I GET /versions, I see this:

{"choices": [{"status": "CURRENT", "media-types": [{"base": "application/xml", "type": "application/vnd.openstack.volume+xml;version=1"}, {"base": "application/json", "type": "application/vnd.openstack.volume+json;version=1"}], "id": "v1.0", "links": [{"href": "http://localhost:8776/v1/volumes", "rel": "self"}]}, {"status": "CURRENT", "media-types": [{"base": "application/xml", "type": "application/vnd.openstack.volume+xml;version=1"}, {"base": "application/json", "type": "application/vnd.openstack.volume+json;version=1"}], "id": "v2.0", "links": [{"href": "http://localhost:8776/v1/volumes", "rel": "self"}]}]}

I would expect the v2 version objects not to be present. The same would apply to the v1 version objects if enable_v1_api were set to true

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/29616

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/29616
Committed: http://github.com/openstack/cinder/commit/c2ee6e2187e258da07e229e690afe20f0039e019
Submitter: Jenkins
Branch: master

commit c2ee6e2187e258da07e229e690afe20f0039e019
Author: Brian Waldon <email address hidden>
Date: Fri May 17 22:42:45 2013 +0000

    Hide v1/v2 version entities in API when disabled

    Fixes bug 1181413

    Change-Id: Ia8aaa78a0e0d222c268e9ca780816eb1c26feb3f

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/grizzly
Review: https://review.openstack.org/29983