openstack
/
keystone
Code Issues Proposed changes

Fix version links to docs.openstack.org 

Remove PDF link.
Replace deep html links with links to the docs.openstack.org site.

Change-Id: Ic7c2218bf43a221e8d753a910fdfb2243851214d
Closes-Bug: #1313127
This commit is contained in:
Andreas Jaeger 2014-05-07 20:30:19 +02:00
parent d4c4a9654a
commit 646100b2cb
3 changed files with 8 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/source/api_curl_examples.rst
View File

@ -101,18 +101,8 @@ Returns::
{
"rel":"describedby",
"type":"text/html",
"href":"http://docs.openstack.org/api/openstack-identity-service/2.0/content/"
"href":"http://docs.openstack.org/"
},
{
"rel":"describedby",
"type":"application/pdf",
"href":"http://docs.openstack.org/api/openstack-identity-service/2.0/identity-dev-guide-2.0.pdf"
},
{
"rel":"describedby",
"type":"application/vnd.sun.wadl+xml",
"href":"http://127.0.0.1:35357/v2.0/identity-admin.wadl"
}
],
"media-types":[
{

9
keystone/controllers.py
View File

@ -89,14 +89,7 @@ class Version(wsgi.Application):
}, {
'rel': 'describedby',
'type': 'text/html',
'href': 'http://docs.openstack.org/api/openstack-'
'identity-service/2.0/content/'
}, {
'rel': 'describedby',
'type': 'application/pdf',
'href': 'http://docs.openstack.org/api/openstack-'
'identity-service/2.0/identity-dev-guide-'
'2.0.pdf'
'href': 'http://docs.openstack.org/'
}
],
'media-types': [

26
keystone/tests/test_versions.py
View File

@ -41,18 +41,9 @@ v2_MEDIA_TYPES = [
v2_HTML_DESCRIPTION = {
"rel": "describedby",
"type": "text/html",
"href": "http://docs.openstack.org/api/"
"openstack-identity-service/2.0/"
"content/"
"href": "http://docs.openstack.org/"
}
v2_PDF_DESCRIPTION = {
"rel": "describedby",
"type": "application/pdf",
"href": "http://docs.openstack.org/api/"
"openstack-identity-service/2.0/"
"identity-dev-guide-2.0.pdf"
}
v2_EXPECTED_RESPONSE = {
"id": "v2.0",
@ -63,8 +54,7 @@ v2_EXPECTED_RESPONSE = {
"rel": "self",
"href": "", # Will get filled in after initialization
},
v2_HTML_DESCRIPTION,
v2_PDF_DESCRIPTION
v2_HTML_DESCRIPTION
],
"media-types": v2_MEDIA_TYPES
}
@ -326,16 +316,12 @@ vnd.openstack.identity-v2.0+xml"/>
</media-types>
<links>
<link href="http://localhost:%%(port)s/v2.0/" rel="self"/>
<link href="http://docs.openstack.org/api/openstack-identity-service/\
2.0/content/" type="text/html" rel="describedby"/>
<link href="http://docs.openstack.org/api/openstack-identity-service/\
2.0/identity-dev-guide-2.0.pdf" type="application/pdf" rel="describedby"/>
<link href="http://docs.openstack.org/" type="text/html" \
rel="describedby"/>
</links>
<link href="http://localhost:%%(port)s/v2.0/" rel="self"/>
<link href="http://docs.openstack.org/api/openstack-identity-service/\
2.0/content/" type="text/html" rel="describedby"/>
<link href="http://docs.openstack.org/api/openstack-identity-service/\
2.0/identity-dev-guide-2.0.pdf" type="application/pdf" rel="describedby"/>
<link href="http://docs.openstack.org/" type="text/html" \
rel="describedby"/>
</version>
"""